793 files changed, 0 insertions, 167243 deletions

diff --git a/patches/binutils/2.23.2/120-sh-conf.patch b/patches/binutils/2.23.2/120-sh-conf.patch
deleted file mode 100644
index ea3d1b6..0000000
--- a/patches/binutils/2.23.2/120-sh-conf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
---- a/configure
-+++ b/configure
-@@ -1495,7 +1495,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
---- a/configure.ac
-+++ b/configure.ac
-@@ -712,7 +712,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
diff --git a/patches/binutils/2.23.2/300-001_ld_makefile_patch.patch b/patches/binutils/2.23.2/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 5cb0f61..0000000
--- a/patches/binutils/2.23.2/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/patches/binutils/2.23.2/300-012_check_ldrunpath_length.patch b/patches/binutils/2.23.2/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index df78310..0000000
--- a/patches/binutils/2.23.2/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
---- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
-+++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
-@@ -1270,6 +1270,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1497,6 +1499,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/patches/binutils/2.23.2/310-fix-gold-pthreads-typo.patch b/patches/binutils/2.23.2/310-fix-gold-pthreads-typo.patch
deleted file mode 100644
index f2e6ff2..0000000
--- a/patches/binutils/2.23.2/310-fix-gold-pthreads-typo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
-@@ -102,9 +102,9 @@
-   if (err != 0)
-     gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
- #ifdef PTHREAD_MUTEX_ADAPTIVE_NP
--  err = pthread_mutextattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-+  err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-   if (err != 0)
--    gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err));
-+    gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
- #endif
- 
-   err = pthread_mutex_init(&this->mutex_, &attr);
diff --git a/patches/binutils/2.23.2/500-sysroot.patch b/patches/binutils/2.23.2/500-sysroot.patch
deleted file mode 100644
index e49c795..0000000
--- a/patches/binutils/2.23.2/500-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
-      directory first.  */
-   if (! entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/patches/binutils/2.23.2/600-poison-system-directories.patch b/patches/binutils/2.23.2/600-poison-system-directories.patch
deleted file mode 100644
index 780e48e..0000000
--- a/patches/binutils/2.23.2/600-poison-system-directories.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.in (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-Index: b/ld/config.in
-===================================================================
---- a/ld/config.in
-+++ b/ld/config.in
-@@ -11,6 +11,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-Index: b/ld/configure
-===================================================================
---- a/ld/configure
-+++ b/ld/configure
-@@ -773,6 +773,7 @@
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_werror
-@@ -1428,6 +1429,8 @@
- 			  (and sometimes confusing) to the casual installer
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -4338,7 +4341,18 @@
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-Index: b/ld/configure.in
-===================================================================
---- a/ld/configure.in
-+++ b/ld/configure.in
-@@ -70,6 +70,16 @@
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-Index: b/ld/ldfile.c
-===================================================================
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -116,6 +116,23 @@
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-Index: b/ld/ld.h
-===================================================================
---- a/ld/ld.h
-+++ b/ld/ld.h
-@@ -203,6 +203,14 @@
-   /* If TRUE we'll just print the default output on stdout.  */
-   bfd_boolean print_output_format;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-Index: b/ld/ldmain.c
-===================================================================
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -265,6 +265,8 @@
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-   command_line.disable_target_specific_optimizations = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-Index: b/ld/ld.texinfo
-===================================================================
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -2154,6 +2154,18 @@
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-Index: b/ld/lexsup.c
-===================================================================
---- a/ld/lexsup.c
-+++ b/ld/lexsup.c
-@@ -498,6 +498,14 @@
-     TWO_DASHES },
-   { {"wrap", required_argument, NULL, OPTION_WRAP},
-     '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+     OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+     OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -510,6 +518,7 @@
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1427,9 +1436,21 @@
-               einfo (_("%P%X: --hash-size needs a numeric argument\n"));
-           }
-           break;
-+
-+   case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+     command_line.poison_system_directories = FALSE;
-+     break;
-+
-+   case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+     command_line.error_poison_system_directories = TRUE;
-+     break;
- 	}
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
-Index: b/ld/ldlex.h
-===================================================================
---- a/ld/ldlex.h
-+++ b/ld/ldlex.h
-@@ -136,6 +136,8 @@
- #endif /* ENABLE_PLUGINS */
-   OPTION_DEFAULT_SCRIPT,
-   OPTION_PRINT_OUTPUT_FORMAT,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
diff --git a/patches/binutils/2.23.2/900-xtensa-trampolines.patch b/patches/binutils/2.23.2/900-xtensa-trampolines.patch
deleted file mode 100644
index b5b934f..0000000
--- a/patches/binutils/2.23.2/900-xtensa-trampolines.patch
+++ /dev/null
@@ -1,846 +0,0 @@
-From a82c7d9030b67a6a76a5403d0e1641f9e42141ac Mon Sep 17 00:00:00 2001
-From: David Weatherford <weath@cadence.com>
-Date: Fri, 21 Mar 2014 11:53:42 +0000
-Subject: [PATCH] Add support to the Xtensa target for creating trampolines for
- out-of-range branches.
-
-    * tc-xtensa.c (xtensa_check_frag_count, xtensa_create_trampoline_frag)
-    (xtensa_maybe_create_trampoline_frag, init_trampoline_frag)
-    (find_trampoline_seg, search_trampolines, get_best_trampoline)
-    (check_and_update_trampolines, add_jump_to_trampoline)
-    (dump_trampolines): New function.
-    (md_parse_option): Add cases for --[no-]trampolines options.
-    (md_assemble, finish_vinsn, xtensa_end): Add call to
-    xtensa_check_frag_count.
-    (xg_assemble_vliw_tokens): Add call to
-    xtensa_maybe_create_trampoline_frag.
-    (xtensa_relax_frag): Relax fragments with RELAX_TRAMPOLINE state.
-    (relax_frag_immed): Relax jump instructions that cannot reach its
-    target.
-    * tc-xtensa.h (xtensa_relax_statesE::RELAX_TRAMPOLINE): New relax
-    state.
-
-    * as.texinfo: Document --[no-]trampolines command-line options.
-    * c-xtensa.texi: Document trampolines relaxation and command line
-    options.
-
-    * frags.c (get_frag_count, clear_frag_count): New function.
-    (frag_alloc): Increment totalfrags counter.
-    * frags.h (get_frag_count, clear_frag_count): New function.
-
-    * all.exp: Add test for trampoline relaxation.
-    * trampoline.d: Trampoline relaxation expected dump.
-    * trampoline.s: Trampoline relaxation test source.
----
-Backported from: a82c7d9030b67a6a76a5403d0e1641f9e42141ac
-Changes to Changelog files are dropped.
-
- gas/config/tc-xtensa.c                | 558 +++++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                |   5 +
- gas/frags.c                           |  15 +
- gas/frags.h                           |   3 +
- gas/testsuite/gas/xtensa/all.exp      |   1 +
- gas/testsuite/gas/xtensa/trampoline.d |  26 ++
- gas/testsuite/gas/xtensa/trampoline.s |  21 ++
- 11 files changed, 753 insertions(+), 2 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/trampoline.d
- create mode 100644 gas/testsuite/gas/xtensa/trampoline.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index fe8ec0f..ea23c96 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -468,6 +468,12 @@ static void xtensa_set_frag_assembly_state (fragS *);
- static void finish_vinsn (vliw_insn *);
- static bfd_boolean emit_single_op (TInsn *);
- static int total_frag_text_expansion (fragS *);
-+static bfd_boolean use_trampolines = TRUE;
-+static void xtensa_check_frag_count (void);
-+static void xtensa_create_trampoline_frag (bfd_boolean);
-+static void xtensa_maybe_create_trampoline_frag (void);
-+struct trampoline_frag;
-+static int init_trampoline_frag (struct trampoline_frag *);
- 
- /* Alignment Functions.  */
- 
-@@ -520,6 +526,7 @@ static void tinsn_from_chars (TInsn *, char *, int);
- static void tinsn_immed_from_frag (TInsn *, fragS *, int);
- static int get_num_stack_text_bytes (IStack *);
- static int get_num_stack_literal_bytes (IStack *);
-+static bfd_boolean tinsn_to_slotbuf (xtensa_format, int, TInsn *, xtensa_insnbuf);
- 
- /* vliw_insn functions.  */
- 
-@@ -687,7 +694,10 @@ enum
-   option_prefer_l32r,
-   option_prefer_const16,
- 
--  option_target_hardware
-+  option_target_hardware,
-+
-+  option_trampolines,
-+  option_no_trampolines,
- };
- 
- const char *md_shortopts = "";
-@@ -760,6 +770,9 @@ struct option md_longopts[] =
- 
-   { "target-hardware", required_argument, NULL, option_target_hardware },
- 
-+  { "trampolines", no_argument, NULL, option_trampolines },
-+  { "no-trampolines", no_argument, NULL, option_no_trampolines },
-+
-   { NULL, no_argument, NULL, 0 }
- };
- 
-@@ -940,6 +953,14 @@ md_parse_option (int c, char *arg)
-       directive_state[directive_transform] = FALSE;
-       return 1;
- 
-+    case option_trampolines:
-+      use_trampolines = TRUE;
-+      return 1;
-+
-+    case option_no_trampolines:
-+      use_trampolines = FALSE;
-+      return 1;
-+
-     default:
-       return 0;
-     }
-@@ -963,7 +984,9 @@ Xtensa options:\n\
-                           flix bundles\n\
-   --no-allow-flix         neither allow hand-written nor generate\n\
-                           flix bundles\n\
--  --rename-section old=new Rename section 'old' to 'new'\n", stream);
-+  --rename-section old=new Rename section 'old' to 'new'\n\
-+  --[no-]trampolines      [Do not] generate trampolines (jumps to jumps)\n\
-+                          when jumps do not reach their targets\n", stream);
- }
- 
- 
-@@ -5568,6 +5591,8 @@ md_assemble (char *str)
- 
-   /* We've just emitted a new instruction so clear the list of labels.  */
-   xtensa_clear_insn_labels ();
-+
-+  xtensa_check_frag_count ();
- }
- 
- 
-@@ -6372,6 +6397,8 @@ finish_vinsn (vliw_insn *vinsn)
-   xg_assemble_vliw_tokens (vinsn);
- 
-   xg_clear_vinsn (vinsn);
-+
-+  xtensa_check_frag_count ();
- }
- 
- 
-@@ -7140,6 +7167,7 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
- 		    RELAX_UNREACHABLE,
- 		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
- 	  xtensa_set_frag_assembly_state (frag_now);
-+	  xtensa_maybe_create_trampoline_frag ();
- 	}
-       else if (is_branch && do_align_targets ())
- 	{
-@@ -7222,9 +7250,164 @@ xtensa_end (void)
-   xtensa_sanity_check ();
- 
-   xtensa_add_config_info ();
-+
-+  xtensa_check_frag_count ();
-+}
-+
-+
-+struct trampoline_frag
-+{
-+  struct trampoline_frag *next;
-+  bfd_boolean needs_jump_around;
-+  fragS *fragP;
-+  fixS *fixP;
-+};
-+
-+struct trampoline_seg
-+{
-+  struct trampoline_seg *next;
-+  asection *seg;
-+  struct trampoline_frag trampoline_list;
-+};
-+
-+static struct trampoline_seg trampoline_seg_list;
-+#define J_RANGE (128 * 1024)
-+
-+static int unreachable_count = 0;
-+
-+
-+static void
-+xtensa_maybe_create_trampoline_frag (void)
-+{
-+  if (!use_trampolines)
-+    return;
-+
-+  /* We create an area for possible trampolines every 10 unreachable frags.
-+     These are preferred over the ones not preceded by an unreachable frag,
-+     because we don't have to jump around them. This function is called after
-+     each RELAX_UNREACHABLE frag is created.  */
-+
-+  if (++unreachable_count > 10)
-+    {
-+      xtensa_create_trampoline_frag (FALSE);
-+      clear_frag_count ();
-+      unreachable_count = 0;
-+    }
-+}
-+
-+static void
-+xtensa_check_frag_count (void)
-+{
-+  if (!use_trampolines || frag_now->tc_frag_data.is_no_transform)
-+    return;
-+
-+  /* We create an area for possible trampolines every 8000 frags or so. This
-+     is an estimate based on the max range of a "j" insn (+/-128K) divided
-+     by a typical frag byte count (16), minus a few for safety. This function
-+     is called after each source line is processed.  */
-+
-+  if (get_frag_count () > 8000)
-+    {
-+      xtensa_create_trampoline_frag (TRUE);
-+      clear_frag_count ();
-+      unreachable_count = 0;
-+    }
-+}
-+
-+static xtensa_insnbuf trampoline_buf = NULL;
-+static xtensa_insnbuf trampoline_slotbuf = NULL;
-+
-+#define TRAMPOLINE_FRAG_SIZE 3000
-+
-+static void
-+xtensa_create_trampoline_frag (bfd_boolean needs_jump_around)
-+{
-+  /* Emit a frag where we can place intermediate jump instructions,
-+     in case we need to jump farther than 128K bytes.
-+     Each jump instruction takes three bytes.
-+     We allocate enough for 1000 trampolines in each frag.
-+     If that's not enough, oh well.  */
-+
-+  struct trampoline_seg *ts = trampoline_seg_list.next;
-+  struct trampoline_frag *tf;
-+  char *varP;
-+  fragS *fragP;
-+  int size = TRAMPOLINE_FRAG_SIZE;
-+
-+  for ( ; ts; ts = ts->next)
-+    {
-+      if (ts->seg == now_seg)
-+	break;
-+    }
-+
-+  if (ts == NULL)
-+    {
-+      ts = (struct trampoline_seg *)xcalloc(sizeof (struct trampoline_seg), 1);
-+      ts->next = trampoline_seg_list.next;
-+      trampoline_seg_list.next = ts;
-+      ts->seg = now_seg;
-+    }
-+
-+  frag_wane (frag_now);
-+  frag_new (0);
-+  xtensa_set_frag_assembly_state (frag_now);
-+  varP = frag_var (rs_machine_dependent, size, size, RELAX_TRAMPOLINE, NULL, 0, NULL);
-+  fragP = (fragS *)(varP - SIZEOF_STRUCT_FRAG);
-+  if (trampoline_buf == NULL)
-+    {
-+      trampoline_buf = xtensa_insnbuf_alloc (xtensa_default_isa);
-+      trampoline_slotbuf = xtensa_insnbuf_alloc (xtensa_default_isa);
-+    }
-+  tf = (struct trampoline_frag *)xmalloc(sizeof (struct trampoline_frag));
-+  tf->next = ts->trampoline_list.next;
-+  ts->trampoline_list.next = tf;
-+  tf->needs_jump_around = needs_jump_around;
-+  tf->fragP = fragP;
-+  tf->fixP = NULL;
-+}
-+
-+
-+static struct trampoline_seg *
-+find_trampoline_seg (asection *seg)
-+{
-+  struct trampoline_seg *ts = trampoline_seg_list.next;
-+
-+  for ( ; ts; ts = ts->next)
-+    {
-+      if (ts->seg == seg)
-+	return ts;
-+    }
-+
-+  return NULL;
- }
- 
- 
-+void dump_trampolines (void);
-+
-+void
-+dump_trampolines (void)
-+{
-+  struct trampoline_seg *ts = trampoline_seg_list.next;
-+
-+  for ( ; ts; ts = ts->next)
-+    {
-+      asection *seg = ts->seg;
-+
-+      if (seg == NULL)
-+	continue;
-+      fprintf(stderr, "SECTION %s\n", seg->name);
-+      struct trampoline_frag *tf = ts->trampoline_list.next;
-+      for ( ; tf; tf = tf->next)
-+	{
-+	  if (tf->fragP == NULL)
-+	    continue;
-+	  fprintf(stderr, "   0x%08x: fix=%d, jump_around=%s\n",
-+		  (int)tf->fragP->fr_address, (int)tf->fragP->fr_fix,
-+		  tf->needs_jump_around ? "T" : "F");
-+	}
-+    }
-+}
-+
- static void
- xtensa_cleanup_align_frags (void)
- {
-@@ -8708,6 +8891,149 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 	new_stretch += relax_frag_for_align (fragP, stretch);
-       break;
- 
-+    case RELAX_TRAMPOLINE:
-+      if (fragP->tc_frag_data.relax_seen)
-+        {
-+          segment_info_type *seginfo = seg_info (now_seg);
-+          fragS *fP; /* The out-of-range jump.  */
-+          fixS *fixP;
-+
-+          /* Scan for jumps that will not reach.  */
-+          for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+            {
-+              symbolS *s = fixP->fx_addsy;
-+	      xtensa_opcode opcode;
-+              int target;
-+              int addr;
-+              int delta;
-+
-+              if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
-+                  fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
-+                continue;
-+	      xtensa_insnbuf_from_chars (isa, trampoline_buf,
-+					 (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where,
-+					 0);
-+	      fmt = xtensa_format_decode (isa, trampoline_buf);
-+	      gas_assert (fmt != XTENSA_UNDEFINED);
-+	      slot = fixP->tc_fix_data.slot;
-+	      xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
-+	      opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
-+	      if (opcode != xtensa_j_opcode)
-+		continue;
-+              target = S_GET_VALUE (s);
-+              addr = fixP->fx_frag->fr_address;
-+              delta = target - addr + stretch;
-+              if (delta > J_RANGE  || delta < -1 * J_RANGE)
-+                { /* Found an out-of-range jump; scan the list of trampolines for the best match.  */
-+		  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-+		  struct trampoline_frag *tf = ts->trampoline_list.next;
-+		  struct trampoline_frag *prev = &ts->trampoline_list;
-+		  int lower = (target < addr) ? target : addr;
-+		  int upper = (target > addr) ? target : addr;
-+		  int midpoint = lower + (upper - lower) / 2;
-+
-+		  if ((upper - lower) > 2 * J_RANGE)
-+		    {
-+		      /* One trampoline won't suffice; we need multiple jumps.
-+			 Jump to the trampoline that's farthest, but still in
-+			 range relative to the original "j" instruction.  */
-+		      for ( ; tf; prev = tf, tf = tf->next )
-+			{
-+			  int this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+			  int next_addr = (tf->next) ? tf->next->fragP->fr_address + tf->next->fragP->fr_fix : 0 ;
-+
-+			  if (addr == lower)
-+			    {
-+			      /* Forward jump.  */
-+			      if (this_addr - addr < J_RANGE)
-+				break;
-+			    }
-+			  else
-+			    {
-+			      /* Backward jump.  */
-+			      if (next_addr == 0 || addr - next_addr > J_RANGE)
-+				break;
-+			    }
-+			}
-+		    }
-+		  else
-+		    {
-+		      struct trampoline_frag *best_tf = NULL;
-+		      int best_delta = 0;
-+
-+		      for ( ; tf; prev = tf, tf = tf->next )
-+			{
-+			  int this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+			  int this_delta = abs (this_addr - midpoint);
-+
-+			  if (!best_tf || this_delta < best_delta)
-+			    {
-+			       best_tf = tf;
-+			       best_delta = this_delta;
-+			    }
-+			}
-+		      tf = best_tf;
-+		    }
-+		  if (tf->fragP == fragP)
-+		    {
-+		      int trampaddr = fragP->fr_address + fragP->fr_fix;
-+
-+		      if (abs (addr - trampaddr) < J_RANGE)
-+			{ /* The trampoline is in range of original; fix it!  */
-+			  fixS *newfixP;
-+			  int offset;
-+			  TInsn insn;
-+			  symbolS *lsym;
-+
-+			  new_stretch += init_trampoline_frag (tf);
-+			  offset = fragP->fr_fix; /* Where to assemble the j insn.  */
-+			  lsym = fragP->fr_symbol;
-+			  fP = fixP->fx_frag;
-+			  /* Assemble a jump to the target label here.  */
-+			  tinsn_init (&insn);
-+			  insn.insn_type = ITYPE_INSN;
-+			  insn.opcode = xtensa_j_opcode;
-+			  insn.ntok = 1;
-+			  set_expr_symbol_offset (&insn.tok[0], lsym, offset);
-+			  fmt = xg_get_single_format (xtensa_j_opcode);
-+			  tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf);
-+			  xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf);
-+			  xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)fragP->fr_literal + offset, 3);
-+			  fragP->fr_fix += 3;
-+			  fragP->fr_var -= 3;
-+			  /* Add a fix-up for the original j insn.  */
-+			  newfixP = fix_new (fP, fixP->fx_where, fixP->fx_size, lsym, fragP->fr_fix - 3, TRUE, fixP->fx_r_type);
-+			  newfixP->fx_no_overflow = 1;
-+			  newfixP->tc_fix_data.X_add_symbol = lsym;
-+			  newfixP->tc_fix_data.X_add_number = offset;
-+			  newfixP->tc_fix_data.slot = slot;
-+			  /* Move the fix-up from the original j insn to this one.  */
-+			  fixP->fx_frag = fragP;
-+			  fixP->fx_where = fragP->fr_fix - 3;
-+			  fixP->tc_fix_data.slot = 0;
-+			  /* Adjust the jump around this trampoline (if present).  */
-+			  if (tf->fixP != NULL)
-+			    {
-+			      tf->fixP->fx_offset += 3;
-+			    }
-+			  new_stretch += 3;
-+			  fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass.  */
-+			  /* Do we have room for more?  */
-+			  if (fragP->fr_var < 3)
-+			    { /* No, convert to fill.  */
-+			      frag_wane (fragP);
-+			      fragP->fr_subtype = 0;
-+			      /* Remove from the trampoline_list.  */
-+			      prev->next = tf->next;
-+			      break;
-+			    }
-+			}
-+		    }
-+                }
-+            }
-+        }
-+      break;
-+
-     default:
-       as_bad (_("bad relaxation state"));
-     }
-@@ -9146,6 +9472,200 @@ bytes_to_stretch (fragS *this_frag,
- }
- 
- 
-+static struct trampoline_frag *
-+search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
-+{
-+  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-+  struct trampoline_frag *tf = (ts) ? ts->trampoline_list.next : NULL;
-+  struct trampoline_frag *best_tf = NULL;
-+  int best_delta = 0;
-+  int best_addr = 0;
-+  symbolS *sym = tinsn->tok[0].X_add_symbol;
-+  offsetT target = S_GET_VALUE (sym) + tinsn->tok[0].X_add_number;
-+  offsetT addr = fragP->fr_address;
-+  offsetT lower = (addr < target) ? addr : target;
-+  offsetT upper = (addr > target) ? addr : target;
-+  int delta = upper - lower;
-+  offsetT midpoint = lower + delta / 2;
-+  int this_delta = -1;
-+  int this_addr = -1;
-+
-+  if (delta > 2 * J_RANGE)
-+    {
-+      /* One trampoline won't do; we need multiple.
-+	 Choose the farthest trampoline that's still in range of the original
-+	 and let a later pass finish the job.  */
-+      for ( ; tf; tf = tf->next)
-+	{
-+	  int next_addr = (tf->next) ? tf->next->fragP->fr_address + tf->next->fragP->fr_fix : 0;
-+
-+	  this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+	  if (lower == addr)
-+	    {
-+	      /* Forward jump.  */
-+	      if (this_addr - addr < J_RANGE)
-+		break;
-+	    }
-+	  else
-+	    {
-+	      /* Backward jump.  */
-+	      if (next_addr == 0 || addr - next_addr > J_RANGE)
-+		break;
-+	    }
-+	  if (abs (addr - this_addr) < J_RANGE)
-+	    return tf;
-+
-+	  return NULL;
-+	}
-+    }
-+  for ( ; tf; tf = tf->next)
-+    {
-+      this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+      this_delta = abs (this_addr - midpoint);
-+      if (unreachable_only && tf->needs_jump_around)
-+	continue;
-+      if (!best_tf || this_delta < best_delta)
-+        {
-+	  best_tf = tf;
-+	  best_delta = this_delta;
-+	  best_addr = this_addr;
-+        }
-+    }
-+
-+  if (best_tf &&
-+      best_delta < J_RANGE &&
-+      abs(best_addr - lower) < J_RANGE &&
-+      abs(best_addr - upper) < J_RANGE)
-+    return best_tf;
-+
-+  return NULL; /* No suitable trampoline found.  */
-+}
-+
-+
-+static struct trampoline_frag *
-+get_best_trampoline (TInsn *tinsn, fragS *fragP)
-+{
-+  struct trampoline_frag *tf = NULL;
-+
-+  tf = search_trampolines (tinsn, fragP, TRUE); /* Try unreachable first.  */
-+
-+  if (tf == NULL)
-+    tf = search_trampolines (tinsn, fragP, FALSE); /* Try ones needing a jump-around, too.  */
-+
-+  return tf;
-+}
-+
-+
-+static void
-+check_and_update_trampolines (void)
-+{
-+  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-+  struct trampoline_frag *tf = ts->trampoline_list.next;
-+  struct trampoline_frag *prev = &ts->trampoline_list;
-+
-+  for ( ; tf; prev = tf, tf = tf->next)
-+    {
-+      if (tf->fragP->fr_var < 3)
-+	{
-+	  frag_wane (tf->fragP);
-+	  prev->next = tf->next;
-+	  tf->fragP = NULL;
-+	}
-+    }
-+}
-+
-+
-+static int
-+init_trampoline_frag (struct trampoline_frag *trampP)
-+{
-+  fragS *fp = trampP->fragP;
-+  int growth = 0;
-+
-+  if (fp->fr_fix == 0)
-+    {
-+      symbolS *lsym;
-+      char label[10 + 2 * sizeof(fp)];
-+      sprintf (label, ".L0_TR_%p", fp);
-+
-+      lsym = (symbolS *)local_symbol_make (label, now_seg, 0, fp);
-+      fp->fr_symbol = lsym;
-+      if (trampP->needs_jump_around)
-+        {
-+	  /* Add a jump around this block of jumps, in case
-+	     control flows into this block.  */
-+	  fixS *fixP;
-+	  TInsn insn;
-+	  xtensa_format fmt;
-+	  xtensa_isa isa = xtensa_default_isa;
-+
-+	  fp->tc_frag_data.is_insn = 1;
-+	  /* Assemble a jump insn.  */
-+	  tinsn_init (&insn);
-+	  insn.insn_type = ITYPE_INSN;
-+	  insn.opcode = xtensa_j_opcode;
-+	  insn.ntok = 1;
-+	  set_expr_symbol_offset (&insn.tok[0], lsym, 3);
-+	  fmt = xg_get_single_format (xtensa_j_opcode);
-+	  tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf);
-+	  xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf);
-+	  xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)fp->fr_literal, 3);
-+	  fp->fr_fix += 3;
-+	  fp->fr_var -= 3;
-+	  growth = 3;
-+	  fixP = fix_new (fp, 0, 3, lsym, 3, TRUE, BFD_RELOC_XTENSA_SLOT0_OP);
-+	  trampP->fixP = fixP;
-+        }
-+    }
-+  return growth;
-+}
-+
-+
-+static int
-+add_jump_to_trampoline (struct trampoline_frag *trampP, fragS *origfrag)
-+{
-+  fragS *tramp = trampP->fragP;
-+  fixS *fixP;
-+  int offset = tramp->fr_fix; /* Where to assemble the j insn.  */
-+  TInsn insn;
-+  symbolS *lsym;
-+  symbolS *tsym;
-+  int toffset;
-+  xtensa_format fmt;
-+  xtensa_isa isa = xtensa_default_isa;
-+  int growth = 0;
-+
-+  lsym = tramp->fr_symbol;
-+  /* Assemble a jump to the target label in the trampoline frag.  */
-+  tsym = origfrag->tc_frag_data.slot_symbols[0];
-+  toffset = origfrag-> tc_frag_data.slot_offsets[0];
-+  tinsn_init (&insn);
-+  insn.insn_type = ITYPE_INSN;
-+  insn.opcode = xtensa_j_opcode;
-+  insn.ntok = 1;
-+  set_expr_symbol_offset (&insn.tok[0], tsym, toffset);
-+  fmt = xg_get_single_format (xtensa_j_opcode);
-+  tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf);
-+  xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf);
-+  xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)tramp->fr_literal + offset, 3);
-+  tramp->fr_fix += 3;
-+  tramp->fr_var -= 3;
-+  growth = 3;
-+  /* add a fix-up for the trampoline jump.  */
-+  fixP = fix_new (tramp, tramp->fr_fix - 3, 3, tsym, toffset, TRUE, BFD_RELOC_XTENSA_SLOT0_OP);
-+  /* Modify the jump at the start of this trampoline to point past the newly-added jump.  */
-+  fixP = trampP->fixP;
-+  if (fixP)
-+    fixP->fx_offset += 3;
-+  /* Modify the original j to point here.  */
-+  origfrag->tc_frag_data.slot_symbols[0] = lsym;
-+  origfrag->tc_frag_data.slot_offsets[0] = tramp->fr_fix - 3;
-+  /* If trampoline is full, remove it from the list.  */
-+  check_and_update_trampolines ();
-+
-+  return growth;
-+}
-+
-+
- static long
- relax_frag_immed (segT segP,
- 		  fragS *fragP,
-@@ -9284,6 +9804,37 @@ relax_frag_immed (segT segP,
-   if (negatable_branch && istack.ninsn > 1)
-     update_next_frag_state (fragP);
- 
-+  /* If last insn is a jump, and it cannot reach its target, try to find a trampoline.  */
-+  if (istack.ninsn > 2 &&
-+      istack.insn[istack.ninsn - 1].insn_type == ITYPE_LABEL &&
-+      istack.insn[istack.ninsn - 2].insn_type == ITYPE_INSN &&
-+      istack.insn[istack.ninsn - 2].opcode == xtensa_j_opcode)
-+    {
-+      TInsn *jinsn = &istack.insn[istack.ninsn - 2];
-+
-+      if (!xg_symbolic_immeds_fit (jinsn, segP, fragP, fragP->fr_offset, total_text_diff))
-+	{
-+	  struct trampoline_frag *tf = get_best_trampoline (jinsn, fragP);
-+
-+	  if (tf)
-+	    {
-+	      this_text_diff += init_trampoline_frag (tf);
-+	      this_text_diff += add_jump_to_trampoline (tf, fragP);
-+	    }
-+	  else
-+	    {
-+	      /* If target symbol is undefined, assume it will reach once linked.  */
-+	      expressionS *exp = &istack.insn[istack.ninsn - 2].tok[0];
-+
-+	      if (exp->X_op == O_symbol && S_IS_DEFINED (exp->X_add_symbol))
-+		{
-+		  as_bad_where (fragP->fr_file, fragP->fr_line,
-+		    _("jump target out of range; no usable trampoline found"));
-+		}
-+	    }
-+	}
-+    }
-+
-   return this_text_diff;
- }
- 
-@@ -9404,6 +9955,9 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec, fragS *fragp)
-       else
- 	as_bad (_("invalid relaxation fragment result"));
-       break;
-+
-+    case RELAX_TRAMPOLINE:
-+      break;
-     }
- 
-   fragp->fr_var = 0;
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index 0bf1240..4672bc6 100644
---- a/gas/config/tc-xtensa.h
-+++ b/gas/config/tc-xtensa.h
-@@ -180,6 +180,11 @@ enum xtensa_relax_statesE
-      prevent the linker from changing the size of any frag between the
-      section start and the org frag.  */
- 
-+  RELAX_TRAMPOLINE,
-+  /* Every few thousand frags, we insert one of these, just in case we may
-+     need some space for a trampoline (jump to a jump) because the function
-+     has gotten too big. If not needed, it disappears. */
-+
-   RELAX_NONE
- };
- 
-diff --git a/gas/frags.c b/gas/frags.c
-index 5f68480..e14099d 100644
---- a/gas/frags.c
-+++ b/gas/frags.c
-@@ -24,6 +24,20 @@
- 
- extern fragS zero_address_frag;
- extern fragS predefined_address_frag;
-+
-+static int totalfrags;
-+
-+int
-+get_frag_count (void)
-+{
-+  return totalfrags;
-+}
-+
-+void
-+clear_frag_count (void)
-+{
-+  totalfrags = 0;
-+}
- 
- /* Initialization for frag routines.  */
- 
-@@ -70,6 +84,7 @@ frag_alloc (struct obstack *ob)
-   ptr = (fragS *) obstack_alloc (ob, SIZEOF_STRUCT_FRAG);
-   obstack_alignment_mask (ob) = oalign;
-   memset (ptr, 0, SIZEOF_STRUCT_FRAG);
-+  totalfrags++;
-   return ptr;
- }
- 
-diff --git a/gas/frags.h b/gas/frags.h
-index 319898f..2f9e1b5 100644
---- a/gas/frags.h
-+++ b/gas/frags.h
-@@ -155,4 +155,7 @@ char *frag_var (relax_stateT type,
- 
- bfd_boolean frag_offset_fixed_p (const fragS *, const fragS *, offsetT *);
- 
-+int get_frag_count (void);
-+void clear_frag_count (void);
-+
- #endif /* FRAGS_H */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 2b2c294..3683b78 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -98,6 +98,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "pcrel"
-     run_dump_test "weak-call"
-     run_dump_test "jlong"
-+    run_dump_test "trampoline"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-new file mode 100644
-index 0000000..b4f65dc
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/trampoline.d
-@@ -0,0 +1,26 @@
-+#as:
-+#objdump: -d
-+#name: trampolines relaxation
-+
-+.*: +file format .*xtensa.*
-+#...
-+.*0:.*j.0x1194c
-+.*3:.*j.0x1194f
-+.*6:.*j.0x11952
-+.*9:.*j.0x1d4e4
-+#...
-+.*11949:.*j.0x11955
-+.*1194c:.*j.0x24a0e
-+.*1194f:.*j.0x24a0e
-+.*11952:.*j.0x24a11
-+#...
-+.*1d4e1:.*j.0x1d4e7
-+.*1d4e4:.*j.0x33462
-+#...
-+.*24a0e:.*j.0x24a0e
-+.*24a11:.*j.0x24a11
-+#...
-+.*3345f:.*ret
-+.*33462:.*j.0x49407
-+#...
-+.*49407:.*j.0x49407
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-new file mode 100644
-index 0000000..259a3bb
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/trampoline.s
-@@ -0,0 +1,21 @@
-+	.text
-+	j	1f
-+	j	1f
-+	j	2f
-+	j	3f
-+	.rep	25000
-+99:
-+	and	a2, a2, a3
-+	bne	a2, a3, 99b
-+	.endr
-+1:
-+	j	1b
-+2:
-+	j	2b
-+
-+	.rep	25000
-+	and	a2, a2, a3
-+	_ret
-+	.endr
-+3:
-+	j	3b
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/901-xtensa-gas-first-frag-alignment.patch b/patches/binutils/2.23.2/901-xtensa-gas-first-frag-alignment.patch
deleted file mode 100644
index e1c2d85..0000000
--- a/patches/binutils/2.23.2/901-xtensa-gas-first-frag-alignment.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 15 Apr 2014 19:12:46 +0400
-Subject: [PATCH] Fix alignment for the first section frag on xtensa
-
-Linking object files produced by partial linking with link-time
-relaxation enabled sometimes fails with the following error message:
-
-dangerous relocation: call8: misaligned call target: (.text.unlikely+0x63)
-
-This happens because no basic block with an XTENSA_PROP_ALIGN flag in the
-property table is generated for the first basic block, even if the
-.align directive is present.
-It was believed that the first frag alignment could be derived from the
-section alignment, but this was not implemented for the partial linking
-case: after partial linking first frag of a section may become not
-first, but no additional alignment frag is inserted before it.
-Basic block for such frag may be merged with previous basic block into
-extended basic block during relaxation pass losing its alignment
-restrictions.
-
-Fix this by always recording alignment for the first section frag.
-
-2014-04-22  Max Filippov  <jcmvbkbc@gmail.com>
-
-gas/
-    * config/tc-xtensa.c (xtensa_handle_align): record alignment for the
-    first section frag.
-
----
-Backported from: a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1
-Changes to Changelog files and tests are dropped.
-
- gas/config/tc-xtensa.c                      | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index ea23c96..58ace38 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5609,7 +5609,6 @@ xtensa_handle_align (fragS *fragP)
-       && ! fragP->tc_frag_data.is_literal
-       && (fragP->fr_type == rs_align
- 	  || fragP->fr_type == rs_align_code)
--      && fragP->fr_address + fragP->fr_fix > 0
-       && fragP->fr_offset > 0
-       && now_seg != bss_section)
-     {
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/902-xtensa-gas-ld-diff-relocation-signed.patch b/patches/binutils/2.23.2/902-xtensa-gas-ld-diff-relocation-signed.patch
deleted file mode 100644
index ba24f4e..0000000
--- a/patches/binutils/2.23.2/902-xtensa-gas-ld-diff-relocation-signed.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 6a17eba5358549d0d6d195bb22b34cdbc068def2 Mon Sep 17 00:00:00 2001
-From: Volodymyr Arbatov <arbatov@cadence.com>
-Date: Mon, 6 May 2013 09:43:21 -0800
-Subject: [PATCH] Use signed data type for R_XTENSA_DIFF* relocation offsets.
-
-R_XTENSA_DIFF relocation offsets are in fact signed. Treat them as such.
-Add testcase that examines ld behaviour on R_XTENSA_DIFF relocation
-changing sign during relaxation.
-
-2014-05-02  Volodymyr Arbatov  <arbatov@cadence.com>
-	    David Weatherford  <weath@cadence.com>
-	    Max Filippov  <jcmvbkbc@gmail.com>
-
-bfd/
-  * elf32-xtensa.c (relax_section): treat R_XTENSA_DIFF* relocations as
-  signed.
-
-gas/
-  * config/tc-xtensa.c (md_apply_fix): mark BFD_RELOC_XTENSA_DIFF*
-  fixups as signed.
----
-Backported from: 1058c7532d0b012ac329219264ddad59049fb6e6
-Changes to Changelog files and tests are dropped.
-
- bfd/elf32-xtensa.c                       | 32 ++++++++++++-----------
- gas/config/tc-xtensa.c                   |  3 +++
- 2 files changed, 20 insertions(+), 15 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index edb04b4..8818d67 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -222,11 +222,11 @@ static reloc_howto_type elf_howto_table[] =
- 	 FALSE, 0, 0, FALSE),
- 
-   /* Relocations for supporting difference of symbols.  */
--  HOWTO (R_XTENSA_DIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
-+  HOWTO (R_XTENSA_DIFF8, 0, 0, 8, FALSE, 0, complain_overflow_signed,
- 	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF8", FALSE, 0, 0xff, FALSE),
--  HOWTO (R_XTENSA_DIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
-+  HOWTO (R_XTENSA_DIFF16, 0, 1, 16, FALSE, 0, complain_overflow_signed,
- 	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF16", FALSE, 0, 0xffff, FALSE),
--  HOWTO (R_XTENSA_DIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
-+  HOWTO (R_XTENSA_DIFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
- 	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF32", FALSE, 0, 0xffffffff, FALSE),
- 
-   /* General immediate operand relocations.  */
-@@ -9013,7 +9013,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		  || r_type == R_XTENSA_DIFF16
- 		  || r_type == R_XTENSA_DIFF32)
- 		{
--		  bfd_vma diff_value = 0, new_end_offset, diff_mask = 0;
-+		  bfd_signed_vma diff_value = 0;
-+		  bfd_vma new_end_offset, diff_mask = 0;
- 
- 		  if (bfd_get_section_limit (abfd, sec) < old_source_offset)
- 		    {
-@@ -9027,15 +9028,15 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		    {
- 		    case R_XTENSA_DIFF8:
- 		      diff_value =
--			bfd_get_8 (abfd, &contents[old_source_offset]);
-+			bfd_get_signed_8 (abfd, &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF16:
- 		      diff_value =
--			bfd_get_16 (abfd, &contents[old_source_offset]);
-+			bfd_get_signed_16 (abfd, &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF32:
- 		      diff_value =
--			bfd_get_32 (abfd, &contents[old_source_offset]);
-+			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
- 		      break;
- 		    }
- 
-@@ -9047,24 +9048,25 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		  switch (r_type)
- 		    {
- 		    case R_XTENSA_DIFF8:
--		      diff_mask = 0xff;
--		      bfd_put_8 (abfd, diff_value,
-+		      diff_mask = 0x7f;
-+		      bfd_put_signed_8 (abfd, diff_value,
- 				 &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF16:
--		      diff_mask = 0xffff;
--		      bfd_put_16 (abfd, diff_value,
-+		      diff_mask = 0x7fff;
-+		      bfd_put_signed_16 (abfd, diff_value,
- 				  &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF32:
--		      diff_mask = 0xffffffff;
--		      bfd_put_32 (abfd, diff_value,
-+		      diff_mask = 0x7fffffff;
-+		      bfd_put_signed_32 (abfd, diff_value,
- 				  &contents[old_source_offset]);
- 		      break;
- 		    }
- 
--		  /* Check for overflow.  */
--		  if ((diff_value & ~diff_mask) != 0)
-+		  /* Check for overflow. Sign bits must be all zeroes or all ones */
-+		  if ((diff_value & ~diff_mask) != 0 &&
-+		      (diff_value & ~diff_mask) != (-1 & ~diff_mask))
- 		    {
- 		      (*link_info->callbacks->reloc_dangerous)
- 			(link_info, _("overflow after relaxation"),
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 58ace38..7547c0a0 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5867,12 +5867,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
-+	      fixP->fx_signed = 1;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
-+	      fixP->fx_signed = 1;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
-+	      fixP->fx_signed = 1;
- 	      break;
- 	    default:
- 	      break;
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch b/patches/binutils/2.23.2/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
deleted file mode 100644
index 6a0846e..0000000
--- a/patches/binutils/2.23.2/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 10 Jul 2014 01:47:33 +0400
-Subject: [PATCH] Fix xtensa ld segfault when linking linux modules
-
-is_inconsistent_linkonce_section makes an assumption that section name
-that starts with ".gnu.linkonce.prop." has one more dot in its suffix.
-However gas generates such section name by insertion of "prop." right
-after ".gnu.linkonce." part of the name of the original section. So, for
-section named ".gnu.linkonce.this_module" corresponding property section
-name does not satisfy the assumption. Such section names are common in
-linux modules. This bug was exposed by the patch "a35d5e8 Fix alignment
-for the first section frag on xtensa", that makes gas produce property
-section for each section that has ".align" directive in it.
-
-Use suffix that immediately follows ".gnu.linkonce.prop." when there are
-no more dots following it.
-
-2014-07-10  Max Filippov  <jcmvbkbc@gmail.com>
-
-ld/
-    * emultempl/xtensaelf.em (is_inconsistent_linkonce_section):
-    correctly handle missing dot in section name after
-    ".gnu.linkonce.prop.".
----
-Backported from: e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2
-Changes to ld/ChangeLog file are dropped.
-
- ld/emultempl/xtensaelf.em | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
-index 151eea4..948d18d 100644
---- a/ld/emultempl/xtensaelf.em
-+++ b/ld/emultempl/xtensaelf.em
-@@ -1310,7 +1310,7 @@ is_inconsistent_linkonce_section (asection *sec)
-      for Tensilica's XCC compiler.  */
-   name = sec_name + linkonce_len;
-   if (CONST_STRNEQ (name, "prop."))
--    name = strchr (name + 5, '.') + 1;
-+    name = strchr (name + 5, '.') ? strchr (name + 5, '.') + 1 : name + 5;
-   else if (name[1] == '.'
- 	   && (name[0] == 'p' || name[0] == 'e' || name[0] == 'h'))
-     name += 2;
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch b/patches/binutils/2.23.2/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
deleted file mode 100644
index dba7620..0000000
--- a/patches/binutils/2.23.2/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 7fc39194f8fb48914c995f8ec3826d50086f1ec0 Mon Sep 17 00:00:00 2001
-From: Sterling Augustine <augustine.sterling@gmail.com>
-Date: Tue, 25 Jan 2011 13:59:13 -0800
-Subject: [PATCH] Fix 'call8: call target out of range' xtensa ld relaxation
- bug
-
-During link-time relaxation distance between cross-section call site and
-its target may grow, producing 'call target out of range' error for
-relaxed calls. Be more conservative when calculating whether or not a
-callx can be converted to a straight call.
-
-2014-09-23  Sterling Augustine  <augustine.sterling@gmail.com>
-
-bfd/
-    * elf32-xtensa.c (is_resolvable_asm_expansion): for cross-section
-    call relaxation use furthermost addresses where call source and
-    destination can be to check whether it's in the range of a direct
-    call.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 41 +++++++++++++++++++++++++++++++++++++----
- 1 file changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 09862e3..e32496a 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -7124,10 +7124,43 @@ is_resolvable_asm_expansion (bfd *abfd,
- 	  || is_reloc_sym_weak (abfd, irel)))
-     return FALSE;
- 
--  self_address = (sec->output_section->vma
--		  + sec->output_offset + irel->r_offset + 3);
--  dest_address = (target_sec->output_section->vma
--		  + target_sec->output_offset + target_offset);
-+  if (target_sec->output_section != sec->output_section)
-+    {
-+      /* If the two sections are sufficiently far away that relaxation
-+	 might take the call out of range, we can't simplify.  For
-+	 example, a positive displacement call into another memory
-+	 could get moved to a lower address due to literal removal,
-+	 but the destination won't move, and so the displacment might
-+	 get larger.
-+
-+	 If the displacement is negative, assume the destination could
-+	 move as far back as the start of the output section.  The
-+	 self_address will be at least as far into the output section
-+	 as it is prior to relaxation.
-+
-+	 If the displacement is postive, assume the destination will be in
-+	 it's pre-relaxed location (because relaxation only makes sections
-+	 smaller).  The self_address could go all the way to the beginning
-+	 of the output section.  */
-+
-+      dest_address = target_sec->output_section->vma;
-+      self_address = sec->output_section->vma;
-+
-+      if (sec->output_section->vma > target_sec->output_section->vma)
-+	self_address += sec->output_offset + irel->r_offset + 3;
-+      else
-+	dest_address += bfd_get_section_limit (abfd, target_sec->output_section);
-+      /* Call targets should be four-byte aligned.  */
-+      dest_address = (dest_address + 3) & ~3;
-+    }
-+  else
-+    {
-+
-+      self_address = (sec->output_section->vma
-+		      + sec->output_offset + irel->r_offset + 3);
-+      dest_address = (target_sec->output_section->vma
-+		      + target_sec->output_offset + target_offset);
-+    }
-       
-   *is_reachable_p = pcrel_reloc_fits (direct_call_opcode, 0,
- 				      self_address, dest_address);
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/905-Fix-trampolines-search-code-for-conditional-branches.patch b/patches/binutils/2.23.2/905-Fix-trampolines-search-code-for-conditional-branches.patch
deleted file mode 100644
index 8aeb064..0000000
--- a/patches/binutils/2.23.2/905-Fix-trampolines-search-code-for-conditional-branches.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 415480d6471e67aef97c0241d451ef2423a1da9d Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 25 Nov 2014 21:33:21 +0300
-Subject: [PATCH] Fix trampolines search code for conditional branches
-
-For conditional branches that need more than one trampoline to reach its
-target assembler couldn't always find suitable trampoline because
-post-loop condition check was placed inside the loop, resulting in
-premature loop termination. Move check outside the loop.
-
-This fixes the following build errors seen when assembling huge files
-produced by gcc:
-    Error: jump target out of range; no usable trampoline found
-    Error: operand 1 of 'j' has out of range value '307307'
-
-2014-11-25  Max Filippov  <jcmvbkbc@gmail.com>
-
-gas/
-	* config/tc-xtensa.c (search_trampolines): Move post-loop
-	condition check outside the search loop.
-
-gas/testsuite/
-	* gas/xtensa/trampoline.d: Add expected output for branches.
-	* gas/xtensa/trampoline.s: Add test case for branches.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3
-Changes to ChangeLogs are dropped.
-
- gas/config/tc-xtensa.c                | 8 ++++----
- gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++
- gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++
- 3 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d11b0c7..f23ccf8 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
- 	      if (next_addr == 0 || addr - next_addr > J_RANGE)
- 		break;
- 	    }
--	  if (abs (addr - this_addr) < J_RANGE)
--	    return tf;
--
--	  return NULL;
- 	}
-+      if (abs (addr - this_addr) < J_RANGE)
-+	return tf;
-+
-+      return NULL;
-     }
-   for ( ; tf; tf = tf->next)
-     {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-index b4f65dc..5ae32a6 100644
---- a/gas/testsuite/gas/xtensa/trampoline.d
-+++ b/gas/testsuite/gas/xtensa/trampoline.d
-@@ -24,3 +24,12 @@
- .*33462:.*j.0x49407
- #...
- .*49407:.*j.0x49407
-+.*4940a:.*beqz.n.a2,.0x4940f
-+.*4940c:.*j.0x693d1
-+#...
-+.*693d1:.*j.0x7ddd4
-+#...
-+.*7ddd4:.*j.0x927f5
-+#...
-+.*927f5:.*j.0x927f5
-+#...
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-index 259a3bb..4465786 100644
---- a/gas/testsuite/gas/xtensa/trampoline.s
-+++ b/gas/testsuite/gas/xtensa/trampoline.s
-@@ -19,3 +19,10 @@
- 	.endr
- 3:
- 	j	3b
-+	bnez	a2, 4f
-+	.rep	50000
-+	and	a2, a2, a3
-+	_ret
-+	.endr
-+4:
-+	j	4b
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/patches/binutils/2.23.2/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
deleted file mode 100644
index 9ad6b3b..0000000
--- a/patches/binutils/2.23.2/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8ec76b16f62d1bf386fb2c39af5f66c3afddc5cb Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 14 May 2015 05:22:55 +0300
-Subject: [PATCH] xtensa: fix localized symbol refcounting with --gc-sections
-
-elf_xtensa_gc_sweep_hook doesn't correctly unreference symbols that were
-made local, that results in link failure with the following message:
-
-  BFD (GNU Binutils) 2.24 internal error, aborting at elf32-xtensa.c line
-  3372 in elf_xtensa_finish_dynamic_sections
-
-elf_xtensa_gc_sweep_hook determines symbol reference type (PLT or GOT) by
-relocation type. Relocation types are not changed when symbol becomes
-local, but its PLT references are added to GOT references and
-plt.refcount is set to 0. Such symbol cannot be unreferences in the
-elf_xtensa_gc_sweep_hook and its extra references make calculated GOT
-relocations section size not match number of GOT relocations.
-
-Fix it by treating PLT reference as GOT reference when plt.refcount is
-not positive.
-
-2015-05-14  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Treat PLT reference
-	as GOT reference when plt.refcount is not positive.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388
-Changes to ChangeLog are dropped.
-
- bfd/elf32-xtensa.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 53af1c6..2523670 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd,
- 	{
- 	  if (is_plt)
- 	    {
-+	      /* If the symbol has been localized its plt.refcount got moved
-+	         to got.refcount.  Handle it as GOT.  */
- 	      if (h->plt.refcount > 0)
- 		h->plt.refcount--;
-+	      else
-+		is_got = TRUE;
- 	    }
--	  else if (is_got)
-+	  if (is_got)
- 	    {
- 	      if (h->got.refcount > 0)
- 		h->got.refcount--;
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/patches/binutils/2.23.2/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
deleted file mode 100644
index 4a3de2c..0000000
--- a/patches/binutils/2.23.2/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0522e76e4afeeb2e104e0a4332d94fa0d2fbf6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 17 May 2015 06:46:15 +0300
-Subject: [PATCH] xtensa: fix gas segfault with --text-section-literals
-
-When --text-section-literals is used and code in the .init or .fini
-emits literal in the absence of .literal_position, xtensa_move_literals
-segfaults.
-
-Check that search_frag is non-NULL in the xtensa_move_literals and
-report error otherwise.
-
-2015-05-26  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Check that
-	search_frag is non-NULL. Report error if literal frag is not
-	found.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4
-Changes to ChangeLog are dropped.
-
- gas/config/tc-xtensa.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 31c0b6b..18307c1 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -10808,13 +10808,21 @@ xtensa_move_literals (void)
-       frchain_to = NULL;
-       frag_splice = &(frchain_from->frch_root);
- 
--      while (!search_frag->tc_frag_data.literal_frag)
-+      while (search_frag && !search_frag->tc_frag_data.literal_frag)
- 	{
- 	  gas_assert (search_frag->fr_fix == 0
- 		  || search_frag->fr_type == rs_align);
- 	  search_frag = search_frag->fr_next;
- 	}
- 
-+      if (!search_frag)
-+	{
-+	  search_frag = frchain_from->frch_root;
-+	  as_bad_where (search_frag->fr_file, search_frag->fr_line,
-+			_("literal pool location required for text-section-literals; specify with .literal_position"));
-+	  continue;
-+	}
-+
-       gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype
- 	      == RELAX_LITERAL_POOL_BEGIN);
-       xtensa_switch_section_emit_state (&state, segment->seg, 0);
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.23.2/914-xtensa-fix-signedness-of-gas-relocations.patch b/patches/binutils/2.23.2/914-xtensa-fix-signedness-of-gas-relocations.patch
deleted file mode 100644
index 2955e11..0000000
--- a/patches/binutils/2.23.2/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6c7c5c477ef9ccf2d2548cf2ac3cec9bd3c9c5b6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 2 Feb 2016 17:11:38 +0300
-Subject: [PATCH] xtensa: fix signedness of gas relocations
-
-Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation
-offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations
-substituted for BFD_RELOC_*. This made it impossible to encode arbitrary
-8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc
-directive. Revert this part and add test.
-
-gas/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF*
-	substitutions for BFD_RELOC_* as unsigned.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gas/config/tc-xtensa.c           |  6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    default:
- 	      break;
--- 
-2.1.4
-
diff --git a/patches/binutils/2.23.2/915-xtensa-fix-.init-.fini-literals-moving.patch b/patches/binutils/2.23.2/915-xtensa-fix-.init-.fini-literals-moving.patch
deleted file mode 100644
index 62bc4b5..0000000
--- a/patches/binutils/2.23.2/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 16 Feb 2016 02:23:28 +0300
-Subject: [PATCH] xtensa: fix .init/.fini literals moving
-
-Despite the documentation and the comment in xtensa_move_literals, in
-the presence of --text-section-literals and --auto-litpools literals are
-moved from the separate literal sections into .init and .fini, because
-the check in the xtensa_move_literals is incorrect.
-
-This moving was broken with introduction of auto litpools: some literals
-now may be lost. This happens because literal frags emitted from .init
-and .fini are not closed when new .literal_position marks new literal
-pool. Then frag_align(2, 0, 0) changes type of the last literal frag to
-rs_align. rs_align frags are skipped in the xtensa_move_literals. As a
-result fixups against such literals are not moved out of .init.literal/
-.fini.literal sections producing the following assembler error:
-
-  test.S: Warning: fixes not all moved from .init.literal
-  test.S: Internal error!
-
-Fix check for .init.literal/.fini.literal in the xtensa_move_literals
-and don't let it move literals from there in the presence of
---text-section-literals or --auto-litpools.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Fix check for
-	.init.literal/.fini.literal section name.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
-
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -10625,5 +10625,9 @@ xtensa_move_literals (void)
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-+  const char *init_name = INIT_SECTION_NAME;
-+  const char *fini_name = FINI_SECTION_NAME;
-+  int init_name_len = strlen(init_name);
-+  int fini_name_len = strlen(fini_name);
- 
-   mark_literal_frags (literal_head->next);
- 
-@@ -10632,9 +10636,13 @@ xtensa_move_literals (void)
- 
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-+      const char *seg_name = segment_name (segment->seg);
-+
-       /* Keep the literals for .init and .fini in separate sections.  */
--      if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME)
--	  || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME))
-+      if ((!memcmp (seg_name, init_name, init_name_len) &&
-+	   !strcmp (seg_name + init_name_len, ".literal")) ||
-+	  (!memcmp (seg_name, fini_name, fini_name_len) &&
-+	   !strcmp (seg_name + fini_name_len, ".literal")))
- 	continue;
- 
-       frchain_from = seg_info (segment->seg)->frchainP;
--- 
-2.1.4
-
diff --git a/patches/binutils/2.24/001-fix-enable-install-libiberty-flag.patch b/patches/binutils/2.24/001-fix-enable-install-libiberty-flag.patch
deleted file mode 100644
index e408401..0000000
--- a/patches/binutils/2.24/001-fix-enable-install-libiberty-flag.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 369be6981b26787b2685e3b8c6da779dae8ce35f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 6 Jan 2014 18:15:31 +0000
-Subject: [PATCH] libiberty: fix --enable-install-libiberty flag [PR 56780]
-
-Commit 199570 fixed the --disable-install-libiberty behavior, but it also
-added a bug where the enable path never works because the initial clear
-of target_header_dir wasn't deleted.  So we end up initializing properly
-at the top only to reset it at the end all the time.
-
-[Arnout: adapt to match 2.24 tarball]
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
----
- libiberty/configure    |    1 -
- libiberty/configure.ac |    1 -
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libiberty/configure b/libiberty/configure
-index 8ea54da..7bde9b3 100755
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -5507,7 +5507,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index 4ad88a9..d6180bc 100644
---- a/libiberty/configure.ac
-+++ b/libiberty/configure.ac
-@@ -405,7 +405,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
--- 
-1.7.1
-
diff --git a/patches/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch b/patches/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch
deleted file mode 100644
index 7881646..0000000
--- a/patches/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Alan Modra <amodra@gmail.com>
-Date: Fri, 20 Dec 2013 13:27:52 +0000 (+1030)
-Subject: Don't segv on cie.initial_instructions[] overflow.
-X-Git-Tag: gdb-7.7-release~148
-X-Git-Url: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff_plain;h=99d190fac4d2aab238cfc798dc5c28ab41456882
-
-Don't segv on cie.initial_instructions[] overflow.
-
-Don't attempt to merge CIEs with a larger number of insns than will
-fit in the buffer.
-
-	* elf-eh-frame.c (cie_eq): Return false when initial_insn_length
-	is too large.
-	(cie_compute_hash): Don't exceed bounds of initial_instructions.
-	(_bfd_elf_parse_eh_frame): Always set initial_insn_length, and
-	save as much of insns to initial_instructions[] as will fit.
----
-
-diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
-index 832a991..4b6e8ea 100644
---- a/bfd/elf-eh-frame.c
-+++ b/bfd/elf-eh-frame.c
-@@ -235,6 +235,7 @@ cie_eq (const void *e1, const void *e2)
-       && c1->lsda_encoding == c2->lsda_encoding
-       && c1->fde_encoding == c2->fde_encoding
-       && c1->initial_insn_length == c2->initial_insn_length
-+      && c1->initial_insn_length <= sizeof (c1->initial_instructions)
-       && memcmp (c1->initial_instructions,
- 		 c2->initial_instructions,
- 		 c1->initial_insn_length) == 0)
-@@ -254,6 +255,7 @@ static hashval_t
- cie_compute_hash (struct cie *c)
- {
-   hashval_t h = 0;
-+  size_t len;
-   h = iterative_hash_object (c->length, h);
-   h = iterative_hash_object (c->version, h);
-   h = iterative_hash (c->augmentation, strlen (c->augmentation) + 1, h);
-@@ -267,7 +269,10 @@ cie_compute_hash (struct cie *c)
-   h = iterative_hash_object (c->lsda_encoding, h);
-   h = iterative_hash_object (c->fde_encoding, h);
-   h = iterative_hash_object (c->initial_insn_length, h);
--  h = iterative_hash (c->initial_instructions, c->initial_insn_length, h);
-+  len = c->initial_insn_length;
-+  if (len > sizeof (c->initial_instructions))
-+    len = sizeof (c->initial_instructions);
-+  h = iterative_hash (c->initial_instructions, len, h);
-   c->hash = h;
-   return h;
- }
-@@ -762,11 +767,10 @@ _bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info,
- 	    cie->fde_encoding = DW_EH_PE_absptr;
- 
- 	  initial_insn_length = end - buf;
--	  if (initial_insn_length <= sizeof (cie->initial_instructions))
--	    {
--	      cie->initial_insn_length = initial_insn_length;
--	      memcpy (cie->initial_instructions, buf, initial_insn_length);
--	    }
-+	  cie->initial_insn_length = initial_insn_length;
-+	  memcpy (cie->initial_instructions, buf,
-+		  initial_insn_length <= sizeof (cie->initial_instructions)
-+		  ? initial_insn_length : sizeof (cie->initial_instructions));
- 	  insns = buf;
- 	  buf += initial_insn_length;
- 	  ENSURE_NO_RELOCS (buf);
diff --git a/patches/binutils/2.24/120-sh-conf.patch b/patches/binutils/2.24/120-sh-conf.patch
deleted file mode 100644
index d5913e8..0000000
--- a/patches/binutils/2.24/120-sh-conf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
-diff -durN binutils-2.22.orig/configure binutils-2.22/configure
---- binutils-2.22.orig/configure	2011-08-14 14:28:15.000000000 +0200
-+++ binutils-2.22/configure	2011-12-14 19:49:40.284777434 +0100
-@@ -3570,7 +3570,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
-diff -durN binutils-2.22.orig/configure.ac binutils-2.22/configure.ac
---- binutils-2.22.orig/configure.ac	2011-11-21 12:58:27.000000000 +0100
-+++ binutils-2.22/configure.ac	2011-12-14 19:49:40.316777436 +0100
-@@ -1006,7 +1006,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
diff --git a/patches/binutils/2.24/300-001_ld_makefile_patch.patch b/patches/binutils/2.24/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 4b5888a..0000000
--- a/patches/binutils/2.24/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -durN binutils-2.22.orig/ld/Makefile.am binutils-2.22/ld/Makefile.am
---- binutils-2.22.orig/ld/Makefile.am	2011-07-22 22:22:37.000000000 +0200
-+++ binutils-2.22/ld/Makefile.am	2011-12-14 19:50:25.760779164 +0100
-@@ -37,7 +37,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -durN binutils-2.22.orig/ld/Makefile.in binutils-2.22/ld/Makefile.in
---- binutils-2.22.orig/ld/Makefile.in	2011-07-22 22:22:37.000000000 +0200
-+++ binutils-2.22/ld/Makefile.in	2011-12-14 19:50:25.784779163 +0100
-@@ -366,7 +366,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/patches/binutils/2.24/300-012_check_ldrunpath_length.patch b/patches/binutils/2.24/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index b49cc04..0000000
--- a/patches/binutils/2.24/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -durN binutils-2.22.orig/ld/emultempl/elf32.em binutils-2.22/ld/emultempl/elf32.em
---- binutils-2.22.orig/ld/emultempl/elf32.em	2011-11-21 10:29:39.000000000 +0100
-+++ binutils-2.22/ld/emultempl/elf32.em	2011-12-14 19:52:12.880783238 +0100
-@@ -1273,6 +1273,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1500,6 +1502,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/patches/binutils/2.24/310-fix-gold-pthreads-typo.patch b/patches/binutils/2.24/310-fix-gold-pthreads-typo.patch
deleted file mode 100644
index f2e6ff2..0000000
--- a/patches/binutils/2.24/310-fix-gold-pthreads-typo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
-@@ -102,9 +102,9 @@
-   if (err != 0)
-     gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
- #ifdef PTHREAD_MUTEX_ADAPTIVE_NP
--  err = pthread_mutextattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-+  err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-   if (err != 0)
--    gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err));
-+    gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
- #endif
- 
-   err = pthread_mutex_init(&this->mutex_, &attr);
diff --git a/patches/binutils/2.24/500-sysroot.patch b/patches/binutils/2.24/500-sysroot.patch
deleted file mode 100644
index e49c795..0000000
--- a/patches/binutils/2.24/500-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
-      directory first.  */
-   if (! entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/patches/binutils/2.24/600-poison-system-directories.patch b/patches/binutils/2.24/600-poison-system-directories.patch
deleted file mode 100644
index 6a3bf6b..0000000
--- a/patches/binutils/2.24/600-poison-system-directories.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.in (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-Index: b/ld/config.in
-===================================================================
---- a/ld/config.in
-+++ b/ld/config.in
-@@ -11,6 +11,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-Index: b/ld/configure
-===================================================================
---- a/ld/configure
-+++ b/ld/configure
-@@ -774,6 +774,7 @@
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_werror
-@@ -1429,6 +1430,8 @@
- 			  (and sometimes confusing) to the casual installer
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -4339,7 +4342,18 @@
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-Index: b/ld/configure.in
-===================================================================
---- a/ld/configure.in
-+++ b/ld/configure.in
-@@ -87,6 +87,16 @@
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-Index: b/ld/ldfile.c
-===================================================================
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -116,6 +116,23 @@
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-Index: b/ld/ld.h
-===================================================================
---- a/ld/ld.h
-+++ b/ld/ld.h
-@@ -180,6 +180,14 @@
-   /* If TRUE we'll just print the default output on stdout.  */
-   bfd_boolean print_output_format;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-Index: b/ld/ldmain.c
-===================================================================
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -266,6 +266,8 @@
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-Index: b/ld/ld.texinfo
-===================================================================
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -2175,6 +2175,18 @@
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-Index: b/ld/lexsup.c
-===================================================================
---- a/ld/lexsup.c
-+++ b/ld/lexsup.c
-@@ -507,6 +507,14 @@
-     OPTION_IGNORE_UNRESOLVED_SYMBOL},
-     '\0', N_("SYMBOL"),
-     N_("Unresolved SYMBOL will not cause an error or warning"), TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+     OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+    +     OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -519,6 +527,7 @@
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1442,9 +1451,21 @@
-               einfo (_("%P%X: --hash-size needs a numeric argument\n"));
-           }
-           break;
-+
-+   case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+     command_line.poison_system_directories = FALSE;
-+     break;
-+
-+   case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+     command_line.error_poison_system_directories = TRUE;
-+     break;
- 	}
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
-Index: b/ld/ldlex.h
-===================================================================
---- a/ld/ldlex.h
-+++ b/ld/ldlex.h
-@@ -138,6 +138,8 @@
-   OPTION_DEFAULT_SCRIPT,
-   OPTION_PRINT_OUTPUT_FORMAT,
-   OPTION_IGNORE_UNRESOLVED_SYMBOL,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
diff --git a/patches/binutils/2.24/900-xtensa-trampolines.patch b/patches/binutils/2.24/900-xtensa-trampolines.patch
deleted file mode 100644
index b5b934f..0000000
--- a/patches/binutils/2.24/900-xtensa-trampolines.patch
+++ /dev/null
@@ -1,846 +0,0 @@
-From a82c7d9030b67a6a76a5403d0e1641f9e42141ac Mon Sep 17 00:00:00 2001
-From: David Weatherford <weath@cadence.com>
-Date: Fri, 21 Mar 2014 11:53:42 +0000
-Subject: [PATCH] Add support to the Xtensa target for creating trampolines for
- out-of-range branches.
-
-    * tc-xtensa.c (xtensa_check_frag_count, xtensa_create_trampoline_frag)
-    (xtensa_maybe_create_trampoline_frag, init_trampoline_frag)
-    (find_trampoline_seg, search_trampolines, get_best_trampoline)
-    (check_and_update_trampolines, add_jump_to_trampoline)
-    (dump_trampolines): New function.
-    (md_parse_option): Add cases for --[no-]trampolines options.
-    (md_assemble, finish_vinsn, xtensa_end): Add call to
-    xtensa_check_frag_count.
-    (xg_assemble_vliw_tokens): Add call to
-    xtensa_maybe_create_trampoline_frag.
-    (xtensa_relax_frag): Relax fragments with RELAX_TRAMPOLINE state.
-    (relax_frag_immed): Relax jump instructions that cannot reach its
-    target.
-    * tc-xtensa.h (xtensa_relax_statesE::RELAX_TRAMPOLINE): New relax
-    state.
-
-    * as.texinfo: Document --[no-]trampolines command-line options.
-    * c-xtensa.texi: Document trampolines relaxation and command line
-    options.
-
-    * frags.c (get_frag_count, clear_frag_count): New function.
-    (frag_alloc): Increment totalfrags counter.
-    * frags.h (get_frag_count, clear_frag_count): New function.
-
-    * all.exp: Add test for trampoline relaxation.
-    * trampoline.d: Trampoline relaxation expected dump.
-    * trampoline.s: Trampoline relaxation test source.
----
-Backported from: a82c7d9030b67a6a76a5403d0e1641f9e42141ac
-Changes to Changelog files are dropped.
-
- gas/config/tc-xtensa.c                | 558 +++++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                |   5 +
- gas/frags.c                           |  15 +
- gas/frags.h                           |   3 +
- gas/testsuite/gas/xtensa/all.exp      |   1 +
- gas/testsuite/gas/xtensa/trampoline.d |  26 ++
- gas/testsuite/gas/xtensa/trampoline.s |  21 ++
- 11 files changed, 753 insertions(+), 2 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/trampoline.d
- create mode 100644 gas/testsuite/gas/xtensa/trampoline.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index fe8ec0f..ea23c96 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -468,6 +468,12 @@ static void xtensa_set_frag_assembly_state (fragS *);
- static void finish_vinsn (vliw_insn *);
- static bfd_boolean emit_single_op (TInsn *);
- static int total_frag_text_expansion (fragS *);
-+static bfd_boolean use_trampolines = TRUE;
-+static void xtensa_check_frag_count (void);
-+static void xtensa_create_trampoline_frag (bfd_boolean);
-+static void xtensa_maybe_create_trampoline_frag (void);
-+struct trampoline_frag;
-+static int init_trampoline_frag (struct trampoline_frag *);
- 
- /* Alignment Functions.  */
- 
-@@ -520,6 +526,7 @@ static void tinsn_from_chars (TInsn *, char *, int);
- static void tinsn_immed_from_frag (TInsn *, fragS *, int);
- static int get_num_stack_text_bytes (IStack *);
- static int get_num_stack_literal_bytes (IStack *);
-+static bfd_boolean tinsn_to_slotbuf (xtensa_format, int, TInsn *, xtensa_insnbuf);
- 
- /* vliw_insn functions.  */
- 
-@@ -687,7 +694,10 @@ enum
-   option_prefer_l32r,
-   option_prefer_const16,
- 
--  option_target_hardware
-+  option_target_hardware,
-+
-+  option_trampolines,
-+  option_no_trampolines,
- };
- 
- const char *md_shortopts = "";
-@@ -760,6 +770,9 @@ struct option md_longopts[] =
- 
-   { "target-hardware", required_argument, NULL, option_target_hardware },
- 
-+  { "trampolines", no_argument, NULL, option_trampolines },
-+  { "no-trampolines", no_argument, NULL, option_no_trampolines },
-+
-   { NULL, no_argument, NULL, 0 }
- };
- 
-@@ -940,6 +953,14 @@ md_parse_option (int c, char *arg)
-       directive_state[directive_transform] = FALSE;
-       return 1;
- 
-+    case option_trampolines:
-+      use_trampolines = TRUE;
-+      return 1;
-+
-+    case option_no_trampolines:
-+      use_trampolines = FALSE;
-+      return 1;
-+
-     default:
-       return 0;
-     }
-@@ -963,7 +984,9 @@ Xtensa options:\n\
-                           flix bundles\n\
-   --no-allow-flix         neither allow hand-written nor generate\n\
-                           flix bundles\n\
--  --rename-section old=new Rename section 'old' to 'new'\n", stream);
-+  --rename-section old=new Rename section 'old' to 'new'\n\
-+  --[no-]trampolines      [Do not] generate trampolines (jumps to jumps)\n\
-+                          when jumps do not reach their targets\n", stream);
- }
- 
- 
-@@ -5568,6 +5591,8 @@ md_assemble (char *str)
- 
-   /* We've just emitted a new instruction so clear the list of labels.  */
-   xtensa_clear_insn_labels ();
-+
-+  xtensa_check_frag_count ();
- }
- 
- 
-@@ -6372,6 +6397,8 @@ finish_vinsn (vliw_insn *vinsn)
-   xg_assemble_vliw_tokens (vinsn);
- 
-   xg_clear_vinsn (vinsn);
-+
-+  xtensa_check_frag_count ();
- }
- 
- 
-@@ -7140,6 +7167,7 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
- 		    RELAX_UNREACHABLE,
- 		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
- 	  xtensa_set_frag_assembly_state (frag_now);
-+	  xtensa_maybe_create_trampoline_frag ();
- 	}
-       else if (is_branch && do_align_targets ())
- 	{
-@@ -7222,9 +7250,164 @@ xtensa_end (void)
-   xtensa_sanity_check ();
- 
-   xtensa_add_config_info ();
-+
-+  xtensa_check_frag_count ();
-+}
-+
-+
-+struct trampoline_frag
-+{
-+  struct trampoline_frag *next;
-+  bfd_boolean needs_jump_around;
-+  fragS *fragP;
-+  fixS *fixP;
-+};
-+
-+struct trampoline_seg
-+{
-+  struct trampoline_seg *next;
-+  asection *seg;
-+  struct trampoline_frag trampoline_list;
-+};
-+
-+static struct trampoline_seg trampoline_seg_list;
-+#define J_RANGE (128 * 1024)
-+
-+static int unreachable_count = 0;
-+
-+
-+static void
-+xtensa_maybe_create_trampoline_frag (void)
-+{
-+  if (!use_trampolines)
-+    return;
-+
-+  /* We create an area for possible trampolines every 10 unreachable frags.
-+     These are preferred over the ones not preceded by an unreachable frag,
-+     because we don't have to jump around them. This function is called after
-+     each RELAX_UNREACHABLE frag is created.  */
-+
-+  if (++unreachable_count > 10)
-+    {
-+      xtensa_create_trampoline_frag (FALSE);
-+      clear_frag_count ();
-+      unreachable_count = 0;
-+    }
-+}
-+
-+static void
-+xtensa_check_frag_count (void)
-+{
-+  if (!use_trampolines || frag_now->tc_frag_data.is_no_transform)
-+    return;
-+
-+  /* We create an area for possible trampolines every 8000 frags or so. This
-+     is an estimate based on the max range of a "j" insn (+/-128K) divided
-+     by a typical frag byte count (16), minus a few for safety. This function
-+     is called after each source line is processed.  */
-+
-+  if (get_frag_count () > 8000)
-+    {
-+      xtensa_create_trampoline_frag (TRUE);
-+      clear_frag_count ();
-+      unreachable_count = 0;
-+    }
-+}
-+
-+static xtensa_insnbuf trampoline_buf = NULL;
-+static xtensa_insnbuf trampoline_slotbuf = NULL;
-+
-+#define TRAMPOLINE_FRAG_SIZE 3000
-+
-+static void
-+xtensa_create_trampoline_frag (bfd_boolean needs_jump_around)
-+{
-+  /* Emit a frag where we can place intermediate jump instructions,
-+     in case we need to jump farther than 128K bytes.
-+     Each jump instruction takes three bytes.
-+     We allocate enough for 1000 trampolines in each frag.
-+     If that's not enough, oh well.  */
-+
-+  struct trampoline_seg *ts = trampoline_seg_list.next;
-+  struct trampoline_frag *tf;
-+  char *varP;
-+  fragS *fragP;
-+  int size = TRAMPOLINE_FRAG_SIZE;
-+
-+  for ( ; ts; ts = ts->next)
-+    {
-+      if (ts->seg == now_seg)
-+	break;
-+    }
-+
-+  if (ts == NULL)
-+    {
-+      ts = (struct trampoline_seg *)xcalloc(sizeof (struct trampoline_seg), 1);
-+      ts->next = trampoline_seg_list.next;
-+      trampoline_seg_list.next = ts;
-+      ts->seg = now_seg;
-+    }
-+
-+  frag_wane (frag_now);
-+  frag_new (0);
-+  xtensa_set_frag_assembly_state (frag_now);
-+  varP = frag_var (rs_machine_dependent, size, size, RELAX_TRAMPOLINE, NULL, 0, NULL);
-+  fragP = (fragS *)(varP - SIZEOF_STRUCT_FRAG);
-+  if (trampoline_buf == NULL)
-+    {
-+      trampoline_buf = xtensa_insnbuf_alloc (xtensa_default_isa);
-+      trampoline_slotbuf = xtensa_insnbuf_alloc (xtensa_default_isa);
-+    }
-+  tf = (struct trampoline_frag *)xmalloc(sizeof (struct trampoline_frag));
-+  tf->next = ts->trampoline_list.next;
-+  ts->trampoline_list.next = tf;
-+  tf->needs_jump_around = needs_jump_around;
-+  tf->fragP = fragP;
-+  tf->fixP = NULL;
-+}
-+
-+
-+static struct trampoline_seg *
-+find_trampoline_seg (asection *seg)
-+{
-+  struct trampoline_seg *ts = trampoline_seg_list.next;
-+
-+  for ( ; ts; ts = ts->next)
-+    {
-+      if (ts->seg == seg)
-+	return ts;
-+    }
-+
-+  return NULL;
- }
- 
- 
-+void dump_trampolines (void);
-+
-+void
-+dump_trampolines (void)
-+{
-+  struct trampoline_seg *ts = trampoline_seg_list.next;
-+
-+  for ( ; ts; ts = ts->next)
-+    {
-+      asection *seg = ts->seg;
-+
-+      if (seg == NULL)
-+	continue;
-+      fprintf(stderr, "SECTION %s\n", seg->name);
-+      struct trampoline_frag *tf = ts->trampoline_list.next;
-+      for ( ; tf; tf = tf->next)
-+	{
-+	  if (tf->fragP == NULL)
-+	    continue;
-+	  fprintf(stderr, "   0x%08x: fix=%d, jump_around=%s\n",
-+		  (int)tf->fragP->fr_address, (int)tf->fragP->fr_fix,
-+		  tf->needs_jump_around ? "T" : "F");
-+	}
-+    }
-+}
-+
- static void
- xtensa_cleanup_align_frags (void)
- {
-@@ -8708,6 +8891,149 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 	new_stretch += relax_frag_for_align (fragP, stretch);
-       break;
- 
-+    case RELAX_TRAMPOLINE:
-+      if (fragP->tc_frag_data.relax_seen)
-+        {
-+          segment_info_type *seginfo = seg_info (now_seg);
-+          fragS *fP; /* The out-of-range jump.  */
-+          fixS *fixP;
-+
-+          /* Scan for jumps that will not reach.  */
-+          for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+            {
-+              symbolS *s = fixP->fx_addsy;
-+	      xtensa_opcode opcode;
-+              int target;
-+              int addr;
-+              int delta;
-+
-+              if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
-+                  fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
-+                continue;
-+	      xtensa_insnbuf_from_chars (isa, trampoline_buf,
-+					 (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where,
-+					 0);
-+	      fmt = xtensa_format_decode (isa, trampoline_buf);
-+	      gas_assert (fmt != XTENSA_UNDEFINED);
-+	      slot = fixP->tc_fix_data.slot;
-+	      xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
-+	      opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
-+	      if (opcode != xtensa_j_opcode)
-+		continue;
-+              target = S_GET_VALUE (s);
-+              addr = fixP->fx_frag->fr_address;
-+              delta = target - addr + stretch;
-+              if (delta > J_RANGE  || delta < -1 * J_RANGE)
-+                { /* Found an out-of-range jump; scan the list of trampolines for the best match.  */
-+		  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-+		  struct trampoline_frag *tf = ts->trampoline_list.next;
-+		  struct trampoline_frag *prev = &ts->trampoline_list;
-+		  int lower = (target < addr) ? target : addr;
-+		  int upper = (target > addr) ? target : addr;
-+		  int midpoint = lower + (upper - lower) / 2;
-+
-+		  if ((upper - lower) > 2 * J_RANGE)
-+		    {
-+		      /* One trampoline won't suffice; we need multiple jumps.
-+			 Jump to the trampoline that's farthest, but still in
-+			 range relative to the original "j" instruction.  */
-+		      for ( ; tf; prev = tf, tf = tf->next )
-+			{
-+			  int this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+			  int next_addr = (tf->next) ? tf->next->fragP->fr_address + tf->next->fragP->fr_fix : 0 ;
-+
-+			  if (addr == lower)
-+			    {
-+			      /* Forward jump.  */
-+			      if (this_addr - addr < J_RANGE)
-+				break;
-+			    }
-+			  else
-+			    {
-+			      /* Backward jump.  */
-+			      if (next_addr == 0 || addr - next_addr > J_RANGE)
-+				break;
-+			    }
-+			}
-+		    }
-+		  else
-+		    {
-+		      struct trampoline_frag *best_tf = NULL;
-+		      int best_delta = 0;
-+
-+		      for ( ; tf; prev = tf, tf = tf->next )
-+			{
-+			  int this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+			  int this_delta = abs (this_addr - midpoint);
-+
-+			  if (!best_tf || this_delta < best_delta)
-+			    {
-+			       best_tf = tf;
-+			       best_delta = this_delta;
-+			    }
-+			}
-+		      tf = best_tf;
-+		    }
-+		  if (tf->fragP == fragP)
-+		    {
-+		      int trampaddr = fragP->fr_address + fragP->fr_fix;
-+
-+		      if (abs (addr - trampaddr) < J_RANGE)
-+			{ /* The trampoline is in range of original; fix it!  */
-+			  fixS *newfixP;
-+			  int offset;
-+			  TInsn insn;
-+			  symbolS *lsym;
-+
-+			  new_stretch += init_trampoline_frag (tf);
-+			  offset = fragP->fr_fix; /* Where to assemble the j insn.  */
-+			  lsym = fragP->fr_symbol;
-+			  fP = fixP->fx_frag;
-+			  /* Assemble a jump to the target label here.  */
-+			  tinsn_init (&insn);
-+			  insn.insn_type = ITYPE_INSN;
-+			  insn.opcode = xtensa_j_opcode;
-+			  insn.ntok = 1;
-+			  set_expr_symbol_offset (&insn.tok[0], lsym, offset);
-+			  fmt = xg_get_single_format (xtensa_j_opcode);
-+			  tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf);
-+			  xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf);
-+			  xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)fragP->fr_literal + offset, 3);
-+			  fragP->fr_fix += 3;
-+			  fragP->fr_var -= 3;
-+			  /* Add a fix-up for the original j insn.  */
-+			  newfixP = fix_new (fP, fixP->fx_where, fixP->fx_size, lsym, fragP->fr_fix - 3, TRUE, fixP->fx_r_type);
-+			  newfixP->fx_no_overflow = 1;
-+			  newfixP->tc_fix_data.X_add_symbol = lsym;
-+			  newfixP->tc_fix_data.X_add_number = offset;
-+			  newfixP->tc_fix_data.slot = slot;
-+			  /* Move the fix-up from the original j insn to this one.  */
-+			  fixP->fx_frag = fragP;
-+			  fixP->fx_where = fragP->fr_fix - 3;
-+			  fixP->tc_fix_data.slot = 0;
-+			  /* Adjust the jump around this trampoline (if present).  */
-+			  if (tf->fixP != NULL)
-+			    {
-+			      tf->fixP->fx_offset += 3;
-+			    }
-+			  new_stretch += 3;
-+			  fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass.  */
-+			  /* Do we have room for more?  */
-+			  if (fragP->fr_var < 3)
-+			    { /* No, convert to fill.  */
-+			      frag_wane (fragP);
-+			      fragP->fr_subtype = 0;
-+			      /* Remove from the trampoline_list.  */
-+			      prev->next = tf->next;
-+			      break;
-+			    }
-+			}
-+		    }
-+                }
-+            }
-+        }
-+      break;
-+
-     default:
-       as_bad (_("bad relaxation state"));
-     }
-@@ -9146,6 +9472,200 @@ bytes_to_stretch (fragS *this_frag,
- }
- 
- 
-+static struct trampoline_frag *
-+search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
-+{
-+  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-+  struct trampoline_frag *tf = (ts) ? ts->trampoline_list.next : NULL;
-+  struct trampoline_frag *best_tf = NULL;
-+  int best_delta = 0;
-+  int best_addr = 0;
-+  symbolS *sym = tinsn->tok[0].X_add_symbol;
-+  offsetT target = S_GET_VALUE (sym) + tinsn->tok[0].X_add_number;
-+  offsetT addr = fragP->fr_address;
-+  offsetT lower = (addr < target) ? addr : target;
-+  offsetT upper = (addr > target) ? addr : target;
-+  int delta = upper - lower;
-+  offsetT midpoint = lower + delta / 2;
-+  int this_delta = -1;
-+  int this_addr = -1;
-+
-+  if (delta > 2 * J_RANGE)
-+    {
-+      /* One trampoline won't do; we need multiple.
-+	 Choose the farthest trampoline that's still in range of the original
-+	 and let a later pass finish the job.  */
-+      for ( ; tf; tf = tf->next)
-+	{
-+	  int next_addr = (tf->next) ? tf->next->fragP->fr_address + tf->next->fragP->fr_fix : 0;
-+
-+	  this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+	  if (lower == addr)
-+	    {
-+	      /* Forward jump.  */
-+	      if (this_addr - addr < J_RANGE)
-+		break;
-+	    }
-+	  else
-+	    {
-+	      /* Backward jump.  */
-+	      if (next_addr == 0 || addr - next_addr > J_RANGE)
-+		break;
-+	    }
-+	  if (abs (addr - this_addr) < J_RANGE)
-+	    return tf;
-+
-+	  return NULL;
-+	}
-+    }
-+  for ( ; tf; tf = tf->next)
-+    {
-+      this_addr = tf->fragP->fr_address + tf->fragP->fr_fix;
-+      this_delta = abs (this_addr - midpoint);
-+      if (unreachable_only && tf->needs_jump_around)
-+	continue;
-+      if (!best_tf || this_delta < best_delta)
-+        {
-+	  best_tf = tf;
-+	  best_delta = this_delta;
-+	  best_addr = this_addr;
-+        }
-+    }
-+
-+  if (best_tf &&
-+      best_delta < J_RANGE &&
-+      abs(best_addr - lower) < J_RANGE &&
-+      abs(best_addr - upper) < J_RANGE)
-+    return best_tf;
-+
-+  return NULL; /* No suitable trampoline found.  */
-+}
-+
-+
-+static struct trampoline_frag *
-+get_best_trampoline (TInsn *tinsn, fragS *fragP)
-+{
-+  struct trampoline_frag *tf = NULL;
-+
-+  tf = search_trampolines (tinsn, fragP, TRUE); /* Try unreachable first.  */
-+
-+  if (tf == NULL)
-+    tf = search_trampolines (tinsn, fragP, FALSE); /* Try ones needing a jump-around, too.  */
-+
-+  return tf;
-+}
-+
-+
-+static void
-+check_and_update_trampolines (void)
-+{
-+  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-+  struct trampoline_frag *tf = ts->trampoline_list.next;
-+  struct trampoline_frag *prev = &ts->trampoline_list;
-+
-+  for ( ; tf; prev = tf, tf = tf->next)
-+    {
-+      if (tf->fragP->fr_var < 3)
-+	{
-+	  frag_wane (tf->fragP);
-+	  prev->next = tf->next;
-+	  tf->fragP = NULL;
-+	}
-+    }
-+}
-+
-+
-+static int
-+init_trampoline_frag (struct trampoline_frag *trampP)
-+{
-+  fragS *fp = trampP->fragP;
-+  int growth = 0;
-+
-+  if (fp->fr_fix == 0)
-+    {
-+      symbolS *lsym;
-+      char label[10 + 2 * sizeof(fp)];
-+      sprintf (label, ".L0_TR_%p", fp);
-+
-+      lsym = (symbolS *)local_symbol_make (label, now_seg, 0, fp);
-+      fp->fr_symbol = lsym;
-+      if (trampP->needs_jump_around)
-+        {
-+	  /* Add a jump around this block of jumps, in case
-+	     control flows into this block.  */
-+	  fixS *fixP;
-+	  TInsn insn;
-+	  xtensa_format fmt;
-+	  xtensa_isa isa = xtensa_default_isa;
-+
-+	  fp->tc_frag_data.is_insn = 1;
-+	  /* Assemble a jump insn.  */
-+	  tinsn_init (&insn);
-+	  insn.insn_type = ITYPE_INSN;
-+	  insn.opcode = xtensa_j_opcode;
-+	  insn.ntok = 1;
-+	  set_expr_symbol_offset (&insn.tok[0], lsym, 3);
-+	  fmt = xg_get_single_format (xtensa_j_opcode);
-+	  tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf);
-+	  xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf);
-+	  xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)fp->fr_literal, 3);
-+	  fp->fr_fix += 3;
-+	  fp->fr_var -= 3;
-+	  growth = 3;
-+	  fixP = fix_new (fp, 0, 3, lsym, 3, TRUE, BFD_RELOC_XTENSA_SLOT0_OP);
-+	  trampP->fixP = fixP;
-+        }
-+    }
-+  return growth;
-+}
-+
-+
-+static int
-+add_jump_to_trampoline (struct trampoline_frag *trampP, fragS *origfrag)
-+{
-+  fragS *tramp = trampP->fragP;
-+  fixS *fixP;
-+  int offset = tramp->fr_fix; /* Where to assemble the j insn.  */
-+  TInsn insn;
-+  symbolS *lsym;
-+  symbolS *tsym;
-+  int toffset;
-+  xtensa_format fmt;
-+  xtensa_isa isa = xtensa_default_isa;
-+  int growth = 0;
-+
-+  lsym = tramp->fr_symbol;
-+  /* Assemble a jump to the target label in the trampoline frag.  */
-+  tsym = origfrag->tc_frag_data.slot_symbols[0];
-+  toffset = origfrag-> tc_frag_data.slot_offsets[0];
-+  tinsn_init (&insn);
-+  insn.insn_type = ITYPE_INSN;
-+  insn.opcode = xtensa_j_opcode;
-+  insn.ntok = 1;
-+  set_expr_symbol_offset (&insn.tok[0], tsym, toffset);
-+  fmt = xg_get_single_format (xtensa_j_opcode);
-+  tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf);
-+  xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf);
-+  xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)tramp->fr_literal + offset, 3);
-+  tramp->fr_fix += 3;
-+  tramp->fr_var -= 3;
-+  growth = 3;
-+  /* add a fix-up for the trampoline jump.  */
-+  fixP = fix_new (tramp, tramp->fr_fix - 3, 3, tsym, toffset, TRUE, BFD_RELOC_XTENSA_SLOT0_OP);
-+  /* Modify the jump at the start of this trampoline to point past the newly-added jump.  */
-+  fixP = trampP->fixP;
-+  if (fixP)
-+    fixP->fx_offset += 3;
-+  /* Modify the original j to point here.  */
-+  origfrag->tc_frag_data.slot_symbols[0] = lsym;
-+  origfrag->tc_frag_data.slot_offsets[0] = tramp->fr_fix - 3;
-+  /* If trampoline is full, remove it from the list.  */
-+  check_and_update_trampolines ();
-+
-+  return growth;
-+}
-+
-+
- static long
- relax_frag_immed (segT segP,
- 		  fragS *fragP,
-@@ -9284,6 +9804,37 @@ relax_frag_immed (segT segP,
-   if (negatable_branch && istack.ninsn > 1)
-     update_next_frag_state (fragP);
- 
-+  /* If last insn is a jump, and it cannot reach its target, try to find a trampoline.  */
-+  if (istack.ninsn > 2 &&
-+      istack.insn[istack.ninsn - 1].insn_type == ITYPE_LABEL &&
-+      istack.insn[istack.ninsn - 2].insn_type == ITYPE_INSN &&
-+      istack.insn[istack.ninsn - 2].opcode == xtensa_j_opcode)
-+    {
-+      TInsn *jinsn = &istack.insn[istack.ninsn - 2];
-+
-+      if (!xg_symbolic_immeds_fit (jinsn, segP, fragP, fragP->fr_offset, total_text_diff))
-+	{
-+	  struct trampoline_frag *tf = get_best_trampoline (jinsn, fragP);
-+
-+	  if (tf)
-+	    {
-+	      this_text_diff += init_trampoline_frag (tf);
-+	      this_text_diff += add_jump_to_trampoline (tf, fragP);
-+	    }
-+	  else
-+	    {
-+	      /* If target symbol is undefined, assume it will reach once linked.  */
-+	      expressionS *exp = &istack.insn[istack.ninsn - 2].tok[0];
-+
-+	      if (exp->X_op == O_symbol && S_IS_DEFINED (exp->X_add_symbol))
-+		{
-+		  as_bad_where (fragP->fr_file, fragP->fr_line,
-+		    _("jump target out of range; no usable trampoline found"));
-+		}
-+	    }
-+	}
-+    }
-+
-   return this_text_diff;
- }
- 
-@@ -9404,6 +9955,9 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec, fragS *fragp)
-       else
- 	as_bad (_("invalid relaxation fragment result"));
-       break;
-+
-+    case RELAX_TRAMPOLINE:
-+      break;
-     }
- 
-   fragp->fr_var = 0;
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index 0bf1240..4672bc6 100644
---- a/gas/config/tc-xtensa.h
-+++ b/gas/config/tc-xtensa.h
-@@ -180,6 +180,11 @@ enum xtensa_relax_statesE
-      prevent the linker from changing the size of any frag between the
-      section start and the org frag.  */
- 
-+  RELAX_TRAMPOLINE,
-+  /* Every few thousand frags, we insert one of these, just in case we may
-+     need some space for a trampoline (jump to a jump) because the function
-+     has gotten too big. If not needed, it disappears. */
-+
-   RELAX_NONE
- };
- 
-diff --git a/gas/frags.c b/gas/frags.c
-index 5f68480..e14099d 100644
---- a/gas/frags.c
-+++ b/gas/frags.c
-@@ -24,6 +24,20 @@
- 
- extern fragS zero_address_frag;
- extern fragS predefined_address_frag;
-+
-+static int totalfrags;
-+
-+int
-+get_frag_count (void)
-+{
-+  return totalfrags;
-+}
-+
-+void
-+clear_frag_count (void)
-+{
-+  totalfrags = 0;
-+}
- 
- /* Initialization for frag routines.  */
- 
-@@ -70,6 +84,7 @@ frag_alloc (struct obstack *ob)
-   ptr = (fragS *) obstack_alloc (ob, SIZEOF_STRUCT_FRAG);
-   obstack_alignment_mask (ob) = oalign;
-   memset (ptr, 0, SIZEOF_STRUCT_FRAG);
-+  totalfrags++;
-   return ptr;
- }
- 
-diff --git a/gas/frags.h b/gas/frags.h
-index 319898f..2f9e1b5 100644
---- a/gas/frags.h
-+++ b/gas/frags.h
-@@ -155,4 +155,7 @@ char *frag_var (relax_stateT type,
- 
- bfd_boolean frag_offset_fixed_p (const fragS *, const fragS *, offsetT *);
- 
-+int get_frag_count (void);
-+void clear_frag_count (void);
-+
- #endif /* FRAGS_H */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 2b2c294..3683b78 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -98,6 +98,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "pcrel"
-     run_dump_test "weak-call"
-     run_dump_test "jlong"
-+    run_dump_test "trampoline"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-new file mode 100644
-index 0000000..b4f65dc
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/trampoline.d
-@@ -0,0 +1,26 @@
-+#as:
-+#objdump: -d
-+#name: trampolines relaxation
-+
-+.*: +file format .*xtensa.*
-+#...
-+.*0:.*j.0x1194c
-+.*3:.*j.0x1194f
-+.*6:.*j.0x11952
-+.*9:.*j.0x1d4e4
-+#...
-+.*11949:.*j.0x11955
-+.*1194c:.*j.0x24a0e
-+.*1194f:.*j.0x24a0e
-+.*11952:.*j.0x24a11
-+#...
-+.*1d4e1:.*j.0x1d4e7
-+.*1d4e4:.*j.0x33462
-+#...
-+.*24a0e:.*j.0x24a0e
-+.*24a11:.*j.0x24a11
-+#...
-+.*3345f:.*ret
-+.*33462:.*j.0x49407
-+#...
-+.*49407:.*j.0x49407
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-new file mode 100644
-index 0000000..259a3bb
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/trampoline.s
-@@ -0,0 +1,21 @@
-+	.text
-+	j	1f
-+	j	1f
-+	j	2f
-+	j	3f
-+	.rep	25000
-+99:
-+	and	a2, a2, a3
-+	bne	a2, a3, 99b
-+	.endr
-+1:
-+	j	1b
-+2:
-+	j	2b
-+
-+	.rep	25000
-+	and	a2, a2, a3
-+	_ret
-+	.endr
-+3:
-+	j	3b
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch b/patches/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch
deleted file mode 100644
index e1c2d85..0000000
--- a/patches/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 15 Apr 2014 19:12:46 +0400
-Subject: [PATCH] Fix alignment for the first section frag on xtensa
-
-Linking object files produced by partial linking with link-time
-relaxation enabled sometimes fails with the following error message:
-
-dangerous relocation: call8: misaligned call target: (.text.unlikely+0x63)
-
-This happens because no basic block with an XTENSA_PROP_ALIGN flag in the
-property table is generated for the first basic block, even if the
-.align directive is present.
-It was believed that the first frag alignment could be derived from the
-section alignment, but this was not implemented for the partial linking
-case: after partial linking first frag of a section may become not
-first, but no additional alignment frag is inserted before it.
-Basic block for such frag may be merged with previous basic block into
-extended basic block during relaxation pass losing its alignment
-restrictions.
-
-Fix this by always recording alignment for the first section frag.
-
-2014-04-22  Max Filippov  <jcmvbkbc@gmail.com>
-
-gas/
-    * config/tc-xtensa.c (xtensa_handle_align): record alignment for the
-    first section frag.
-
----
-Backported from: a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1
-Changes to Changelog files and tests are dropped.
-
- gas/config/tc-xtensa.c                      | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index ea23c96..58ace38 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5609,7 +5609,6 @@ xtensa_handle_align (fragS *fragP)
-       && ! fragP->tc_frag_data.is_literal
-       && (fragP->fr_type == rs_align
- 	  || fragP->fr_type == rs_align_code)
--      && fragP->fr_address + fragP->fr_fix > 0
-       && fragP->fr_offset > 0
-       && now_seg != bss_section)
-     {
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch b/patches/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch
deleted file mode 100644
index ba24f4e..0000000
--- a/patches/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 6a17eba5358549d0d6d195bb22b34cdbc068def2 Mon Sep 17 00:00:00 2001
-From: Volodymyr Arbatov <arbatov@cadence.com>
-Date: Mon, 6 May 2013 09:43:21 -0800
-Subject: [PATCH] Use signed data type for R_XTENSA_DIFF* relocation offsets.
-
-R_XTENSA_DIFF relocation offsets are in fact signed. Treat them as such.
-Add testcase that examines ld behaviour on R_XTENSA_DIFF relocation
-changing sign during relaxation.
-
-2014-05-02  Volodymyr Arbatov  <arbatov@cadence.com>
-	    David Weatherford  <weath@cadence.com>
-	    Max Filippov  <jcmvbkbc@gmail.com>
-
-bfd/
-  * elf32-xtensa.c (relax_section): treat R_XTENSA_DIFF* relocations as
-  signed.
-
-gas/
-  * config/tc-xtensa.c (md_apply_fix): mark BFD_RELOC_XTENSA_DIFF*
-  fixups as signed.
----
-Backported from: 1058c7532d0b012ac329219264ddad59049fb6e6
-Changes to Changelog files and tests are dropped.
-
- bfd/elf32-xtensa.c                       | 32 ++++++++++++-----------
- gas/config/tc-xtensa.c                   |  3 +++
- 2 files changed, 20 insertions(+), 15 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index edb04b4..8818d67 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -222,11 +222,11 @@ static reloc_howto_type elf_howto_table[] =
- 	 FALSE, 0, 0, FALSE),
- 
-   /* Relocations for supporting difference of symbols.  */
--  HOWTO (R_XTENSA_DIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
-+  HOWTO (R_XTENSA_DIFF8, 0, 0, 8, FALSE, 0, complain_overflow_signed,
- 	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF8", FALSE, 0, 0xff, FALSE),
--  HOWTO (R_XTENSA_DIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
-+  HOWTO (R_XTENSA_DIFF16, 0, 1, 16, FALSE, 0, complain_overflow_signed,
- 	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF16", FALSE, 0, 0xffff, FALSE),
--  HOWTO (R_XTENSA_DIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
-+  HOWTO (R_XTENSA_DIFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
- 	 bfd_elf_xtensa_reloc, "R_XTENSA_DIFF32", FALSE, 0, 0xffffffff, FALSE),
- 
-   /* General immediate operand relocations.  */
-@@ -9013,7 +9013,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		  || r_type == R_XTENSA_DIFF16
- 		  || r_type == R_XTENSA_DIFF32)
- 		{
--		  bfd_vma diff_value = 0, new_end_offset, diff_mask = 0;
-+		  bfd_signed_vma diff_value = 0;
-+		  bfd_vma new_end_offset, diff_mask = 0;
- 
- 		  if (bfd_get_section_limit (abfd, sec) < old_source_offset)
- 		    {
-@@ -9027,15 +9028,15 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		    {
- 		    case R_XTENSA_DIFF8:
- 		      diff_value =
--			bfd_get_8 (abfd, &contents[old_source_offset]);
-+			bfd_get_signed_8 (abfd, &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF16:
- 		      diff_value =
--			bfd_get_16 (abfd, &contents[old_source_offset]);
-+			bfd_get_signed_16 (abfd, &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF32:
- 		      diff_value =
--			bfd_get_32 (abfd, &contents[old_source_offset]);
-+			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
- 		      break;
- 		    }
- 
-@@ -9047,24 +9048,25 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		  switch (r_type)
- 		    {
- 		    case R_XTENSA_DIFF8:
--		      diff_mask = 0xff;
--		      bfd_put_8 (abfd, diff_value,
-+		      diff_mask = 0x7f;
-+		      bfd_put_signed_8 (abfd, diff_value,
- 				 &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF16:
--		      diff_mask = 0xffff;
--		      bfd_put_16 (abfd, diff_value,
-+		      diff_mask = 0x7fff;
-+		      bfd_put_signed_16 (abfd, diff_value,
- 				  &contents[old_source_offset]);
- 		      break;
- 		    case R_XTENSA_DIFF32:
--		      diff_mask = 0xffffffff;
--		      bfd_put_32 (abfd, diff_value,
-+		      diff_mask = 0x7fffffff;
-+		      bfd_put_signed_32 (abfd, diff_value,
- 				  &contents[old_source_offset]);
- 		      break;
- 		    }
- 
--		  /* Check for overflow.  */
--		  if ((diff_value & ~diff_mask) != 0)
-+		  /* Check for overflow. Sign bits must be all zeroes or all ones */
-+		  if ((diff_value & ~diff_mask) != 0 &&
-+		      (diff_value & ~diff_mask) != (-1 & ~diff_mask))
- 		    {
- 		      (*link_info->callbacks->reloc_dangerous)
- 			(link_info, _("overflow after relaxation"),
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 58ace38..7547c0a0 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5867,12 +5867,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
-+	      fixP->fx_signed = 1;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
-+	      fixP->fx_signed = 1;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
-+	      fixP->fx_signed = 1;
- 	      break;
- 	    default:
- 	      break;
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch b/patches/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
deleted file mode 100644
index 6a0846e..0000000
--- a/patches/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 10 Jul 2014 01:47:33 +0400
-Subject: [PATCH] Fix xtensa ld segfault when linking linux modules
-
-is_inconsistent_linkonce_section makes an assumption that section name
-that starts with ".gnu.linkonce.prop." has one more dot in its suffix.
-However gas generates such section name by insertion of "prop." right
-after ".gnu.linkonce." part of the name of the original section. So, for
-section named ".gnu.linkonce.this_module" corresponding property section
-name does not satisfy the assumption. Such section names are common in
-linux modules. This bug was exposed by the patch "a35d5e8 Fix alignment
-for the first section frag on xtensa", that makes gas produce property
-section for each section that has ".align" directive in it.
-
-Use suffix that immediately follows ".gnu.linkonce.prop." when there are
-no more dots following it.
-
-2014-07-10  Max Filippov  <jcmvbkbc@gmail.com>
-
-ld/
-    * emultempl/xtensaelf.em (is_inconsistent_linkonce_section):
-    correctly handle missing dot in section name after
-    ".gnu.linkonce.prop.".
----
-Backported from: e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2
-Changes to ld/ChangeLog file are dropped.
-
- ld/emultempl/xtensaelf.em | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
-index 151eea4..948d18d 100644
---- a/ld/emultempl/xtensaelf.em
-+++ b/ld/emultempl/xtensaelf.em
-@@ -1310,7 +1310,7 @@ is_inconsistent_linkonce_section (asection *sec)
-      for Tensilica's XCC compiler.  */
-   name = sec_name + linkonce_len;
-   if (CONST_STRNEQ (name, "prop."))
--    name = strchr (name + 5, '.') + 1;
-+    name = strchr (name + 5, '.') ? strchr (name + 5, '.') + 1 : name + 5;
-   else if (name[1] == '.'
- 	   && (name[0] == 'p' || name[0] == 'e' || name[0] == 'h'))
-     name += 2;
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch b/patches/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
deleted file mode 100644
index e4c600e..0000000
--- a/patches/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 7fc39194f8fb48914c995f8ec3826d50086f1ec0 Mon Sep 17 00:00:00 2001
-From: Sterling Augustine <augustine.sterling@gmail.com>
-Date: Tue, 25 Jan 2011 13:59:13 -0800
-Subject: [PATCH] Fix 'call8: call target out of range' xtensa ld relaxation
- bug
-
-During link-time relaxation distance between cross-section call site and
-its target may grow, producing 'call target out of range' error for
-relaxed calls. Be more conservative when calculating whether or not a
-callx can be converted to a straight call.
-
-2014-09-23  Sterling Augustine  <augustine.sterling@gmail.com>
-
-bfd/
-    * elf32-xtensa.c (is_resolvable_asm_expansion): for cross-section
-    call relaxation use furthermost addresses where call source and
-    destination can be to check whether it's in the range of a direct
-    call.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 41 +++++++++++++++++++++++++++++++++++++----
- 1 file changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 09862e3..e32496a 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -7124,10 +7124,43 @@ is_resolvable_asm_expansion (bfd *abfd,
- 	  || is_reloc_sym_weak (abfd, irel)))
-     return FALSE;
- 
--  self_address = (sec->output_section->vma
--		  + sec->output_offset + irel->r_offset + 3);
--  dest_address = (target_sec->output_section->vma
--		  + target_sec->output_offset + target_offset);
-+  if (target_sec->output_section != sec->output_section)
-+    {
-+      /* If the two sections are sufficiently far away that relaxation
-+	 might take the call out of range, we can't simplify.  For
-+	 example, a positive displacement call into another memory
-+	 could get moved to a lower address due to literal removal,
-+	 but the destination won't move, and so the displacment might
-+	 get larger.
-+
-+	 If the displacement is negative, assume the destination could
-+	 move as far back as the start of the output section.  The
-+	 self_address will be at least as far into the output section
-+	 as it is prior to relaxation.
-+
-+	 If the displacement is postive, assume the destination will be in
-+	 it's pre-relaxed location (because relaxation only makes sections
-+	 smaller).  The self_address could go all the way to the beginning
-+	 of the output section.  */
-+
-+      dest_address = target_sec->output_section->vma;
-+      self_address = sec->output_section->vma;
-+
-+      if (sec->output_section->vma > target_sec->output_section->vma)
-+	self_address += sec->output_offset + irel->r_offset + 3;
-+      else
-+	dest_address += bfd_get_section_limit (abfd, target_sec->output_section);
-+      /* Call targets should be four-byte aligned.  */
-+      dest_address = (dest_address + 3) & ~3;
-+    }
-+  else
-+    {
-+
-+      self_address = (sec->output_section->vma
-+		      + sec->output_offset + irel->r_offset + 3);
-+      dest_address = (target_sec->output_section->vma
-+		      + target_sec->output_offset + target_offset);
-+    }
- 
-   *is_reachable_p = pcrel_reloc_fits (direct_call_opcode, 0,
- 				      self_address, dest_address);
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch b/patches/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch
deleted file mode 100644
index 8aeb064..0000000
--- a/patches/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 415480d6471e67aef97c0241d451ef2423a1da9d Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 25 Nov 2014 21:33:21 +0300
-Subject: [PATCH] Fix trampolines search code for conditional branches
-
-For conditional branches that need more than one trampoline to reach its
-target assembler couldn't always find suitable trampoline because
-post-loop condition check was placed inside the loop, resulting in
-premature loop termination. Move check outside the loop.
-
-This fixes the following build errors seen when assembling huge files
-produced by gcc:
-    Error: jump target out of range; no usable trampoline found
-    Error: operand 1 of 'j' has out of range value '307307'
-
-2014-11-25  Max Filippov  <jcmvbkbc@gmail.com>
-
-gas/
-	* config/tc-xtensa.c (search_trampolines): Move post-loop
-	condition check outside the search loop.
-
-gas/testsuite/
-	* gas/xtensa/trampoline.d: Add expected output for branches.
-	* gas/xtensa/trampoline.s: Add test case for branches.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3
-Changes to ChangeLogs are dropped.
-
- gas/config/tc-xtensa.c                | 8 ++++----
- gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++
- gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++
- 3 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d11b0c7..f23ccf8 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
- 	      if (next_addr == 0 || addr - next_addr > J_RANGE)
- 		break;
- 	    }
--	  if (abs (addr - this_addr) < J_RANGE)
--	    return tf;
--
--	  return NULL;
- 	}
-+      if (abs (addr - this_addr) < J_RANGE)
-+	return tf;
-+
-+      return NULL;
-     }
-   for ( ; tf; tf = tf->next)
-     {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-index b4f65dc..5ae32a6 100644
---- a/gas/testsuite/gas/xtensa/trampoline.d
-+++ b/gas/testsuite/gas/xtensa/trampoline.d
-@@ -24,3 +24,12 @@
- .*33462:.*j.0x49407
- #...
- .*49407:.*j.0x49407
-+.*4940a:.*beqz.n.a2,.0x4940f
-+.*4940c:.*j.0x693d1
-+#...
-+.*693d1:.*j.0x7ddd4
-+#...
-+.*7ddd4:.*j.0x927f5
-+#...
-+.*927f5:.*j.0x927f5
-+#...
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-index 259a3bb..4465786 100644
---- a/gas/testsuite/gas/xtensa/trampoline.s
-+++ b/gas/testsuite/gas/xtensa/trampoline.s
-@@ -19,3 +19,10 @@
- 	.endr
- 3:
- 	j	3b
-+	bnez	a2, 4f
-+	.rep	50000
-+	and	a2, a2, a3
-+	_ret
-+	.endr
-+4:
-+	j	4b
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch b/patches/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
deleted file mode 100644
index 8a21100..0000000
--- a/patches/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
+++ /dev/null
@@ -1,502 +0,0 @@
-From 20c79baf82273a0b368587f761f152c4d3a593a4 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 27 Mar 2015 07:13:55 +0300
-Subject: [PATCH 1/4] xtensa: optimize check_section_ebb_pcrels_fit
-
-The original check_section_ebb_pcrels_fit algorithm checks that text
-actions proposed for current EBB are OK for every relocation in a
-section. There's no need to check every relocation, because text actions
-for EBB can only change size of that EBB, thus only affecting
-relocations that in any way cross that EBB. In addition EBBs are
-iterated in ascending order of their VMA, making it easier to track
-relevant relocations.
-
-Introduce a structure that can track relocations that cross the range of
-VMAs of EBB and use it to only check relocations relevant to current EBB
-in check_section_ebb_pcrels_fit.
-It takes O(N log N) operations to build it and O(N) operations to move
-current EBB VMA window through its entire range, where N is the number
-of relocations in a section. The resulting complexity of
-compute_text_actions is thus reduced from O(N^2) to O(N log N + N * M),
-where M is the average number of relocations crossing each EBB.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-         44.26   71.53    6429/6429        compute_text_actions
-  50.2   44.26   71.53    6429         check_section_ebb_pcrels_fit
-          1.16   20.12 347506666/347576152     pcrel_reloc_fits
-          2.95   16.52 347506666/348104944     get_relocation_opnd
-          2.01    9.74 347575100/361252208     r_reloc_init
-          0.55    7.53 347575100/363381467     r_reloc_get_section
-          5.76    0.02 695013332/695013332     xlate_offset_with_removed_text
-          0.68    3.89 347575100/363483827     bfd_octets_per_byte
-          0.32    0.00 347506666/349910253     is_alt_relocation
-          0.18    0.11    6391/6391        build_xlate_map
-          0.00    0.00    6429/19417168     get_xtensa_relax_info
-          0.00    0.00    6391/6391        free_xlate_map
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          2.56    3.08    6429/6429        compute_text_actions
-   8.2    2.56    3.08    6429         check_section_ebb_pcrels_fit
-          0.08    0.91 17721075/17790561     pcrel_reloc_fits
-          0.17    0.47 17721075/31685977     r_reloc_init
-          0.43    0.00 35442150/35442150     xlate_offset_with_removed_text
-          0.02    0.37 17721075/33815236     r_reloc_get_section
-          0.22    0.11    6391/6391        build_xlate_map
-          0.05    0.22 17721075/33917596     bfd_octets_per_byte
-          0.03    0.00 17721075/20405299     is_alt_relocation
-          0.01    0.00    6429/6429        reloc_range_list_update_range
-          0.00    0.00    6429/19417168     get_xtensa_relax_info
-          0.00    0.00    6391/6391        free_xlate_map
------------------------------------------
-
-2015-04-01  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (reloc_range_list, reloc_range_list_entry,
-	reloc_range): new typedef.
-	(reloc_range_list_struct, reloc_range_list_entry_struct,
-	reloc_range_struct): new structures.
-	(reloc_range_compare, build_reloc_ranges,
-	reloc_range_list_append, reloc_range_list_remove,
-	reloc_range_list_update_range, free_reloc_range_list): new
-	functions.
-	(compute_text_actions): precompute relocation opcodes before the
-	loop. Add relevant_relocs variable, initialize it before the
-	loop, pass it to the check_section_ebb_pcrels_fit.
-	(check_section_ebb_pcrels_fit): add new parameter:
-	relevant_relocs. Update address range in the relevant_relocs if
-	it's non-NULL and iterate only over relevant relocations.
-
-Backported from: b2b326d246f839ee218192ac88da2384d929a072
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 298 insertions(+), 23 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 0b6f584..872370b 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -6619,8 +6619,10 @@ static bfd_boolean compute_text_actions
-   (bfd *, asection *, struct bfd_link_info *);
- static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *);
- static bfd_boolean compute_ebb_actions (ebb_constraint *);
-+typedef struct reloc_range_list_struct reloc_range_list;
- static bfd_boolean check_section_ebb_pcrels_fit
--  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, const ebb_constraint *,
-+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *,
-+   reloc_range_list *, const ebb_constraint *,
-    const xtensa_opcode *);
- static bfd_boolean check_section_ebb_reduces (const ebb_constraint *);
- static void text_action_add_proposed
-@@ -7219,6 +7221,221 @@ build_reloc_opcodes (bfd *abfd,
-   return reloc_opcodes;
- }
- 
-+struct reloc_range_struct
-+{
-+  bfd_vma addr;
-+  bfd_boolean add; /* TRUE if start of a range, FALSE otherwise.  */
-+  /* Original irel index in the array of relocations for a section.  */
-+  unsigned irel_index;
-+};
-+typedef struct reloc_range_struct reloc_range;
-+
-+typedef struct reloc_range_list_entry_struct reloc_range_list_entry;
-+struct reloc_range_list_entry_struct
-+{
-+  reloc_range_list_entry *next;
-+  reloc_range_list_entry *prev;
-+  Elf_Internal_Rela *irel;
-+  xtensa_opcode opcode;
-+  int opnum;
-+};
-+
-+struct reloc_range_list_struct
-+{
-+  /* The rest of the structure is only meaningful when ok is TRUE.  */
-+  bfd_boolean ok;
-+
-+  unsigned n_range; /* Number of range markers.  */
-+  reloc_range *range; /* Sorted range markers.  */
-+
-+  unsigned first; /* Index of a first range element in the list.  */
-+  unsigned last; /* One past index of a last range element in the list.  */
-+
-+  unsigned n_list; /* Number of list elements.  */
-+  reloc_range_list_entry *reloc; /*  */
-+  reloc_range_list_entry list_root;
-+};
-+
-+static int
-+reloc_range_compare (const void *a, const void *b)
-+{
-+  const reloc_range *ra = a;
-+  const reloc_range *rb = b;
-+
-+  if (ra->addr != rb->addr)
-+    return ra->addr < rb->addr ? -1 : 1;
-+  if (ra->add != rb->add)
-+    return ra->add ? -1 : 1;
-+  return 0;
-+}
-+
-+static void
-+build_reloc_ranges (bfd *abfd, asection *sec,
-+		    bfd_byte *contents,
-+		    Elf_Internal_Rela *internal_relocs,
-+		    xtensa_opcode *reloc_opcodes,
-+		    reloc_range_list *list)
-+{
-+  unsigned i;
-+  size_t n = 0;
-+  size_t max_n = 0;
-+  reloc_range *ranges = NULL;
-+  reloc_range_list_entry *reloc =
-+    bfd_malloc (sec->reloc_count * sizeof (*reloc));
-+
-+  memset (list, 0, sizeof (*list));
-+  list->ok = TRUE;
-+
-+  for (i = 0; i < sec->reloc_count; i++)
-+    {
-+      Elf_Internal_Rela *irel = &internal_relocs[i];
-+      int r_type = ELF32_R_TYPE (irel->r_info);
-+      reloc_howto_type *howto = &elf_howto_table[r_type];
-+      r_reloc r_rel;
-+
-+      if (r_type == R_XTENSA_ASM_SIMPLIFY
-+	  || r_type == R_XTENSA_32_PCREL
-+	  || !howto->pc_relative)
-+	continue;
-+
-+      r_reloc_init (&r_rel, abfd, irel, contents,
-+		    bfd_get_section_limit (abfd, sec));
-+
-+      if (r_reloc_get_section (&r_rel) != sec)
-+	continue;
-+
-+      if (n + 2 > max_n)
-+	{
-+	  max_n = (max_n + 2) * 2;
-+	  ranges = bfd_realloc (ranges, max_n * sizeof (*ranges));
-+	}
-+
-+      ranges[n].addr = irel->r_offset;
-+      ranges[n + 1].addr = r_rel.target_offset;
-+
-+      ranges[n].add = ranges[n].addr < ranges[n + 1].addr;
-+      ranges[n + 1].add = !ranges[n].add;
-+
-+      ranges[n].irel_index = i;
-+      ranges[n + 1].irel_index = i;
-+
-+      n += 2;
-+
-+      reloc[i].irel = irel;
-+
-+      /* Every relocation won't possibly be checked in the optimized version of
-+         check_section_ebb_pcrels_fit, so this needs to be done here.  */
-+      if (is_alt_relocation (ELF32_R_TYPE (irel->r_info)))
-+	{
-+	  /* None of the current alternate relocs are PC-relative,
-+	     and only PC-relative relocs matter here.  */
-+	}
-+      else
-+	{
-+	  xtensa_opcode opcode;
-+	  int opnum;
-+
-+	  if (reloc_opcodes)
-+	    opcode = reloc_opcodes[i];
-+	  else
-+	    opcode = get_relocation_opcode (abfd, sec, contents, irel);
-+
-+	  if (opcode == XTENSA_UNDEFINED)
-+	    {
-+	      list->ok = FALSE;
-+	      break;
-+	    }
-+
-+	  opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
-+	  if (opnum == XTENSA_UNDEFINED)
-+	    {
-+	      list->ok = FALSE;
-+	      break;
-+	    }
-+
-+	  /* Record relocation opcode and opnum as we've calculated them
-+	     anyway and they won't change.  */
-+	  reloc[i].opcode = opcode;
-+	  reloc[i].opnum = opnum;
-+	}
-+    }
-+
-+  if (list->ok)
-+    {
-+      ranges = bfd_realloc (ranges, n * sizeof (*ranges));
-+      qsort (ranges, n, sizeof (*ranges), reloc_range_compare);
-+
-+      list->n_range = n;
-+      list->range = ranges;
-+      list->reloc = reloc;
-+      list->list_root.prev = &list->list_root;
-+      list->list_root.next = &list->list_root;
-+    }
-+  else
-+    {
-+      free (ranges);
-+      free (reloc);
-+    }
-+}
-+
-+static void reloc_range_list_append (reloc_range_list *list,
-+				     unsigned irel_index)
-+{
-+  reloc_range_list_entry *entry = list->reloc + irel_index;
-+
-+  entry->prev = list->list_root.prev;
-+  entry->next = &list->list_root;
-+  entry->prev->next = entry;
-+  entry->next->prev = entry;
-+  ++list->n_list;
-+}
-+
-+static void reloc_range_list_remove (reloc_range_list *list,
-+				     unsigned irel_index)
-+{
-+  reloc_range_list_entry *entry = list->reloc + irel_index;
-+
-+  entry->next->prev = entry->prev;
-+  entry->prev->next = entry->next;
-+  --list->n_list;
-+}
-+
-+/* Update relocation list object so that it lists all relocations that cross
-+   [first; last] range.  Range bounds should not decrease with successive
-+   invocations.  */
-+static void reloc_range_list_update_range (reloc_range_list *list,
-+					   bfd_vma first, bfd_vma last)
-+{
-+  /* This should not happen: EBBs are iterated from lower addresses to higher.
-+     But even if that happens there's no need to break: just flush current list
-+     and start from scratch.  */
-+  if ((list->last > 0 && list->range[list->last - 1].addr > last) ||
-+      (list->first > 0 && list->range[list->first - 1].addr >= first))
-+    {
-+      list->first = 0;
-+      list->last = 0;
-+      list->n_list = 0;
-+      list->list_root.next = &list->list_root;
-+      list->list_root.prev = &list->list_root;
-+      fprintf (stderr, "%s: move backwards requested\n", __func__);
-+    }
-+
-+  for (; list->last < list->n_range &&
-+       list->range[list->last].addr <= last; ++list->last)
-+    if (list->range[list->last].add)
-+      reloc_range_list_append (list, list->range[list->last].irel_index);
-+
-+  for (; list->first < list->n_range &&
-+       list->range[list->first].addr < first; ++list->first)
-+    if (!list->range[list->first].add)
-+      reloc_range_list_remove (list, list->range[list->first].irel_index);
-+}
-+
-+static void free_reloc_range_list (reloc_range_list *list)
-+{
-+  free (list->range);
-+  free (list->reloc);
-+}
- 
- /* The compute_text_actions function will build a list of potential
-    transformation actions for code in the extended basic block of each
-@@ -7245,6 +7462,7 @@ compute_text_actions (bfd *abfd,
-   property_table_entry *prop_table = 0;
-   int ptblsize = 0;
-   bfd_size_type sec_size;
-+  reloc_range_list relevant_relocs;
- 
-   relax_info = get_xtensa_relax_info (sec);
-   BFD_ASSERT (relax_info);
-@@ -7277,6 +7495,12 @@ compute_text_actions (bfd *abfd,
-       goto error_return;
-     }
- 
-+  /* Precompute the opcode for each relocation.  */
-+  reloc_opcodes = build_reloc_opcodes (abfd, sec, contents, internal_relocs);
-+
-+  build_reloc_ranges (abfd, sec, contents, internal_relocs, reloc_opcodes,
-+		      &relevant_relocs);
-+
-   for (i = 0; i < sec->reloc_count; i++)
-     {
-       Elf_Internal_Rela *irel = &internal_relocs[i];
-@@ -7340,17 +7564,13 @@ compute_text_actions (bfd *abfd,
-       ebb->start_reloc_idx = i;
-       ebb->end_reloc_idx = i;
- 
--      /* Precompute the opcode for each relocation.  */
--      if (reloc_opcodes == NULL)
--	reloc_opcodes = build_reloc_opcodes (abfd, sec, contents,
--					     internal_relocs);
--
-       if (!extend_ebb_bounds (ebb)
- 	  || !compute_ebb_proposed_actions (&ebb_table)
- 	  || !compute_ebb_actions (&ebb_table)
- 	  || !check_section_ebb_pcrels_fit (abfd, sec, contents,
--					    internal_relocs, &ebb_table,
--					    reloc_opcodes)
-+					    internal_relocs,
-+					    &relevant_relocs,
-+					    &ebb_table, reloc_opcodes)
- 	  || !check_section_ebb_reduces (&ebb_table))
- 	{
- 	  /* If anything goes wrong or we get unlucky and something does
-@@ -7372,6 +7592,8 @@ compute_text_actions (bfd *abfd,
-       free_ebb_constraint (&ebb_table);
-     }
- 
-+  free_reloc_range_list (&relevant_relocs);
-+
- #if DEBUG
-   if (relax_info->action_list.head)
-     print_action_list (stderr, &relax_info->action_list);
-@@ -7974,14 +8196,17 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 			      asection *sec,
- 			      bfd_byte *contents,
- 			      Elf_Internal_Rela *internal_relocs,
-+			      reloc_range_list *relevant_relocs,
- 			      const ebb_constraint *constraint,
- 			      const xtensa_opcode *reloc_opcodes)
- {
-   unsigned i, j;
-+  unsigned n = sec->reloc_count;
-   Elf_Internal_Rela *irel;
-   xlate_map_t *xmap = NULL;
-   bfd_boolean ok = TRUE;
-   xtensa_relax_info *relax_info;
-+  reloc_range_list_entry *entry = NULL;
- 
-   relax_info = get_xtensa_relax_info (sec);
- 
-@@ -7992,7 +8217,40 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 	 can still be used.  */
-     }
- 
--  for (i = 0; i < sec->reloc_count; i++)
-+  if (relevant_relocs && constraint->action_count)
-+    {
-+      if (!relevant_relocs->ok)
-+	{
-+	  ok = FALSE;
-+	  n = 0;
-+	}
-+      else
-+	{
-+	  bfd_vma min_offset, max_offset;
-+	  min_offset = max_offset = constraint->actions[0].offset;
-+
-+	  for (i = 1; i < constraint->action_count; ++i)
-+	    {
-+	      proposed_action *action = &constraint->actions[i];
-+	      bfd_vma offset = action->offset;
-+
-+	      if (offset < min_offset)
-+		min_offset = offset;
-+	      if (offset > max_offset)
-+		max_offset = offset;
-+	    }
-+	  reloc_range_list_update_range (relevant_relocs, min_offset,
-+					 max_offset);
-+	  n = relevant_relocs->n_list;
-+	  entry = &relevant_relocs->list_root;
-+	}
-+    }
-+  else
-+    {
-+      relevant_relocs = NULL;
-+    }
-+
-+  for (i = 0; i < n; i++)
-     {
-       r_reloc r_rel;
-       bfd_vma orig_self_offset, orig_target_offset;
-@@ -8001,7 +8259,15 @@ check_section_ebb_pcrels_fit (bfd *abfd,
-       reloc_howto_type *howto;
-       int self_removed_bytes, target_removed_bytes;
- 
--      irel = &internal_relocs[i];
-+      if (relevant_relocs)
-+	{
-+	  entry = entry->next;
-+	  irel = entry->irel;
-+	}
-+      else
-+	{
-+	  irel = internal_relocs + i;
-+	}
-       r_type = ELF32_R_TYPE (irel->r_info);
- 
-       howto = &elf_howto_table[r_type];
-@@ -8067,21 +8333,30 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 	  xtensa_opcode opcode;
- 	  int opnum;
- 
--	  if (reloc_opcodes)
--	    opcode = reloc_opcodes[i];
--	  else
--	    opcode = get_relocation_opcode (abfd, sec, contents, irel);
--	  if (opcode == XTENSA_UNDEFINED)
-+	  if (relevant_relocs)
- 	    {
--	      ok = FALSE;
--	      break;
-+	      opcode = entry->opcode;
-+	      opnum = entry->opnum;
- 	    }
--
--	  opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
--	  if (opnum == XTENSA_UNDEFINED)
-+	  else
- 	    {
--	      ok = FALSE;
--	      break;
-+	      if (reloc_opcodes)
-+		opcode = reloc_opcodes[relevant_relocs ?
-+		  (unsigned)(entry - relevant_relocs->reloc) : i];
-+	      else
-+		opcode = get_relocation_opcode (abfd, sec, contents, irel);
-+	      if (opcode == XTENSA_UNDEFINED)
-+		{
-+		  ok = FALSE;
-+		  break;
-+		}
-+
-+	      opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
-+	      if (opnum == XTENSA_UNDEFINED)
-+		{
-+		  ok = FALSE;
-+		  break;
-+		}
- 	    }
- 
- 	  if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset))
-@@ -8778,7 +9053,7 @@ move_shared_literal (asection *sec,
-   /* Check all of the PC-relative relocations to make sure they still fit.  */
-   relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec,
- 					     target_sec_cache->contents,
--					     target_sec_cache->relocs,
-+					     target_sec_cache->relocs, NULL,
- 					     &ebb_table, NULL);
- 
-   if (!relocs_fit)
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch b/patches/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch
deleted file mode 100644
index 9df8065..0000000
--- a/patches/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From 3e3f60207399ab29dd55af109e5ae9facc7d8e83 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 28 Mar 2015 08:46:28 +0300
-Subject: [PATCH 2/4] xtensa: optimize removed_by_actions
-
-The function removed_by_actions iterates through text actions to
-calculate an offset applied by text actions to a given VMA. Although it
-has a parameter p_start_action that allows for incremental offset
-calculation, in many places it's used with p_start_action explicitly set
-to the first action. After the first relaxation pass when the list of
-text actions is finalized, an array of offsets sorted by VMA may be used
-to speed up this function.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-          0.35    0.00   33872/4808961     relax_section_symbols
-          3.32    0.00  326022/4808961     relax_property_section
-         12.83    0.00 1259379/4808961     offset_with_removed_text
-         32.50    0.00 3189688/4808961     translate_reloc
-  71.5   49.00    0.00 4808961         removed_by_actions
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00   33872/4808537     relax_section_symbols
-          0.01    0.00  326022/4808537     relax_property_section
-          0.05    0.00 1258955/4808537     offset_with_removed_text_map
-          0.13    0.00 3189688/4808537     translate_reloc
-   1.0    0.20    0.00 4808537         removed_by_actions_map
-          0.00    0.00     120/120         map_removal_by_action
------------------------------------------
-
-2015-04-01  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (removal_by_action_entry_struct,
-	removal_by_action_map_struct): new structures.
-	(removal_by_action_entry, removal_by_action_map): new typedefs.
-	(text_action_list_struct): add new field: map.
-	(map_removal_by_action, removed_by_actions_map,
-	offset_with_removed_text_map): new functions.
-	(relax_section): replace offset_with_removed_text with
-	offset_with_removed_text_map.
-	(translate_reloc, relax_property_section, relax_section_symbols):
-	replace removed_by_actions with removed_by_actions_map.
-
-Backported from: 071aa5c98a31c966f5fbfc573fcee61350fd1936
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 181 +++++++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 156 insertions(+), 25 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 872370b..21b2871 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -5420,11 +5420,28 @@ struct text_action_struct
-   text_action *next;
- };
- 
-+struct removal_by_action_entry_struct
-+{
-+  bfd_vma offset;
-+  int removed;
-+  int eq_removed;
-+  int eq_removed_before_fill;
-+};
-+typedef struct removal_by_action_entry_struct removal_by_action_entry;
-+
-+struct removal_by_action_map_struct
-+{
-+  unsigned n_entries;
-+  removal_by_action_entry *entry;
-+};
-+typedef struct removal_by_action_map_struct removal_by_action_map;
-+
- 
- /* List of all of the actions taken on a text section.  */
- struct text_action_list_struct
- {
-   text_action *head;
-+  removal_by_action_map map;
- };
- 
- 
-@@ -5636,6 +5653,101 @@ action_list_count (text_action_list *action_list)
-   return count;
- }
- 
-+static void
-+map_removal_by_action (text_action_list *action_list)
-+{
-+  text_action *r;
-+  int removed = 0;
-+  removal_by_action_map map;
-+  bfd_boolean eq_complete;
-+
-+  map.n_entries = 0;
-+  map.entry = bfd_malloc (action_list_count (action_list) *
-+			  sizeof (removal_by_action_entry));
-+  eq_complete = FALSE;
-+
-+  for (r = action_list->head; r;)
-+    {
-+      removal_by_action_entry *ientry = map.entry + map.n_entries;
-+
-+      if (map.n_entries && (ientry - 1)->offset == r->offset)
-+	{
-+	  --ientry;
-+	}
-+      else
-+	{
-+	  ++map.n_entries;
-+	  eq_complete = FALSE;
-+	  ientry->offset = r->offset;
-+	  ientry->eq_removed_before_fill = removed;
-+	}
-+
-+      if (!eq_complete)
-+	{
-+	  if (r->action != ta_fill || r->removed_bytes >= 0)
-+	    {
-+	      ientry->eq_removed = removed;
-+	      eq_complete = TRUE;
-+	    }
-+	  else
-+	    ientry->eq_removed = removed + r->removed_bytes;
-+	}
-+
-+      removed += r->removed_bytes;
-+      ientry->removed = removed;
-+      r = r->next;
-+    }
-+  action_list->map = map;
-+}
-+
-+static int
-+removed_by_actions_map (text_action_list *action_list, bfd_vma offset,
-+			bfd_boolean before_fill)
-+{
-+  unsigned a, b;
-+
-+  if (!action_list->map.entry)
-+    map_removal_by_action (action_list);
-+
-+  if (!action_list->map.n_entries)
-+    return 0;
-+
-+  a = 0;
-+  b = action_list->map.n_entries;
-+
-+  while (b - a > 1)
-+    {
-+      unsigned c = (a + b) / 2;
-+
-+      if (action_list->map.entry[c].offset <= offset)
-+	a = c;
-+      else
-+	b = c;
-+    }
-+
-+  if (action_list->map.entry[a].offset < offset)
-+    {
-+      return action_list->map.entry[a].removed;
-+    }
-+  else if (action_list->map.entry[a].offset == offset)
-+    {
-+      return before_fill ?
-+	action_list->map.entry[a].eq_removed_before_fill :
-+	action_list->map.entry[a].eq_removed;
-+    }
-+  else
-+    {
-+      return 0;
-+    }
-+}
-+
-+static bfd_vma
-+offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
-+{
-+  int removed = removed_by_actions_map (action_list, offset, FALSE);
-+  return offset - removed;
-+}
-+
- 
- /* The find_insn_action routine will only find non-fill actions.  */
- 
-@@ -5909,6 +6021,9 @@ init_xtensa_relax_info (asection *sec)
- 
-   relax_info->action_list.head = NULL;
- 
-+  relax_info->action_list.map.n_entries = 0;
-+  relax_info->action_list.map.entry = NULL;
-+
-   relax_info->fix_list = NULL;
-   relax_info->fix_array = NULL;
-   relax_info->fix_array_count = 0;
-@@ -9218,7 +9333,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		  if (elf_hash_table (link_info)->dynamic_sections_created)
- 		    shrink_dynamic_reloc_sections (link_info, abfd, sec, irel);
- 		  irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
--		  irel->r_offset = offset_with_removed_text
-+		  irel->r_offset = offset_with_removed_text_map
- 		    (&relax_info->action_list, irel->r_offset);
- 		  continue;
- 		}
-@@ -9255,7 +9370,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		    }
- 		}
- 
--	      source_offset = offset_with_removed_text
-+	      source_offset = offset_with_removed_text_map
- 		(&relax_info->action_list, irel->r_offset);
- 	      irel->r_offset = source_offset;
- 	    }
-@@ -9352,7 +9467,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		      break;
- 		    }
- 
--		  new_end_offset = offset_with_removed_text
-+		  new_end_offset = offset_with_removed_text_map
- 		    (&target_relax_info->action_list,
- 		     r_rel.target_offset + diff_value);
- 		  diff_value = new_end_offset - new_reloc.target_offset;
-@@ -9750,7 +9865,6 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
-   xtensa_relax_info *relax_info;
-   removed_literal *removed;
-   bfd_vma target_offset, base_offset;
--  text_action *act;
- 
-   *new_rel = *orig_rel;
- 
-@@ -9803,19 +9917,26 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
-      offset.  */
- 
-   base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend;
--  act = relax_info->action_list.head;
-   if (base_offset <= target_offset)
-     {
--      int base_removed = removed_by_actions (&act, base_offset, FALSE);
--      int addend_removed = removed_by_actions (&act, target_offset, FALSE);
-+      int base_removed = removed_by_actions_map (&relax_info->action_list,
-+						 base_offset, FALSE);
-+      int addend_removed = removed_by_actions_map (&relax_info->action_list,
-+						   target_offset, FALSE) -
-+	base_removed;
-+
-       new_rel->target_offset = target_offset - base_removed - addend_removed;
-       new_rel->rela.r_addend -= addend_removed;
-     }
-   else
-     {
-       /* Handle a negative addend.  The base offset comes first.  */
--      int tgt_removed = removed_by_actions (&act, target_offset, FALSE);
--      int addend_removed = removed_by_actions (&act, base_offset, FALSE);
-+      int tgt_removed = removed_by_actions_map (&relax_info->action_list,
-+						target_offset, FALSE);
-+      int addend_removed = removed_by_actions_map (&relax_info->action_list,
-+						   base_offset, FALSE) -
-+	tgt_removed;
-+
-       new_rel->target_offset = target_offset - tgt_removed;
-       new_rel->rela.r_addend += addend_removed;
-     }
-@@ -10138,9 +10259,10 @@ relax_property_section (bfd *abfd,
- 	      bfd_vma old_offset = val.r_rel.target_offset;
- 	      bfd_vma new_offset;
- 	      long old_size, new_size;
--	      text_action *act = target_relax_info->action_list.head;
--	      new_offset = old_offset -
--		removed_by_actions (&act, old_offset, FALSE);
-+	      int removed_by_old_offset =
-+		removed_by_actions_map (&target_relax_info->action_list,
-+					old_offset, FALSE);
-+	      new_offset = old_offset - removed_by_old_offset;
- 
- 	      /* Assert that we are not out of bounds.  */
- 	      old_size = bfd_get_32 (abfd, size_p);
-@@ -10164,9 +10286,10 @@ relax_property_section (bfd *abfd,
- 
- 		      /* Recompute the new_offset, but this time don't
- 			 include any fill inserted by relaxation.  */
--		      act = target_relax_info->action_list.head;
--		      new_offset = old_offset -
--			removed_by_actions (&act, old_offset, TRUE);
-+		      removed_by_old_offset =
-+			removed_by_actions_map (&target_relax_info->action_list,
-+						old_offset, TRUE);
-+		      new_offset = old_offset - removed_by_old_offset;
- 
- 		      /* If it is not unreachable and we have not yet
- 			 seen an unreachable at this address, place it
-@@ -10182,8 +10305,12 @@ relax_property_section (bfd *abfd,
- 		    }
- 		}
- 	      else
--		new_size -=
--		    removed_by_actions (&act, old_offset + old_size, TRUE);
-+		{
-+		  int removed_by_old_offset_size =
-+		    removed_by_actions_map (&target_relax_info->action_list,
-+					    old_offset + old_size, TRUE);
-+		  new_size -= removed_by_old_offset_size - removed_by_old_offset;
-+		}
- 
- 	      if (new_size != old_size)
- 		{
-@@ -10441,14 +10568,16 @@ relax_section_symbols (bfd *abfd, asection *sec)
- 
-       if (isym->st_shndx == sec_shndx)
- 	{
--	  text_action *act = relax_info->action_list.head;
- 	  bfd_vma orig_addr = isym->st_value;
-+	  int removed = removed_by_actions_map (&relax_info->action_list,
-+						orig_addr, FALSE);
- 
--	  isym->st_value -= removed_by_actions (&act, orig_addr, FALSE);
--
-+	  isym->st_value -= removed;
- 	  if (ELF32_ST_TYPE (isym->st_info) == STT_FUNC)
- 	    isym->st_size -=
--	      removed_by_actions (&act, orig_addr + isym->st_size, FALSE);
-+	      removed_by_actions_map (&relax_info->action_list,
-+				      orig_addr + isym->st_size, FALSE) -
-+	      removed;
- 	}
-     }
- 
-@@ -10466,15 +10595,17 @@ relax_section_symbols (bfd *abfd, asection *sec)
- 	   || sym_hash->root.type == bfd_link_hash_defweak)
- 	  && sym_hash->root.u.def.section == sec)
- 	{
--	  text_action *act = relax_info->action_list.head;
- 	  bfd_vma orig_addr = sym_hash->root.u.def.value;
-+	  int removed = removed_by_actions_map (&relax_info->action_list,
-+						orig_addr, FALSE);
- 
--	  sym_hash->root.u.def.value -=
--	    removed_by_actions (&act, orig_addr, FALSE);
-+	  sym_hash->root.u.def.value -= removed;
- 
- 	  if (sym_hash->type == STT_FUNC)
- 	    sym_hash->size -=
--	      removed_by_actions (&act, orig_addr + sym_hash->size, FALSE);
-+	      removed_by_actions_map (&relax_info->action_list,
-+				      orig_addr + sym_hash->size, FALSE) -
-+	      removed;
- 	}
-     }
- 
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch b/patches/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch
deleted file mode 100644
index 96d526f..0000000
--- a/patches/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 288c2b709e5e6841484e1a129eaccd299db36877 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 4 Apr 2015 14:49:42 +0300
-Subject: [PATCH 3/4] xtensa: optimize find_removed_literal
-
-find_removed_literal uses linear search to find removed literal by its
-VMA. The list of literals is fixed at that point, build an ordered index
-array and use binary search instead.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-         56.72    0.00  297578/669392      translate_reloc
-         70.86    0.00  371814/669392      relax_section
-  67.9  127.58    0.00  669392         find_removed_literal
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00  297578/669392      translate_reloc
-          0.00    0.00  371814/669392      relax_section
-   0.0    0.00    0.00  669392         find_removed_literal
-          0.00    0.00   23838/23838       map_removed_literal
------------------------------------------
-
-2015-04-03  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (removed_literal_map_entry): new typedef.
-	(removed_literal_map_entry_struct): new structure.
-	(removed_literal_list_struct): add new fields: n_map and map.
-	(map_removed_literal, removed_literal_compare): new functions.
-	(find_removed_literal): build index array for literals ordered
-	by VMA, use binary search to find removed literal.
-
-Backported from: 3439c466273378021821473d3fc84990e089ae34
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 58 insertions(+), 6 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 21b2871..51733ad 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -5832,6 +5832,7 @@ print_action_list (FILE *fp, text_action_list *action_list)
-    by the "from" offset field.  */
- 
- typedef struct removed_literal_struct removed_literal;
-+typedef struct removed_literal_map_entry_struct removed_literal_map_entry;
- typedef struct removed_literal_list_struct removed_literal_list;
- 
- struct removed_literal_struct
-@@ -5841,10 +5842,19 @@ struct removed_literal_struct
-   removed_literal *next;
- };
- 
-+struct removed_literal_map_entry_struct
-+{
-+  bfd_vma addr;
-+  removed_literal *literal;
-+};
-+
- struct removed_literal_list_struct
- {
-   removed_literal *head;
-   removed_literal *tail;
-+
-+  unsigned n_map;
-+  removed_literal_map_entry *map;
- };
- 
- 
-@@ -5893,6 +5903,39 @@ add_removed_literal (removed_literal_list *removed_list,
-     }
- }
- 
-+static void
-+map_removed_literal (removed_literal_list *removed_list)
-+{
-+  unsigned n_map = 0;
-+  unsigned i;
-+  removed_literal_map_entry *map = NULL;
-+  removed_literal *r = removed_list->head;
-+
-+  for (i = 0; r; ++i, r = r->next)
-+    {
-+      if (i == n_map)
-+	{
-+	  n_map = (n_map * 2) + 2;
-+	  map = bfd_realloc (map, n_map * sizeof (*map));
-+	}
-+      map[i].addr = r->from.target_offset;
-+      map[i].literal = r;
-+    }
-+  removed_list->map = map;
-+  removed_list->n_map = i;
-+}
-+
-+static int
-+removed_literal_compare (const void *a, const void *b)
-+{
-+  const removed_literal_map_entry *pa = a;
-+  const removed_literal_map_entry *pb = b;
-+
-+  if (pa->addr == pb->addr)
-+    return 0;
-+  else
-+    return pa->addr < pb->addr ? -1 : 1;
-+}
- 
- /* Check if the list of removed literals contains an entry for the
-    given address.  Return the entry if found.  */
-@@ -5900,12 +5943,21 @@ add_removed_literal (removed_literal_list *removed_list,
- static removed_literal *
- find_removed_literal (removed_literal_list *removed_list, bfd_vma addr)
- {
--  removed_literal *r = removed_list->head;
--  while (r && r->from.target_offset < addr)
--    r = r->next;
--  if (r && r->from.target_offset == addr)
--    return r;
--  return NULL;
-+  removed_literal_map_entry *p;
-+  removed_literal *r = NULL;
-+
-+  if (removed_list->map == NULL)
-+    map_removed_literal (removed_list);
-+
-+  p = bsearch (&addr, removed_list->map, removed_list->n_map,
-+	       sizeof (*removed_list->map), removed_literal_compare);
-+  if (p)
-+    {
-+      while (p != removed_list->map && (p - 1)->addr == addr)
-+	--p;
-+      r = p->literal;
-+    }
-+  return r;
- }
- 
- 
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch b/patches/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch
deleted file mode 100644
index 3090cc2..0000000
--- a/patches/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-From e5409aedd3ee2192855018a564650ffb75c26e60 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 5 Apr 2015 17:04:22 +0300
-Subject: [PATCH 4/4] xtensa: replace action list with splay tree
-
-text_action_add uses linear list search to order text actions list by
-action VMA. The list is used at the first relaxation pass, when it's not
-fixed yet.
-Replace the list with splay tree from libiberty.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00      14/158225      compute_text_actions
-          3.62    0.00   25211/158225      remove_dead_literal
-          8.42    0.00   58645/158225      coalesce_shared_literal
-         10.68    0.00   74355/158225      text_action_add_proposed
-  38.8   22.73    0.00  158225         text_action_add
-          0.00    0.00  144527/293246      bfd_zmalloc
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00      14/158225      compute_text_actions
-          0.00    0.00   25211/158225      remove_dead_literal
-          0.00    0.01   58645/158225      coalesce_shared_literal
-          0.00    0.01   74355/158225      text_action_add_proposed
-   0.1    0.00    0.02  158225         text_action_add
-          0.01    0.00  144527/144527      splay_tree_insert
-          0.00    0.00  144527/195130      splay_tree_lookup
-          0.00    0.00  144527/293246      bfd_zmalloc
------------------------------------------
-
-2015-04-03  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (splay-tree.h): include header.
-	(text_action_struct): drop next pointer.
-	(text_action_list_struct): drop head pointer, add count and
-	tree fields.
-	(find_fill_action): instead of linear search in text_action_list
-	search in the tree.
-	(text_action_compare, action_first, action_next): new functions.
-	(text_action_add, text_action_add_literal): instead of linear
-	search and insertion insert new node into the tree.
-	(removed_by_actions): pass additional parameter: action_list,
-	use it to traverse the tree.
-	(offset_with_removed_text): pass additional action_list parameter
-	to removed_by_actions.
-	(map_action_fn_context): new typedef.
-	(map_action_fn_context_struct): new structure.
-	(map_action_fn): new function.
-	(map_removal_by_action): use splay_tree_foreach to build map.
-	(find_insn_action): replace linear search in text_action_list
-	with series of splay_tree_lookups.
-	(print_action, print_action_list_fn): new functions.
-	(print_action_list): use splay_tree_foreach.
-	(init_xtensa_relax_info): drop action_list.head initialization.
-	Initialize the tree.
-	(compute_text_actions): use non-zero action_list_count instead of
-	non-NULL action list.
-	(xlate_map_context): new typedef.
-	(xlate_map_context_struct): new structure.
-	(xlate_map_fn): new function.
-	(build_xlate_map): use splay_tree_foreach to build map.
-	(action_remove_bytes_fn): new function.
-	(relax_section): use zero action_list_count instead of NULL
-	action list. Use splay_tree_foreach to count final section size.
-	Drop unused variable 'removed'.
-
-Backported from: 4c2af04fe8b4452bf51d2debf1bb467fafcd0f08
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 488 +++++++++++++++++++++++++++++++----------------------
- 1 file changed, 282 insertions(+), 206 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 51733ad..53af1c6 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -28,6 +28,7 @@
- #include "libbfd.h"
- #include "elf-bfd.h"
- #include "elf/xtensa.h"
-+#include "splay-tree.h"
- #include "xtensa-isa.h"
- #include "xtensa-config.h"
- 
-@@ -5416,8 +5417,6 @@ struct text_action_struct
-   bfd_vma virtual_offset;  /* Zero except for adding literals.  */
-   int removed_bytes;
-   literal_value value;	/* Only valid when adding literals.  */
--
--  text_action *next;
- };
- 
- struct removal_by_action_entry_struct
-@@ -5440,7 +5439,8 @@ typedef struct removal_by_action_map_struct removal_by_action_map;
- /* List of all of the actions taken on a text section.  */
- struct text_action_list_struct
- {
--  text_action *head;
-+  unsigned count;
-+  splay_tree tree;
-   removal_by_action_map map;
- };
- 
-@@ -5448,20 +5448,18 @@ struct text_action_list_struct
- static text_action *
- find_fill_action (text_action_list *l, asection *sec, bfd_vma offset)
- {
--  text_action **m_p;
-+  text_action a;
- 
-   /* It is not necessary to fill at the end of a section.  */
-   if (sec->size == offset)
-     return NULL;
- 
--  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
--    {
--      text_action *t = *m_p;
--      /* When the action is another fill at the same address,
--	 just increase the size.  */
--      if (t->offset == offset && t->action == ta_fill)
--	return t;
--    }
-+  a.offset = offset;
-+  a.action = ta_fill;
-+
-+  splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a);
-+  if (node)
-+    return (text_action *)node->value;
-   return NULL;
- }
- 
-@@ -5509,6 +5507,49 @@ adjust_fill_action (text_action *ta, int fill_diff)
- }
- 
- 
-+static int
-+text_action_compare (splay_tree_key a, splay_tree_key b)
-+{
-+  text_action *pa = (text_action *)a;
-+  text_action *pb = (text_action *)b;
-+  static const int action_priority[] =
-+    {
-+      [ta_fill] = 0,
-+      [ta_none] = 1,
-+      [ta_convert_longcall] = 2,
-+      [ta_narrow_insn] = 3,
-+      [ta_remove_insn] = 4,
-+      [ta_remove_longcall] = 5,
-+      [ta_remove_literal] = 6,
-+      [ta_widen_insn] = 7,
-+      [ta_add_literal] = 8,
-+    };
-+
-+  if (pa->offset == pb->offset)
-+    {
-+      if (pa->action == pb->action)
-+	  return 0;
-+      return action_priority[pa->action] - action_priority[pb->action];
-+    }
-+  else
-+    return pa->offset < pb->offset ? -1 : 1;
-+}
-+
-+static text_action *
-+action_first (text_action_list *action_list)
-+{
-+  splay_tree_node node = splay_tree_min (action_list->tree);
-+  return node ? (text_action *)node->value : NULL;
-+}
-+
-+static text_action *
-+action_next (text_action_list *action_list, text_action *action)
-+{
-+  splay_tree_node node = splay_tree_successor (action_list->tree,
-+					       (splay_tree_key)action);
-+  return node ? (text_action *)node->value : NULL;
-+}
-+
- /* Add a modification action to the text.  For the case of adding or
-    removing space, modify any current fill and assume that
-    "unreachable_space" bytes can be freely contracted.  Note that a
-@@ -5521,8 +5562,8 @@ text_action_add (text_action_list *l,
- 		 bfd_vma offset,
- 		 int removed)
- {
--  text_action **m_p;
-   text_action *ta;
-+  text_action a;
- 
-   /* It is not necessary to fill at the end of a section.  */
-   if (action == ta_fill && sec->size == offset)
-@@ -5532,34 +5573,30 @@ text_action_add (text_action_list *l,
-   if (action == ta_fill && removed == 0)
-     return;
- 
--  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
-+  a.action = action;
-+  a.offset = offset;
-+
-+  if (action == ta_fill)
-     {
--      text_action *t = *m_p;
-+      splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a);
- 
--      if (action == ta_fill)
-+      if (node)
- 	{
--	  /* When the action is another fill at the same address,
--	     just increase the size.  */
--	  if (t->offset == offset && t->action == ta_fill)
--	    {
--	      t->removed_bytes += removed;
--	      return;
--	    }
--	  /* Fills need to happen before widens so that we don't
--	     insert fill bytes into the instruction stream.  */
--	  if (t->offset == offset && t->action == ta_widen_insn)
--	    break;
-+	  ta = (text_action *)node->value;
-+	  ta->removed_bytes += removed;
-+	  return;
- 	}
-     }
-+  else
-+    BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)&a) == NULL);
- 
--  /* Create a new record and fill it up.  */
-   ta = (text_action *) bfd_zmalloc (sizeof (text_action));
-   ta->action = action;
-   ta->sec = sec;
-   ta->offset = offset;
-   ta->removed_bytes = removed;
--  ta->next = (*m_p);
--  *m_p = ta;
-+  splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta);
-+  ++l->count;
- }
- 
- 
-@@ -5570,7 +5607,6 @@ text_action_add_literal (text_action_list *l,
- 			 const literal_value *value,
- 			 int removed)
- {
--  text_action **m_p;
-   text_action *ta;
-   asection *sec = r_reloc_get_section (loc);
-   bfd_vma offset = loc->target_offset;
-@@ -5578,14 +5614,6 @@ text_action_add_literal (text_action_list *l,
- 
-   BFD_ASSERT (action == ta_add_literal);
- 
--  for (m_p = &l->head; *m_p != NULL; m_p = &(*m_p)->next)
--    {
--      if ((*m_p)->offset > offset
--	  && ((*m_p)->offset != offset
--	      || (*m_p)->virtual_offset > virtual_offset))
--	break;
--    }
--
-   /* Create a new record and fill it up.  */
-   ta = (text_action *) bfd_zmalloc (sizeof (text_action));
-   ta->action = action;
-@@ -5594,8 +5622,10 @@ text_action_add_literal (text_action_list *l,
-   ta->virtual_offset = virtual_offset;
-   ta->value = *value;
-   ta->removed_bytes = removed;
--  ta->next = (*m_p);
--  *m_p = ta;
-+
-+  BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)ta) == NULL);
-+  splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta);
-+  ++l->count;
- }
- 
- 
-@@ -5606,7 +5636,8 @@ text_action_add_literal (text_action_list *l,
-    so that each search may begin where the previous one left off.  */
- 
- static int
--removed_by_actions (text_action **p_start_action,
-+removed_by_actions (text_action_list *action_list,
-+		    text_action **p_start_action,
- 		    bfd_vma offset,
- 		    bfd_boolean before_fill)
- {
-@@ -5614,6 +5645,13 @@ removed_by_actions (text_action **p_start_action,
-   int removed = 0;
- 
-   r = *p_start_action;
-+  if (r)
-+    {
-+      splay_tree_node node = splay_tree_lookup (action_list->tree,
-+						(splay_tree_key)r);
-+      BFD_ASSERT (node != NULL && r == (text_action *)node->value);
-+    }
-+
-   while (r)
-     {
-       if (r->offset > offset)
-@@ -5625,7 +5663,7 @@ removed_by_actions (text_action **p_start_action,
- 
-       removed += r->removed_bytes;
- 
--      r = r->next;
-+      r = action_next (action_list, r);
-     }
- 
-   *p_start_action = r;
-@@ -5636,68 +5674,74 @@ removed_by_actions (text_action **p_start_action,
- static bfd_vma
- offset_with_removed_text (text_action_list *action_list, bfd_vma offset)
- {
--  text_action *r = action_list->head;
--  return offset - removed_by_actions (&r, offset, FALSE);
-+  text_action *r = action_first (action_list);
-+
-+  return offset - removed_by_actions (action_list, &r, offset, FALSE);
- }
- 
- 
- static unsigned
- action_list_count (text_action_list *action_list)
- {
--  text_action *r = action_list->head;
--  unsigned count = 0;
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      count++;
--    }
--  return count;
-+  return action_list->count;
- }
- 
--static void
--map_removal_by_action (text_action_list *action_list)
-+typedef struct map_action_fn_context_struct map_action_fn_context;
-+struct map_action_fn_context_struct
- {
--  text_action *r;
--  int removed = 0;
-+  int removed;
-   removal_by_action_map map;
-   bfd_boolean eq_complete;
-+};
- 
--  map.n_entries = 0;
--  map.entry = bfd_malloc (action_list_count (action_list) *
--			  sizeof (removal_by_action_entry));
--  eq_complete = FALSE;
-+static int
-+map_action_fn (splay_tree_node node, void *p)
-+{
-+  map_action_fn_context *ctx = p;
-+  text_action *r = (text_action *)node->value;
-+  removal_by_action_entry *ientry = ctx->map.entry + ctx->map.n_entries;
- 
--  for (r = action_list->head; r;)
-+  if (ctx->map.n_entries && (ientry - 1)->offset == r->offset)
-     {
--      removal_by_action_entry *ientry = map.entry + map.n_entries;
-+      --ientry;
-+    }
-+  else
-+    {
-+      ++ctx->map.n_entries;
-+      ctx->eq_complete = FALSE;
-+      ientry->offset = r->offset;
-+      ientry->eq_removed_before_fill = ctx->removed;
-+    }
- 
--      if (map.n_entries && (ientry - 1)->offset == r->offset)
-+  if (!ctx->eq_complete)
-+    {
-+      if (r->action != ta_fill || r->removed_bytes >= 0)
- 	{
--	  --ientry;
-+	  ientry->eq_removed = ctx->removed;
-+	  ctx->eq_complete = TRUE;
- 	}
-       else
--	{
--	  ++map.n_entries;
--	  eq_complete = FALSE;
--	  ientry->offset = r->offset;
--	  ientry->eq_removed_before_fill = removed;
--	}
-+	ientry->eq_removed = ctx->removed + r->removed_bytes;
-+    }
- 
--      if (!eq_complete)
--	{
--	  if (r->action != ta_fill || r->removed_bytes >= 0)
--	    {
--	      ientry->eq_removed = removed;
--	      eq_complete = TRUE;
--	    }
--	  else
--	    ientry->eq_removed = removed + r->removed_bytes;
--	}
-+  ctx->removed += r->removed_bytes;
-+  ientry->removed = ctx->removed;
-+  return 0;
-+}
- 
--      removed += r->removed_bytes;
--      ientry->removed = removed;
--      r = r->next;
--    }
--  action_list->map = map;
-+static void
-+map_removal_by_action (text_action_list *action_list)
-+{
-+  map_action_fn_context ctx;
-+
-+  ctx.removed = 0;
-+  ctx.map.n_entries = 0;
-+  ctx.map.entry = bfd_malloc (action_list_count (action_list) *
-+			      sizeof (removal_by_action_entry));
-+  ctx.eq_complete = FALSE;
-+
-+  splay_tree_foreach (action_list->tree, map_action_fn, &ctx);
-+  action_list->map = ctx.map;
- }
- 
- static int
-@@ -5754,28 +5798,26 @@ offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
- static text_action *
- find_insn_action (text_action_list *action_list, bfd_vma offset)
- {
--  text_action *t;
--  for (t = action_list->head; t; t = t->next)
-+  static const text_action_t action[] =
-     {
--      if (t->offset == offset)
--	{
--	  switch (t->action)
--	    {
--	    case ta_none:
--	    case ta_fill:
--	      break;
--	    case ta_remove_insn:
--	    case ta_remove_longcall:
--	    case ta_convert_longcall:
--	    case ta_narrow_insn:
--	    case ta_widen_insn:
--	      return t;
--	    case ta_remove_literal:
--	    case ta_add_literal:
--	      BFD_ASSERT (0);
--	      break;
--	    }
--	}
-+      ta_convert_longcall,
-+      ta_remove_longcall,
-+      ta_widen_insn,
-+      ta_narrow_insn,
-+      ta_remove_insn,
-+    };
-+  text_action a;
-+  unsigned i;
-+
-+  a.offset = offset;
-+  for (i = 0; i < sizeof (action) / sizeof (*action); ++i)
-+    {
-+      splay_tree_node node;
-+
-+      a.action = action[i];
-+      node = splay_tree_lookup (action_list->tree, (splay_tree_key)&a);
-+      if (node)
-+	return (text_action *)node->value;
-     }
-   return NULL;
- }
-@@ -5784,40 +5826,50 @@ find_insn_action (text_action_list *action_list, bfd_vma offset)
- #if DEBUG
- 
- static void
--print_action_list (FILE *fp, text_action_list *action_list)
-+print_action (FILE *fp, text_action *r)
-+{
-+  const char *t = "unknown";
-+  switch (r->action)
-+    {
-+    case ta_remove_insn:
-+      t = "remove_insn"; break;
-+    case ta_remove_longcall:
-+      t = "remove_longcall"; break;
-+    case ta_convert_longcall:
-+      t = "convert_longcall"; break;
-+    case ta_narrow_insn:
-+      t = "narrow_insn"; break;
-+    case ta_widen_insn:
-+      t = "widen_insn"; break;
-+    case ta_fill:
-+      t = "fill"; break;
-+    case ta_none:
-+      t = "none"; break;
-+    case ta_remove_literal:
-+      t = "remove_literal"; break;
-+    case ta_add_literal:
-+      t = "add_literal"; break;
-+    }
-+
-+  fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
-+	   r->sec->owner->filename,
-+	   r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
-+}
-+
-+static int
-+print_action_list_fn (splay_tree_node node, void *p)
- {
--  text_action *r;
-+  text_action *r = (text_action *)node->value;
- 
--  fprintf (fp, "Text Action\n");
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      const char *t = "unknown";
--      switch (r->action)
--	{
--	case ta_remove_insn:
--	  t = "remove_insn"; break;
--	case ta_remove_longcall:
--	  t = "remove_longcall"; break;
--	case ta_convert_longcall:
--	  t = "convert_longcall"; break;
--	case ta_narrow_insn:
--	  t = "narrow_insn"; break;
--	case ta_widen_insn:
--	  t = "widen_insn"; break;
--	case ta_fill:
--	  t = "fill"; break;
--	case ta_none:
--	  t = "none"; break;
--	case ta_remove_literal:
--	  t = "remove_literal"; break;
--	case ta_add_literal:
--	  t = "add_literal"; break;
--	}
-+  print_action (p, r);
-+  return 0;
-+}
- 
--      fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
--	       r->sec->owner->filename,
--	       r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
--    }
-+static void
-+print_action_list (FILE *fp, text_action_list *action_list)
-+{
-+  fprintf (fp, "Text Action\n");
-+  splay_tree_foreach (action_list->tree, print_action_list_fn, fp);
- }
- 
- #endif /* DEBUG */
-@@ -6071,8 +6123,8 @@ init_xtensa_relax_info (asection *sec)
-   relax_info->removed_list.head = NULL;
-   relax_info->removed_list.tail = NULL;
- 
--  relax_info->action_list.head = NULL;
--
-+  relax_info->action_list.tree = splay_tree_new (text_action_compare,
-+						 NULL, NULL);
-   relax_info->action_list.map.n_entries = 0;
-   relax_info->action_list.map.entry = NULL;
- 
-@@ -7762,7 +7814,7 @@ compute_text_actions (bfd *abfd,
-   free_reloc_range_list (&relevant_relocs);
- 
- #if DEBUG
--  if (relax_info->action_list.head)
-+  if (action_list_count (&relax_info->action_list))
-     print_action_list (stderr, &relax_info->action_list);
- #endif
- 
-@@ -8263,6 +8315,54 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
-   return e->new_address - e->orig_address + offset;
- }
- 
-+typedef struct xlate_map_context_struct xlate_map_context;
-+struct xlate_map_context_struct
-+{
-+  xlate_map_t *map;
-+  xlate_map_entry_t *current_entry;
-+  int removed;
-+};
-+
-+static int
-+xlate_map_fn (splay_tree_node node, void *p)
-+{
-+  text_action *r = (text_action *)node->value;
-+  xlate_map_context *ctx = p;
-+  unsigned orig_size = 0;
-+
-+  switch (r->action)
-+    {
-+    case ta_none:
-+    case ta_remove_insn:
-+    case ta_convert_longcall:
-+    case ta_remove_literal:
-+    case ta_add_literal:
-+      break;
-+    case ta_remove_longcall:
-+      orig_size = 6;
-+      break;
-+    case ta_narrow_insn:
-+      orig_size = 3;
-+      break;
-+    case ta_widen_insn:
-+      orig_size = 2;
-+      break;
-+    case ta_fill:
-+      break;
-+    }
-+  ctx->current_entry->size =
-+    r->offset + orig_size - ctx->current_entry->orig_address;
-+  if (ctx->current_entry->size != 0)
-+    {
-+      ctx->current_entry++;
-+      ctx->map->entry_count++;
-+    }
-+  ctx->current_entry->orig_address = r->offset + orig_size;
-+  ctx->removed += r->removed_bytes;
-+  ctx->current_entry->new_address = r->offset + orig_size - ctx->removed;
-+  ctx->current_entry->size = 0;
-+  return 0;
-+}
- 
- /* Build a binary searchable offset translation map from a section's
-    action list.  */
-@@ -8270,75 +8370,40 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
- static xlate_map_t *
- build_xlate_map (asection *sec, xtensa_relax_info *relax_info)
- {
--  xlate_map_t *map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t));
-   text_action_list *action_list = &relax_info->action_list;
-   unsigned num_actions = 0;
--  text_action *r;
--  int removed;
--  xlate_map_entry_t *current_entry;
-+  xlate_map_context ctx;
- 
--  if (map == NULL)
-+  ctx.map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t));
-+
-+  if (ctx.map == NULL)
-     return NULL;
- 
-   num_actions = action_list_count (action_list);
--  map->entry = (xlate_map_entry_t *)
-+  ctx.map->entry = (xlate_map_entry_t *)
-     bfd_malloc (sizeof (xlate_map_entry_t) * (num_actions + 1));
--  if (map->entry == NULL)
-+  if (ctx.map->entry == NULL)
-     {
--      free (map);
-+      free (ctx.map);
-       return NULL;
-     }
--  map->entry_count = 0;
-+  ctx.map->entry_count = 0;
- 
--  removed = 0;
--  current_entry = &map->entry[0];
-+  ctx.removed = 0;
-+  ctx.current_entry = &ctx.map->entry[0];
- 
--  current_entry->orig_address = 0;
--  current_entry->new_address = 0;
--  current_entry->size = 0;
-+  ctx.current_entry->orig_address = 0;
-+  ctx.current_entry->new_address = 0;
-+  ctx.current_entry->size = 0;
- 
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      unsigned orig_size = 0;
--      switch (r->action)
--	{
--	case ta_none:
--	case ta_remove_insn:
--	case ta_convert_longcall:
--	case ta_remove_literal:
--	case ta_add_literal:
--	  break;
--	case ta_remove_longcall:
--	  orig_size = 6;
--	  break;
--	case ta_narrow_insn:
--	  orig_size = 3;
--	  break;
--	case ta_widen_insn:
--	  orig_size = 2;
--	  break;
--	case ta_fill:
--	  break;
--	}
--      current_entry->size =
--	r->offset + orig_size - current_entry->orig_address;
--      if (current_entry->size != 0)
--	{
--	  current_entry++;
--	  map->entry_count++;
--	}
--      current_entry->orig_address = r->offset + orig_size;
--      removed += r->removed_bytes;
--      current_entry->new_address = r->offset + orig_size - removed;
--      current_entry->size = 0;
--    }
-+  splay_tree_foreach (action_list->tree, xlate_map_fn, &ctx);
- 
--  current_entry->size = (bfd_get_section_limit (sec->owner, sec)
--			 - current_entry->orig_address);
--  if (current_entry->size != 0)
--    map->entry_count++;
-+  ctx.current_entry->size = (bfd_get_section_limit (sec->owner, sec)
-+			     - ctx.current_entry->orig_address);
-+  if (ctx.current_entry->size != 0)
-+    ctx.map->entry_count++;
- 
--  return map;
-+  return ctx.map;
- }
- 
- 
-@@ -9302,6 +9367,16 @@ move_shared_literal (asection *sec,
- 
- /* Second relaxation pass.  */
- 
-+static int
-+action_remove_bytes_fn (splay_tree_node node, void *p)
-+{
-+  bfd_size_type *final_size = p;
-+  text_action *action = (text_action *)node->value;
-+
-+  *final_size -= action->removed_bytes;
-+  return 0;
-+}
-+
- /* Modify all of the relocations to point to the right spot, and if this
-    is a relaxable section, delete the unwanted literals and fix the
-    section size.  */
-@@ -9334,7 +9409,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 
-   internal_relocs = retrieve_internal_relocs (abfd, sec,
- 					      link_info->keep_memory);
--  if (!internal_relocs && !relax_info->action_list.head)
-+  if (!internal_relocs && !action_list_count (&relax_info->action_list))
-     return TRUE;
- 
-   contents = retrieve_contents (abfd, sec, link_info->keep_memory);
-@@ -9412,6 +9487,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 			}
- 		      /* Update the action so that the code that moves
- 			 the contents will do the right thing.  */
-+		      /* ta_remove_longcall and ta_remove_insn actions are
-+		         grouped together in the tree as well as
-+			 ta_convert_longcall and ta_none, so that changes below
-+			 can be done w/o removing and reinserting action into
-+			 the tree.  */
-+
- 		      if (action->action == ta_remove_longcall)
- 			action->action = ta_remove_insn;
- 		      else
-@@ -9584,13 +9665,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 
-   if ((relax_info->is_relaxable_literal_section
-        || relax_info->is_relaxable_asm_section)
--      && relax_info->action_list.head)
-+      && action_list_count (&relax_info->action_list))
-     {
-       /* Walk through the planned actions and build up a table
- 	 of move, copy and fill records.  Use the move, copy and
- 	 fill records to perform the actions once.  */
- 
--      int removed = 0;
-       bfd_size_type final_size, copy_size, orig_insn_size;
-       bfd_byte *scratch = NULL;
-       bfd_byte *dup_contents = NULL;
-@@ -9601,15 +9681,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
-       bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot.  */
-       bfd_vma dup_dot = 0;
- 
--      text_action *action = relax_info->action_list.head;
-+      text_action *action;
- 
-       final_size = sec->size;
--      for (action = relax_info->action_list.head; action;
--	   action = action->next)
--	{
--	  final_size -= action->removed_bytes;
--	}
- 
-+      splay_tree_foreach (relax_info->action_list.tree,
-+			  action_remove_bytes_fn, &final_size);
-       scratch = (bfd_byte *) bfd_zmalloc (final_size);
-       dup_contents = (bfd_byte *) bfd_zmalloc (final_size);
- 
-@@ -9618,8 +9695,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
-       print_action_list (stderr, &relax_info->action_list);
- #endif
- 
--      for (action = relax_info->action_list.head; action;
--	   action = action->next)
-+      for (action = action_first (&relax_info->action_list); action;
-+	   action = action_next (&relax_info->action_list, action))
- 	{
- 	  virtual_action = FALSE;
- 	  if (action->offset > orig_dot)
-@@ -9748,7 +9825,6 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 	      break;
- 	    }
- 
--	  removed += action->removed_bytes;
- 	  BFD_ASSERT (dup_dot <= final_size);
- 	  BFD_ASSERT (orig_dot <= orig_size);
- 	}
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch b/patches/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch
deleted file mode 100644
index 043ff4d..0000000
--- a/patches/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From cbe53e134d4c3a656880a906738ce19fdcd38e8b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 1 May 2015 11:39:12 +0300
-Subject: [PATCH] xtensa: optimize trampolines relaxation
-
-Currently every fixup in the current segment is checked when relaxing
-trampoline frag. This is very expensive. Make a searchable array of
-fixups pointing at potentially oversized jumps at the beginning of every
-relaxation pass and only check subset of this cache in the reach of
-single jump from the trampoline frag currently being relaxed.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-        370.16  593.38 12283048/12283048     relax_segment
-  98.4  370.16  593.38 12283048         xtensa_relax_frag
-         58.91  269.26 2691463834/2699602236     xtensa_insnbuf_from_chars
-         68.35   68.17 811266668/813338977     S_GET_VALUE
-         36.85   29.51 2684369246/2685538060     xtensa_opcode_decode
-         28.34    8.84 2684369246/2685538060     xtensa_format_get_slot
-         12.39    5.94 2691463834/2699775044     xtensa_format_decode
-          0.03    4.60 4101109/4101109     relax_frag_for_align
-          0.18    1.76  994617/994617      relax_frag_immed
-          0.07    0.09 24556277/24851220     new_logical_line
-          0.06    0.00 12283048/14067410     as_where
-          0.04    0.00 7094588/15460506     xtensa_format_num_slots
-          0.00    0.00       1/712477      xtensa_insnbuf_alloc
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.51    7.47 12283048/12283048     relax_segment
-  58.0    0.51    7.47 12283048         xtensa_relax_frag
-          0.02    4.08 4101109/4101109     relax_frag_for_align
-          0.18    1.39  994617/994617      relax_frag_immed
-          0.01    0.98     555/555         xtensa_cache_relaxable_fixups
-          0.21    0.25 7094588/16693271     xtensa_insnbuf_from_chars
-          0.06    0.12 24556277/24851220     new_logical_line
-          0.06    0.00 7094588/15460506     xtensa_format_num_slots
-          0.02    0.04 7094588/16866079     xtensa_format_decode
-          0.05    0.00 12283048/14067410     as_where
-          0.00    0.00       1/712477      xtensa_insnbuf_alloc
-          0.00    0.00   93808/93808       xtensa_find_first_cached_fixup
------------------------------------------
-
-2015-05-02  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (cached_fixupS, fixup_cacheS): New typedefs.
-	(struct cached_fixup, struct fixup_cache): New structures.
-	(fixup_order, xtensa_make_cached_fixup),
-	(xtensa_realloc_fixup_cache, xtensa_cache_relaxable_fixups),
-	(xtensa_find_first_cached_fixup, xtensa_delete_cached_fixup),
-	(xtensa_add_cached_fixup): New functions.
-	(xtensa_relax_frag): Cache fixups pointing at potentially
-	oversized jumps at the beginning of every relaxation pass. Only
-	check subset of this cache in the reach of single jump from the
-	trampoline frag currently being relaxed.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: b76f99d702c3501ac320396ea06bc7f9237173c3
-Changes to ChangeLog are dropped.
-
- gas/config/tc-xtensa.c | 220 +++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 194 insertions(+), 26 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 3e85b69..31c0b6b 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -8785,6 +8785,154 @@ static long relax_frag_for_align (fragS *, long);
- static long relax_frag_immed
-   (segT, fragS *, long, int, xtensa_format, int, int *, bfd_boolean);
- 
-+typedef struct cached_fixup cached_fixupS;
-+struct cached_fixup
-+{
-+  int addr;
-+  int target;
-+  int delta;
-+  fixS *fixP;
-+};
-+
-+typedef struct fixup_cache fixup_cacheS;
-+struct fixup_cache
-+{
-+  cached_fixupS *fixups;
-+  unsigned n_fixups;
-+  unsigned n_max;
-+
-+  segT seg;
-+  fragS *first_frag;
-+};
-+
-+static int fixup_order (const void *a, const void *b)
-+{
-+  const cached_fixupS *pa = a;
-+  const cached_fixupS *pb = b;
-+
-+  if (pa->addr == pb->addr)
-+    {
-+      if (pa->target == pb->target)
-+	{
-+	  if (pa->fixP->fx_r_type == pb->fixP->fx_r_type)
-+	    return 0;
-+	  return pa->fixP->fx_r_type < pb->fixP->fx_r_type ?  -1 : 1;
-+	}
-+      return pa->target - pb->target;
-+    }
-+  return pa->addr - pb->addr;
-+}
-+
-+static bfd_boolean xtensa_make_cached_fixup (cached_fixupS *o, fixS *fixP)
-+{
-+  xtensa_isa isa = xtensa_default_isa;
-+  int addr = fixP->fx_frag->fr_address;
-+  int target;
-+  int delta;
-+  symbolS *s = fixP->fx_addsy;
-+  int slot;
-+  xtensa_format fmt;
-+  xtensa_opcode opcode;
-+
-+  if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
-+      fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
-+    return FALSE;
-+  target = S_GET_VALUE (s);
-+  delta = target - addr;
-+
-+  if (abs(delta) < J_RANGE / 2)
-+    return FALSE;
-+
-+  xtensa_insnbuf_from_chars (isa, trampoline_buf,
-+			     (unsigned char *) fixP->fx_frag->fr_literal +
-+			     fixP->fx_where, 0);
-+  fmt = xtensa_format_decode (isa, trampoline_buf);
-+  gas_assert (fmt != XTENSA_UNDEFINED);
-+  slot = fixP->tc_fix_data.slot;
-+  xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
-+  opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
-+  if (opcode != xtensa_j_opcode)
-+    return FALSE;
-+
-+  o->addr = addr;
-+  o->target = target;
-+  o->delta = delta;
-+  o->fixP = fixP;
-+
-+  return TRUE;
-+}
-+
-+static void xtensa_realloc_fixup_cache (fixup_cacheS *cache, unsigned add)
-+{
-+  if (cache->n_fixups + add > cache->n_max)
-+    {
-+      cache->n_max = (cache->n_fixups + add) * 2;
-+      cache->fixups = xrealloc (cache->fixups,
-+				sizeof (*cache->fixups) * cache->n_max);
-+    }
-+}
-+
-+static void xtensa_cache_relaxable_fixups (fixup_cacheS *cache,
-+					   segment_info_type *seginfo)
-+{
-+  fixS *fixP;
-+
-+  cache->n_fixups = 0;
-+
-+  for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+    {
-+      xtensa_realloc_fixup_cache (cache, 1);
-+
-+      if (xtensa_make_cached_fixup (cache->fixups + cache->n_fixups, fixP))
-+	++cache->n_fixups;
-+    }
-+  qsort (cache->fixups, cache->n_fixups, sizeof (*cache->fixups), fixup_order);
-+}
-+
-+static unsigned xtensa_find_first_cached_fixup (const fixup_cacheS *cache,
-+						int addr)
-+{
-+  unsigned a = 0;
-+  unsigned b = cache->n_fixups;
-+
-+  while (b - a > 1)
-+    {
-+      unsigned c = (a + b) / 2;
-+
-+      if (cache->fixups[c].addr < addr)
-+	a = c;
-+      else
-+	b = c;
-+    }
-+  return a;
-+}
-+
-+static void xtensa_delete_cached_fixup (fixup_cacheS *cache, unsigned i)
-+{
-+  memmove (cache->fixups + i, cache->fixups + i + 1,
-+	   (cache->n_fixups - i - 1) * sizeof (*cache->fixups));
-+  --cache->n_fixups;
-+}
-+
-+static bfd_boolean xtensa_add_cached_fixup (fixup_cacheS *cache, fixS *fixP)
-+{
-+  cached_fixupS o;
-+  unsigned i;
-+
-+  if (!xtensa_make_cached_fixup (&o, fixP))
-+    return FALSE;
-+  xtensa_realloc_fixup_cache (cache, 1);
-+  i = xtensa_find_first_cached_fixup (cache, o.addr);
-+  if (i < cache->n_fixups)
-+    {
-+      ++i;
-+      memmove (cache->fixups + i + 1, cache->fixups + i,
-+	       (cache->n_fixups - i) * sizeof (*cache->fixups));
-+    }
-+  cache->fixups[i] = o;
-+  ++cache->n_fixups;
-+  return TRUE;
-+}
- 
- /* Return the number of bytes added to this fragment, given that the
-    input has been stretched already by "stretch".  */
-@@ -8896,35 +9044,42 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
-     case RELAX_TRAMPOLINE:
-       if (fragP->tc_frag_data.relax_seen)
-         {
--          segment_info_type *seginfo = seg_info (now_seg);
--          fragS *fP; /* The out-of-range jump.  */
--          fixS *fixP;
-+	  static fixup_cacheS fixup_cache;
-+	  segment_info_type *seginfo = seg_info (now_seg);
-+	  int trampaddr = fragP->fr_address + fragP->fr_fix;
-+	  int searchaddr = trampaddr < J_RANGE ? 0 : trampaddr - J_RANGE;
-+	  unsigned i;
-+
-+	  if (now_seg != fixup_cache.seg ||
-+	      fragP == fixup_cache.first_frag ||
-+	      fixup_cache.first_frag == NULL)
-+	    {
-+	      xtensa_cache_relaxable_fixups (&fixup_cache, seginfo);
-+	      fixup_cache.seg = now_seg;
-+	      fixup_cache.first_frag = fragP;
-+	    }
- 
-           /* Scan for jumps that will not reach.  */
--          for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+          for (i = xtensa_find_first_cached_fixup (&fixup_cache, searchaddr);
-+	       i < fixup_cache.n_fixups; ++i)
-+
-             {
--              symbolS *s = fixP->fx_addsy;
--	      xtensa_opcode opcode;
--              int target;
--              int addr;
--              int delta;
--
--              if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
--                  fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
--                continue;
--	      xtensa_insnbuf_from_chars (isa, trampoline_buf,
--					 (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where,
--					 0);
--	      fmt = xtensa_format_decode (isa, trampoline_buf);
--	      gas_assert (fmt != XTENSA_UNDEFINED);
--	      slot = fixP->tc_fix_data.slot;
--	      xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
--	      opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
--	      if (opcode != xtensa_j_opcode)
-+	      fixS *fixP = fixup_cache.fixups[i].fixP;
-+	      int target = fixup_cache.fixups[i].target;
-+	      int addr = fixup_cache.fixups[i].addr;
-+	      int delta = fixup_cache.fixups[i].delta + stretch;
-+
-+	      trampaddr = fragP->fr_address + fragP->fr_fix;
-+
-+	      if (addr + J_RANGE < trampaddr)
- 		continue;
--              target = S_GET_VALUE (s);
--              addr = fixP->fx_frag->fr_address;
--              delta = target - addr + stretch;
-+	      if (addr > trampaddr + J_RANGE)
-+		break;
-+	      if (abs (delta) < J_RANGE)
-+		continue;
-+
-+	      slot = fixP->tc_fix_data.slot;
-+
-               if (delta > J_RANGE  || delta < -1 * J_RANGE)
-                 { /* Found an out-of-range jump; scan the list of trampolines for the best match.  */
- 		  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-@@ -8978,14 +9133,13 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 		    }
- 		  if (tf->fragP == fragP)
- 		    {
--		      int trampaddr = fragP->fr_address + fragP->fr_fix;
--
- 		      if (abs (addr - trampaddr) < J_RANGE)
- 			{ /* The trampoline is in range of original; fix it!  */
- 			  fixS *newfixP;
- 			  int offset;
- 			  TInsn insn;
- 			  symbolS *lsym;
-+			  fragS *fP; /* The out-of-range jump.  */
- 
- 			  new_stretch += init_trampoline_frag (tf);
- 			  offset = fragP->fr_fix; /* Where to assemble the j insn.  */
-@@ -9009,10 +9163,20 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 			  newfixP->tc_fix_data.X_add_symbol = lsym;
- 			  newfixP->tc_fix_data.X_add_number = offset;
- 			  newfixP->tc_fix_data.slot = slot;
-+
-+			  xtensa_delete_cached_fixup (&fixup_cache, i);
-+			  xtensa_add_cached_fixup (&fixup_cache, newfixP);
-+
- 			  /* Move the fix-up from the original j insn to this one.  */
- 			  fixP->fx_frag = fragP;
- 			  fixP->fx_where = fragP->fr_fix - 3;
- 			  fixP->tc_fix_data.slot = 0;
-+
-+			  xtensa_add_cached_fixup (&fixup_cache, fixP);
-+
-+			  /* re-do current fixup */
-+			  --i;
-+
- 			  /* Adjust the jump around this trampoline (if present).  */
- 			  if (tf->fixP != NULL)
- 			    {
-@@ -9027,6 +9191,8 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 			      fragP->fr_subtype = 0;
- 			      /* Remove from the trampoline_list.  */
- 			      prev->next = tf->next;
-+			      if (fragP == fixup_cache.first_frag)
-+				fixup_cache.first_frag = NULL;
- 			      break;
- 			    }
- 			}
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/patches/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
deleted file mode 100644
index 9ad6b3b..0000000
--- a/patches/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8ec76b16f62d1bf386fb2c39af5f66c3afddc5cb Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 14 May 2015 05:22:55 +0300
-Subject: [PATCH] xtensa: fix localized symbol refcounting with --gc-sections
-
-elf_xtensa_gc_sweep_hook doesn't correctly unreference symbols that were
-made local, that results in link failure with the following message:
-
-  BFD (GNU Binutils) 2.24 internal error, aborting at elf32-xtensa.c line
-  3372 in elf_xtensa_finish_dynamic_sections
-
-elf_xtensa_gc_sweep_hook determines symbol reference type (PLT or GOT) by
-relocation type. Relocation types are not changed when symbol becomes
-local, but its PLT references are added to GOT references and
-plt.refcount is set to 0. Such symbol cannot be unreferences in the
-elf_xtensa_gc_sweep_hook and its extra references make calculated GOT
-relocations section size not match number of GOT relocations.
-
-Fix it by treating PLT reference as GOT reference when plt.refcount is
-not positive.
-
-2015-05-14  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Treat PLT reference
-	as GOT reference when plt.refcount is not positive.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388
-Changes to ChangeLog are dropped.
-
- bfd/elf32-xtensa.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 53af1c6..2523670 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd,
- 	{
- 	  if (is_plt)
- 	    {
-+	      /* If the symbol has been localized its plt.refcount got moved
-+	         to got.refcount.  Handle it as GOT.  */
- 	      if (h->plt.refcount > 0)
- 		h->plt.refcount--;
-+	      else
-+		is_got = TRUE;
- 	    }
--	  else if (is_got)
-+	  if (is_got)
- 	    {
- 	      if (h->got.refcount > 0)
- 		h->got.refcount--;
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/patches/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
deleted file mode 100644
index 4a3de2c..0000000
--- a/patches/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0522e76e4afeeb2e104e0a4332d94fa0d2fbf6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 17 May 2015 06:46:15 +0300
-Subject: [PATCH] xtensa: fix gas segfault with --text-section-literals
-
-When --text-section-literals is used and code in the .init or .fini
-emits literal in the absence of .literal_position, xtensa_move_literals
-segfaults.
-
-Check that search_frag is non-NULL in the xtensa_move_literals and
-report error otherwise.
-
-2015-05-26  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Check that
-	search_frag is non-NULL. Report error if literal frag is not
-	found.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4
-Changes to ChangeLog are dropped.
-
- gas/config/tc-xtensa.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 31c0b6b..18307c1 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -10808,13 +10808,21 @@ xtensa_move_literals (void)
-       frchain_to = NULL;
-       frag_splice = &(frchain_from->frch_root);
- 
--      while (!search_frag->tc_frag_data.literal_frag)
-+      while (search_frag && !search_frag->tc_frag_data.literal_frag)
- 	{
- 	  gas_assert (search_frag->fr_fix == 0
- 		  || search_frag->fr_type == rs_align);
- 	  search_frag = search_frag->fr_next;
- 	}
- 
-+      if (!search_frag)
-+	{
-+	  search_frag = frchain_from->frch_root;
-+	  as_bad_where (search_frag->fr_file, search_frag->fr_line,
-+			_("literal pool location required for text-section-literals; specify with .literal_position"));
-+	  continue;
-+	}
-+
-       gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype
- 	      == RELAX_LITERAL_POOL_BEGIN);
-       xtensa_switch_section_emit_state (&state, segment->seg, 0);
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/913-xtensa-add-auto-litpools-option.patch b/patches/binutils/2.24/913-xtensa-add-auto-litpools-option.patch
deleted file mode 100644
index f0199e1..0000000
--- a/patches/binutils/2.24/913-xtensa-add-auto-litpools-option.patch
+++ /dev/null
@@ -1,698 +0,0 @@
-From 978adaaa4cd3921842e2be8a31c05f081fb17fcf Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Wed, 29 Jul 2015 17:42:54 +0300
-Subject: [PATCH] xtensa: add --auto-litpools option
-
-Auto-litpools is the automated version of text-section-literals: literal
-pool candidate frags are planted every N frags and during relaxation
-they are turned into actual literal pools where literals are moved to
-become reachable for their first reference by L32R instruction.
-
-2015-08-12  David Weatherford  <weath@cadence.com>
-gas/
-	* config/tc-xtensa.c (struct litpool_frag, struct litpool_seg):
-	New structures.
-	(xtensa_maybe_create_literal_pool_frag): New function.
-	(litpool_seg_list, auto_litpools, auto_litpool_limit)
-	(litpool_buf, litpool_slotbuf): New static variables.
-	(option_auto_litpools, option_no_auto_litpools)
-	(option_auto_litpool_limit): New enum identifiers.
-	(md_longopts): Add entries for auto-litpools, no-auto-litpools
-	and auto-litpool-limit.
-	(md_parse_option): Handle option_auto_litpools,
-	option_no_auto_litpools and option_auto_litpool_limit.
-	(md_show_usage): Add help for --[no-]auto-litpools and
-	--auto-litpool-limit.
-	(xtensa_mark_literal_pool_location): Record a place for literal
-	pool with a call to xtensa_maybe_create_literal_pool_frag.
-	(get_literal_pool_location): Find highest priority literal pool
-	or convert candidate to literal pool when auto-litpools are used.
-	(xg_assemble_vliw_tokens): Create literal pool after jump
-	instruction.
-	(xtensa_check_frag_count): Create candidate literal pool every
-	auto_litpool_limit frags.
-	(xtensa_relax_frag): Add jump around literals to non-empty
-	literal pool.
-	(xtensa_move_literals): Estimate literal pool addresses and move
-	unreachable literals closer to their users, converting candidate
-	to literal pool if needed.
-	(xtensa_switch_to_non_abs_literal_fragment): Only emit error
-	about missing .literal_position in case auto-litpools are not
-	used.
-	* config/tc-xtensa.h (xtensa_relax_statesE): New relaxation
-	state: RELAX_LITERAL_POOL_CANDIDATE_BEGIN.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gas/testsuite/
-	* gas/xtensa/all.exp: Add auto-litpools to the list of xtensa
-	tests.
-	* gas/xtensa/auto-litpools.s: New file: auto-litpools test.
-	* gas/xtensa/auto-litpools.s: New file: auto-litpools test
-	result pattern.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: b46824bd49648c575372e6d9bc6a6defeabd6ed5
-Changes to ChangeLogs and documentation are dropped.
-
- gas/config/tc-xtensa.c                   | 432 ++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                   |   1 +
- gas/testsuite/gas/xtensa/all.exp         |   1 +
- gas/testsuite/gas/xtensa/auto-litpools.d |  12 +
- gas/testsuite/gas/xtensa/auto-litpools.s |  13 +
- 5 files changed, 454 insertions(+), 5 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.d
- create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 7311a05..b8b1e7d 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -440,6 +440,29 @@ bfd_boolean directive_state[] =
- #endif
- };
- 
-+/* A circular list of all potential and actual literal pool locations
-+   in a segment.  */
-+struct litpool_frag
-+{
-+  struct litpool_frag *next;
-+  struct litpool_frag *prev;
-+  fragS *fragP;
-+  addressT addr;
-+  short priority; /* 1, 2, or 3 -- 1 is highest  */
-+  short original_priority;
-+};
-+
-+/* Map a segment to its litpool_frag list.  */
-+struct litpool_seg
-+{
-+  struct litpool_seg *next;
-+  asection *seg;
-+  struct litpool_frag frag_list;
-+  int frag_count; /* since last litpool location  */
-+};
-+
-+static struct litpool_seg litpool_seg_list;
-+
- 
- /* Directive functions.  */
- 
-@@ -474,6 +497,9 @@ static void xtensa_create_trampoline_frag (bfd_boolean);
- static void xtensa_maybe_create_trampoline_frag (void);
- struct trampoline_frag;
- static int init_trampoline_frag (struct trampoline_frag *);
-+static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean);
-+static bfd_boolean auto_litpools = FALSE;
-+static int auto_litpool_limit = 10000;
- 
- /* Alignment Functions.  */
- 
-@@ -698,6 +724,10 @@ enum
- 
-   option_trampolines,
-   option_no_trampolines,
-+
-+  option_auto_litpools,
-+  option_no_auto_litpools,
-+  option_auto_litpool_limit,
- };
- 
- const char *md_shortopts = "";
-@@ -773,6 +803,10 @@ struct option md_longopts[] =
-   { "trampolines", no_argument, NULL, option_trampolines },
-   { "no-trampolines", no_argument, NULL, option_no_trampolines },
- 
-+  { "auto-litpools", no_argument, NULL, option_auto_litpools },
-+  { "no-auto-litpools", no_argument, NULL, option_no_auto_litpools },
-+  { "auto-litpool-limit", required_argument, NULL, option_auto_litpool_limit },
-+
-   { NULL, no_argument, NULL, 0 }
- };
- 
-@@ -961,6 +995,34 @@ md_parse_option (int c, char *arg)
-       use_trampolines = FALSE;
-       return 1;
- 
-+    case option_auto_litpools:
-+      auto_litpools = TRUE;
-+      use_literal_section = FALSE;
-+      return 1;
-+
-+    case option_no_auto_litpools:
-+      auto_litpools = FALSE;
-+      auto_litpool_limit = -1;
-+      return 1;
-+
-+    case option_auto_litpool_limit:
-+      {
-+	int value = 0;
-+	if (auto_litpool_limit < 0)
-+	  as_fatal (_("no-auto-litpools is incompatible with auto-litpool-limit"));
-+	if (*arg == 0 || *arg == '-')
-+	  as_fatal (_("invalid auto-litpool-limit argument"));
-+	value = strtol (arg, &arg, 10);
-+	if (*arg != 0)
-+	  as_fatal (_("invalid auto-litpool-limit argument"));
-+	if (value < 100 || value > 10000)
-+	  as_fatal (_("invalid auto-litpool-limit argument (range is 100-10000)"));
-+	auto_litpool_limit = value;
-+	auto_litpools = TRUE;
-+	use_literal_section = FALSE;
-+	return 1;
-+      }
-+
-     default:
-       return 0;
-     }
-@@ -986,7 +1048,12 @@ Xtensa options:\n\
-                           flix bundles\n\
-   --rename-section old=new Rename section 'old' to 'new'\n\
-   --[no-]trampolines      [Do not] generate trampolines (jumps to jumps)\n\
--                          when jumps do not reach their targets\n", stream);
-+                          when jumps do not reach their targets\n\
-+  --[no-]auto-litpools    [Do not] automatically create literal pools\n\
-+  --auto-litpool-limit=<value>\n\
-+                          (range 100-10000) Maximum number of blocks of\n\
-+                          instructions to emit between literal pool\n\
-+                          locations; implies --auto-litpools flag\n", stream);
- }
- 
- 
-@@ -4728,6 +4795,8 @@ xtensa_mark_literal_pool_location (void)
-   pool_location = frag_now;
-   frag_now->tc_frag_data.lit_frchain = frchain_now;
-   frag_now->tc_frag_data.literal_frag = frag_now;
-+  /* Just record this frag.  */
-+  xtensa_maybe_create_literal_pool_frag (FALSE, FALSE);
-   frag_variant (rs_machine_dependent, 0, 0,
- 		RELAX_LITERAL_POOL_BEGIN, NULL, 0, NULL);
-   xtensa_set_frag_assembly_state (frag_now);
-@@ -4832,6 +4901,31 @@ get_expanded_loop_offset (xtensa_opcode opcode)
- static fragS *
- get_literal_pool_location (segT seg)
- {
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  struct litpool_frag *lpf;
-+  for ( ; lps && lps->seg->id != seg->id; lps = lps->next)
-+    ;
-+  if (lps)
-+    {
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{ /* Skip "candidates" for now.  */
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN &&
-+	      lpf->priority == 1)
-+	    return lpf->fragP;
-+	}
-+      /* Must convert a lower-priority pool.  */
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN)
-+	    return lpf->fragP;
-+	}
-+      /* Still no match -- try for a low priority pool.  */
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN)
-+	    return lpf->fragP;
-+	}
-+    }
-   return seg_info (seg)->tc_segment_info_data.literal_pool_loc;
- }
- 
-@@ -7098,6 +7192,11 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
-       frag_now->tc_frag_data.slot_symbols[slot] = tinsn->symbol;
-       frag_now->tc_frag_data.slot_offsets[slot] = tinsn->offset;
-       frag_now->tc_frag_data.literal_frags[slot] = tinsn->literal_frag;
-+      if (tinsn->opcode == xtensa_l32r_opcode)
-+	{
-+	  frag_now->tc_frag_data.literal_frags[slot] =
-+		  tinsn->tok[1].X_add_symbol->sy_frag;
-+	}
-       if (tinsn->literal_space != 0)
- 	xg_assemble_literal_space (tinsn->literal_space, slot);
-       frag_now->tc_frag_data.free_reg[slot] = tinsn->extra_arg;
-@@ -7170,6 +7269,8 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
- 		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
- 	  xtensa_set_frag_assembly_state (frag_now);
- 	  xtensa_maybe_create_trampoline_frag ();
-+	  /* Always create one here.  */
-+	  xtensa_maybe_create_literal_pool_frag (TRUE, FALSE);
- 	}
-       else if (is_branch && do_align_targets ())
- 	{
-@@ -7314,11 +7415,18 @@ xtensa_check_frag_count (void)
-       clear_frag_count ();
-       unreachable_count = 0;
-     }
-+
-+  /* We create an area for a possible literal pool every N (default 5000)
-+     frags or so.  */
-+  xtensa_maybe_create_literal_pool_frag (TRUE, TRUE);
- }
- 
- static xtensa_insnbuf trampoline_buf = NULL;
- static xtensa_insnbuf trampoline_slotbuf = NULL;
- 
-+static xtensa_insnbuf litpool_buf = NULL;
-+static xtensa_insnbuf litpool_slotbuf = NULL;
-+
- #define TRAMPOLINE_FRAG_SIZE 3000
- 
- static void
-@@ -7410,6 +7518,135 @@ dump_trampolines (void)
-     }
- }
- 
-+static void dump_litpools (void) __attribute__ ((unused));
-+
-+static void
-+dump_litpools (void)
-+{
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  struct litpool_frag *lpf;
-+
-+  for ( ; lps ; lps = lps->next )
-+    {
-+      printf("litpool seg %s\n", lps->seg->name);
-+      for ( lpf = lps->frag_list.next; lpf->fragP; lpf = lpf->next )
-+	{
-+	  fragS *litfrag = lpf->fragP->fr_next;
-+	  int count = 0;
-+	  while (litfrag && litfrag->fr_subtype != RELAX_LITERAL_POOL_END)
-+	    {
-+	      if (litfrag->fr_fix == 4)
-+		count++;
-+	      litfrag = litfrag->fr_next;
-+	    }
-+	  printf("   %ld <%d:%d> (%d) [%d]: ",
-+		 lpf->addr, lpf->priority, lpf->original_priority,
-+		 lpf->fragP->fr_line, count);
-+	  //dump_frag(lpf->fragP);
-+	}
-+    }
-+}
-+
-+static void
-+xtensa_maybe_create_literal_pool_frag (bfd_boolean create,
-+				       bfd_boolean only_if_needed)
-+{
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  fragS *fragP;
-+  struct litpool_frag *lpf;
-+  bfd_boolean needed = FALSE;
-+
-+  if (use_literal_section || !auto_litpools)
-+    return;
-+
-+  for ( ; lps ; lps = lps->next )
-+    {
-+      if (lps->seg == now_seg)
-+	break;
-+    }
-+
-+  if (lps == NULL)
-+    {
-+      lps = (struct litpool_seg *)xcalloc (sizeof (struct litpool_seg), 1);
-+      lps->next = litpool_seg_list.next;
-+      litpool_seg_list.next = lps;
-+      lps->seg = now_seg;
-+      lps->frag_list.next = &lps->frag_list;
-+      lps->frag_list.prev = &lps->frag_list;
-+    }
-+
-+  lps->frag_count++;
-+
-+  if (create)
-+    {
-+      if (only_if_needed)
-+	{
-+	  if (past_xtensa_end || !use_transform() ||
-+	      frag_now->tc_frag_data.is_no_transform)
-+	    {
-+	      return;
-+	    }
-+	  if (auto_litpool_limit <= 0)
-+	    {
-+	      /* Don't create a litpool based only on frag count.  */
-+	      return;
-+	    }
-+	  else if (lps->frag_count > auto_litpool_limit)
-+	    {
-+	      needed = TRUE;
-+	    }
-+	  else
-+	    {
-+	      return;
-+	    }
-+	}
-+      else
-+	{
-+	  needed = TRUE;
-+	}
-+    }
-+
-+  if (needed)
-+    {
-+      int size = (only_if_needed) ? 3 : 0; /* Space for a "j" insn.  */
-+      /* Create a potential site for a literal pool.  */
-+      frag_wane (frag_now);
-+      frag_new (0);
-+      xtensa_set_frag_assembly_state (frag_now);
-+      fragP = frag_now;
-+      fragP->tc_frag_data.lit_frchain = frchain_now;
-+      fragP->tc_frag_data.literal_frag = fragP;
-+      frag_var (rs_machine_dependent, size, size,
-+		    (only_if_needed) ?
-+		        RELAX_LITERAL_POOL_CANDIDATE_BEGIN :
-+		        RELAX_LITERAL_POOL_BEGIN,
-+		    NULL, 0, NULL);
-+      frag_now->tc_frag_data.lit_seg = now_seg;
-+      frag_variant (rs_machine_dependent, 0, 0,
-+		    RELAX_LITERAL_POOL_END, NULL, 0, NULL);
-+      xtensa_set_frag_assembly_state (frag_now);
-+    }
-+  else
-+    {
-+      /* RELAX_LITERAL_POOL_BEGIN frag is being created;
-+	 just record it here.  */
-+      fragP = frag_now;
-+    }
-+
-+  lpf = (struct litpool_frag *)xmalloc(sizeof (struct litpool_frag));
-+  /* Insert at tail of circular list.  */
-+  lpf->addr = 0;
-+  lps->frag_list.prev->next = lpf;
-+  lpf->next = &lps->frag_list;
-+  lpf->prev = lps->frag_list.prev;
-+  lps->frag_list.prev = lpf;
-+  lpf->fragP = fragP;
-+  lpf->priority = (needed) ? (only_if_needed) ? 3 : 2 : 1;
-+  lpf->original_priority = lpf->priority;
-+
-+  lps->frag_count = 0;
-+}
-+
- static void
- xtensa_cleanup_align_frags (void)
- {
-@@ -9029,7 +9266,41 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
-       break;
- 
-     case RELAX_LITERAL_POOL_BEGIN:
-+      if (fragP->fr_var != 0)
-+	{
-+	  /* We have a converted "candidate" literal pool;
-+	     assemble a jump around it.  */
-+	  TInsn insn;
-+	  if (!litpool_slotbuf)
-+	    {
-+	      litpool_buf = xtensa_insnbuf_alloc (isa);
-+	      litpool_slotbuf = xtensa_insnbuf_alloc (isa);
-+	    }
-+	  new_stretch += 3;
-+	  fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass.  */
-+	  fragP->tc_frag_data.is_insn = TRUE;
-+	  tinsn_init (&insn);
-+	  insn.insn_type = ITYPE_INSN;
-+	  insn.opcode = xtensa_j_opcode;
-+	  insn.ntok = 1;
-+	  set_expr_symbol_offset (&insn.tok[0], fragP->fr_symbol,
-+				  fragP->fr_fix);
-+	  fmt = xg_get_single_format (xtensa_j_opcode);
-+	  tinsn_to_slotbuf (fmt, 0, &insn, litpool_slotbuf);
-+	  xtensa_format_set_slot (isa, fmt, 0, litpool_buf, litpool_slotbuf);
-+	  xtensa_insnbuf_to_chars (isa, litpool_buf,
-+				   (unsigned char *)fragP->fr_literal +
-+				   fragP->fr_fix, 3);
-+	  fragP->fr_fix += 3;
-+	  fragP->fr_var -= 3;
-+	  /* Add a fix-up.  */
-+	  fix_new (fragP, 0, 3, fragP->fr_symbol, 0, TRUE,
-+		   BFD_RELOC_XTENSA_SLOT0_OP);
-+	}
-+      break;
-+
-     case RELAX_LITERAL_POOL_END:
-+    case RELAX_LITERAL_POOL_CANDIDATE_BEGIN:
-     case RELAX_MAYBE_UNREACHABLE:
-     case RELAX_MAYBE_DESIRE_ALIGN:
-       /* No relaxation required.  */
-@@ -10789,12 +11060,115 @@ xtensa_move_literals (void)
-   segT dest_seg;
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-+  struct litpool_seg *lps;
- 
-   mark_literal_frags (literal_head->next);
- 
-   if (use_literal_section)
-     return;
- 
-+  /* Assign addresses (rough estimates) to the potential literal pool locations
-+     and create new ones if the gaps are too large.  */
-+
-+  for (lps = litpool_seg_list.next; lps; lps = lps->next)
-+    {
-+      frchainS *frchP = seg_info (lps->seg)->frchainP;
-+      struct litpool_frag *lpf = lps->frag_list.next;
-+      addressT addr = 0;
-+
-+      for ( ; frchP; frchP = frchP->frch_next)
-+	{
-+	  fragS *fragP;
-+	  for (fragP = frchP->frch_root; fragP; fragP = fragP->fr_next)
-+	    {
-+	      if (lpf && fragP == lpf->fragP)
-+		{
-+		  gas_assert(fragP->fr_type == rs_machine_dependent &&
-+			     (fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN ||
-+			      fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN));
-+		  /* Found a litpool location.  */
-+		  lpf->addr = addr;
-+		  lpf = lpf->next;
-+		}
-+	      if (fragP->fr_type == rs_machine_dependent &&
-+		  fragP->fr_subtype == RELAX_SLOTS)
-+		{
-+		  int slot;
-+		  for (slot = 0; slot < MAX_SLOTS; slot++)
-+		    {
-+		      if (fragP->tc_frag_data.literal_frags[slot])
-+			{
-+			  /* L32R; point its literal to the nearest litpool
-+			     preferring non-"candidate" positions to avoid
-+			     the jump-around.  */
-+			  fragS *litfrag = fragP->tc_frag_data.literal_frags[slot];
-+			  struct litpool_frag *lp = lpf->prev;
-+			  if (!lp->fragP)
-+			    {
-+			      break;
-+			    }
-+			  while (lp->fragP->fr_subtype ==
-+				 RELAX_LITERAL_POOL_CANDIDATE_BEGIN)
-+			    {
-+			      lp = lp->prev;
-+			      if (lp->fragP == NULL)
-+				{
-+				  /* End of list; have to bite the bullet.
-+				     Take the nearest.  */
-+				  lp = lpf->prev;
-+				  break;
-+				}
-+			      /* Does it (conservatively) reach?  */
-+			      if (addr - lp->addr <= 128 * 1024)
-+				{
-+				  if (lp->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN)
-+				    {
-+				      /* Found a good one.  */
-+				      break;
-+				    }
-+				  else if (lp->prev->fragP &&
-+					   addr - lp->prev->addr > 128 * 1024)
-+				    {
-+				      /* This is still a "candidate" but the next one
-+				         will be too far away, so revert to the nearest
-+					 one, convert it and add the jump around.  */
-+				      fragS *poolbeg;
-+				      fragS *poolend;
-+				      symbolS *lsym;
-+				      char label[10 + 2 * sizeof (fragS *)];
-+				      lp = lpf->prev;
-+				      poolbeg = lp->fragP;
-+				      lp->priority = 1;
-+				      poolbeg->fr_subtype = RELAX_LITERAL_POOL_BEGIN;
-+				      poolend = poolbeg->fr_next;
-+				      gas_assert (poolend->fr_type == rs_machine_dependent &&
-+						  poolend->fr_subtype == RELAX_LITERAL_POOL_END);
-+				      /* Create a local symbol pointing to the
-+				         end of the pool.  */
-+				      sprintf (label, ".L0_LT_%p", poolbeg);
-+				      lsym = (symbolS *)local_symbol_make (label, lps->seg,
-+									   0, poolend);
-+				      poolbeg->fr_symbol = lsym;
-+				      /* Rest is done in xtensa_relax_frag.  */
-+				    }
-+				}
-+			    }
-+			  if (! litfrag->tc_frag_data.literal_frag)
-+			    {
-+			      /* Take earliest use of this literal to avoid
-+				 forward refs.  */
-+			      litfrag->tc_frag_data.literal_frag = lp->fragP;
-+			    }
-+			}
-+		    }
-+		}
-+	      addr += fragP->fr_fix;
-+	      if (fragP->fr_type == rs_fill)
-+		addr += fragP->fr_offset;
-+	    }
-+	}
-+    }
-+
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-       /* Keep the literals for .init and .fini in separate sections.  */
-@@ -10839,9 +11213,6 @@ xtensa_move_literals (void)
-       while (search_frag != frag_now)
- 	{
- 	  next_frag = search_frag->fr_next;
--
--	  /* First, move the frag out of the literal section and
--	     to the appropriate place.  */
- 	  if (search_frag->tc_frag_data.literal_frag)
- 	    {
- 	      literal_pool = search_frag->tc_frag_data.literal_frag;
-@@ -10849,8 +11220,56 @@ xtensa_move_literals (void)
- 	      frchain_to = literal_pool->tc_frag_data.lit_frchain;
- 	      gas_assert (frchain_to);
- 	    }
-+
-+	  if (search_frag->fr_type == rs_fill && search_frag->fr_fix == 0)
-+	    {
-+	      /* Skip empty fill frags.  */
-+	      *frag_splice = next_frag;
-+	      search_frag = next_frag;
-+	      continue;
-+	    }
-+
-+	  if (search_frag->fr_type == rs_align)
-+	    {
-+	      /* Skip alignment frags, because the pool as a whole will be
-+	         aligned if used, and we don't want to force alignment if the
-+		 pool is unused.  */
-+	      *frag_splice = next_frag;
-+	      search_frag = next_frag;
-+	      continue;
-+	    }
-+
-+	  /* First, move the frag out of the literal section and
-+	     to the appropriate place.  */
-+
-+	  /* Insert an aligmnent frag at start of pool.  */
-+	  if (literal_pool->fr_next->fr_type == rs_machine_dependent &&
-+	      literal_pool->fr_next->fr_subtype == RELAX_LITERAL_POOL_END)
-+	    {
-+	      segT pool_seg = literal_pool->fr_next->tc_frag_data.lit_seg;
-+	      emit_state prev_state;
-+	      fragS *prev_frag;
-+	      fragS *align_frag;
-+	      xtensa_switch_section_emit_state (&prev_state, pool_seg, 0);
-+	      prev_frag = frag_now;
-+	      frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL);
-+	      align_frag = frag_now;
-+	      frag_align (2, 0, 0);
-+	      /* Splice it into the right place.  */
-+	      prev_frag->fr_next = align_frag->fr_next;
-+	      align_frag->fr_next = literal_pool->fr_next;
-+	      literal_pool->fr_next = align_frag;
-+	      /* Insert after this one.  */
-+	      literal_pool->tc_frag_data.literal_frag = align_frag;
-+	      xtensa_restore_emit_state (&prev_state);
-+	    }
- 	  insert_after = literal_pool->tc_frag_data.literal_frag;
- 	  dest_seg = insert_after->fr_next->tc_frag_data.lit_seg;
-+	  /* Skip align frag.  */
-+	  if (insert_after->fr_next->fr_type == rs_align)
-+	    {
-+	      insert_after = insert_after->fr_next;
-+	    }
- 
- 	  *frag_splice = next_frag;
- 	  search_frag->fr_next = insert_after->fr_next;
-@@ -11014,7 +11433,10 @@ xtensa_switch_to_non_abs_literal_fragment (emit_state *result)
-       && !recursive
-       && !is_init && ! is_fini)
-     {
--      as_bad (_("literal pool location required for text-section-literals; specify with .literal_position"));
-+      if (!auto_litpools)
-+	{
-+	  as_bad (_("literal pool location required for text-section-literals; specify with .literal_position"));
-+	}
- 
-       /* When we mark a literal pool location, we want to put a frag in
- 	 the literal pool that points to it.  But to do that, we want to
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index b2e43fa..290d902 100644
---- a/gas/config/tc-xtensa.h
-+++ b/gas/config/tc-xtensa.h
-@@ -124,6 +124,7 @@ enum xtensa_relax_statesE
- 
-   RELAX_LITERAL_POOL_BEGIN,
-   RELAX_LITERAL_POOL_END,
-+  RELAX_LITERAL_POOL_CANDIDATE_BEGIN,
-   /* Technically these are not relaxations at all but mark a location
-      to store literals later.  Note that fr_var stores the frchain for
-      BEGIN frags and fr_var stores now_seg for END frags.  */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index d197ec8..db39629 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -100,5 +100,6 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "jlong"
-     run_dump_test "trampoline"
-+    run_dump_test "auto-litpools"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.d b/gas/testsuite/gas/xtensa/auto-litpools.d
-new file mode 100644
-index 0000000..4d1a690
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/auto-litpools.d
-@@ -0,0 +1,12 @@
-+#as: --auto-litpools
-+#objdump: -d
-+#name: auto literal pool placement
-+
-+.*: +file format .*xtensa.*
-+#...
-+.*4:.*l32r.a2, 0 .*
-+#...
-+.*3e437:.*j.3e440 .*
-+#...
-+.*40750:.*l32r.a2, 3e43c .*
-+#...
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.s b/gas/testsuite/gas/xtensa/auto-litpools.s
-new file mode 100644
-index 0000000..9a5b26b
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/auto-litpools.s
-@@ -0,0 +1,13 @@
-+	.text
-+	.align	4
-+	.literal	.L0, 0x12345
-+	.literal	.L1, 0x12345
-+
-+f:
-+	l32r	a2, .L0
-+	.rep	44000
-+	_nop
-+	_nop
-+	.endr
-+	l32r	a2, .L1
-+	ret
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch b/patches/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch
deleted file mode 100644
index 2955e11..0000000
--- a/patches/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6c7c5c477ef9ccf2d2548cf2ac3cec9bd3c9c5b6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 2 Feb 2016 17:11:38 +0300
-Subject: [PATCH] xtensa: fix signedness of gas relocations
-
-Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation
-offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations
-substituted for BFD_RELOC_*. This made it impossible to encode arbitrary
-8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc
-directive. Revert this part and add test.
-
-gas/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF*
-	substitutions for BFD_RELOC_* as unsigned.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gas/config/tc-xtensa.c           |  6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    default:
- 	      break;
--- 
-2.1.4
-
diff --git a/patches/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch b/patches/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch
deleted file mode 100644
index 656373f..0000000
--- a/patches/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 16 Feb 2016 02:23:28 +0300
-Subject: [PATCH] xtensa: fix .init/.fini literals moving
-
-Despite the documentation and the comment in xtensa_move_literals, in
-the presence of --text-section-literals and --auto-litpools literals are
-moved from the separate literal sections into .init and .fini, because
-the check in the xtensa_move_literals is incorrect.
-
-This moving was broken with introduction of auto litpools: some literals
-now may be lost. This happens because literal frags emitted from .init
-and .fini are not closed when new .literal_position marks new literal
-pool. Then frag_align(2, 0, 0) changes type of the last literal frag to
-rs_align. rs_align frags are skipped in the xtensa_move_literals. As a
-result fixups against such literals are not moved out of .init.literal/
-.fini.literal sections producing the following assembler error:
-
-  test.S: Warning: fixes not all moved from .init.literal
-  test.S: Internal error!
-
-Fix check for .init.literal/.fini.literal in the xtensa_move_literals
-and don't let it move literals from there in the presence of
---text-section-literals or --auto-litpools.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Fix check for
-	.init.literal/.fini.literal section name.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
-
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-   struct litpool_seg *lps;
-+  const char *init_name = INIT_SECTION_NAME;
-+  const char *fini_name = FINI_SECTION_NAME;
-+  int init_name_len = strlen(init_name);
-+  int fini_name_len = strlen(fini_name);
- 
-   mark_literal_frags (literal_head->next);
- 
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
- 
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-+      const char *seg_name = segment_name (segment->seg);
-+
-       /* Keep the literals for .init and .fini in separate sections.  */
--      if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME)
--	  || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME))
-+      if ((!memcmp (seg_name, init_name, init_name_len) &&
-+	   !strcmp (seg_name + init_name_len, ".literal")) ||
-+	  (!memcmp (seg_name, fini_name, fini_name_len) &&
-+	   !strcmp (seg_name + fini_name_len, ".literal")))
- 	continue;
- 
-       frchain_from = seg_info (segment->seg)->frchainP;
--- 
-2.1.4
-
diff --git a/patches/binutils/2.25.1/120-sh-conf.patch b/patches/binutils/2.25.1/120-sh-conf.patch
deleted file mode 100644
index c12a023..0000000
--- a/patches/binutils/2.25.1/120-sh-conf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
---- a/configure
-+++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
-   or1k*-*-*)
-     noconfigdirs="$noconfigdirs gdb"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
-   or1k*-*-*)
-     noconfigdirs="$noconfigdirs gdb"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
diff --git a/patches/binutils/2.25.1/300-001_ld_makefile_patch.patch b/patches/binutils/2.25.1/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 2a1320c..0000000
--- a/patches/binutils/2.25.1/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch b/patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index f1f31af..0000000
--- a/patches/binutils/2.25.1/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (*rpath == '\0'))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/patches/binutils/2.25.1/310-fix-gold-pthreads-typo.patch b/patches/binutils/2.25.1/310-fix-gold-pthreads-typo.patch
deleted file mode 100644
index f2e6ff2..0000000
--- a/patches/binutils/2.25.1/310-fix-gold-pthreads-typo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
-@@ -102,9 +102,9 @@
-   if (err != 0)
-     gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
- #ifdef PTHREAD_MUTEX_ADAPTIVE_NP
--  err = pthread_mutextattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-+  err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-   if (err != 0)
--    gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err));
-+    gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
- #endif
- 
-   err = pthread_mutex_init(&this->mutex_, &attr);
diff --git a/patches/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/patches/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
deleted file mode 100644
index f9a8af6..0000000
--- a/patches/binutils/2.25.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2015-10-20 22:39:36.371169400 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:39:38.182772700 +0100
-@@ -101,7 +101,7 @@
-   int err = pthread_mutexattr_init(&attr);
-   if (err != 0)
-     gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
--#ifdef PTHREAD_MUTEX_ADAPTIVE_NP
-+#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32)
-   err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-   if (err != 0)
-     gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
diff --git a/patches/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch b/patches/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
deleted file mode 100644
index af4032a..0000000
--- a/patches/binutils/2.25.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -urN binutils-2.25.1.orig/binutils/configure binutils-2.25.1/binutils/configure
---- binutils-2.25.1.orig/binutils/configure	2015-10-25 13:18:46.249052806 +0000
-+++ binutils-2.25.1/binutils/configure	2015-10-25 13:39:21.339034801 +0000
-@@ -12067,6 +12067,7 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12227,6 +12228,8 @@
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
- # If we haven't got the data from the intl directory,
-diff -urN binutils-2.25.1.orig/binutils/configure.ac binutils-2.25.1/binutils/configure.ac
---- binutils-2.25.1.orig/binutils/configure.ac	2015-10-25 13:18:46.249052806 +0000
-+++ binutils-2.25.1/binutils/configure.ac	2015-10-25 13:38:52.969035216 +0000
-@@ -87,7 +87,10 @@
- fi
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff -urN binutils-2.25.1.orig/gas/configure binutils-2.25.1/gas/configure
---- binutils-2.25.1.orig/gas/configure	2015-10-25 13:18:46.389052803 +0000
-+++ binutils-2.25.1/gas/configure	2015-10-25 15:16:55.988949456 +0000
-@@ -12795,6 +12795,7 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12955,6 +12956,8 @@
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja"
- # If we haven't got the data from the intl directory,
-diff -urN binutils-2.25.1.orig/gas/configure.ac binutils-2.25.1/gas/configure.ac
---- binutils-2.25.1.orig/gas/configure.ac	2015-10-25 15:15:06.000000000 +0000
-+++ binutils-2.25.1/gas/configure.ac	2015-10-25 14:45:32.000000000 +0000
-@@ -717,7 +717,10 @@
- AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff -urN binutils-2.25.1.orig/ld/configure binutils-2.25.1/ld/configure
---- binutils-2.25.1.orig/ld/configure	2015-10-25 13:18:47.399052788 +0000
-+++ binutils-2.25.1/ld/configure	2015-10-25 15:17:06.472282637 +0000
-@@ -16071,6 +16071,7 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16231,6 +16232,8 @@
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff -urN binutils-2.25.1.orig/ld/configure.ac binutils-2.25.1/ld/configure.ac
---- binutils-2.25.1.orig/ld/configure.ac	2015-10-25 13:18:47.415719456 +0000
-+++ binutils-2.25.1/ld/configure.ac	2015-10-25 15:14:43.000000000 +0000
-@@ -173,7 +173,10 @@
- AC_EXEEXT
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- AM_MAINTAINER_MODE
- AM_CONDITIONAL(GENINSRC_NEVER, false)
diff --git a/patches/binutils/2.25.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/patches/binutils/2.25.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
deleted file mode 100644
index 33441cc..0000000
--- a/patches/binutils/2.25.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils-2.25.orig/gold/binary.cc	2015-06-09 10:48:32.000000000 +0100
-+++ binutils-2.25/gold/binary.cc	2015-06-09 10:49:23.000000000 +0100
-@@ -23,7 +23,7 @@
- #include "gold.h"
- 
- #include <cerrno>
--#include <cstring>
-+#include <string>
- #include "safe-ctype.h"
- 
- #include "elfcpp.h"
diff --git a/patches/binutils/2.25.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/patches/binutils/2.25.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
deleted file mode 100644
index 6168b31..0000000
--- a/patches/binutils/2.25.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001
-From: Andrew Hsieh <andrewhsieh@google.com>
-Date: Wed, 18 Mar 2015 10:57:24 +0800
-Subject: [PATCH] Fix darwin build
-
-1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4
-   doesn't support ended initializer list
-2. wcsncasecmp doesn't exist in MacSDK10.6.x
-
-Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
----
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
- }
- #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
- 
-+#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L
-+/* wcsncasecmp isn't always defined in Mac SDK */
-+static int
-+wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-+{
-+  wchar_t c1, c2;
-+
-+  if (n == 0)
-+    return (0);
-+  for (; *s1; s1++, s2++)
-+  {
-+    c1 = towlower(*s1);
-+    c2 = towlower(*s2);
-+    if (c1 != c2)
-+      return ((int)c1 - c2);
-+    if (--n == 0)
-+      return (0);
-+  }
-+  return (-*s2);
-+}
-+#endif
-+
- /* Perform a comparison of two entries.  */
- static signed int
- rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
- class Once_initialize
- {
-  public:
--  Once_initialize()
--    : once_(PTHREAD_ONCE_INIT)
--  { }
-+   Once_initialize()
-+#if !defined(__APPLE__)
-+     : once_(PTHREAD_ONCE_INIT)
-+   { }
-+#else
-+// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support
-+// extended initializer list as above */
-+   {
-+     pthread_once_t once_2 = PTHREAD_ONCE_INIT;
-+     once_ = once_2; 
-+   }
-+#endif
- 
-   // Return a pointer to the pthread_once_t variable.
-   pthread_once_t*
--- 
-2.1.3
-
diff --git a/patches/binutils/2.25.1/400-arm-rotate_left-fix.patch b/patches/binutils/2.25.1/400-arm-rotate_left-fix.patch
deleted file mode 100644
index 4149597..0000000
--- a/patches/binutils/2.25.1/400-arm-rotate_left-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d840c081f8082e8b9e63fead5306643975a97bb3 Mon Sep 17 00:00:00 2001
-From: Richard Earnshaw <Richard.Earnshaw@arm.com>
-Date: Thu, 20 Nov 2014 17:02:47 +0000
-Subject: [PATCH] * config/tc-arm.c (rotate_left): Avoid undefined behaviour
- when N = 0.
-
----
- gas/config/tc-arm.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
-index 5077f87..9100fb2 100644
---- a/gas/config/tc-arm.c
-+++ b/gas/config/tc-arm.c
-@@ -7251,7 +7251,7 @@ parse_operands (char *str, const unsigned int *pattern, bfd_boolean thumb)
- 
- /* Functions for operand encoding.  ARM, then Thumb.  */
- 
--#define rotate_left(v, n) (v << n | v >> (32 - n))
-+#define rotate_left(v, n) (v << (n & 31) | v >> ((32 - n) & 31))
- 
- /* If VAL can be encoded in the immediate field of an ARM instruction,
-    return the encoded form.  Otherwise, return FAIL.  */
--- 
-1.9.4
-
diff --git a/patches/binutils/2.25.1/500-sysroot.patch b/patches/binutils/2.25.1/500-sysroot.patch
deleted file mode 100644
index e49c795..0000000
--- a/patches/binutils/2.25.1/500-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
-      directory first.  */
-   if (! entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/patches/binutils/2.25.1/600-poison-system-directories.patch b/patches/binutils/2.25.1/600-poison-system-directories.patch
deleted file mode 100644
index ec3622b..0000000
--- a/patches/binutils/2.25.1/600-poison-system-directories.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-[Gustavo: adapt to binutils 2.25]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.ac (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-diff -Nura a/ld/config.in b/ld/config.in
---- a/ld/config.in	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/config.in	2014-12-24 08:07:28.997918918 -0300
-@@ -11,6 +11,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-diff -Nura a/ld/configure b/ld/configure
---- a/ld/configure	2014-12-23 11:22:07.000000000 -0300
-+++ b/ld/configure	2014-12-24 08:07:29.002919088 -0300
-@@ -783,6 +783,7 @@
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_werror
-@@ -1439,6 +1440,8 @@
-   --disable-largefile     omit support for large files
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -15487,7 +15490,18 @@
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-diff -Nura a/ld/configure.ac b/ld/configure.ac
---- a/ld/configure.ac	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/configure.ac	2014-12-24 08:07:29.002919088 -0300
-@@ -94,6 +94,16 @@
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-diff -Nura a/ld/ldfile.c b/ld/ldfile.c
---- a/ld/ldfile.c	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ldfile.c	2014-12-24 08:07:29.002919088 -0300
-@@ -114,6 +114,23 @@
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-diff -Nura a/ld/ld.h b/ld/ld.h
---- a/ld/ld.h	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ld.h	2014-12-24 08:07:29.003919122 -0300
-@@ -161,6 +161,14 @@
-   /* If TRUE we'll just print the default output on stdout.  */
-   bfd_boolean print_output_format;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-diff -Nura a/ld/ldlex.h b/ld/ldlex.h
---- a/ld/ldlex.h	2014-11-04 06:54:41.000000000 -0300
-+++ b/ld/ldlex.h	2014-12-24 08:09:47.477644294 -0300
-@@ -140,6 +140,8 @@
-   OPTION_IGNORE_UNRESOLVED_SYMBOL,
-   OPTION_PUSH_STATE,
-   OPTION_POP_STATE,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
-diff -Nura a/ld/ldmain.c b/ld/ldmain.c
---- a/ld/ldmain.c	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ldmain.c	2014-12-24 08:07:29.003919122 -0300
-@@ -266,6 +266,8 @@
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff -Nura a/ld/ld.texinfo b/ld/ld.texinfo
---- a/ld/ld.texinfo	2014-12-23 05:47:10.000000000 -0300
-+++ b/ld/ld.texinfo	2014-12-24 08:07:29.005919191 -0300
-@@ -2212,6 +2212,18 @@
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-diff -Nura a/ld/lexsup.c b/ld/lexsup.c
---- a/ld/lexsup.c	2014-11-04 06:54:41.000000000 -0300
-+++ b/ld/lexsup.c	2014-12-24 08:48:50.136583414 -0300
-@@ -513,6 +513,14 @@
-   { {"pop-state", no_argument, NULL, OPTION_POP_STATE},
-     '\0', NULL, N_("Pop state of flags governing input file handling"),
-     TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -525,6 +533,7 @@
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1458,6 +1467,14 @@
-           }
-           break;
- 
-+	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.poison_system_directories = FALSE;
-+	  break;
-+
-+	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.error_poison_system_directories = TRUE;
-+	  break;
-+
- 	case OPTION_PUSH_STATE:
- 	  input_flags.pushed = xmemdup (&input_flags,
- 					sizeof (input_flags),
-@@ -1483,6 +1500,10 @@
-       command_line.soname = NULL;
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
diff --git a/patches/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch b/patches/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch
deleted file mode 100644
index 8aeb064..0000000
--- a/patches/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 415480d6471e67aef97c0241d451ef2423a1da9d Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 25 Nov 2014 21:33:21 +0300
-Subject: [PATCH] Fix trampolines search code for conditional branches
-
-For conditional branches that need more than one trampoline to reach its
-target assembler couldn't always find suitable trampoline because
-post-loop condition check was placed inside the loop, resulting in
-premature loop termination. Move check outside the loop.
-
-This fixes the following build errors seen when assembling huge files
-produced by gcc:
-    Error: jump target out of range; no usable trampoline found
-    Error: operand 1 of 'j' has out of range value '307307'
-
-2014-11-25  Max Filippov  <jcmvbkbc@gmail.com>
-
-gas/
-	* config/tc-xtensa.c (search_trampolines): Move post-loop
-	condition check outside the search loop.
-
-gas/testsuite/
-	* gas/xtensa/trampoline.d: Add expected output for branches.
-	* gas/xtensa/trampoline.s: Add test case for branches.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3
-Changes to ChangeLogs are dropped.
-
- gas/config/tc-xtensa.c                | 8 ++++----
- gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++
- gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++
- 3 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d11b0c7..f23ccf8 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
- 	      if (next_addr == 0 || addr - next_addr > J_RANGE)
- 		break;
- 	    }
--	  if (abs (addr - this_addr) < J_RANGE)
--	    return tf;
--
--	  return NULL;
- 	}
-+      if (abs (addr - this_addr) < J_RANGE)
-+	return tf;
-+
-+      return NULL;
-     }
-   for ( ; tf; tf = tf->next)
-     {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-index b4f65dc..5ae32a6 100644
---- a/gas/testsuite/gas/xtensa/trampoline.d
-+++ b/gas/testsuite/gas/xtensa/trampoline.d
-@@ -24,3 +24,12 @@
- .*33462:.*j.0x49407
- #...
- .*49407:.*j.0x49407
-+.*4940a:.*beqz.n.a2,.0x4940f
-+.*4940c:.*j.0x693d1
-+#...
-+.*693d1:.*j.0x7ddd4
-+#...
-+.*7ddd4:.*j.0x927f5
-+#...
-+.*927f5:.*j.0x927f5
-+#...
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-index 259a3bb..4465786 100644
---- a/gas/testsuite/gas/xtensa/trampoline.s
-+++ b/gas/testsuite/gas/xtensa/trampoline.s
-@@ -19,3 +19,10 @@
- 	.endr
- 3:
- 	j	3b
-+	bnez	a2, 4f
-+	.rep	50000
-+	and	a2, a2, a3
-+	_ret
-+	.endr
-+4:
-+	j	4b
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch b/patches/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
deleted file mode 100644
index 8a21100..0000000
--- a/patches/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
+++ /dev/null
@@ -1,502 +0,0 @@
-From 20c79baf82273a0b368587f761f152c4d3a593a4 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 27 Mar 2015 07:13:55 +0300
-Subject: [PATCH 1/4] xtensa: optimize check_section_ebb_pcrels_fit
-
-The original check_section_ebb_pcrels_fit algorithm checks that text
-actions proposed for current EBB are OK for every relocation in a
-section. There's no need to check every relocation, because text actions
-for EBB can only change size of that EBB, thus only affecting
-relocations that in any way cross that EBB. In addition EBBs are
-iterated in ascending order of their VMA, making it easier to track
-relevant relocations.
-
-Introduce a structure that can track relocations that cross the range of
-VMAs of EBB and use it to only check relocations relevant to current EBB
-in check_section_ebb_pcrels_fit.
-It takes O(N log N) operations to build it and O(N) operations to move
-current EBB VMA window through its entire range, where N is the number
-of relocations in a section. The resulting complexity of
-compute_text_actions is thus reduced from O(N^2) to O(N log N + N * M),
-where M is the average number of relocations crossing each EBB.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-         44.26   71.53    6429/6429        compute_text_actions
-  50.2   44.26   71.53    6429         check_section_ebb_pcrels_fit
-          1.16   20.12 347506666/347576152     pcrel_reloc_fits
-          2.95   16.52 347506666/348104944     get_relocation_opnd
-          2.01    9.74 347575100/361252208     r_reloc_init
-          0.55    7.53 347575100/363381467     r_reloc_get_section
-          5.76    0.02 695013332/695013332     xlate_offset_with_removed_text
-          0.68    3.89 347575100/363483827     bfd_octets_per_byte
-          0.32    0.00 347506666/349910253     is_alt_relocation
-          0.18    0.11    6391/6391        build_xlate_map
-          0.00    0.00    6429/19417168     get_xtensa_relax_info
-          0.00    0.00    6391/6391        free_xlate_map
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          2.56    3.08    6429/6429        compute_text_actions
-   8.2    2.56    3.08    6429         check_section_ebb_pcrels_fit
-          0.08    0.91 17721075/17790561     pcrel_reloc_fits
-          0.17    0.47 17721075/31685977     r_reloc_init
-          0.43    0.00 35442150/35442150     xlate_offset_with_removed_text
-          0.02    0.37 17721075/33815236     r_reloc_get_section
-          0.22    0.11    6391/6391        build_xlate_map
-          0.05    0.22 17721075/33917596     bfd_octets_per_byte
-          0.03    0.00 17721075/20405299     is_alt_relocation
-          0.01    0.00    6429/6429        reloc_range_list_update_range
-          0.00    0.00    6429/19417168     get_xtensa_relax_info
-          0.00    0.00    6391/6391        free_xlate_map
------------------------------------------
-
-2015-04-01  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (reloc_range_list, reloc_range_list_entry,
-	reloc_range): new typedef.
-	(reloc_range_list_struct, reloc_range_list_entry_struct,
-	reloc_range_struct): new structures.
-	(reloc_range_compare, build_reloc_ranges,
-	reloc_range_list_append, reloc_range_list_remove,
-	reloc_range_list_update_range, free_reloc_range_list): new
-	functions.
-	(compute_text_actions): precompute relocation opcodes before the
-	loop. Add relevant_relocs variable, initialize it before the
-	loop, pass it to the check_section_ebb_pcrels_fit.
-	(check_section_ebb_pcrels_fit): add new parameter:
-	relevant_relocs. Update address range in the relevant_relocs if
-	it's non-NULL and iterate only over relevant relocations.
-
-Backported from: b2b326d246f839ee218192ac88da2384d929a072
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 298 insertions(+), 23 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 0b6f584..872370b 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -6619,8 +6619,10 @@ static bfd_boolean compute_text_actions
-   (bfd *, asection *, struct bfd_link_info *);
- static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *);
- static bfd_boolean compute_ebb_actions (ebb_constraint *);
-+typedef struct reloc_range_list_struct reloc_range_list;
- static bfd_boolean check_section_ebb_pcrels_fit
--  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, const ebb_constraint *,
-+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *,
-+   reloc_range_list *, const ebb_constraint *,
-    const xtensa_opcode *);
- static bfd_boolean check_section_ebb_reduces (const ebb_constraint *);
- static void text_action_add_proposed
-@@ -7219,6 +7221,221 @@ build_reloc_opcodes (bfd *abfd,
-   return reloc_opcodes;
- }
- 
-+struct reloc_range_struct
-+{
-+  bfd_vma addr;
-+  bfd_boolean add; /* TRUE if start of a range, FALSE otherwise.  */
-+  /* Original irel index in the array of relocations for a section.  */
-+  unsigned irel_index;
-+};
-+typedef struct reloc_range_struct reloc_range;
-+
-+typedef struct reloc_range_list_entry_struct reloc_range_list_entry;
-+struct reloc_range_list_entry_struct
-+{
-+  reloc_range_list_entry *next;
-+  reloc_range_list_entry *prev;
-+  Elf_Internal_Rela *irel;
-+  xtensa_opcode opcode;
-+  int opnum;
-+};
-+
-+struct reloc_range_list_struct
-+{
-+  /* The rest of the structure is only meaningful when ok is TRUE.  */
-+  bfd_boolean ok;
-+
-+  unsigned n_range; /* Number of range markers.  */
-+  reloc_range *range; /* Sorted range markers.  */
-+
-+  unsigned first; /* Index of a first range element in the list.  */
-+  unsigned last; /* One past index of a last range element in the list.  */
-+
-+  unsigned n_list; /* Number of list elements.  */
-+  reloc_range_list_entry *reloc; /*  */
-+  reloc_range_list_entry list_root;
-+};
-+
-+static int
-+reloc_range_compare (const void *a, const void *b)
-+{
-+  const reloc_range *ra = a;
-+  const reloc_range *rb = b;
-+
-+  if (ra->addr != rb->addr)
-+    return ra->addr < rb->addr ? -1 : 1;
-+  if (ra->add != rb->add)
-+    return ra->add ? -1 : 1;
-+  return 0;
-+}
-+
-+static void
-+build_reloc_ranges (bfd *abfd, asection *sec,
-+		    bfd_byte *contents,
-+		    Elf_Internal_Rela *internal_relocs,
-+		    xtensa_opcode *reloc_opcodes,
-+		    reloc_range_list *list)
-+{
-+  unsigned i;
-+  size_t n = 0;
-+  size_t max_n = 0;
-+  reloc_range *ranges = NULL;
-+  reloc_range_list_entry *reloc =
-+    bfd_malloc (sec->reloc_count * sizeof (*reloc));
-+
-+  memset (list, 0, sizeof (*list));
-+  list->ok = TRUE;
-+
-+  for (i = 0; i < sec->reloc_count; i++)
-+    {
-+      Elf_Internal_Rela *irel = &internal_relocs[i];
-+      int r_type = ELF32_R_TYPE (irel->r_info);
-+      reloc_howto_type *howto = &elf_howto_table[r_type];
-+      r_reloc r_rel;
-+
-+      if (r_type == R_XTENSA_ASM_SIMPLIFY
-+	  || r_type == R_XTENSA_32_PCREL
-+	  || !howto->pc_relative)
-+	continue;
-+
-+      r_reloc_init (&r_rel, abfd, irel, contents,
-+		    bfd_get_section_limit (abfd, sec));
-+
-+      if (r_reloc_get_section (&r_rel) != sec)
-+	continue;
-+
-+      if (n + 2 > max_n)
-+	{
-+	  max_n = (max_n + 2) * 2;
-+	  ranges = bfd_realloc (ranges, max_n * sizeof (*ranges));
-+	}
-+
-+      ranges[n].addr = irel->r_offset;
-+      ranges[n + 1].addr = r_rel.target_offset;
-+
-+      ranges[n].add = ranges[n].addr < ranges[n + 1].addr;
-+      ranges[n + 1].add = !ranges[n].add;
-+
-+      ranges[n].irel_index = i;
-+      ranges[n + 1].irel_index = i;
-+
-+      n += 2;
-+
-+      reloc[i].irel = irel;
-+
-+      /* Every relocation won't possibly be checked in the optimized version of
-+         check_section_ebb_pcrels_fit, so this needs to be done here.  */
-+      if (is_alt_relocation (ELF32_R_TYPE (irel->r_info)))
-+	{
-+	  /* None of the current alternate relocs are PC-relative,
-+	     and only PC-relative relocs matter here.  */
-+	}
-+      else
-+	{
-+	  xtensa_opcode opcode;
-+	  int opnum;
-+
-+	  if (reloc_opcodes)
-+	    opcode = reloc_opcodes[i];
-+	  else
-+	    opcode = get_relocation_opcode (abfd, sec, contents, irel);
-+
-+	  if (opcode == XTENSA_UNDEFINED)
-+	    {
-+	      list->ok = FALSE;
-+	      break;
-+	    }
-+
-+	  opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
-+	  if (opnum == XTENSA_UNDEFINED)
-+	    {
-+	      list->ok = FALSE;
-+	      break;
-+	    }
-+
-+	  /* Record relocation opcode and opnum as we've calculated them
-+	     anyway and they won't change.  */
-+	  reloc[i].opcode = opcode;
-+	  reloc[i].opnum = opnum;
-+	}
-+    }
-+
-+  if (list->ok)
-+    {
-+      ranges = bfd_realloc (ranges, n * sizeof (*ranges));
-+      qsort (ranges, n, sizeof (*ranges), reloc_range_compare);
-+
-+      list->n_range = n;
-+      list->range = ranges;
-+      list->reloc = reloc;
-+      list->list_root.prev = &list->list_root;
-+      list->list_root.next = &list->list_root;
-+    }
-+  else
-+    {
-+      free (ranges);
-+      free (reloc);
-+    }
-+}
-+
-+static void reloc_range_list_append (reloc_range_list *list,
-+				     unsigned irel_index)
-+{
-+  reloc_range_list_entry *entry = list->reloc + irel_index;
-+
-+  entry->prev = list->list_root.prev;
-+  entry->next = &list->list_root;
-+  entry->prev->next = entry;
-+  entry->next->prev = entry;
-+  ++list->n_list;
-+}
-+
-+static void reloc_range_list_remove (reloc_range_list *list,
-+				     unsigned irel_index)
-+{
-+  reloc_range_list_entry *entry = list->reloc + irel_index;
-+
-+  entry->next->prev = entry->prev;
-+  entry->prev->next = entry->next;
-+  --list->n_list;
-+}
-+
-+/* Update relocation list object so that it lists all relocations that cross
-+   [first; last] range.  Range bounds should not decrease with successive
-+   invocations.  */
-+static void reloc_range_list_update_range (reloc_range_list *list,
-+					   bfd_vma first, bfd_vma last)
-+{
-+  /* This should not happen: EBBs are iterated from lower addresses to higher.
-+     But even if that happens there's no need to break: just flush current list
-+     and start from scratch.  */
-+  if ((list->last > 0 && list->range[list->last - 1].addr > last) ||
-+      (list->first > 0 && list->range[list->first - 1].addr >= first))
-+    {
-+      list->first = 0;
-+      list->last = 0;
-+      list->n_list = 0;
-+      list->list_root.next = &list->list_root;
-+      list->list_root.prev = &list->list_root;
-+      fprintf (stderr, "%s: move backwards requested\n", __func__);
-+    }
-+
-+  for (; list->last < list->n_range &&
-+       list->range[list->last].addr <= last; ++list->last)
-+    if (list->range[list->last].add)
-+      reloc_range_list_append (list, list->range[list->last].irel_index);
-+
-+  for (; list->first < list->n_range &&
-+       list->range[list->first].addr < first; ++list->first)
-+    if (!list->range[list->first].add)
-+      reloc_range_list_remove (list, list->range[list->first].irel_index);
-+}
-+
-+static void free_reloc_range_list (reloc_range_list *list)
-+{
-+  free (list->range);
-+  free (list->reloc);
-+}
- 
- /* The compute_text_actions function will build a list of potential
-    transformation actions for code in the extended basic block of each
-@@ -7245,6 +7462,7 @@ compute_text_actions (bfd *abfd,
-   property_table_entry *prop_table = 0;
-   int ptblsize = 0;
-   bfd_size_type sec_size;
-+  reloc_range_list relevant_relocs;
- 
-   relax_info = get_xtensa_relax_info (sec);
-   BFD_ASSERT (relax_info);
-@@ -7277,6 +7495,12 @@ compute_text_actions (bfd *abfd,
-       goto error_return;
-     }
- 
-+  /* Precompute the opcode for each relocation.  */
-+  reloc_opcodes = build_reloc_opcodes (abfd, sec, contents, internal_relocs);
-+
-+  build_reloc_ranges (abfd, sec, contents, internal_relocs, reloc_opcodes,
-+		      &relevant_relocs);
-+
-   for (i = 0; i < sec->reloc_count; i++)
-     {
-       Elf_Internal_Rela *irel = &internal_relocs[i];
-@@ -7340,17 +7564,13 @@ compute_text_actions (bfd *abfd,
-       ebb->start_reloc_idx = i;
-       ebb->end_reloc_idx = i;
- 
--      /* Precompute the opcode for each relocation.  */
--      if (reloc_opcodes == NULL)
--	reloc_opcodes = build_reloc_opcodes (abfd, sec, contents,
--					     internal_relocs);
--
-       if (!extend_ebb_bounds (ebb)
- 	  || !compute_ebb_proposed_actions (&ebb_table)
- 	  || !compute_ebb_actions (&ebb_table)
- 	  || !check_section_ebb_pcrels_fit (abfd, sec, contents,
--					    internal_relocs, &ebb_table,
--					    reloc_opcodes)
-+					    internal_relocs,
-+					    &relevant_relocs,
-+					    &ebb_table, reloc_opcodes)
- 	  || !check_section_ebb_reduces (&ebb_table))
- 	{
- 	  /* If anything goes wrong or we get unlucky and something does
-@@ -7372,6 +7592,8 @@ compute_text_actions (bfd *abfd,
-       free_ebb_constraint (&ebb_table);
-     }
- 
-+  free_reloc_range_list (&relevant_relocs);
-+
- #if DEBUG
-   if (relax_info->action_list.head)
-     print_action_list (stderr, &relax_info->action_list);
-@@ -7974,14 +8196,17 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 			      asection *sec,
- 			      bfd_byte *contents,
- 			      Elf_Internal_Rela *internal_relocs,
-+			      reloc_range_list *relevant_relocs,
- 			      const ebb_constraint *constraint,
- 			      const xtensa_opcode *reloc_opcodes)
- {
-   unsigned i, j;
-+  unsigned n = sec->reloc_count;
-   Elf_Internal_Rela *irel;
-   xlate_map_t *xmap = NULL;
-   bfd_boolean ok = TRUE;
-   xtensa_relax_info *relax_info;
-+  reloc_range_list_entry *entry = NULL;
- 
-   relax_info = get_xtensa_relax_info (sec);
- 
-@@ -7992,7 +8217,40 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 	 can still be used.  */
-     }
- 
--  for (i = 0; i < sec->reloc_count; i++)
-+  if (relevant_relocs && constraint->action_count)
-+    {
-+      if (!relevant_relocs->ok)
-+	{
-+	  ok = FALSE;
-+	  n = 0;
-+	}
-+      else
-+	{
-+	  bfd_vma min_offset, max_offset;
-+	  min_offset = max_offset = constraint->actions[0].offset;
-+
-+	  for (i = 1; i < constraint->action_count; ++i)
-+	    {
-+	      proposed_action *action = &constraint->actions[i];
-+	      bfd_vma offset = action->offset;
-+
-+	      if (offset < min_offset)
-+		min_offset = offset;
-+	      if (offset > max_offset)
-+		max_offset = offset;
-+	    }
-+	  reloc_range_list_update_range (relevant_relocs, min_offset,
-+					 max_offset);
-+	  n = relevant_relocs->n_list;
-+	  entry = &relevant_relocs->list_root;
-+	}
-+    }
-+  else
-+    {
-+      relevant_relocs = NULL;
-+    }
-+
-+  for (i = 0; i < n; i++)
-     {
-       r_reloc r_rel;
-       bfd_vma orig_self_offset, orig_target_offset;
-@@ -8001,7 +8259,15 @@ check_section_ebb_pcrels_fit (bfd *abfd,
-       reloc_howto_type *howto;
-       int self_removed_bytes, target_removed_bytes;
- 
--      irel = &internal_relocs[i];
-+      if (relevant_relocs)
-+	{
-+	  entry = entry->next;
-+	  irel = entry->irel;
-+	}
-+      else
-+	{
-+	  irel = internal_relocs + i;
-+	}
-       r_type = ELF32_R_TYPE (irel->r_info);
- 
-       howto = &elf_howto_table[r_type];
-@@ -8067,21 +8333,30 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 	  xtensa_opcode opcode;
- 	  int opnum;
- 
--	  if (reloc_opcodes)
--	    opcode = reloc_opcodes[i];
--	  else
--	    opcode = get_relocation_opcode (abfd, sec, contents, irel);
--	  if (opcode == XTENSA_UNDEFINED)
-+	  if (relevant_relocs)
- 	    {
--	      ok = FALSE;
--	      break;
-+	      opcode = entry->opcode;
-+	      opnum = entry->opnum;
- 	    }
--
--	  opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
--	  if (opnum == XTENSA_UNDEFINED)
-+	  else
- 	    {
--	      ok = FALSE;
--	      break;
-+	      if (reloc_opcodes)
-+		opcode = reloc_opcodes[relevant_relocs ?
-+		  (unsigned)(entry - relevant_relocs->reloc) : i];
-+	      else
-+		opcode = get_relocation_opcode (abfd, sec, contents, irel);
-+	      if (opcode == XTENSA_UNDEFINED)
-+		{
-+		  ok = FALSE;
-+		  break;
-+		}
-+
-+	      opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
-+	      if (opnum == XTENSA_UNDEFINED)
-+		{
-+		  ok = FALSE;
-+		  break;
-+		}
- 	    }
- 
- 	  if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset))
-@@ -8778,7 +9053,7 @@ move_shared_literal (asection *sec,
-   /* Check all of the PC-relative relocations to make sure they still fit.  */
-   relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec,
- 					     target_sec_cache->contents,
--					     target_sec_cache->relocs,
-+					     target_sec_cache->relocs, NULL,
- 					     &ebb_table, NULL);
- 
-   if (!relocs_fit)
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch b/patches/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch
deleted file mode 100644
index 9df8065..0000000
--- a/patches/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From 3e3f60207399ab29dd55af109e5ae9facc7d8e83 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 28 Mar 2015 08:46:28 +0300
-Subject: [PATCH 2/4] xtensa: optimize removed_by_actions
-
-The function removed_by_actions iterates through text actions to
-calculate an offset applied by text actions to a given VMA. Although it
-has a parameter p_start_action that allows for incremental offset
-calculation, in many places it's used with p_start_action explicitly set
-to the first action. After the first relaxation pass when the list of
-text actions is finalized, an array of offsets sorted by VMA may be used
-to speed up this function.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-          0.35    0.00   33872/4808961     relax_section_symbols
-          3.32    0.00  326022/4808961     relax_property_section
-         12.83    0.00 1259379/4808961     offset_with_removed_text
-         32.50    0.00 3189688/4808961     translate_reloc
-  71.5   49.00    0.00 4808961         removed_by_actions
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00   33872/4808537     relax_section_symbols
-          0.01    0.00  326022/4808537     relax_property_section
-          0.05    0.00 1258955/4808537     offset_with_removed_text_map
-          0.13    0.00 3189688/4808537     translate_reloc
-   1.0    0.20    0.00 4808537         removed_by_actions_map
-          0.00    0.00     120/120         map_removal_by_action
------------------------------------------
-
-2015-04-01  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (removal_by_action_entry_struct,
-	removal_by_action_map_struct): new structures.
-	(removal_by_action_entry, removal_by_action_map): new typedefs.
-	(text_action_list_struct): add new field: map.
-	(map_removal_by_action, removed_by_actions_map,
-	offset_with_removed_text_map): new functions.
-	(relax_section): replace offset_with_removed_text with
-	offset_with_removed_text_map.
-	(translate_reloc, relax_property_section, relax_section_symbols):
-	replace removed_by_actions with removed_by_actions_map.
-
-Backported from: 071aa5c98a31c966f5fbfc573fcee61350fd1936
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 181 +++++++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 156 insertions(+), 25 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 872370b..21b2871 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -5420,11 +5420,28 @@ struct text_action_struct
-   text_action *next;
- };
- 
-+struct removal_by_action_entry_struct
-+{
-+  bfd_vma offset;
-+  int removed;
-+  int eq_removed;
-+  int eq_removed_before_fill;
-+};
-+typedef struct removal_by_action_entry_struct removal_by_action_entry;
-+
-+struct removal_by_action_map_struct
-+{
-+  unsigned n_entries;
-+  removal_by_action_entry *entry;
-+};
-+typedef struct removal_by_action_map_struct removal_by_action_map;
-+
- 
- /* List of all of the actions taken on a text section.  */
- struct text_action_list_struct
- {
-   text_action *head;
-+  removal_by_action_map map;
- };
- 
- 
-@@ -5636,6 +5653,101 @@ action_list_count (text_action_list *action_list)
-   return count;
- }
- 
-+static void
-+map_removal_by_action (text_action_list *action_list)
-+{
-+  text_action *r;
-+  int removed = 0;
-+  removal_by_action_map map;
-+  bfd_boolean eq_complete;
-+
-+  map.n_entries = 0;
-+  map.entry = bfd_malloc (action_list_count (action_list) *
-+			  sizeof (removal_by_action_entry));
-+  eq_complete = FALSE;
-+
-+  for (r = action_list->head; r;)
-+    {
-+      removal_by_action_entry *ientry = map.entry + map.n_entries;
-+
-+      if (map.n_entries && (ientry - 1)->offset == r->offset)
-+	{
-+	  --ientry;
-+	}
-+      else
-+	{
-+	  ++map.n_entries;
-+	  eq_complete = FALSE;
-+	  ientry->offset = r->offset;
-+	  ientry->eq_removed_before_fill = removed;
-+	}
-+
-+      if (!eq_complete)
-+	{
-+	  if (r->action != ta_fill || r->removed_bytes >= 0)
-+	    {
-+	      ientry->eq_removed = removed;
-+	      eq_complete = TRUE;
-+	    }
-+	  else
-+	    ientry->eq_removed = removed + r->removed_bytes;
-+	}
-+
-+      removed += r->removed_bytes;
-+      ientry->removed = removed;
-+      r = r->next;
-+    }
-+  action_list->map = map;
-+}
-+
-+static int
-+removed_by_actions_map (text_action_list *action_list, bfd_vma offset,
-+			bfd_boolean before_fill)
-+{
-+  unsigned a, b;
-+
-+  if (!action_list->map.entry)
-+    map_removal_by_action (action_list);
-+
-+  if (!action_list->map.n_entries)
-+    return 0;
-+
-+  a = 0;
-+  b = action_list->map.n_entries;
-+
-+  while (b - a > 1)
-+    {
-+      unsigned c = (a + b) / 2;
-+
-+      if (action_list->map.entry[c].offset <= offset)
-+	a = c;
-+      else
-+	b = c;
-+    }
-+
-+  if (action_list->map.entry[a].offset < offset)
-+    {
-+      return action_list->map.entry[a].removed;
-+    }
-+  else if (action_list->map.entry[a].offset == offset)
-+    {
-+      return before_fill ?
-+	action_list->map.entry[a].eq_removed_before_fill :
-+	action_list->map.entry[a].eq_removed;
-+    }
-+  else
-+    {
-+      return 0;
-+    }
-+}
-+
-+static bfd_vma
-+offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
-+{
-+  int removed = removed_by_actions_map (action_list, offset, FALSE);
-+  return offset - removed;
-+}
-+
- 
- /* The find_insn_action routine will only find non-fill actions.  */
- 
-@@ -5909,6 +6021,9 @@ init_xtensa_relax_info (asection *sec)
- 
-   relax_info->action_list.head = NULL;
- 
-+  relax_info->action_list.map.n_entries = 0;
-+  relax_info->action_list.map.entry = NULL;
-+
-   relax_info->fix_list = NULL;
-   relax_info->fix_array = NULL;
-   relax_info->fix_array_count = 0;
-@@ -9218,7 +9333,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		  if (elf_hash_table (link_info)->dynamic_sections_created)
- 		    shrink_dynamic_reloc_sections (link_info, abfd, sec, irel);
- 		  irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
--		  irel->r_offset = offset_with_removed_text
-+		  irel->r_offset = offset_with_removed_text_map
- 		    (&relax_info->action_list, irel->r_offset);
- 		  continue;
- 		}
-@@ -9255,7 +9370,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		    }
- 		}
- 
--	      source_offset = offset_with_removed_text
-+	      source_offset = offset_with_removed_text_map
- 		(&relax_info->action_list, irel->r_offset);
- 	      irel->r_offset = source_offset;
- 	    }
-@@ -9352,7 +9467,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		      break;
- 		    }
- 
--		  new_end_offset = offset_with_removed_text
-+		  new_end_offset = offset_with_removed_text_map
- 		    (&target_relax_info->action_list,
- 		     r_rel.target_offset + diff_value);
- 		  diff_value = new_end_offset - new_reloc.target_offset;
-@@ -9750,7 +9865,6 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
-   xtensa_relax_info *relax_info;
-   removed_literal *removed;
-   bfd_vma target_offset, base_offset;
--  text_action *act;
- 
-   *new_rel = *orig_rel;
- 
-@@ -9803,19 +9917,26 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
-      offset.  */
- 
-   base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend;
--  act = relax_info->action_list.head;
-   if (base_offset <= target_offset)
-     {
--      int base_removed = removed_by_actions (&act, base_offset, FALSE);
--      int addend_removed = removed_by_actions (&act, target_offset, FALSE);
-+      int base_removed = removed_by_actions_map (&relax_info->action_list,
-+						 base_offset, FALSE);
-+      int addend_removed = removed_by_actions_map (&relax_info->action_list,
-+						   target_offset, FALSE) -
-+	base_removed;
-+
-       new_rel->target_offset = target_offset - base_removed - addend_removed;
-       new_rel->rela.r_addend -= addend_removed;
-     }
-   else
-     {
-       /* Handle a negative addend.  The base offset comes first.  */
--      int tgt_removed = removed_by_actions (&act, target_offset, FALSE);
--      int addend_removed = removed_by_actions (&act, base_offset, FALSE);
-+      int tgt_removed = removed_by_actions_map (&relax_info->action_list,
-+						target_offset, FALSE);
-+      int addend_removed = removed_by_actions_map (&relax_info->action_list,
-+						   base_offset, FALSE) -
-+	tgt_removed;
-+
-       new_rel->target_offset = target_offset - tgt_removed;
-       new_rel->rela.r_addend += addend_removed;
-     }
-@@ -10138,9 +10259,10 @@ relax_property_section (bfd *abfd,
- 	      bfd_vma old_offset = val.r_rel.target_offset;
- 	      bfd_vma new_offset;
- 	      long old_size, new_size;
--	      text_action *act = target_relax_info->action_list.head;
--	      new_offset = old_offset -
--		removed_by_actions (&act, old_offset, FALSE);
-+	      int removed_by_old_offset =
-+		removed_by_actions_map (&target_relax_info->action_list,
-+					old_offset, FALSE);
-+	      new_offset = old_offset - removed_by_old_offset;
- 
- 	      /* Assert that we are not out of bounds.  */
- 	      old_size = bfd_get_32 (abfd, size_p);
-@@ -10164,9 +10286,10 @@ relax_property_section (bfd *abfd,
- 
- 		      /* Recompute the new_offset, but this time don't
- 			 include any fill inserted by relaxation.  */
--		      act = target_relax_info->action_list.head;
--		      new_offset = old_offset -
--			removed_by_actions (&act, old_offset, TRUE);
-+		      removed_by_old_offset =
-+			removed_by_actions_map (&target_relax_info->action_list,
-+						old_offset, TRUE);
-+		      new_offset = old_offset - removed_by_old_offset;
- 
- 		      /* If it is not unreachable and we have not yet
- 			 seen an unreachable at this address, place it
-@@ -10182,8 +10305,12 @@ relax_property_section (bfd *abfd,
- 		    }
- 		}
- 	      else
--		new_size -=
--		    removed_by_actions (&act, old_offset + old_size, TRUE);
-+		{
-+		  int removed_by_old_offset_size =
-+		    removed_by_actions_map (&target_relax_info->action_list,
-+					    old_offset + old_size, TRUE);
-+		  new_size -= removed_by_old_offset_size - removed_by_old_offset;
-+		}
- 
- 	      if (new_size != old_size)
- 		{
-@@ -10441,14 +10568,16 @@ relax_section_symbols (bfd *abfd, asection *sec)
- 
-       if (isym->st_shndx == sec_shndx)
- 	{
--	  text_action *act = relax_info->action_list.head;
- 	  bfd_vma orig_addr = isym->st_value;
-+	  int removed = removed_by_actions_map (&relax_info->action_list,
-+						orig_addr, FALSE);
- 
--	  isym->st_value -= removed_by_actions (&act, orig_addr, FALSE);
--
-+	  isym->st_value -= removed;
- 	  if (ELF32_ST_TYPE (isym->st_info) == STT_FUNC)
- 	    isym->st_size -=
--	      removed_by_actions (&act, orig_addr + isym->st_size, FALSE);
-+	      removed_by_actions_map (&relax_info->action_list,
-+				      orig_addr + isym->st_size, FALSE) -
-+	      removed;
- 	}
-     }
- 
-@@ -10466,15 +10595,17 @@ relax_section_symbols (bfd *abfd, asection *sec)
- 	   || sym_hash->root.type == bfd_link_hash_defweak)
- 	  && sym_hash->root.u.def.section == sec)
- 	{
--	  text_action *act = relax_info->action_list.head;
- 	  bfd_vma orig_addr = sym_hash->root.u.def.value;
-+	  int removed = removed_by_actions_map (&relax_info->action_list,
-+						orig_addr, FALSE);
- 
--	  sym_hash->root.u.def.value -=
--	    removed_by_actions (&act, orig_addr, FALSE);
-+	  sym_hash->root.u.def.value -= removed;
- 
- 	  if (sym_hash->type == STT_FUNC)
- 	    sym_hash->size -=
--	      removed_by_actions (&act, orig_addr + sym_hash->size, FALSE);
-+	      removed_by_actions_map (&relax_info->action_list,
-+				      orig_addr + sym_hash->size, FALSE) -
-+	      removed;
- 	}
-     }
- 
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch b/patches/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch
deleted file mode 100644
index 96d526f..0000000
--- a/patches/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 288c2b709e5e6841484e1a129eaccd299db36877 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 4 Apr 2015 14:49:42 +0300
-Subject: [PATCH 3/4] xtensa: optimize find_removed_literal
-
-find_removed_literal uses linear search to find removed literal by its
-VMA. The list of literals is fixed at that point, build an ordered index
-array and use binary search instead.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-         56.72    0.00  297578/669392      translate_reloc
-         70.86    0.00  371814/669392      relax_section
-  67.9  127.58    0.00  669392         find_removed_literal
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00  297578/669392      translate_reloc
-          0.00    0.00  371814/669392      relax_section
-   0.0    0.00    0.00  669392         find_removed_literal
-          0.00    0.00   23838/23838       map_removed_literal
------------------------------------------
-
-2015-04-03  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (removed_literal_map_entry): new typedef.
-	(removed_literal_map_entry_struct): new structure.
-	(removed_literal_list_struct): add new fields: n_map and map.
-	(map_removed_literal, removed_literal_compare): new functions.
-	(find_removed_literal): build index array for literals ordered
-	by VMA, use binary search to find removed literal.
-
-Backported from: 3439c466273378021821473d3fc84990e089ae34
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 58 insertions(+), 6 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 21b2871..51733ad 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -5832,6 +5832,7 @@ print_action_list (FILE *fp, text_action_list *action_list)
-    by the "from" offset field.  */
- 
- typedef struct removed_literal_struct removed_literal;
-+typedef struct removed_literal_map_entry_struct removed_literal_map_entry;
- typedef struct removed_literal_list_struct removed_literal_list;
- 
- struct removed_literal_struct
-@@ -5841,10 +5842,19 @@ struct removed_literal_struct
-   removed_literal *next;
- };
- 
-+struct removed_literal_map_entry_struct
-+{
-+  bfd_vma addr;
-+  removed_literal *literal;
-+};
-+
- struct removed_literal_list_struct
- {
-   removed_literal *head;
-   removed_literal *tail;
-+
-+  unsigned n_map;
-+  removed_literal_map_entry *map;
- };
- 
- 
-@@ -5893,6 +5903,39 @@ add_removed_literal (removed_literal_list *removed_list,
-     }
- }
- 
-+static void
-+map_removed_literal (removed_literal_list *removed_list)
-+{
-+  unsigned n_map = 0;
-+  unsigned i;
-+  removed_literal_map_entry *map = NULL;
-+  removed_literal *r = removed_list->head;
-+
-+  for (i = 0; r; ++i, r = r->next)
-+    {
-+      if (i == n_map)
-+	{
-+	  n_map = (n_map * 2) + 2;
-+	  map = bfd_realloc (map, n_map * sizeof (*map));
-+	}
-+      map[i].addr = r->from.target_offset;
-+      map[i].literal = r;
-+    }
-+  removed_list->map = map;
-+  removed_list->n_map = i;
-+}
-+
-+static int
-+removed_literal_compare (const void *a, const void *b)
-+{
-+  const removed_literal_map_entry *pa = a;
-+  const removed_literal_map_entry *pb = b;
-+
-+  if (pa->addr == pb->addr)
-+    return 0;
-+  else
-+    return pa->addr < pb->addr ? -1 : 1;
-+}
- 
- /* Check if the list of removed literals contains an entry for the
-    given address.  Return the entry if found.  */
-@@ -5900,12 +5943,21 @@ add_removed_literal (removed_literal_list *removed_list,
- static removed_literal *
- find_removed_literal (removed_literal_list *removed_list, bfd_vma addr)
- {
--  removed_literal *r = removed_list->head;
--  while (r && r->from.target_offset < addr)
--    r = r->next;
--  if (r && r->from.target_offset == addr)
--    return r;
--  return NULL;
-+  removed_literal_map_entry *p;
-+  removed_literal *r = NULL;
-+
-+  if (removed_list->map == NULL)
-+    map_removed_literal (removed_list);
-+
-+  p = bsearch (&addr, removed_list->map, removed_list->n_map,
-+	       sizeof (*removed_list->map), removed_literal_compare);
-+  if (p)
-+    {
-+      while (p != removed_list->map && (p - 1)->addr == addr)
-+	--p;
-+      r = p->literal;
-+    }
-+  return r;
- }
- 
- 
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch b/patches/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch
deleted file mode 100644
index 3090cc2..0000000
--- a/patches/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-From e5409aedd3ee2192855018a564650ffb75c26e60 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 5 Apr 2015 17:04:22 +0300
-Subject: [PATCH 4/4] xtensa: replace action list with splay tree
-
-text_action_add uses linear list search to order text actions list by
-action VMA. The list is used at the first relaxation pass, when it's not
-fixed yet.
-Replace the list with splay tree from libiberty.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00      14/158225      compute_text_actions
-          3.62    0.00   25211/158225      remove_dead_literal
-          8.42    0.00   58645/158225      coalesce_shared_literal
-         10.68    0.00   74355/158225      text_action_add_proposed
-  38.8   22.73    0.00  158225         text_action_add
-          0.00    0.00  144527/293246      bfd_zmalloc
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00      14/158225      compute_text_actions
-          0.00    0.00   25211/158225      remove_dead_literal
-          0.00    0.01   58645/158225      coalesce_shared_literal
-          0.00    0.01   74355/158225      text_action_add_proposed
-   0.1    0.00    0.02  158225         text_action_add
-          0.01    0.00  144527/144527      splay_tree_insert
-          0.00    0.00  144527/195130      splay_tree_lookup
-          0.00    0.00  144527/293246      bfd_zmalloc
------------------------------------------
-
-2015-04-03  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (splay-tree.h): include header.
-	(text_action_struct): drop next pointer.
-	(text_action_list_struct): drop head pointer, add count and
-	tree fields.
-	(find_fill_action): instead of linear search in text_action_list
-	search in the tree.
-	(text_action_compare, action_first, action_next): new functions.
-	(text_action_add, text_action_add_literal): instead of linear
-	search and insertion insert new node into the tree.
-	(removed_by_actions): pass additional parameter: action_list,
-	use it to traverse the tree.
-	(offset_with_removed_text): pass additional action_list parameter
-	to removed_by_actions.
-	(map_action_fn_context): new typedef.
-	(map_action_fn_context_struct): new structure.
-	(map_action_fn): new function.
-	(map_removal_by_action): use splay_tree_foreach to build map.
-	(find_insn_action): replace linear search in text_action_list
-	with series of splay_tree_lookups.
-	(print_action, print_action_list_fn): new functions.
-	(print_action_list): use splay_tree_foreach.
-	(init_xtensa_relax_info): drop action_list.head initialization.
-	Initialize the tree.
-	(compute_text_actions): use non-zero action_list_count instead of
-	non-NULL action list.
-	(xlate_map_context): new typedef.
-	(xlate_map_context_struct): new structure.
-	(xlate_map_fn): new function.
-	(build_xlate_map): use splay_tree_foreach to build map.
-	(action_remove_bytes_fn): new function.
-	(relax_section): use zero action_list_count instead of NULL
-	action list. Use splay_tree_foreach to count final section size.
-	Drop unused variable 'removed'.
-
-Backported from: 4c2af04fe8b4452bf51d2debf1bb467fafcd0f08
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 488 +++++++++++++++++++++++++++++++----------------------
- 1 file changed, 282 insertions(+), 206 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 51733ad..53af1c6 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -28,6 +28,7 @@
- #include "libbfd.h"
- #include "elf-bfd.h"
- #include "elf/xtensa.h"
-+#include "splay-tree.h"
- #include "xtensa-isa.h"
- #include "xtensa-config.h"
- 
-@@ -5416,8 +5417,6 @@ struct text_action_struct
-   bfd_vma virtual_offset;  /* Zero except for adding literals.  */
-   int removed_bytes;
-   literal_value value;	/* Only valid when adding literals.  */
--
--  text_action *next;
- };
- 
- struct removal_by_action_entry_struct
-@@ -5440,7 +5439,8 @@ typedef struct removal_by_action_map_struct removal_by_action_map;
- /* List of all of the actions taken on a text section.  */
- struct text_action_list_struct
- {
--  text_action *head;
-+  unsigned count;
-+  splay_tree tree;
-   removal_by_action_map map;
- };
- 
-@@ -5448,20 +5448,18 @@ struct text_action_list_struct
- static text_action *
- find_fill_action (text_action_list *l, asection *sec, bfd_vma offset)
- {
--  text_action **m_p;
-+  text_action a;
- 
-   /* It is not necessary to fill at the end of a section.  */
-   if (sec->size == offset)
-     return NULL;
- 
--  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
--    {
--      text_action *t = *m_p;
--      /* When the action is another fill at the same address,
--	 just increase the size.  */
--      if (t->offset == offset && t->action == ta_fill)
--	return t;
--    }
-+  a.offset = offset;
-+  a.action = ta_fill;
-+
-+  splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a);
-+  if (node)
-+    return (text_action *)node->value;
-   return NULL;
- }
- 
-@@ -5509,6 +5507,49 @@ adjust_fill_action (text_action *ta, int fill_diff)
- }
- 
- 
-+static int
-+text_action_compare (splay_tree_key a, splay_tree_key b)
-+{
-+  text_action *pa = (text_action *)a;
-+  text_action *pb = (text_action *)b;
-+  static const int action_priority[] =
-+    {
-+      [ta_fill] = 0,
-+      [ta_none] = 1,
-+      [ta_convert_longcall] = 2,
-+      [ta_narrow_insn] = 3,
-+      [ta_remove_insn] = 4,
-+      [ta_remove_longcall] = 5,
-+      [ta_remove_literal] = 6,
-+      [ta_widen_insn] = 7,
-+      [ta_add_literal] = 8,
-+    };
-+
-+  if (pa->offset == pb->offset)
-+    {
-+      if (pa->action == pb->action)
-+	  return 0;
-+      return action_priority[pa->action] - action_priority[pb->action];
-+    }
-+  else
-+    return pa->offset < pb->offset ? -1 : 1;
-+}
-+
-+static text_action *
-+action_first (text_action_list *action_list)
-+{
-+  splay_tree_node node = splay_tree_min (action_list->tree);
-+  return node ? (text_action *)node->value : NULL;
-+}
-+
-+static text_action *
-+action_next (text_action_list *action_list, text_action *action)
-+{
-+  splay_tree_node node = splay_tree_successor (action_list->tree,
-+					       (splay_tree_key)action);
-+  return node ? (text_action *)node->value : NULL;
-+}
-+
- /* Add a modification action to the text.  For the case of adding or
-    removing space, modify any current fill and assume that
-    "unreachable_space" bytes can be freely contracted.  Note that a
-@@ -5521,8 +5562,8 @@ text_action_add (text_action_list *l,
- 		 bfd_vma offset,
- 		 int removed)
- {
--  text_action **m_p;
-   text_action *ta;
-+  text_action a;
- 
-   /* It is not necessary to fill at the end of a section.  */
-   if (action == ta_fill && sec->size == offset)
-@@ -5532,34 +5573,30 @@ text_action_add (text_action_list *l,
-   if (action == ta_fill && removed == 0)
-     return;
- 
--  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
-+  a.action = action;
-+  a.offset = offset;
-+
-+  if (action == ta_fill)
-     {
--      text_action *t = *m_p;
-+      splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a);
- 
--      if (action == ta_fill)
-+      if (node)
- 	{
--	  /* When the action is another fill at the same address,
--	     just increase the size.  */
--	  if (t->offset == offset && t->action == ta_fill)
--	    {
--	      t->removed_bytes += removed;
--	      return;
--	    }
--	  /* Fills need to happen before widens so that we don't
--	     insert fill bytes into the instruction stream.  */
--	  if (t->offset == offset && t->action == ta_widen_insn)
--	    break;
-+	  ta = (text_action *)node->value;
-+	  ta->removed_bytes += removed;
-+	  return;
- 	}
-     }
-+  else
-+    BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)&a) == NULL);
- 
--  /* Create a new record and fill it up.  */
-   ta = (text_action *) bfd_zmalloc (sizeof (text_action));
-   ta->action = action;
-   ta->sec = sec;
-   ta->offset = offset;
-   ta->removed_bytes = removed;
--  ta->next = (*m_p);
--  *m_p = ta;
-+  splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta);
-+  ++l->count;
- }
- 
- 
-@@ -5570,7 +5607,6 @@ text_action_add_literal (text_action_list *l,
- 			 const literal_value *value,
- 			 int removed)
- {
--  text_action **m_p;
-   text_action *ta;
-   asection *sec = r_reloc_get_section (loc);
-   bfd_vma offset = loc->target_offset;
-@@ -5578,14 +5614,6 @@ text_action_add_literal (text_action_list *l,
- 
-   BFD_ASSERT (action == ta_add_literal);
- 
--  for (m_p = &l->head; *m_p != NULL; m_p = &(*m_p)->next)
--    {
--      if ((*m_p)->offset > offset
--	  && ((*m_p)->offset != offset
--	      || (*m_p)->virtual_offset > virtual_offset))
--	break;
--    }
--
-   /* Create a new record and fill it up.  */
-   ta = (text_action *) bfd_zmalloc (sizeof (text_action));
-   ta->action = action;
-@@ -5594,8 +5622,10 @@ text_action_add_literal (text_action_list *l,
-   ta->virtual_offset = virtual_offset;
-   ta->value = *value;
-   ta->removed_bytes = removed;
--  ta->next = (*m_p);
--  *m_p = ta;
-+
-+  BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)ta) == NULL);
-+  splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta);
-+  ++l->count;
- }
- 
- 
-@@ -5606,7 +5636,8 @@ text_action_add_literal (text_action_list *l,
-    so that each search may begin where the previous one left off.  */
- 
- static int
--removed_by_actions (text_action **p_start_action,
-+removed_by_actions (text_action_list *action_list,
-+		    text_action **p_start_action,
- 		    bfd_vma offset,
- 		    bfd_boolean before_fill)
- {
-@@ -5614,6 +5645,13 @@ removed_by_actions (text_action **p_start_action,
-   int removed = 0;
- 
-   r = *p_start_action;
-+  if (r)
-+    {
-+      splay_tree_node node = splay_tree_lookup (action_list->tree,
-+						(splay_tree_key)r);
-+      BFD_ASSERT (node != NULL && r == (text_action *)node->value);
-+    }
-+
-   while (r)
-     {
-       if (r->offset > offset)
-@@ -5625,7 +5663,7 @@ removed_by_actions (text_action **p_start_action,
- 
-       removed += r->removed_bytes;
- 
--      r = r->next;
-+      r = action_next (action_list, r);
-     }
- 
-   *p_start_action = r;
-@@ -5636,68 +5674,74 @@ removed_by_actions (text_action **p_start_action,
- static bfd_vma
- offset_with_removed_text (text_action_list *action_list, bfd_vma offset)
- {
--  text_action *r = action_list->head;
--  return offset - removed_by_actions (&r, offset, FALSE);
-+  text_action *r = action_first (action_list);
-+
-+  return offset - removed_by_actions (action_list, &r, offset, FALSE);
- }
- 
- 
- static unsigned
- action_list_count (text_action_list *action_list)
- {
--  text_action *r = action_list->head;
--  unsigned count = 0;
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      count++;
--    }
--  return count;
-+  return action_list->count;
- }
- 
--static void
--map_removal_by_action (text_action_list *action_list)
-+typedef struct map_action_fn_context_struct map_action_fn_context;
-+struct map_action_fn_context_struct
- {
--  text_action *r;
--  int removed = 0;
-+  int removed;
-   removal_by_action_map map;
-   bfd_boolean eq_complete;
-+};
- 
--  map.n_entries = 0;
--  map.entry = bfd_malloc (action_list_count (action_list) *
--			  sizeof (removal_by_action_entry));
--  eq_complete = FALSE;
-+static int
-+map_action_fn (splay_tree_node node, void *p)
-+{
-+  map_action_fn_context *ctx = p;
-+  text_action *r = (text_action *)node->value;
-+  removal_by_action_entry *ientry = ctx->map.entry + ctx->map.n_entries;
- 
--  for (r = action_list->head; r;)
-+  if (ctx->map.n_entries && (ientry - 1)->offset == r->offset)
-     {
--      removal_by_action_entry *ientry = map.entry + map.n_entries;
-+      --ientry;
-+    }
-+  else
-+    {
-+      ++ctx->map.n_entries;
-+      ctx->eq_complete = FALSE;
-+      ientry->offset = r->offset;
-+      ientry->eq_removed_before_fill = ctx->removed;
-+    }
- 
--      if (map.n_entries && (ientry - 1)->offset == r->offset)
-+  if (!ctx->eq_complete)
-+    {
-+      if (r->action != ta_fill || r->removed_bytes >= 0)
- 	{
--	  --ientry;
-+	  ientry->eq_removed = ctx->removed;
-+	  ctx->eq_complete = TRUE;
- 	}
-       else
--	{
--	  ++map.n_entries;
--	  eq_complete = FALSE;
--	  ientry->offset = r->offset;
--	  ientry->eq_removed_before_fill = removed;
--	}
-+	ientry->eq_removed = ctx->removed + r->removed_bytes;
-+    }
- 
--      if (!eq_complete)
--	{
--	  if (r->action != ta_fill || r->removed_bytes >= 0)
--	    {
--	      ientry->eq_removed = removed;
--	      eq_complete = TRUE;
--	    }
--	  else
--	    ientry->eq_removed = removed + r->removed_bytes;
--	}
-+  ctx->removed += r->removed_bytes;
-+  ientry->removed = ctx->removed;
-+  return 0;
-+}
- 
--      removed += r->removed_bytes;
--      ientry->removed = removed;
--      r = r->next;
--    }
--  action_list->map = map;
-+static void
-+map_removal_by_action (text_action_list *action_list)
-+{
-+  map_action_fn_context ctx;
-+
-+  ctx.removed = 0;
-+  ctx.map.n_entries = 0;
-+  ctx.map.entry = bfd_malloc (action_list_count (action_list) *
-+			      sizeof (removal_by_action_entry));
-+  ctx.eq_complete = FALSE;
-+
-+  splay_tree_foreach (action_list->tree, map_action_fn, &ctx);
-+  action_list->map = ctx.map;
- }
- 
- static int
-@@ -5754,28 +5798,26 @@ offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
- static text_action *
- find_insn_action (text_action_list *action_list, bfd_vma offset)
- {
--  text_action *t;
--  for (t = action_list->head; t; t = t->next)
-+  static const text_action_t action[] =
-     {
--      if (t->offset == offset)
--	{
--	  switch (t->action)
--	    {
--	    case ta_none:
--	    case ta_fill:
--	      break;
--	    case ta_remove_insn:
--	    case ta_remove_longcall:
--	    case ta_convert_longcall:
--	    case ta_narrow_insn:
--	    case ta_widen_insn:
--	      return t;
--	    case ta_remove_literal:
--	    case ta_add_literal:
--	      BFD_ASSERT (0);
--	      break;
--	    }
--	}
-+      ta_convert_longcall,
-+      ta_remove_longcall,
-+      ta_widen_insn,
-+      ta_narrow_insn,
-+      ta_remove_insn,
-+    };
-+  text_action a;
-+  unsigned i;
-+
-+  a.offset = offset;
-+  for (i = 0; i < sizeof (action) / sizeof (*action); ++i)
-+    {
-+      splay_tree_node node;
-+
-+      a.action = action[i];
-+      node = splay_tree_lookup (action_list->tree, (splay_tree_key)&a);
-+      if (node)
-+	return (text_action *)node->value;
-     }
-   return NULL;
- }
-@@ -5784,40 +5826,50 @@ find_insn_action (text_action_list *action_list, bfd_vma offset)
- #if DEBUG
- 
- static void
--print_action_list (FILE *fp, text_action_list *action_list)
-+print_action (FILE *fp, text_action *r)
-+{
-+  const char *t = "unknown";
-+  switch (r->action)
-+    {
-+    case ta_remove_insn:
-+      t = "remove_insn"; break;
-+    case ta_remove_longcall:
-+      t = "remove_longcall"; break;
-+    case ta_convert_longcall:
-+      t = "convert_longcall"; break;
-+    case ta_narrow_insn:
-+      t = "narrow_insn"; break;
-+    case ta_widen_insn:
-+      t = "widen_insn"; break;
-+    case ta_fill:
-+      t = "fill"; break;
-+    case ta_none:
-+      t = "none"; break;
-+    case ta_remove_literal:
-+      t = "remove_literal"; break;
-+    case ta_add_literal:
-+      t = "add_literal"; break;
-+    }
-+
-+  fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
-+	   r->sec->owner->filename,
-+	   r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
-+}
-+
-+static int
-+print_action_list_fn (splay_tree_node node, void *p)
- {
--  text_action *r;
-+  text_action *r = (text_action *)node->value;
- 
--  fprintf (fp, "Text Action\n");
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      const char *t = "unknown";
--      switch (r->action)
--	{
--	case ta_remove_insn:
--	  t = "remove_insn"; break;
--	case ta_remove_longcall:
--	  t = "remove_longcall"; break;
--	case ta_convert_longcall:
--	  t = "convert_longcall"; break;
--	case ta_narrow_insn:
--	  t = "narrow_insn"; break;
--	case ta_widen_insn:
--	  t = "widen_insn"; break;
--	case ta_fill:
--	  t = "fill"; break;
--	case ta_none:
--	  t = "none"; break;
--	case ta_remove_literal:
--	  t = "remove_literal"; break;
--	case ta_add_literal:
--	  t = "add_literal"; break;
--	}
-+  print_action (p, r);
-+  return 0;
-+}
- 
--      fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
--	       r->sec->owner->filename,
--	       r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
--    }
-+static void
-+print_action_list (FILE *fp, text_action_list *action_list)
-+{
-+  fprintf (fp, "Text Action\n");
-+  splay_tree_foreach (action_list->tree, print_action_list_fn, fp);
- }
- 
- #endif /* DEBUG */
-@@ -6071,8 +6123,8 @@ init_xtensa_relax_info (asection *sec)
-   relax_info->removed_list.head = NULL;
-   relax_info->removed_list.tail = NULL;
- 
--  relax_info->action_list.head = NULL;
--
-+  relax_info->action_list.tree = splay_tree_new (text_action_compare,
-+						 NULL, NULL);
-   relax_info->action_list.map.n_entries = 0;
-   relax_info->action_list.map.entry = NULL;
- 
-@@ -7762,7 +7814,7 @@ compute_text_actions (bfd *abfd,
-   free_reloc_range_list (&relevant_relocs);
- 
- #if DEBUG
--  if (relax_info->action_list.head)
-+  if (action_list_count (&relax_info->action_list))
-     print_action_list (stderr, &relax_info->action_list);
- #endif
- 
-@@ -8263,6 +8315,54 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
-   return e->new_address - e->orig_address + offset;
- }
- 
-+typedef struct xlate_map_context_struct xlate_map_context;
-+struct xlate_map_context_struct
-+{
-+  xlate_map_t *map;
-+  xlate_map_entry_t *current_entry;
-+  int removed;
-+};
-+
-+static int
-+xlate_map_fn (splay_tree_node node, void *p)
-+{
-+  text_action *r = (text_action *)node->value;
-+  xlate_map_context *ctx = p;
-+  unsigned orig_size = 0;
-+
-+  switch (r->action)
-+    {
-+    case ta_none:
-+    case ta_remove_insn:
-+    case ta_convert_longcall:
-+    case ta_remove_literal:
-+    case ta_add_literal:
-+      break;
-+    case ta_remove_longcall:
-+      orig_size = 6;
-+      break;
-+    case ta_narrow_insn:
-+      orig_size = 3;
-+      break;
-+    case ta_widen_insn:
-+      orig_size = 2;
-+      break;
-+    case ta_fill:
-+      break;
-+    }
-+  ctx->current_entry->size =
-+    r->offset + orig_size - ctx->current_entry->orig_address;
-+  if (ctx->current_entry->size != 0)
-+    {
-+      ctx->current_entry++;
-+      ctx->map->entry_count++;
-+    }
-+  ctx->current_entry->orig_address = r->offset + orig_size;
-+  ctx->removed += r->removed_bytes;
-+  ctx->current_entry->new_address = r->offset + orig_size - ctx->removed;
-+  ctx->current_entry->size = 0;
-+  return 0;
-+}
- 
- /* Build a binary searchable offset translation map from a section's
-    action list.  */
-@@ -8270,75 +8370,40 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
- static xlate_map_t *
- build_xlate_map (asection *sec, xtensa_relax_info *relax_info)
- {
--  xlate_map_t *map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t));
-   text_action_list *action_list = &relax_info->action_list;
-   unsigned num_actions = 0;
--  text_action *r;
--  int removed;
--  xlate_map_entry_t *current_entry;
-+  xlate_map_context ctx;
- 
--  if (map == NULL)
-+  ctx.map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t));
-+
-+  if (ctx.map == NULL)
-     return NULL;
- 
-   num_actions = action_list_count (action_list);
--  map->entry = (xlate_map_entry_t *)
-+  ctx.map->entry = (xlate_map_entry_t *)
-     bfd_malloc (sizeof (xlate_map_entry_t) * (num_actions + 1));
--  if (map->entry == NULL)
-+  if (ctx.map->entry == NULL)
-     {
--      free (map);
-+      free (ctx.map);
-       return NULL;
-     }
--  map->entry_count = 0;
-+  ctx.map->entry_count = 0;
- 
--  removed = 0;
--  current_entry = &map->entry[0];
-+  ctx.removed = 0;
-+  ctx.current_entry = &ctx.map->entry[0];
- 
--  current_entry->orig_address = 0;
--  current_entry->new_address = 0;
--  current_entry->size = 0;
-+  ctx.current_entry->orig_address = 0;
-+  ctx.current_entry->new_address = 0;
-+  ctx.current_entry->size = 0;
- 
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      unsigned orig_size = 0;
--      switch (r->action)
--	{
--	case ta_none:
--	case ta_remove_insn:
--	case ta_convert_longcall:
--	case ta_remove_literal:
--	case ta_add_literal:
--	  break;
--	case ta_remove_longcall:
--	  orig_size = 6;
--	  break;
--	case ta_narrow_insn:
--	  orig_size = 3;
--	  break;
--	case ta_widen_insn:
--	  orig_size = 2;
--	  break;
--	case ta_fill:
--	  break;
--	}
--      current_entry->size =
--	r->offset + orig_size - current_entry->orig_address;
--      if (current_entry->size != 0)
--	{
--	  current_entry++;
--	  map->entry_count++;
--	}
--      current_entry->orig_address = r->offset + orig_size;
--      removed += r->removed_bytes;
--      current_entry->new_address = r->offset + orig_size - removed;
--      current_entry->size = 0;
--    }
-+  splay_tree_foreach (action_list->tree, xlate_map_fn, &ctx);
- 
--  current_entry->size = (bfd_get_section_limit (sec->owner, sec)
--			 - current_entry->orig_address);
--  if (current_entry->size != 0)
--    map->entry_count++;
-+  ctx.current_entry->size = (bfd_get_section_limit (sec->owner, sec)
-+			     - ctx.current_entry->orig_address);
-+  if (ctx.current_entry->size != 0)
-+    ctx.map->entry_count++;
- 
--  return map;
-+  return ctx.map;
- }
- 
- 
-@@ -9302,6 +9367,16 @@ move_shared_literal (asection *sec,
- 
- /* Second relaxation pass.  */
- 
-+static int
-+action_remove_bytes_fn (splay_tree_node node, void *p)
-+{
-+  bfd_size_type *final_size = p;
-+  text_action *action = (text_action *)node->value;
-+
-+  *final_size -= action->removed_bytes;
-+  return 0;
-+}
-+
- /* Modify all of the relocations to point to the right spot, and if this
-    is a relaxable section, delete the unwanted literals and fix the
-    section size.  */
-@@ -9334,7 +9409,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 
-   internal_relocs = retrieve_internal_relocs (abfd, sec,
- 					      link_info->keep_memory);
--  if (!internal_relocs && !relax_info->action_list.head)
-+  if (!internal_relocs && !action_list_count (&relax_info->action_list))
-     return TRUE;
- 
-   contents = retrieve_contents (abfd, sec, link_info->keep_memory);
-@@ -9412,6 +9487,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 			}
- 		      /* Update the action so that the code that moves
- 			 the contents will do the right thing.  */
-+		      /* ta_remove_longcall and ta_remove_insn actions are
-+		         grouped together in the tree as well as
-+			 ta_convert_longcall and ta_none, so that changes below
-+			 can be done w/o removing and reinserting action into
-+			 the tree.  */
-+
- 		      if (action->action == ta_remove_longcall)
- 			action->action = ta_remove_insn;
- 		      else
-@@ -9584,13 +9665,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 
-   if ((relax_info->is_relaxable_literal_section
-        || relax_info->is_relaxable_asm_section)
--      && relax_info->action_list.head)
-+      && action_list_count (&relax_info->action_list))
-     {
-       /* Walk through the planned actions and build up a table
- 	 of move, copy and fill records.  Use the move, copy and
- 	 fill records to perform the actions once.  */
- 
--      int removed = 0;
-       bfd_size_type final_size, copy_size, orig_insn_size;
-       bfd_byte *scratch = NULL;
-       bfd_byte *dup_contents = NULL;
-@@ -9601,15 +9681,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
-       bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot.  */
-       bfd_vma dup_dot = 0;
- 
--      text_action *action = relax_info->action_list.head;
-+      text_action *action;
- 
-       final_size = sec->size;
--      for (action = relax_info->action_list.head; action;
--	   action = action->next)
--	{
--	  final_size -= action->removed_bytes;
--	}
- 
-+      splay_tree_foreach (relax_info->action_list.tree,
-+			  action_remove_bytes_fn, &final_size);
-       scratch = (bfd_byte *) bfd_zmalloc (final_size);
-       dup_contents = (bfd_byte *) bfd_zmalloc (final_size);
- 
-@@ -9618,8 +9695,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
-       print_action_list (stderr, &relax_info->action_list);
- #endif
- 
--      for (action = relax_info->action_list.head; action;
--	   action = action->next)
-+      for (action = action_first (&relax_info->action_list); action;
-+	   action = action_next (&relax_info->action_list, action))
- 	{
- 	  virtual_action = FALSE;
- 	  if (action->offset > orig_dot)
-@@ -9748,7 +9825,6 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 	      break;
- 	    }
- 
--	  removed += action->removed_bytes;
- 	  BFD_ASSERT (dup_dot <= final_size);
- 	  BFD_ASSERT (orig_dot <= orig_size);
- 	}
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch b/patches/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch
deleted file mode 100644
index 043ff4d..0000000
--- a/patches/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From cbe53e134d4c3a656880a906738ce19fdcd38e8b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 1 May 2015 11:39:12 +0300
-Subject: [PATCH] xtensa: optimize trampolines relaxation
-
-Currently every fixup in the current segment is checked when relaxing
-trampoline frag. This is very expensive. Make a searchable array of
-fixups pointing at potentially oversized jumps at the beginning of every
-relaxation pass and only check subset of this cache in the reach of
-single jump from the trampoline frag currently being relaxed.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-        370.16  593.38 12283048/12283048     relax_segment
-  98.4  370.16  593.38 12283048         xtensa_relax_frag
-         58.91  269.26 2691463834/2699602236     xtensa_insnbuf_from_chars
-         68.35   68.17 811266668/813338977     S_GET_VALUE
-         36.85   29.51 2684369246/2685538060     xtensa_opcode_decode
-         28.34    8.84 2684369246/2685538060     xtensa_format_get_slot
-         12.39    5.94 2691463834/2699775044     xtensa_format_decode
-          0.03    4.60 4101109/4101109     relax_frag_for_align
-          0.18    1.76  994617/994617      relax_frag_immed
-          0.07    0.09 24556277/24851220     new_logical_line
-          0.06    0.00 12283048/14067410     as_where
-          0.04    0.00 7094588/15460506     xtensa_format_num_slots
-          0.00    0.00       1/712477      xtensa_insnbuf_alloc
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.51    7.47 12283048/12283048     relax_segment
-  58.0    0.51    7.47 12283048         xtensa_relax_frag
-          0.02    4.08 4101109/4101109     relax_frag_for_align
-          0.18    1.39  994617/994617      relax_frag_immed
-          0.01    0.98     555/555         xtensa_cache_relaxable_fixups
-          0.21    0.25 7094588/16693271     xtensa_insnbuf_from_chars
-          0.06    0.12 24556277/24851220     new_logical_line
-          0.06    0.00 7094588/15460506     xtensa_format_num_slots
-          0.02    0.04 7094588/16866079     xtensa_format_decode
-          0.05    0.00 12283048/14067410     as_where
-          0.00    0.00       1/712477      xtensa_insnbuf_alloc
-          0.00    0.00   93808/93808       xtensa_find_first_cached_fixup
------------------------------------------
-
-2015-05-02  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (cached_fixupS, fixup_cacheS): New typedefs.
-	(struct cached_fixup, struct fixup_cache): New structures.
-	(fixup_order, xtensa_make_cached_fixup),
-	(xtensa_realloc_fixup_cache, xtensa_cache_relaxable_fixups),
-	(xtensa_find_first_cached_fixup, xtensa_delete_cached_fixup),
-	(xtensa_add_cached_fixup): New functions.
-	(xtensa_relax_frag): Cache fixups pointing at potentially
-	oversized jumps at the beginning of every relaxation pass. Only
-	check subset of this cache in the reach of single jump from the
-	trampoline frag currently being relaxed.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: b76f99d702c3501ac320396ea06bc7f9237173c3
-Changes to ChangeLog are dropped.
-
- gas/config/tc-xtensa.c | 220 +++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 194 insertions(+), 26 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 3e85b69..31c0b6b 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -8785,6 +8785,154 @@ static long relax_frag_for_align (fragS *, long);
- static long relax_frag_immed
-   (segT, fragS *, long, int, xtensa_format, int, int *, bfd_boolean);
- 
-+typedef struct cached_fixup cached_fixupS;
-+struct cached_fixup
-+{
-+  int addr;
-+  int target;
-+  int delta;
-+  fixS *fixP;
-+};
-+
-+typedef struct fixup_cache fixup_cacheS;
-+struct fixup_cache
-+{
-+  cached_fixupS *fixups;
-+  unsigned n_fixups;
-+  unsigned n_max;
-+
-+  segT seg;
-+  fragS *first_frag;
-+};
-+
-+static int fixup_order (const void *a, const void *b)
-+{
-+  const cached_fixupS *pa = a;
-+  const cached_fixupS *pb = b;
-+
-+  if (pa->addr == pb->addr)
-+    {
-+      if (pa->target == pb->target)
-+	{
-+	  if (pa->fixP->fx_r_type == pb->fixP->fx_r_type)
-+	    return 0;
-+	  return pa->fixP->fx_r_type < pb->fixP->fx_r_type ?  -1 : 1;
-+	}
-+      return pa->target - pb->target;
-+    }
-+  return pa->addr - pb->addr;
-+}
-+
-+static bfd_boolean xtensa_make_cached_fixup (cached_fixupS *o, fixS *fixP)
-+{
-+  xtensa_isa isa = xtensa_default_isa;
-+  int addr = fixP->fx_frag->fr_address;
-+  int target;
-+  int delta;
-+  symbolS *s = fixP->fx_addsy;
-+  int slot;
-+  xtensa_format fmt;
-+  xtensa_opcode opcode;
-+
-+  if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
-+      fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
-+    return FALSE;
-+  target = S_GET_VALUE (s);
-+  delta = target - addr;
-+
-+  if (abs(delta) < J_RANGE / 2)
-+    return FALSE;
-+
-+  xtensa_insnbuf_from_chars (isa, trampoline_buf,
-+			     (unsigned char *) fixP->fx_frag->fr_literal +
-+			     fixP->fx_where, 0);
-+  fmt = xtensa_format_decode (isa, trampoline_buf);
-+  gas_assert (fmt != XTENSA_UNDEFINED);
-+  slot = fixP->tc_fix_data.slot;
-+  xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
-+  opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
-+  if (opcode != xtensa_j_opcode)
-+    return FALSE;
-+
-+  o->addr = addr;
-+  o->target = target;
-+  o->delta = delta;
-+  o->fixP = fixP;
-+
-+  return TRUE;
-+}
-+
-+static void xtensa_realloc_fixup_cache (fixup_cacheS *cache, unsigned add)
-+{
-+  if (cache->n_fixups + add > cache->n_max)
-+    {
-+      cache->n_max = (cache->n_fixups + add) * 2;
-+      cache->fixups = xrealloc (cache->fixups,
-+				sizeof (*cache->fixups) * cache->n_max);
-+    }
-+}
-+
-+static void xtensa_cache_relaxable_fixups (fixup_cacheS *cache,
-+					   segment_info_type *seginfo)
-+{
-+  fixS *fixP;
-+
-+  cache->n_fixups = 0;
-+
-+  for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+    {
-+      xtensa_realloc_fixup_cache (cache, 1);
-+
-+      if (xtensa_make_cached_fixup (cache->fixups + cache->n_fixups, fixP))
-+	++cache->n_fixups;
-+    }
-+  qsort (cache->fixups, cache->n_fixups, sizeof (*cache->fixups), fixup_order);
-+}
-+
-+static unsigned xtensa_find_first_cached_fixup (const fixup_cacheS *cache,
-+						int addr)
-+{
-+  unsigned a = 0;
-+  unsigned b = cache->n_fixups;
-+
-+  while (b - a > 1)
-+    {
-+      unsigned c = (a + b) / 2;
-+
-+      if (cache->fixups[c].addr < addr)
-+	a = c;
-+      else
-+	b = c;
-+    }
-+  return a;
-+}
-+
-+static void xtensa_delete_cached_fixup (fixup_cacheS *cache, unsigned i)
-+{
-+  memmove (cache->fixups + i, cache->fixups + i + 1,
-+	   (cache->n_fixups - i - 1) * sizeof (*cache->fixups));
-+  --cache->n_fixups;
-+}
-+
-+static bfd_boolean xtensa_add_cached_fixup (fixup_cacheS *cache, fixS *fixP)
-+{
-+  cached_fixupS o;
-+  unsigned i;
-+
-+  if (!xtensa_make_cached_fixup (&o, fixP))
-+    return FALSE;
-+  xtensa_realloc_fixup_cache (cache, 1);
-+  i = xtensa_find_first_cached_fixup (cache, o.addr);
-+  if (i < cache->n_fixups)
-+    {
-+      ++i;
-+      memmove (cache->fixups + i + 1, cache->fixups + i,
-+	       (cache->n_fixups - i) * sizeof (*cache->fixups));
-+    }
-+  cache->fixups[i] = o;
-+  ++cache->n_fixups;
-+  return TRUE;
-+}
- 
- /* Return the number of bytes added to this fragment, given that the
-    input has been stretched already by "stretch".  */
-@@ -8896,35 +9044,42 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
-     case RELAX_TRAMPOLINE:
-       if (fragP->tc_frag_data.relax_seen)
-         {
--          segment_info_type *seginfo = seg_info (now_seg);
--          fragS *fP; /* The out-of-range jump.  */
--          fixS *fixP;
-+	  static fixup_cacheS fixup_cache;
-+	  segment_info_type *seginfo = seg_info (now_seg);
-+	  int trampaddr = fragP->fr_address + fragP->fr_fix;
-+	  int searchaddr = trampaddr < J_RANGE ? 0 : trampaddr - J_RANGE;
-+	  unsigned i;
-+
-+	  if (now_seg != fixup_cache.seg ||
-+	      fragP == fixup_cache.first_frag ||
-+	      fixup_cache.first_frag == NULL)
-+	    {
-+	      xtensa_cache_relaxable_fixups (&fixup_cache, seginfo);
-+	      fixup_cache.seg = now_seg;
-+	      fixup_cache.first_frag = fragP;
-+	    }
- 
-           /* Scan for jumps that will not reach.  */
--          for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+          for (i = xtensa_find_first_cached_fixup (&fixup_cache, searchaddr);
-+	       i < fixup_cache.n_fixups; ++i)
-+
-             {
--              symbolS *s = fixP->fx_addsy;
--	      xtensa_opcode opcode;
--              int target;
--              int addr;
--              int delta;
--
--              if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
--                  fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
--                continue;
--	      xtensa_insnbuf_from_chars (isa, trampoline_buf,
--					 (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where,
--					 0);
--	      fmt = xtensa_format_decode (isa, trampoline_buf);
--	      gas_assert (fmt != XTENSA_UNDEFINED);
--	      slot = fixP->tc_fix_data.slot;
--	      xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
--	      opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
--	      if (opcode != xtensa_j_opcode)
-+	      fixS *fixP = fixup_cache.fixups[i].fixP;
-+	      int target = fixup_cache.fixups[i].target;
-+	      int addr = fixup_cache.fixups[i].addr;
-+	      int delta = fixup_cache.fixups[i].delta + stretch;
-+
-+	      trampaddr = fragP->fr_address + fragP->fr_fix;
-+
-+	      if (addr + J_RANGE < trampaddr)
- 		continue;
--              target = S_GET_VALUE (s);
--              addr = fixP->fx_frag->fr_address;
--              delta = target - addr + stretch;
-+	      if (addr > trampaddr + J_RANGE)
-+		break;
-+	      if (abs (delta) < J_RANGE)
-+		continue;
-+
-+	      slot = fixP->tc_fix_data.slot;
-+
-               if (delta > J_RANGE  || delta < -1 * J_RANGE)
-                 { /* Found an out-of-range jump; scan the list of trampolines for the best match.  */
- 		  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-@@ -8978,14 +9133,13 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 		    }
- 		  if (tf->fragP == fragP)
- 		    {
--		      int trampaddr = fragP->fr_address + fragP->fr_fix;
--
- 		      if (abs (addr - trampaddr) < J_RANGE)
- 			{ /* The trampoline is in range of original; fix it!  */
- 			  fixS *newfixP;
- 			  int offset;
- 			  TInsn insn;
- 			  symbolS *lsym;
-+			  fragS *fP; /* The out-of-range jump.  */
- 
- 			  new_stretch += init_trampoline_frag (tf);
- 			  offset = fragP->fr_fix; /* Where to assemble the j insn.  */
-@@ -9009,10 +9163,20 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 			  newfixP->tc_fix_data.X_add_symbol = lsym;
- 			  newfixP->tc_fix_data.X_add_number = offset;
- 			  newfixP->tc_fix_data.slot = slot;
-+
-+			  xtensa_delete_cached_fixup (&fixup_cache, i);
-+			  xtensa_add_cached_fixup (&fixup_cache, newfixP);
-+
- 			  /* Move the fix-up from the original j insn to this one.  */
- 			  fixP->fx_frag = fragP;
- 			  fixP->fx_where = fragP->fr_fix - 3;
- 			  fixP->tc_fix_data.slot = 0;
-+
-+			  xtensa_add_cached_fixup (&fixup_cache, fixP);
-+
-+			  /* re-do current fixup */
-+			  --i;
-+
- 			  /* Adjust the jump around this trampoline (if present).  */
- 			  if (tf->fixP != NULL)
- 			    {
-@@ -9027,6 +9191,8 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 			      fragP->fr_subtype = 0;
- 			      /* Remove from the trampoline_list.  */
- 			      prev->next = tf->next;
-+			      if (fragP == fixup_cache.first_frag)
-+				fixup_cache.first_frag = NULL;
- 			      break;
- 			    }
- 			}
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/patches/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
deleted file mode 100644
index 9ad6b3b..0000000
--- a/patches/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8ec76b16f62d1bf386fb2c39af5f66c3afddc5cb Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 14 May 2015 05:22:55 +0300
-Subject: [PATCH] xtensa: fix localized symbol refcounting with --gc-sections
-
-elf_xtensa_gc_sweep_hook doesn't correctly unreference symbols that were
-made local, that results in link failure with the following message:
-
-  BFD (GNU Binutils) 2.24 internal error, aborting at elf32-xtensa.c line
-  3372 in elf_xtensa_finish_dynamic_sections
-
-elf_xtensa_gc_sweep_hook determines symbol reference type (PLT or GOT) by
-relocation type. Relocation types are not changed when symbol becomes
-local, but its PLT references are added to GOT references and
-plt.refcount is set to 0. Such symbol cannot be unreferences in the
-elf_xtensa_gc_sweep_hook and its extra references make calculated GOT
-relocations section size not match number of GOT relocations.
-
-Fix it by treating PLT reference as GOT reference when plt.refcount is
-not positive.
-
-2015-05-14  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Treat PLT reference
-	as GOT reference when plt.refcount is not positive.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388
-Changes to ChangeLog are dropped.
-
- bfd/elf32-xtensa.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 53af1c6..2523670 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd,
- 	{
- 	  if (is_plt)
- 	    {
-+	      /* If the symbol has been localized its plt.refcount got moved
-+	         to got.refcount.  Handle it as GOT.  */
- 	      if (h->plt.refcount > 0)
- 		h->plt.refcount--;
-+	      else
-+		is_got = TRUE;
- 	    }
--	  else if (is_got)
-+	  if (is_got)
- 	    {
- 	      if (h->got.refcount > 0)
- 		h->got.refcount--;
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/patches/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
deleted file mode 100644
index 4a3de2c..0000000
--- a/patches/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0522e76e4afeeb2e104e0a4332d94fa0d2fbf6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 17 May 2015 06:46:15 +0300
-Subject: [PATCH] xtensa: fix gas segfault with --text-section-literals
-
-When --text-section-literals is used and code in the .init or .fini
-emits literal in the absence of .literal_position, xtensa_move_literals
-segfaults.
-
-Check that search_frag is non-NULL in the xtensa_move_literals and
-report error otherwise.
-
-2015-05-26  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Check that
-	search_frag is non-NULL. Report error if literal frag is not
-	found.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4
-Changes to ChangeLog are dropped.
-
- gas/config/tc-xtensa.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 31c0b6b..18307c1 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -10808,13 +10808,21 @@ xtensa_move_literals (void)
-       frchain_to = NULL;
-       frag_splice = &(frchain_from->frch_root);
- 
--      while (!search_frag->tc_frag_data.literal_frag)
-+      while (search_frag && !search_frag->tc_frag_data.literal_frag)
- 	{
- 	  gas_assert (search_frag->fr_fix == 0
- 		  || search_frag->fr_type == rs_align);
- 	  search_frag = search_frag->fr_next;
- 	}
- 
-+      if (!search_frag)
-+	{
-+	  search_frag = frchain_from->frch_root;
-+	  as_bad_where (search_frag->fr_file, search_frag->fr_line,
-+			_("literal pool location required for text-section-literals; specify with .literal_position"));
-+	  continue;
-+	}
-+
-       gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype
- 	      == RELAX_LITERAL_POOL_BEGIN);
-       xtensa_switch_section_emit_state (&state, segment->seg, 0);
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch b/patches/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch
deleted file mode 100644
index 3ed9af1..0000000
--- a/patches/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch
+++ /dev/null
@@ -1,699 +0,0 @@
-From 978adaaa4cd3921842e2be8a31c05f081fb17fcf Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Wed, 29 Jul 2015 17:42:54 +0300
-Subject: [PATCH] xtensa: add --auto-litpools option
-
-Auto-litpools is the automated version of text-section-literals: literal
-pool candidate frags are planted every N frags and during relaxation
-they are turned into actual literal pools where literals are moved to
-become reachable for their first reference by L32R instruction.
-
-2015-08-12  David Weatherford  <weath@cadence.com>
-gas/
-	* config/tc-xtensa.c (struct litpool_frag, struct litpool_seg):
-	New structures.
-	(xtensa_maybe_create_literal_pool_frag): New function.
-	(litpool_seg_list, auto_litpools, auto_litpool_limit)
-	(litpool_buf, litpool_slotbuf): New static variables.
-	(option_auto_litpools, option_no_auto_litpools)
-	(option_auto_litpool_limit): New enum identifiers.
-	(md_longopts): Add entries for auto-litpools, no-auto-litpools
-	and auto-litpool-limit.
-	(md_parse_option): Handle option_auto_litpools,
-	option_no_auto_litpools and option_auto_litpool_limit.
-	(md_show_usage): Add help for --[no-]auto-litpools and
-	--auto-litpool-limit.
-	(xtensa_mark_literal_pool_location): Record a place for literal
-	pool with a call to xtensa_maybe_create_literal_pool_frag.
-	(get_literal_pool_location): Find highest priority literal pool
-	or convert candidate to literal pool when auto-litpools are used.
-	(xg_assemble_vliw_tokens): Create literal pool after jump
-	instruction.
-	(xtensa_check_frag_count): Create candidate literal pool every
-	auto_litpool_limit frags.
-	(xtensa_relax_frag): Add jump around literals to non-empty
-	literal pool.
-	(xtensa_move_literals): Estimate literal pool addresses and move
-	unreachable literals closer to their users, converting candidate
-	to literal pool if needed.
-	(xtensa_switch_to_non_abs_literal_fragment): Only emit error
-	about missing .literal_position in case auto-litpools are not
-	used.
-	* config/tc-xtensa.h (xtensa_relax_statesE): New relaxation
-	state: RELAX_LITERAL_POOL_CANDIDATE_BEGIN.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gas/testsuite/
-	* gas/xtensa/all.exp: Add auto-litpools to the list of xtensa
-	tests.
-	* gas/xtensa/auto-litpools.s: New file: auto-litpools test.
-	* gas/xtensa/auto-litpools.s: New file: auto-litpools test
-	result pattern.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: b46824bd49648c575372e6d9bc6a6defeabd6ed5
-Changes to ChangeLogs and documentation are dropped.
-
- gas/config/tc-xtensa.c                   | 432 ++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                   |   1 +
- gas/testsuite/gas/xtensa/all.exp         |   1 +
- gas/testsuite/gas/xtensa/auto-litpools.d |  12 +
- gas/testsuite/gas/xtensa/auto-litpools.s |  13 +
- 5 files changed, 454 insertions(+), 5 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.d
- create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 7311a05..b8b1e7d 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -440,6 +440,29 @@ bfd_boolean directive_state[] =
- #endif
- };
- 
-+/* A circular list of all potential and actual literal pool locations
-+   in a segment.  */
-+struct litpool_frag
-+{
-+  struct litpool_frag *next;
-+  struct litpool_frag *prev;
-+  fragS *fragP;
-+  addressT addr;
-+  short priority; /* 1, 2, or 3 -- 1 is highest  */
-+  short original_priority;
-+};
-+
-+/* Map a segment to its litpool_frag list.  */
-+struct litpool_seg
-+{
-+  struct litpool_seg *next;
-+  asection *seg;
-+  struct litpool_frag frag_list;
-+  int frag_count; /* since last litpool location  */
-+};
-+
-+static struct litpool_seg litpool_seg_list;
-+
- 
- /* Directive functions.  */
- 
-@@ -474,6 +497,9 @@ static void xtensa_create_trampoline_frag (bfd_boolean);
- static void xtensa_maybe_create_trampoline_frag (void);
- struct trampoline_frag;
- static int init_trampoline_frag (struct trampoline_frag *);
-+static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean);
-+static bfd_boolean auto_litpools = FALSE;
-+static int auto_litpool_limit = 10000;
- 
- /* Alignment Functions.  */
- 
-@@ -698,6 +724,10 @@ enum
- 
-   option_trampolines,
-   option_no_trampolines,
-+
-+  option_auto_litpools,
-+  option_no_auto_litpools,
-+  option_auto_litpool_limit,
- };
- 
- const char *md_shortopts = "";
-@@ -773,6 +803,10 @@ struct option md_longopts[] =
-   { "trampolines", no_argument, NULL, option_trampolines },
-   { "no-trampolines", no_argument, NULL, option_no_trampolines },
- 
-+  { "auto-litpools", no_argument, NULL, option_auto_litpools },
-+  { "no-auto-litpools", no_argument, NULL, option_no_auto_litpools },
-+  { "auto-litpool-limit", required_argument, NULL, option_auto_litpool_limit },
-+
-   { NULL, no_argument, NULL, 0 }
- };
- 
-@@ -961,6 +995,34 @@ md_parse_option (int c, char *arg)
-       use_trampolines = FALSE;
-       return 1;
- 
-+    case option_auto_litpools:
-+      auto_litpools = TRUE;
-+      use_literal_section = FALSE;
-+      return 1;
-+
-+    case option_no_auto_litpools:
-+      auto_litpools = FALSE;
-+      auto_litpool_limit = -1;
-+      return 1;
-+
-+    case option_auto_litpool_limit:
-+      {
-+	int value = 0;
-+	if (auto_litpool_limit < 0)
-+	  as_fatal (_("no-auto-litpools is incompatible with auto-litpool-limit"));
-+	if (*arg == 0 || *arg == '-')
-+	  as_fatal (_("invalid auto-litpool-limit argument"));
-+	value = strtol (arg, &arg, 10);
-+	if (*arg != 0)
-+	  as_fatal (_("invalid auto-litpool-limit argument"));
-+	if (value < 100 || value > 10000)
-+	  as_fatal (_("invalid auto-litpool-limit argument (range is 100-10000)"));
-+	auto_litpool_limit = value;
-+	auto_litpools = TRUE;
-+	use_literal_section = FALSE;
-+	return 1;
-+      }
-+
-     default:
-       return 0;
-     }
-@@ -986,7 +1048,12 @@ Xtensa options:\n\
-                           flix bundles\n\
-   --rename-section old=new Rename section 'old' to 'new'\n\
-   --[no-]trampolines      [Do not] generate trampolines (jumps to jumps)\n\
--                          when jumps do not reach their targets\n", stream);
-+                          when jumps do not reach their targets\n\
-+  --[no-]auto-litpools    [Do not] automatically create literal pools\n\
-+  --auto-litpool-limit=<value>\n\
-+                          (range 100-10000) Maximum number of blocks of\n\
-+                          instructions to emit between literal pool\n\
-+                          locations; implies --auto-litpools flag\n", stream);
- }
- 
- 
-@@ -4728,6 +4795,8 @@ xtensa_mark_literal_pool_location (void)
-   pool_location = frag_now;
-   frag_now->tc_frag_data.lit_frchain = frchain_now;
-   frag_now->tc_frag_data.literal_frag = frag_now;
-+  /* Just record this frag.  */
-+  xtensa_maybe_create_literal_pool_frag (FALSE, FALSE);
-   frag_variant (rs_machine_dependent, 0, 0,
- 		RELAX_LITERAL_POOL_BEGIN, NULL, 0, NULL);
-   xtensa_set_frag_assembly_state (frag_now);
-@@ -4832,6 +4901,31 @@ get_expanded_loop_offset (xtensa_opcode opcode)
- static fragS *
- get_literal_pool_location (segT seg)
- {
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  struct litpool_frag *lpf;
-+  for ( ; lps && lps->seg->id != seg->id; lps = lps->next)
-+    ;
-+  if (lps)
-+    {
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{ /* Skip "candidates" for now.  */
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN &&
-+	      lpf->priority == 1)
-+	    return lpf->fragP;
-+	}
-+      /* Must convert a lower-priority pool.  */
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN)
-+	    return lpf->fragP;
-+	}
-+      /* Still no match -- try for a low priority pool.  */
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN)
-+	    return lpf->fragP;
-+	}
-+    }
-   return seg_info (seg)->tc_segment_info_data.literal_pool_loc;
- }
- 
-@@ -7098,6 +7192,11 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
-       frag_now->tc_frag_data.slot_symbols[slot] = tinsn->symbol;
-       frag_now->tc_frag_data.slot_offsets[slot] = tinsn->offset;
-       frag_now->tc_frag_data.literal_frags[slot] = tinsn->literal_frag;
-+      if (tinsn->opcode == xtensa_l32r_opcode)
-+	{
-+	  frag_now->tc_frag_data.literal_frags[slot] =
-+		  tinsn->tok[1].X_add_symbol->sy_frag;
-+	}
-       if (tinsn->literal_space != 0)
- 	xg_assemble_literal_space (tinsn->literal_space, slot);
-       frag_now->tc_frag_data.free_reg[slot] = tinsn->extra_arg;
-@@ -7170,6 +7269,8 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
- 		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
- 	  xtensa_set_frag_assembly_state (frag_now);
- 	  xtensa_maybe_create_trampoline_frag ();
-+	  /* Always create one here.  */
-+	  xtensa_maybe_create_literal_pool_frag (TRUE, FALSE);
- 	}
-       else if (is_branch && do_align_targets ())
- 	{
-@@ -7314,11 +7415,18 @@ xtensa_check_frag_count (void)
-       clear_frag_count ();
-       unreachable_count = 0;
-     }
-+
-+  /* We create an area for a possible literal pool every N (default 5000)
-+     frags or so.  */
-+  xtensa_maybe_create_literal_pool_frag (TRUE, TRUE);
- }
- 
- static xtensa_insnbuf trampoline_buf = NULL;
- static xtensa_insnbuf trampoline_slotbuf = NULL;
- 
-+static xtensa_insnbuf litpool_buf = NULL;
-+static xtensa_insnbuf litpool_slotbuf = NULL;
-+
- #define TRAMPOLINE_FRAG_SIZE 3000
- 
- static void
-@@ -7410,6 +7518,135 @@ dump_trampolines (void)
-     }
- }
- 
-+static void dump_litpools (void) __attribute__ ((unused));
-+
-+static void
-+dump_litpools (void)
-+{
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  struct litpool_frag *lpf;
-+
-+  for ( ; lps ; lps = lps->next )
-+    {
-+      printf("litpool seg %s\n", lps->seg->name);
-+      for ( lpf = lps->frag_list.next; lpf->fragP; lpf = lpf->next )
-+	{
-+	  fragS *litfrag = lpf->fragP->fr_next;
-+	  int count = 0;
-+	  while (litfrag && litfrag->fr_subtype != RELAX_LITERAL_POOL_END)
-+	    {
-+	      if (litfrag->fr_fix == 4)
-+		count++;
-+	      litfrag = litfrag->fr_next;
-+	    }
-+	  printf("   %ld <%d:%d> (%d) [%d]: ",
-+		 lpf->addr, lpf->priority, lpf->original_priority,
-+		 lpf->fragP->fr_line, count);
-+	  //dump_frag(lpf->fragP);
-+	}
-+    }
-+}
-+
-+static void
-+xtensa_maybe_create_literal_pool_frag (bfd_boolean create,
-+				       bfd_boolean only_if_needed)
-+{
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  fragS *fragP;
-+  struct litpool_frag *lpf;
-+  bfd_boolean needed = FALSE;
-+
-+  if (use_literal_section || !auto_litpools)
-+    return;
-+
-+  for ( ; lps ; lps = lps->next )
-+    {
-+      if (lps->seg == now_seg)
-+	break;
-+    }
-+
-+  if (lps == NULL)
-+    {
-+      lps = (struct litpool_seg *)xcalloc (sizeof (struct litpool_seg), 1);
-+      lps->next = litpool_seg_list.next;
-+      litpool_seg_list.next = lps;
-+      lps->seg = now_seg;
-+      lps->frag_list.next = &lps->frag_list;
-+      lps->frag_list.prev = &lps->frag_list;
-+    }
-+
-+  lps->frag_count++;
-+
-+  if (create)
-+    {
-+      if (only_if_needed)
-+	{
-+	  if (past_xtensa_end || !use_transform() ||
-+	      frag_now->tc_frag_data.is_no_transform)
-+	    {
-+	      return;
-+	    }
-+	  if (auto_litpool_limit <= 0)
-+	    {
-+	      /* Don't create a litpool based only on frag count.  */
-+	      return;
-+	    }
-+	  else if (lps->frag_count > auto_litpool_limit)
-+	    {
-+	      needed = TRUE;
-+	    }
-+	  else
-+	    {
-+	      return;
-+	    }
-+	}
-+      else
-+	{
-+	  needed = TRUE;
-+	}
-+    }
-+
-+  if (needed)
-+    {
-+      int size = (only_if_needed) ? 3 : 0; /* Space for a "j" insn.  */
-+      /* Create a potential site for a literal pool.  */
-+      frag_wane (frag_now);
-+      frag_new (0);
-+      xtensa_set_frag_assembly_state (frag_now);
-+      fragP = frag_now;
-+      fragP->tc_frag_data.lit_frchain = frchain_now;
-+      fragP->tc_frag_data.literal_frag = fragP;
-+      frag_var (rs_machine_dependent, size, size,
-+		    (only_if_needed) ?
-+		        RELAX_LITERAL_POOL_CANDIDATE_BEGIN :
-+		        RELAX_LITERAL_POOL_BEGIN,
-+		    NULL, 0, NULL);
-+      frag_now->tc_frag_data.lit_seg = now_seg;
-+      frag_variant (rs_machine_dependent, 0, 0,
-+		    RELAX_LITERAL_POOL_END, NULL, 0, NULL);
-+      xtensa_set_frag_assembly_state (frag_now);
-+    }
-+  else
-+    {
-+      /* RELAX_LITERAL_POOL_BEGIN frag is being created;
-+	 just record it here.  */
-+      fragP = frag_now;
-+    }
-+
-+  lpf = (struct litpool_frag *)xmalloc(sizeof (struct litpool_frag));
-+  /* Insert at tail of circular list.  */
-+  lpf->addr = 0;
-+  lps->frag_list.prev->next = lpf;
-+  lpf->next = &lps->frag_list;
-+  lpf->prev = lps->frag_list.prev;
-+  lps->frag_list.prev = lpf;
-+  lpf->fragP = fragP;
-+  lpf->priority = (needed) ? (only_if_needed) ? 3 : 2 : 1;
-+  lpf->original_priority = lpf->priority;
-+
-+  lps->frag_count = 0;
-+}
-+
- static void
- xtensa_cleanup_align_frags (void)
- {
-@@ -9029,7 +9266,41 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
-       break;
- 
-     case RELAX_LITERAL_POOL_BEGIN:
-+      if (fragP->fr_var != 0)
-+	{
-+	  /* We have a converted "candidate" literal pool;
-+	     assemble a jump around it.  */
-+	  TInsn insn;
-+	  if (!litpool_slotbuf)
-+	    {
-+	      litpool_buf = xtensa_insnbuf_alloc (isa);
-+	      litpool_slotbuf = xtensa_insnbuf_alloc (isa);
-+	    }
-+	  new_stretch += 3;
-+	  fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass.  */
-+	  fragP->tc_frag_data.is_insn = TRUE;
-+	  tinsn_init (&insn);
-+	  insn.insn_type = ITYPE_INSN;
-+	  insn.opcode = xtensa_j_opcode;
-+	  insn.ntok = 1;
-+	  set_expr_symbol_offset (&insn.tok[0], fragP->fr_symbol,
-+				  fragP->fr_fix);
-+	  fmt = xg_get_single_format (xtensa_j_opcode);
-+	  tinsn_to_slotbuf (fmt, 0, &insn, litpool_slotbuf);
-+	  xtensa_format_set_slot (isa, fmt, 0, litpool_buf, litpool_slotbuf);
-+	  xtensa_insnbuf_to_chars (isa, litpool_buf,
-+				   (unsigned char *)fragP->fr_literal +
-+				   fragP->fr_fix, 3);
-+	  fragP->fr_fix += 3;
-+	  fragP->fr_var -= 3;
-+	  /* Add a fix-up.  */
-+	  fix_new (fragP, 0, 3, fragP->fr_symbol, 0, TRUE,
-+		   BFD_RELOC_XTENSA_SLOT0_OP);
-+	}
-+      break;
-+
-     case RELAX_LITERAL_POOL_END:
-+    case RELAX_LITERAL_POOL_CANDIDATE_BEGIN:
-     case RELAX_MAYBE_UNREACHABLE:
-     case RELAX_MAYBE_DESIRE_ALIGN:
-       /* No relaxation required.  */
-@@ -10789,12 +11060,115 @@ xtensa_move_literals (void)
-   segT dest_seg;
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-+  struct litpool_seg *lps;
- 
-   mark_literal_frags (literal_head->next);
- 
-   if (use_literal_section)
-     return;
- 
-+  /* Assign addresses (rough estimates) to the potential literal pool locations
-+     and create new ones if the gaps are too large.  */
-+
-+  for (lps = litpool_seg_list.next; lps; lps = lps->next)
-+    {
-+      frchainS *frchP = seg_info (lps->seg)->frchainP;
-+      struct litpool_frag *lpf = lps->frag_list.next;
-+      addressT addr = 0;
-+
-+      for ( ; frchP; frchP = frchP->frch_next)
-+	{
-+	  fragS *fragP;
-+	  for (fragP = frchP->frch_root; fragP; fragP = fragP->fr_next)
-+	    {
-+	      if (lpf && fragP == lpf->fragP)
-+		{
-+		  gas_assert(fragP->fr_type == rs_machine_dependent &&
-+			     (fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN ||
-+			      fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN));
-+		  /* Found a litpool location.  */
-+		  lpf->addr = addr;
-+		  lpf = lpf->next;
-+		}
-+	      if (fragP->fr_type == rs_machine_dependent &&
-+		  fragP->fr_subtype == RELAX_SLOTS)
-+		{
-+		  int slot;
-+		  for (slot = 0; slot < MAX_SLOTS; slot++)
-+		    {
-+		      if (fragP->tc_frag_data.literal_frags[slot])
-+			{
-+			  /* L32R; point its literal to the nearest litpool
-+			     preferring non-"candidate" positions to avoid
-+			     the jump-around.  */
-+			  fragS *litfrag = fragP->tc_frag_data.literal_frags[slot];
-+			  struct litpool_frag *lp = lpf->prev;
-+			  if (!lp->fragP)
-+			    {
-+			      break;
-+			    }
-+			  while (lp->fragP->fr_subtype ==
-+				 RELAX_LITERAL_POOL_CANDIDATE_BEGIN)
-+			    {
-+			      lp = lp->prev;
-+			      if (lp->fragP == NULL)
-+				{
-+				  /* End of list; have to bite the bullet.
-+				     Take the nearest.  */
-+				  lp = lpf->prev;
-+				  break;
-+				}
-+			      /* Does it (conservatively) reach?  */
-+			      if (addr - lp->addr <= 128 * 1024)
-+				{
-+				  if (lp->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN)
-+				    {
-+				      /* Found a good one.  */
-+				      break;
-+				    }
-+				  else if (lp->prev->fragP &&
-+					   addr - lp->prev->addr > 128 * 1024)
-+				    {
-+				      /* This is still a "candidate" but the next one
-+				         will be too far away, so revert to the nearest
-+					 one, convert it and add the jump around.  */
-+				      fragS *poolbeg;
-+				      fragS *poolend;
-+				      symbolS *lsym;
-+				      char label[10 + 2 * sizeof (fragS *)];
-+				      lp = lpf->prev;
-+				      poolbeg = lp->fragP;
-+				      lp->priority = 1;
-+				      poolbeg->fr_subtype = RELAX_LITERAL_POOL_BEGIN;
-+				      poolend = poolbeg->fr_next;
-+				      gas_assert (poolend->fr_type == rs_machine_dependent &&
-+						  poolend->fr_subtype == RELAX_LITERAL_POOL_END);
-+				      /* Create a local symbol pointing to the
-+				         end of the pool.  */
-+				      sprintf (label, ".L0_LT_%p", poolbeg);
-+				      lsym = (symbolS *)local_symbol_make (label, lps->seg,
-+									   0, poolend);
-+				      poolbeg->fr_symbol = lsym;
-+				      /* Rest is done in xtensa_relax_frag.  */
-+				    }
-+				}
-+			    }
-+			  if (! litfrag->tc_frag_data.literal_frag)
-+			    {
-+			      /* Take earliest use of this literal to avoid
-+				 forward refs.  */
-+			      litfrag->tc_frag_data.literal_frag = lp->fragP;
-+			    }
-+			}
-+		    }
-+		}
-+	      addr += fragP->fr_fix;
-+	      if (fragP->fr_type == rs_fill)
-+		addr += fragP->fr_offset;
-+	    }
-+	}
-+    }
-+
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-       /* Keep the literals for .init and .fini in separate sections.  */
-@@ -10839,9 +11213,6 @@ xtensa_move_literals (void)
-       while (search_frag != frag_now)
- 	{
- 	  next_frag = search_frag->fr_next;
--
--	  /* First, move the frag out of the literal section and
--	     to the appropriate place.  */
- 	  if (search_frag->tc_frag_data.literal_frag)
- 	    {
- 	      literal_pool = search_frag->tc_frag_data.literal_frag;
-@@ -10849,8 +11220,56 @@ xtensa_move_literals (void)
- 	      frchain_to = literal_pool->tc_frag_data.lit_frchain;
- 	      gas_assert (frchain_to);
- 	    }
-+
-+	  if (search_frag->fr_type == rs_fill && search_frag->fr_fix == 0)
-+	    {
-+	      /* Skip empty fill frags.  */
-+	      *frag_splice = next_frag;
-+	      search_frag = next_frag;
-+	      continue;
-+	    }
-+
-+	  if (search_frag->fr_type == rs_align)
-+	    {
-+	      /* Skip alignment frags, because the pool as a whole will be
-+	         aligned if used, and we don't want to force alignment if the
-+		 pool is unused.  */
-+	      *frag_splice = next_frag;
-+	      search_frag = next_frag;
-+	      continue;
-+	    }
-+
-+	  /* First, move the frag out of the literal section and
-+	     to the appropriate place.  */
-+
-+	  /* Insert an aligmnent frag at start of pool.  */
-+	  if (literal_pool->fr_next->fr_type == rs_machine_dependent &&
-+	      literal_pool->fr_next->fr_subtype == RELAX_LITERAL_POOL_END)
-+	    {
-+	      segT pool_seg = literal_pool->fr_next->tc_frag_data.lit_seg;
-+	      emit_state prev_state;
-+	      fragS *prev_frag;
-+	      fragS *align_frag;
-+	      xtensa_switch_section_emit_state (&prev_state, pool_seg, 0);
-+	      prev_frag = frag_now;
-+	      frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL);
-+	      align_frag = frag_now;
-+	      frag_align (2, 0, 0);
-+	      /* Splice it into the right place.  */
-+	      prev_frag->fr_next = align_frag->fr_next;
-+	      align_frag->fr_next = literal_pool->fr_next;
-+	      literal_pool->fr_next = align_frag;
-+	      /* Insert after this one.  */
-+	      literal_pool->tc_frag_data.literal_frag = align_frag;
-+	      xtensa_restore_emit_state (&prev_state);
-+	    }
- 	  insert_after = literal_pool->tc_frag_data.literal_frag;
- 	  dest_seg = insert_after->fr_next->tc_frag_data.lit_seg;
-+	  /* Skip align frag.  */
-+	  if (insert_after->fr_next->fr_type == rs_align)
-+	    {
-+	      insert_after = insert_after->fr_next;
-+	    }
- 
- 	  *frag_splice = next_frag;
- 	  search_frag->fr_next = insert_after->fr_next;
-@@ -11014,7 +11433,10 @@ xtensa_switch_to_non_abs_literal_fragment (emit_state *result)
-       && !recursive
-       && !is_init && ! is_fini)
-     {
--      as_bad (_("literal pool location required for text-section-literals; specify with .literal_position"));
-+      if (!auto_litpools)
-+	{
-+	  as_bad (_("literal pool location required for text-section-literals; specify with .literal_position"));
-+	}
- 
-       /* When we mark a literal pool location, we want to put a frag in
- 	 the literal pool that points to it.  But to do that, we want to
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index b2e43fa..290d902 100644
---- a/gas/config/tc-xtensa.h
-+++ b/gas/config/tc-xtensa.h
-@@ -124,6 +124,7 @@ enum xtensa_relax_statesE
- 
-   RELAX_LITERAL_POOL_BEGIN,
-   RELAX_LITERAL_POOL_END,
-+  RELAX_LITERAL_POOL_CANDIDATE_BEGIN,
-   /* Technically these are not relaxations at all but mark a location
-      to store literals later.  Note that fr_var stores the frchain for
-      BEGIN frags and fr_var stores now_seg for END frags.  */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index d197ec8..db39629 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -100,6 +100,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "jlong"
-     run_dump_test "trampoline"
-     run_dump_test "first_frag_align"
-+    run_dump_test "auto-litpools"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.d b/gas/testsuite/gas/xtensa/auto-litpools.d
-new file mode 100644
-index 0000000..4d1a690
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/auto-litpools.d
-@@ -0,0 +1,12 @@
-+#as: --auto-litpools
-+#objdump: -d
-+#name: auto literal pool placement
-+
-+.*: +file format .*xtensa.*
-+#...
-+.*4:.*l32r.a2, 0 .*
-+#...
-+.*3e437:.*j.3e440 .*
-+#...
-+.*40750:.*l32r.a2, 3e43c .*
-+#...
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.s b/gas/testsuite/gas/xtensa/auto-litpools.s
-new file mode 100644
-index 0000000..9a5b26b
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/auto-litpools.s
-@@ -0,0 +1,13 @@
-+	.text
-+	.align	4
-+	.literal	.L0, 0x12345
-+	.literal	.L1, 0x12345
-+
-+f:
-+	l32r	a2, .L0
-+	.rep	44000
-+	_nop
-+	_nop
-+	.endr
-+	l32r	a2, .L1
-+	ret
--- 
-1.8.1.4
-
diff --git a/patches/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch b/patches/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch
deleted file mode 100644
index 66d4e60..0000000
--- a/patches/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 6c7c5c477ef9ccf2d2548cf2ac3cec9bd3c9c5b6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 2 Feb 2016 17:11:38 +0300
-Subject: [PATCH] xtensa: fix signedness of gas relocations
-
-Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation
-offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations
-substituted for BFD_RELOC_*. This made it impossible to encode arbitrary
-8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc
-directive. Revert this part and add test.
-
-gas/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF*
-	substitutions for BFD_RELOC_* as unsigned.
-	* gas/testsuite/gas/xtensa/all.exp: Add loc to list of xtensa
-	tests.
-	* gas/testsuite/gas/xtensa/loc.d: New file: loc test result
-	patterns.
-	* gas/testsuite/gas/xtensa/loc.s: New file: loc test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gas/config/tc-xtensa.c           |  6 +++---
- gas/testsuite/gas/xtensa/all.exp |  1 +
- gas/testsuite/gas/xtensa/loc.d   | 10 ++++++++++
- gas/testsuite/gas/xtensa/loc.s   |  7 +++++++
- 4 files changed, 21 insertions(+), 3 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/loc.d
- create mode 100644 gas/testsuite/gas/xtensa/loc.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    default:
- 	      break;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 31b725b..7ff7bd7 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "trampoline"
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-+    run_dump_test "loc"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
-new file mode 100644
-index 0000000..71983cc
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.d
-@@ -0,0 +1,10 @@
-+#as:
-+#objdump: -r
-+#name: .loc directive relocs
-+
-+.*: +file format .*xtensa.*
-+
-+RELOCATION RECORDS FOR \[\.debug_line\]:
-+#...
-+.*R_XTENSA_DIFF16.*\.text\+0x00009c42
-+#...
-diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s
-new file mode 100644
-index 0000000..029e14e
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.s
-@@ -0,0 +1,7 @@
-+	.text
-+	.file 1 "loc.s"
-+	.loc 1 3
-+	nop
-+	.space 40000
-+	.loc 1 5
-+	nop
--- 
-2.1.4
-
diff --git a/patches/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch b/patches/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch
deleted file mode 100644
index ead3e42..0000000
--- a/patches/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 16 Feb 2016 02:23:28 +0300
-Subject: [PATCH] xtensa: fix .init/.fini literals moving
-
-Despite the documentation and the comment in xtensa_move_literals, in
-the presence of --text-section-literals and --auto-litpools literals are
-moved from the separate literal sections into .init and .fini, because
-the check in the xtensa_move_literals is incorrect.
-
-This moving was broken with introduction of auto litpools: some literals
-now may be lost. This happens because literal frags emitted from .init
-and .fini are not closed when new .literal_position marks new literal
-pool. Then frag_align(2, 0, 0) changes type of the last literal frag to
-rs_align. rs_align frags are skipped in the xtensa_move_literals. As a
-result fixups against such literals are not moved out of .init.literal/
-.fini.literal sections producing the following assembler error:
-
-  test.S: Warning: fixes not all moved from .init.literal
-  test.S: Internal error!
-
-Fix check for .init.literal/.fini.literal in the xtensa_move_literals
-and don't let it move literals from there in the presence of
---text-section-literals or --auto-litpools.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Fix check for
-	.init.literal/.fini.literal section name.
-	* testsuite/gas/xtensa/all.exp: Add init-fini-literals to the
-	list of xtensa tests.
-	* testsuite/gas/xtensa/init-fini-literals.d: New file:
-	init-fini-literals test result patterns.
-	* testsuite/gas/xtensa/init-fini-literals.s: New file:
-	init-fini-literals test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
-
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- gas/testsuite/gas/xtensa/all.exp              |  1 +
- gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++
- gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++
- 4 files changed, 54 insertions(+), 2 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-   struct litpool_seg *lps;
-+  const char *init_name = INIT_SECTION_NAME;
-+  const char *fini_name = FINI_SECTION_NAME;
-+  int init_name_len = strlen(init_name);
-+  int fini_name_len = strlen(fini_name);
- 
-   mark_literal_frags (literal_head->next);
- 
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
- 
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-+      const char *seg_name = segment_name (segment->seg);
-+
-       /* Keep the literals for .init and .fini in separate sections.  */
--      if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME)
--	  || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME))
-+      if ((!memcmp (seg_name, init_name, init_name_len) &&
-+	   !strcmp (seg_name + init_name_len, ".literal")) ||
-+	  (!memcmp (seg_name, fini_name, fini_name_len) &&
-+	   !strcmp (seg_name + fini_name_len, ".literal")))
- 	continue;
- 
-       frchain_from = seg_info (segment->seg)->frchainP;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 7ff7bd7..6b67320 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-     run_dump_test "loc"
-+    run_dump_test "init-fini-literals"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d
-new file mode 100644
-index 0000000..19ed121
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.d
-@@ -0,0 +1,24 @@
-+#as: --text-section-literals
-+#objdump: -r
-+#name: check that literals for .init and .fini always go to separate sections
-+
-+.*: +file format .*xtensa.*
-+#...
-+RELOCATION RECORDS FOR \[\.init\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      init
-+#...
-+RELOCATION RECORDS FOR \[\.fini\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      fini
-+#...
-+RELOCATION RECORDS FOR \[\.init\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.init\.literal
-+.* R_XTENSA_SLOT0_OP  \.init\.literal\+0x00000004
-+#...
-+RELOCATION RECORDS FOR \[\.fini\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal\+0x00000004
-+#...
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s
-new file mode 100644
-index 0000000..7c9ec17
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.s
-@@ -0,0 +1,19 @@
-+	.section	.init,"ax",@progbits
-+	.literal_position
-+	.literal .LC0, init@PLT
-+	.literal_position
-+	.literal .LC1, 1
-+	.align	4
-+
-+	l32r	a2, .LC0
-+	l32r	a2, .LC1
-+
-+	.section	.fini,"ax",@progbits
-+	.literal_position
-+	.literal .LC2, fini@PLT
-+	.literal_position
-+	.literal .LC3, 1
-+	.align	4
-+
-+	l32r	a2, .LC2
-+	l32r	a2, .LC3
--- 
-2.1.4
-
diff --git a/patches/binutils/2.26/120-sh-conf.patch b/patches/binutils/2.26/120-sh-conf.patch
deleted file mode 100644
index c12a023..0000000
--- a/patches/binutils/2.26/120-sh-conf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
---- a/configure
-+++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
-   or1k*-*-*)
-     noconfigdirs="$noconfigdirs gdb"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
-   or1k*-*-*)
-     noconfigdirs="$noconfigdirs gdb"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
diff --git a/patches/binutils/2.26/300-001_ld_makefile_patch.patch b/patches/binutils/2.26/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 2a1320c..0000000
--- a/patches/binutils/2.26/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/patches/binutils/2.26/300-012_check_ldrunpath_length.patch b/patches/binutils/2.26/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index f1f31af..0000000
--- a/patches/binutils/2.26/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (*rpath == '\0'))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/patches/binutils/2.26/310-fix-gold-pthreads-typo.patch b/patches/binutils/2.26/310-fix-gold-pthreads-typo.patch
deleted file mode 100644
index f2e6ff2..0000000
--- a/patches/binutils/2.26/310-fix-gold-pthreads-typo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2014-10-14 08:32:04.000000000 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:38:18.640819300 +0100
-@@ -102,9 +102,9 @@
-   if (err != 0)
-     gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
- #ifdef PTHREAD_MUTEX_ADAPTIVE_NP
--  err = pthread_mutextattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-+  err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-   if (err != 0)
--    gold_fatal(_("pthread_mutextattr_settype failed: %s"), strerror(err));
-+    gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
- #endif
- 
-   err = pthread_mutex_init(&this->mutex_, &attr);
diff --git a/patches/binutils/2.26/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/patches/binutils/2.26/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
deleted file mode 100644
index f9a8af6..0000000
--- a/patches/binutils/2.26/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils-2.25.1/gold/gold-threads.cc.orig	2015-10-20 22:39:36.371169400 +0100
-+++ binutils-2.25.1/gold/gold-threads.cc	2015-10-20 22:39:38.182772700 +0100
-@@ -101,7 +101,7 @@
-   int err = pthread_mutexattr_init(&attr);
-   if (err != 0)
-     gold_fatal(_("pthead_mutextattr_init failed: %s"), strerror(err));
--#ifdef PTHREAD_MUTEX_ADAPTIVE_NP
-+#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32)
-   err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-   if (err != 0)
-     gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
diff --git a/patches/binutils/2.26/330-Dont-link-to-libfl-as-its-unnecessary.patch b/patches/binutils/2.26/330-Dont-link-to-libfl-as-its-unnecessary.patch
deleted file mode 100644
index 334ee3e..0000000
--- a/patches/binutils/2.26/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/binutils/configure b/binutils/configure
-index 6e1f21e..78bf4ae 100755
---- a/binutils/configure
-+++ b/binutils/configure
-@@ -12069,6 +12069,7 @@ fi
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12230,6 +12231,8 @@ esac
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg ca da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
- # If we haven't got the data from the intl directory,
-diff --git a/binutils/configure.ac b/binutils/configure.ac
-index defe781..8fd236a 100644
---- a/binutils/configure.ac
-+++ b/binutils/configure.ac
-@@ -87,7 +87,10 @@ if test -z "$host" ; then
- fi
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg ca da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/gas/configure b/gas/configure
-index f959e95..9bb4043 100755
---- a/gas/configure
-+++ b/gas/configure
-@@ -12819,6 +12819,7 @@ fi
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12980,6 +12981,8 @@ esac
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
- # If we haven't got the data from the intl directory,
-diff --git a/gas/configure.ac b/gas/configure.ac
-index 07f825d..c552b7e 100644
---- a/gas/configure.ac
-+++ b/gas/configure.ac
-@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
- AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/ld/configure b/ld/configure
-index a446283..1a6bf81 100755
---- a/ld/configure
-+++ b/ld/configure
-@@ -16087,6 +16087,7 @@ fi
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16248,6 +16249,8 @@ esac
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..45eec53 100644
---- a/ld/configure.ac
-+++ b/ld/configure.ac
-@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
- AC_EXEEXT
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- AM_MAINTAINER_MODE
- AM_CONDITIONAL(GENINSRC_NEVER, false)
diff --git a/patches/binutils/2.26/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/patches/binutils/2.26/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
deleted file mode 100644
index e4f235b..0000000
--- a/patches/binutils/2.26/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gold/binary.cc b/gold/binary.cc
-index 52df81a..03a8f20 100644
---- a/gold/binary.cc
-+++ b/gold/binary.cc
-@@ -23,7 +23,7 @@
- #include "gold.h"
- 
- #include <cerrno>
--#include <cstring>
-+#include <string>
- 
- #include "elfcpp.h"
- #include "stringpool.h"
diff --git a/patches/binutils/2.26/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/patches/binutils/2.26/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
deleted file mode 100644
index 6168b31..0000000
--- a/patches/binutils/2.26/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001
-From: Andrew Hsieh <andrewhsieh@google.com>
-Date: Wed, 18 Mar 2015 10:57:24 +0800
-Subject: [PATCH] Fix darwin build
-
-1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4
-   doesn't support ended initializer list
-2. wcsncasecmp doesn't exist in MacSDK10.6.x
-
-Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
----
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
- }
- #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
- 
-+#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L
-+/* wcsncasecmp isn't always defined in Mac SDK */
-+static int
-+wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-+{
-+  wchar_t c1, c2;
-+
-+  if (n == 0)
-+    return (0);
-+  for (; *s1; s1++, s2++)
-+  {
-+    c1 = towlower(*s1);
-+    c2 = towlower(*s2);
-+    if (c1 != c2)
-+      return ((int)c1 - c2);
-+    if (--n == 0)
-+      return (0);
-+  }
-+  return (-*s2);
-+}
-+#endif
-+
- /* Perform a comparison of two entries.  */
- static signed int
- rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
- class Once_initialize
- {
-  public:
--  Once_initialize()
--    : once_(PTHREAD_ONCE_INIT)
--  { }
-+   Once_initialize()
-+#if !defined(__APPLE__)
-+     : once_(PTHREAD_ONCE_INIT)
-+   { }
-+#else
-+// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support
-+// extended initializer list as above */
-+   {
-+     pthread_once_t once_2 = PTHREAD_ONCE_INIT;
-+     once_ = once_2; 
-+   }
-+#endif
- 
-   // Return a pointer to the pthread_once_t variable.
-   pthread_once_t*
--- 
-2.1.3
-
diff --git a/patches/binutils/2.26/500-sysroot.patch b/patches/binutils/2.26/500-sysroot.patch
deleted file mode 100644
index e49c795..0000000
--- a/patches/binutils/2.26/500-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
-      directory first.  */
-   if (! entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/patches/binutils/2.26/600-poison-system-directories.patch b/patches/binutils/2.26/600-poison-system-directories.patch
deleted file mode 100644
index aa04082..0000000
--- a/patches/binutils/2.26/600-poison-system-directories.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-[Gustavo: adapt to binutils 2.25]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.ac (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
---- a/ld/config.in
-+++ b/ld/config.in
-@@ -14,6 +14,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
---- a/ld/configure
-+++ b/ld/configure
-@@ -786,6 +786,7 @@ with_lib_path
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_compressed_debug_sections
-@@ -1442,6 +1443,8 @@ Optional Features:
-   --disable-largefile     omit support for large files
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -15491,7 +15494,18 @@ else
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
---- a/ld/configure.ac
-+++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
---- a/ld/ld.h
-+++ b/ld/ld.h
-@@ -164,6 +164,14 @@ typedef struct {
-   /* If set, display the target memory usage (per memory region).  */
-   bfd_boolean print_memory_usage;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change.
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..af231c0 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
---- a/ld/ldlex.h
-+++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
-   OPTION_PRINT_MEMORY_USAGE,
-   OPTION_REQUIRE_DEFINED_SYMBOL,
-   OPTION_ORPHAN_HANDLING,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
---- a/ld/lexsup.c
-+++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
-   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
-     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
-     TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
-           }
-           break;
- 
-+	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.poison_system_directories = FALSE;
-+	  break;
-+
-+	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.error_poison_system_directories = TRUE;
-+	  break;
-+
- 	case OPTION_PUSH_STATE:
- 	  input_flags.pushed = xmemdup (&input_flags,
- 					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
-       command_line.soname = NULL;
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
diff --git a/patches/binutils/2.26/914-xtensa-fix-signedness-of-gas-relocations.patch b/patches/binutils/2.26/914-xtensa-fix-signedness-of-gas-relocations.patch
deleted file mode 100644
index 66d4e60..0000000
--- a/patches/binutils/2.26/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 6c7c5c477ef9ccf2d2548cf2ac3cec9bd3c9c5b6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 2 Feb 2016 17:11:38 +0300
-Subject: [PATCH] xtensa: fix signedness of gas relocations
-
-Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation
-offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations
-substituted for BFD_RELOC_*. This made it impossible to encode arbitrary
-8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc
-directive. Revert this part and add test.
-
-gas/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF*
-	substitutions for BFD_RELOC_* as unsigned.
-	* gas/testsuite/gas/xtensa/all.exp: Add loc to list of xtensa
-	tests.
-	* gas/testsuite/gas/xtensa/loc.d: New file: loc test result
-	patterns.
-	* gas/testsuite/gas/xtensa/loc.s: New file: loc test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gas/config/tc-xtensa.c           |  6 +++---
- gas/testsuite/gas/xtensa/all.exp |  1 +
- gas/testsuite/gas/xtensa/loc.d   | 10 ++++++++++
- gas/testsuite/gas/xtensa/loc.s   |  7 +++++++
- 4 files changed, 21 insertions(+), 3 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/loc.d
- create mode 100644 gas/testsuite/gas/xtensa/loc.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    default:
- 	      break;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 31b725b..7ff7bd7 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "trampoline"
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-+    run_dump_test "loc"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
-new file mode 100644
-index 0000000..71983cc
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.d
-@@ -0,0 +1,10 @@
-+#as:
-+#objdump: -r
-+#name: .loc directive relocs
-+
-+.*: +file format .*xtensa.*
-+
-+RELOCATION RECORDS FOR \[\.debug_line\]:
-+#...
-+.*R_XTENSA_DIFF16.*\.text\+0x00009c42
-+#...
-diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s
-new file mode 100644
-index 0000000..029e14e
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.s
-@@ -0,0 +1,7 @@
-+	.text
-+	.file 1 "loc.s"
-+	.loc 1 3
-+	nop
-+	.space 40000
-+	.loc 1 5
-+	nop
--- 
-2.1.4
-
diff --git a/patches/binutils/2.26/915-xtensa-fix-.init-.fini-literals-moving.patch b/patches/binutils/2.26/915-xtensa-fix-.init-.fini-literals-moving.patch
deleted file mode 100644
index ead3e42..0000000
--- a/patches/binutils/2.26/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 16 Feb 2016 02:23:28 +0300
-Subject: [PATCH] xtensa: fix .init/.fini literals moving
-
-Despite the documentation and the comment in xtensa_move_literals, in
-the presence of --text-section-literals and --auto-litpools literals are
-moved from the separate literal sections into .init and .fini, because
-the check in the xtensa_move_literals is incorrect.
-
-This moving was broken with introduction of auto litpools: some literals
-now may be lost. This happens because literal frags emitted from .init
-and .fini are not closed when new .literal_position marks new literal
-pool. Then frag_align(2, 0, 0) changes type of the last literal frag to
-rs_align. rs_align frags are skipped in the xtensa_move_literals. As a
-result fixups against such literals are not moved out of .init.literal/
-.fini.literal sections producing the following assembler error:
-
-  test.S: Warning: fixes not all moved from .init.literal
-  test.S: Internal error!
-
-Fix check for .init.literal/.fini.literal in the xtensa_move_literals
-and don't let it move literals from there in the presence of
---text-section-literals or --auto-litpools.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Fix check for
-	.init.literal/.fini.literal section name.
-	* testsuite/gas/xtensa/all.exp: Add init-fini-literals to the
-	list of xtensa tests.
-	* testsuite/gas/xtensa/init-fini-literals.d: New file:
-	init-fini-literals test result patterns.
-	* testsuite/gas/xtensa/init-fini-literals.s: New file:
-	init-fini-literals test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
-
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- gas/testsuite/gas/xtensa/all.exp              |  1 +
- gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++
- gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++
- 4 files changed, 54 insertions(+), 2 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-   struct litpool_seg *lps;
-+  const char *init_name = INIT_SECTION_NAME;
-+  const char *fini_name = FINI_SECTION_NAME;
-+  int init_name_len = strlen(init_name);
-+  int fini_name_len = strlen(fini_name);
- 
-   mark_literal_frags (literal_head->next);
- 
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
- 
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-+      const char *seg_name = segment_name (segment->seg);
-+
-       /* Keep the literals for .init and .fini in separate sections.  */
--      if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME)
--	  || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME))
-+      if ((!memcmp (seg_name, init_name, init_name_len) &&
-+	   !strcmp (seg_name + init_name_len, ".literal")) ||
-+	  (!memcmp (seg_name, fini_name, fini_name_len) &&
-+	   !strcmp (seg_name + fini_name_len, ".literal")))
- 	continue;
- 
-       frchain_from = seg_info (segment->seg)->frchainP;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 7ff7bd7..6b67320 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-     run_dump_test "loc"
-+    run_dump_test "init-fini-literals"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d
-new file mode 100644
-index 0000000..19ed121
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.d
-@@ -0,0 +1,24 @@
-+#as: --text-section-literals
-+#objdump: -r
-+#name: check that literals for .init and .fini always go to separate sections
-+
-+.*: +file format .*xtensa.*
-+#...
-+RELOCATION RECORDS FOR \[\.init\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      init
-+#...
-+RELOCATION RECORDS FOR \[\.fini\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      fini
-+#...
-+RELOCATION RECORDS FOR \[\.init\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.init\.literal
-+.* R_XTENSA_SLOT0_OP  \.init\.literal\+0x00000004
-+#...
-+RELOCATION RECORDS FOR \[\.fini\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal\+0x00000004
-+#...
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s
-new file mode 100644
-index 0000000..7c9ec17
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.s
-@@ -0,0 +1,19 @@
-+	.section	.init,"ax",@progbits
-+	.literal_position
-+	.literal .LC0, init@PLT
-+	.literal_position
-+	.literal .LC1, 1
-+	.align	4
-+
-+	l32r	a2, .LC0
-+	l32r	a2, .LC1
-+
-+	.section	.fini,"ax",@progbits
-+	.literal_position
-+	.literal .LC2, fini@PLT
-+	.literal_position
-+	.literal .LC3, 1
-+	.align	4
-+
-+	l32r	a2, .LC2
-+	l32r	a2, .LC3
--- 
-2.1.4
-
diff --git a/patches/binutils/2.27/100-missing-break.patch b/patches/binutils/2.27/100-missing-break.patch
deleted file mode 100644
index 6f9d67c..0000000
--- a/patches/binutils/2.27/100-missing-break.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8941017bc0226b60ce306d5271df15820ce66a53 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Tue, 30 Aug 2016 20:57:32 +0930
-Subject: [PATCH] ppc apuinfo for spe parsed incorrectly
-
-apuinfo saying SPE resulted in mach = bfd_mach_ppc_vle due to a
-missing break.
-
-	PR 20531
-	* elf32-ppc.c (_bfd_elf_ppc_set_arch): Add missing "break".
----
- bfd/ChangeLog   | 5 +++++
- bfd/elf32-ppc.c | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
-index 92299bc..1dd6d78 100644
---- a/bfd/elf32-ppc.c
-+++ b/bfd/elf32-ppc.c
-@@ -2246,6 +2246,7 @@ _bfd_elf_ppc_set_arch (bfd *abfd)
- 		case PPC_APUINFO_BRLOCK:
- 		  if (mach != bfd_mach_ppc_vle)
- 		    mach = bfd_mach_ppc_e500;
-+		  break;
- 
- 		case PPC_APUINFO_VLE:
- 		  mach = bfd_mach_ppc_vle;
--- 
-2.9.3
-
diff --git a/patches/binutils/2.27/120-sh-conf.patch b/patches/binutils/2.27/120-sh-conf.patch
deleted file mode 100644
index c12a023..0000000
--- a/patches/binutils/2.27/120-sh-conf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
-diff --git a/configure b/configure
-index 87677bc..2d916f1 100755
---- a/configure
-+++ b/configure
-@@ -3812,7 +3812,7 @@ case "${target}" in
-   or1k*-*-*)
-     noconfigdirs="$noconfigdirs gdb"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
-diff --git a/configure.ac b/configure.ac
-index 8fe0eca..b10a99f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1140,7 +1140,7 @@ case "${target}" in
-   or1k*-*-*)
-     noconfigdirs="$noconfigdirs gdb"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
diff --git a/patches/binutils/2.27/300-001_ld_makefile_patch.patch b/patches/binutils/2.27/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 2a1320c..0000000
--- a/patches/binutils/2.27/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 9575f1f..84df0bf 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -54,7 +54,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index 9f56ca1..272860f 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/patches/binutils/2.27/300-012_check_ldrunpath_length.patch b/patches/binutils/2.27/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index f1f31af..0000000
--- a/patches/binutils/2.27/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 137446f..bb8391a 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1195,6 +1195,8 @@ fragment <<EOF
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (*rpath == '\0'))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/patches/binutils/2.27/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/patches/binutils/2.27/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
deleted file mode 100644
index 2956385..0000000
--- a/patches/binutils/2.27/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- binutils-2.27/gold/gold-threads.cc.orig	2016-12-26 16:44:23.691075600 +1100
-+++ binutils-2.27/gold/gold-threads.cc	2016-12-26 16:46:21.071855200 +1100
-@@ -101,7 +101,7 @@
-   int err = pthread_mutexattr_init(&attr);
-   if (err != 0)
-     gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err));
--#ifdef PTHREAD_MUTEX_ADAPTIVE_NP
-+#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32)
-   err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
-   if (err != 0)
-     gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
diff --git a/patches/binutils/2.27/330-Dont-link-to-libfl-as-its-unnecessary.patch b/patches/binutils/2.27/330-Dont-link-to-libfl-as-its-unnecessary.patch
deleted file mode 100644
index c52af05..0000000
--- a/patches/binutils/2.27/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/binutils/configure b/binutils/configure
-index 6e1f21e..78bf4ae 100755
---- a/binutils/configure
-+++ b/binutils/configure
-@@ -12106,6 +12106,7 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12267,6 +12268,8 @@
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
- # If we haven't got the data from the intl directory,
-diff --git a/binutils/configure.ac b/binutils/configure.ac
-index defe781..8fd236a 100644
---- a/binutils/configure.ac
-+++ b/binutils/configure.ac
-@@ -87,7 +87,10 @@
- fi
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/gas/configure b/gas/configure
-index f959e95..9bb4043 100755
---- a/gas/configure
-+++ b/gas/configure
-@@ -12819,6 +12819,7 @@ fi
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -12980,6 +12981,8 @@ esac
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
- # If we haven't got the data from the intl directory,
-diff --git a/gas/configure.ac b/gas/configure.ac
-index 07f825d..c552b7e 100644
---- a/gas/configure.ac
-+++ b/gas/configure.ac
-@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
- AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
- ZW_GNU_GETTEXT_SISTER_DIR
-diff --git a/ld/configure b/ld/configure
-index a446283..1a6bf81 100755
---- a/ld/configure
-+++ b/ld/configure
-@@ -16087,6 +16087,7 @@ fi
- done
- test -n "$YACC" || YACC="yacc"
- 
-+save_LIBS=$LIBS
- for ac_prog in flex lex
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -16248,6 +16249,8 @@ esac
- if test "$LEX" = :; then
-   LEX=${am_missing_run}flex
- fi
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..45eec53 100644
---- a/ld/configure.ac
-+++ b/ld/configure.ac
-@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
- AC_EXEEXT
- 
- AC_PROG_YACC
-+save_LIBS=$LIBS
- AM_PROG_LEX
-+LIBS=$save_LIBS
-+LEXLIB=
- 
- AM_MAINTAINER_MODE
- AM_CONDITIONAL(GENINSRC_NEVER, false)
diff --git a/patches/binutils/2.27/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/patches/binutils/2.27/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
deleted file mode 100644
index e4f235b..0000000
--- a/patches/binutils/2.27/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gold/binary.cc b/gold/binary.cc
-index 52df81a..03a8f20 100644
---- a/gold/binary.cc
-+++ b/gold/binary.cc
-@@ -23,7 +23,7 @@
- #include "gold.h"
- 
- #include <cerrno>
--#include <cstring>
-+#include <string>
- 
- #include "elfcpp.h"
- #include "stringpool.h"
diff --git a/patches/binutils/2.27/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/patches/binutils/2.27/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
deleted file mode 100644
index 6168b31..0000000
--- a/patches/binutils/2.27/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001
-From: Andrew Hsieh <andrewhsieh@google.com>
-Date: Wed, 18 Mar 2015 10:57:24 +0800
-Subject: [PATCH] Fix darwin build
-
-1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4
-   doesn't support ended initializer list
-2. wcsncasecmp doesn't exist in MacSDK10.6.x
-
-Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
----
- binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
- binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
-index 13e39e4..7a98306 100644
---- binutils-2.25.orig/bfd/peXXigen.c
-+++ binutils-2.25/bfd/peXXigen.c
-@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
- }
- #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
- 
-+#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L
-+/* wcsncasecmp isn't always defined in Mac SDK */
-+static int
-+wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-+{
-+  wchar_t c1, c2;
-+
-+  if (n == 0)
-+    return (0);
-+  for (; *s1; s1++, s2++)
-+  {
-+    c1 = towlower(*s1);
-+    c2 = towlower(*s2);
-+    if (c1 != c2)
-+      return ((int)c1 - c2);
-+    if (--n == 0)
-+      return (0);
-+  }
-+  return (-*s2);
-+}
-+#endif
-+
- /* Perform a comparison of two entries.  */
- static signed int
- rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
-diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
-index ff5a8ac..45140e0 100644
---- binutils-2.25.orig/gold/gold-threads.cc
-+++ binutils-2.25/gold/gold-threads.cc
-@@ -284,9 +284,18 @@ Condvar::~Condvar()
- class Once_initialize
- {
-  public:
--  Once_initialize()
--    : once_(PTHREAD_ONCE_INIT)
--  { }
-+   Once_initialize()
-+#if !defined(__APPLE__)
-+     : once_(PTHREAD_ONCE_INIT)
-+   { }
-+#else
-+// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support
-+// extended initializer list as above */
-+   {
-+     pthread_once_t once_2 = PTHREAD_ONCE_INIT;
-+     once_ = once_2; 
-+   }
-+#endif
- 
-   // Return a pointer to the pthread_once_t variable.
-   pthread_once_t*
--- 
-2.1.3
-
diff --git a/patches/binutils/2.27/500-sysroot.patch b/patches/binutils/2.27/500-sysroot.patch
deleted file mode 100644
index 4cb9bc7..0000000
--- a/patches/binutils/2.27/500-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -336,18 +336,25 @@
-      directory first.  */
-   if (!entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/patches/binutils/2.27/600-poison-system-directories.patch b/patches/binutils/2.27/600-poison-system-directories.patch
deleted file mode 100644
index ff235e3..0000000
--- a/patches/binutils/2.27/600-poison-system-directories.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-[Gustavo: adapt to binutils 2.25]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.ac (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
---- a/ld/config.in
-+++ b/ld/config.in
-@@ -17,6 +17,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
---- a/ld/configure
-+++ b/ld/configure
-@@ -788,6 +788,7 @@ with_lib_path
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_compressed_debug_sections
-@@ -1445,6 +1446,8 @@ Optional Features:
-   --disable-largefile     omit support for large files
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -15498,7 +15501,18 @@ else
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
---- a/ld/configure.ac
-+++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
---- a/ld/ld.h
-+++ b/ld/ld.h
-@@ -169,6 +169,14 @@ typedef struct {
-   /* If set, display the target memory usage (per memory region).  */
-   bfd_boolean print_memory_usage;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..af231c0 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
---- a/ld/ldlex.h
-+++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
-   OPTION_PRINT_MEMORY_USAGE,
-   OPTION_REQUIRE_DEFINED_SYMBOL,
-   OPTION_ORPHAN_HANDLING,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
---- a/ld/lexsup.c
-+++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
-   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
-     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
-     TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
-           }
-           break;
- 
-+	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.poison_system_directories = FALSE;
-+	  break;
-+
-+	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.error_poison_system_directories = TRUE;
-+	  break;
-+
- 	case OPTION_PUSH_STATE:
- 	  input_flags.pushed = xmemdup (&input_flags,
- 					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
-       command_line.soname = NULL;
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
diff --git a/patches/binutils/2.27/999-xtensa-reverse-shift-count.patch b/patches/binutils/2.27/999-xtensa-reverse-shift-count.patch
deleted file mode 100644
index f8bb9c1..0000000
--- a/patches/binutils/2.27/999-xtensa-reverse-shift-count.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 78fb7e37eb8bb08ae537d6c487996ff17c810332 Mon Sep 17 00:00:00 2001
-From: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
-Date: Mon, 26 Sep 2016 12:42:11 -0400
-Subject: [PATCH] tc-xtensa.c: fixup xg_reverse_shift_count typo
-
-gas/ChangeLog:
-
-2016-09-26  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
-
-	* config/tc-xtensa.c (xg_reverse_shift_count): Pass cnt_arg instead of
-	cnt_argp to concat.
----
- gas/ChangeLog          | 5 +++++
- gas/config/tc-xtensa.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-[[ ChangeLog skipped, fails to apply on 2.27 ]]
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d062044..ca261ae 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -2228,7 +2228,7 @@ xg_reverse_shift_count (char **cnt_argp)
-   cnt_arg = *cnt_argp;
- 
-   /* replace the argument with "31-(argument)" */
--  new_arg = concat ("31-(", cnt_argp, ")", (char *) NULL);
-+  new_arg = concat ("31-(", cnt_arg, ")", (char *) NULL);
- 
-   free (cnt_arg);
-   *cnt_argp = new_arg;
--- 
-2.9.3
-
diff --git a/patches/duma/2_5_15/100-cross-compile.patch b/patches/duma/2_5_15/100-cross-compile.patch
deleted file mode 100644
index cc95160..0000000
--- a/patches/duma/2_5_15/100-cross-compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
---- duma_2_5_15.orig/GNUmakefile	2008-08-03 21:22:38.000000000 +0200
-+++ duma_2_5_15/GNUmakefile	2009-06-19 15:32:23.000000000 +0200
-@@ -93,10 +93,6 @@
- # also define 'WIN32'
- 
- # some defaults:
--CC=gcc
--CXX=g++
--AR=ar
--RANLIB=ranlib
- INSTALL=install
- RM=rm
- RMFORCE=rm -f
-@@ -471,7 +467,7 @@
- 
- createconf$(EXEPOSTFIX): createconf.o
- 	- $(RMFORCE) createconf$(EXEPOSTFIX)
--	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
-+	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
- 
- tstheap$(EXEPOSTFIX): libduma.a tstheap.o
- 	- $(RMFORCE) tstheap$(EXEPOSTFIX)
-@@ -532,7 +528,7 @@
- # define rules how to build objects for createconf
- #
- createconf.o:
--	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
-+	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
- 
- 
- #
diff --git a/patches/duma/2_5_15/110-separate_cpp.patch b/patches/duma/2_5_15/110-separate_cpp.patch
deleted file mode 100644
index 4bbccc7..0000000
--- a/patches/duma/2_5_15/110-separate_cpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
---- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
-+++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
-@@ -289,9 +289,13 @@
- 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
- 	createconf.c
- 
--OBJECTS=dumapp.o duma.o sem_inc.o print.o
-+OBJECTS = duma.o sem_inc.o print.o
-+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
- 
--SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o
-+ifeq ($(DUMA_CPP),1)
-+OBJECTS += dumapp.o
-+SO_OBJECTS += dumapp_so.o
-+endif
- 
- # Make all the top-level targets the makefile knows about.
- all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
diff --git a/patches/duma/2_5_15/200-cpp11-new-operator.patch b/patches/duma/2_5_15/200-cpp11-new-operator.patch
deleted file mode 100644
index 900333e..0000000
--- a/patches/duma/2_5_15/200-cpp11-new-operator.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/dumapp.cpp b/dumapp.cpp
-index dbddf66..b5e9ba3 100644
---- a/dumapp.cpp
-+++ b/dumapp.cpp
-@@ -189,8 +189,7 @@ void * duma_new_operator(DUMA_SIZE_T userSize, enum _DUMA_Allocator allocator, b
-  * Single object form, no debug information
-  * (11) = (a) ; ASW
-  */
--void * DUMA_CDECL operator new( DUMA_SIZE_T size )
--throw(std::bad_alloc)
-+void * DUMA_CDECL operator new( DUMA_SIZE_T size ) NEW_THROW_SPEC
- {
-   return duma_new_operator(size, EFA_NEW_ELEM, true  DUMA_PARAMS_UK);
- }
-@@ -253,8 +252,7 @@ throw()
-  * Array object form, no debug information
-  * (21) = (a) ; AAW
-  */
--void * DUMA_CDECL operator new[]( DUMA_SIZE_T size )
--throw(std::bad_alloc)
-+void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) NEW_THROW_SPEC
- {
-   return duma_new_operator(size, EFA_NEW_ARRAY, true  DUMA_PARAMS_UK);
- }
-@@ -320,8 +318,7 @@ throw()
-  * Single object form with debug information
-  * (31) = (a) ; ASW 
-  */
--void * DUMA_CDECL operator new( DUMA_SIZE_T size, const char *filename, int lineno )
--throw( std::bad_alloc )
-+void * DUMA_CDECL operator new( DUMA_SIZE_T size, const char *filename, int lineno ) NEW_THROW_SPEC
- {
-   return duma_new_operator(size, EFA_NEW_ELEM, true  DUMA_PARAMS_FILELINE);
- }
-@@ -373,8 +370,7 @@ throw()
-  * Array object form with debug information
-  * (41) = (a) ; AAW 
-  */
--void * DUMA_CDECL operator new[]( DUMA_SIZE_T size, const char *filename, int lineno )
--throw( std::bad_alloc )
-+void * DUMA_CDECL operator new[]( DUMA_SIZE_T size, const char *filename, int lineno ) NEW_THROW_SPEC
- {
-   return duma_new_operator(size, EFA_NEW_ARRAY, true  DUMA_PARAMS_FILELINE);
- }
-diff --git a/dumapp.h b/dumapp.h
-index fc40d9a..7175359 100644
---- a/dumapp.h
-+++ b/dumapp.h
-@@ -64,6 +64,11 @@
-   #endif
- #endif
- 
-+#if __cplusplus <= 199711L
-+#define NEW_THROW_SPEC throw(std::bad_alloc)
-+#else
-+#define NEW_THROW_SPEC
-+#endif
- 
- #ifndef DUMA_NO_CPP_SUPPORT
- 
-@@ -81,7 +86,7 @@
-     /* (12) = (b) ; ASN */
-     /* (13) = (c) ; FSW */
-     /* (14) = (d) ; FSN */
--    void * DUMA_CDECL operator new(DUMA_SIZE_T) throw(std::bad_alloc);
-+    void * DUMA_CDECL operator new(DUMA_SIZE_T) NEW_THROW_SPEC;
-     void * DUMA_CDECL operator new(DUMA_SIZE_T, const std::nothrow_t &) throw();
-     void   DUMA_CDECL operator delete(void *) throw();
-     void   DUMA_CDECL operator delete(void *, const std::nothrow_t &)   throw();
-@@ -91,7 +96,7 @@
-     /* (22) = (b) ; AAN */
-     /* (23) = (c) ; FAW */
-     /* (24) = (d) ; FAN */
--    void * DUMA_CDECL operator new[](DUMA_SIZE_T) throw(std::bad_alloc);
-+    void * DUMA_CDECL operator new[](DUMA_SIZE_T) NEW_THROW_SPEC;
-     void * DUMA_CDECL operator new[](DUMA_SIZE_T, const std::nothrow_t &) throw();
-     void   DUMA_CDECL operator delete[](void *) throw();
-     void   DUMA_CDECL operator delete[](void *, const std::nothrow_t &)   throw();
-@@ -103,7 +108,7 @@
-       /* (32) = (b) ; ASN */
-       /* (33) = (c) ; FSW */
-       /* (34) = (d) ; FSN */
--      void * DUMA_CDECL operator new(DUMA_SIZE_T, const char *, int) throw(std::bad_alloc);
-+      void * DUMA_CDECL operator new(DUMA_SIZE_T, const char *, int) NEW_THROW_SPEC;
-       void * DUMA_CDECL operator new(DUMA_SIZE_T, const std::nothrow_t &, const char *, int) throw();
-       void   DUMA_CDECL operator delete(void *, const char *, int) throw();
-       void   DUMA_CDECL operator delete(void *, const std::nothrow_t &, const char *, int) throw();
-@@ -113,7 +118,7 @@
-       /* (42) = (b) ; AAN */
-       /* (43) = (c) ; FAW */
-       /* (44) = (d) ; FAN */
--      void * DUMA_CDECL operator new[](DUMA_SIZE_T, const char *, int) throw(std::bad_alloc);
-+      void * DUMA_CDECL operator new[](DUMA_SIZE_T, const char *, int) NEW_THROW_SPEC;
-       void * DUMA_CDECL operator new[](DUMA_SIZE_T, const std::nothrow_t &, const char *, int) throw();
-       void   DUMA_CDECL operator delete[](void *, const char *, int) throw();
-       void   DUMA_CDECL operator delete[](void *, const std::nothrow_t &, const char *, int) throw();
diff --git a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/100-filter-includes.patch b/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/100-filter-includes.patch
deleted file mode 100644
index 204aac0..0000000
--- a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/100-filter-includes.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 6ae8f1cc9abd2c25b3376a18f33fee00d9e771cf Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Mon, 27 Feb 2017 01:20:10 -0800
-Subject: [PATCH 1/2] When looking for binutils/BFD headers, create a local
- include dir
-
-... and filter only those headers that elf2flt binaries are going
-to use, to minimize the chance of clashes with system headers.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- Makefile.in         | 13 ++++++--
- configure           |  4 +--
- configure.ac        |  4 +--
- mk-local-include.sh | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 103 insertions(+), 7 deletions(-)
- create mode 100755 mk-local-include.sh
-
-diff --git a/Makefile.in b/Makefile.in
-index a6feea6..1e34bda 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14,7 +14,9 @@ CPU = @target_cpu@
- TARGET = @target_alias@
- SYMBOL_PREFIX = @SYMBOL_PREFIX@
- CFLAGS = @CFLAGS@
--INCLUDES = -I$(srcdir) @bfd_include_dir@ @binutils_include_dir@ @zlib_include_dir@
-+INCLUDES = -I$(srcdir) -Ilocal-include @zlib_include_dir@
-+BFD_INCLUDE_DIR = @bfd_include_dir@
-+BINUTILS_INCLUDE_DIR = @binutils_include_dir@
- CPPFLAGS = @CPPFLAGS@ $(DEFS) $(INCLUDES)
- LDFLAGS = @LDFLAGS@
- LDLIBS = @LIBS@
-@@ -101,7 +103,7 @@ check-flthdr:
- check: check-flthdr
- 
- clean:
--	-rm -f $(PROGS) *.$(OBJEXT) .deps
-+	-rm -f $(PROGS) *.$(OBJEXT) .deps local-include
- 
- distclean: clean
- 	-rm -f Makefile config.log config.status config.cache ld-elf2flt
-@@ -121,5 +123,10 @@ install:
- 	$(INSTALL) -m 644 $(SRC_LDFILE) $(DESTDIR)$(target_libdir)/$(LDFILE)
- 
- sinclude .deps
--.deps:
-+.deps: local-include/.stamp
- 	$(CC) -MM $(CPPFLAGS) $(srcdir)/*.c > .deps
-+
-+local-include/.stamp: $(srcdir)/mk-local-include.sh
-+	bash $(srcdir)/mk-local-include.sh local-include '$(CC)' \
-+		'$(BFD_INCLUDE_DIR)' '$(BINUTILS_INCLUDE_DIR)' $(DEFS)
-+	touch $@
-diff --git a/configure b/configure
-index 3a4e8d6..af64990 100755
---- a/configure
-+++ b/configure
-@@ -3931,12 +3931,12 @@ fi
- 
- bfd_include_dir=
- if test "$ac_bfd_include_dir" != "NONE"; then
--  bfd_include_dir="-I$ac_bfd_include_dir"
-+  bfd_include_dir="$ac_bfd_include_dir"
- fi
- 
- binutils_include_dir=
- if test "$ac_binutils_include_dir" != "NONE"; then
--  binutils_include_dir="-I$ac_binutils_include_dir"
-+  binutils_include_dir="$ac_binutils_include_dir"
- fi
- 
- zlib_include_dir=
-diff --git a/configure.ac b/configure.ac
-index 6002894..b7fb790 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -135,12 +135,12 @@ fi
- 
- bfd_include_dir=
- if test "$ac_bfd_include_dir" != "NONE"; then
--  bfd_include_dir="-I$ac_bfd_include_dir"
-+  bfd_include_dir="$ac_bfd_include_dir"
- fi
- 
- binutils_include_dir=
- if test "$ac_binutils_include_dir" != "NONE"; then
--  binutils_include_dir="-I$ac_binutils_include_dir"
-+  binutils_include_dir="$ac_binutils_include_dir"
- fi
- 
- zlib_include_dir=
-diff --git a/mk-local-include.sh b/mk-local-include.sh
-new file mode 100755
-index 0000000..a6e8a63
---- /dev/null
-+++ b/mk-local-include.sh
-@@ -0,0 +1,89 @@
-+#!/bin/bash
-+
-+# Binutils provide certain headers that are clashing with system-wide
-+# headers on Cygwin and MacOS. They do so in different manners, though,
-+# so it is not possible to just tweak the inclusion/library order.
-+# Hence, we prepare a filtered inclusion directory where we only place
-+# the headers that we need for BFD/binutils. To determine them, we'll
-+# need to preprocess a sample file including the headers that will be used,
-+# and have the compiler output the actual list of included headers for us.
-+
-+# Usage:
-+#   mk-local-include.sh DIR CC BFD-INCLUDES BINUTILS-INCLUDES [DEFINES...]
-+
-+local_inc=$1
-+cc=$2
-+bfd_inc=$3
-+binutils_inc=$4
-+shift 4
-+# What remains are defines to pass to GCC
-+
-+case "${local_inc}" in
-+	*/*)	echo "Local include dir may only have one component" >&2; exit 1;;
-+	.|..)	echo "Local include dir may not be . or .." >&2; exit 1;;
-+esac
-+
-+# Re-create it from a clean slate
-+rm -rf "${local_inc}"
-+mkdir -p "${local_inc}"
-+
-+# Create a dummy source file that we'll preprocess
-+{
-+	echo "#include <libiberty.h>"
-+	echo "#include <filenames.h>"
-+	echo "#include <bfd.h>"
-+} > "${local_inc}/_dummy.c"
-+
-+$cc ${bfd_inc:+-I${bfd_inc}} ${binutils_inc:+-I${binutils_inc}} "$@" \
-+		-E -o /dev/null -H "${local_inc}/_dummy.c" 2>&1 | \
-+	sed -rn -e 's/^\.+ //p' > "${local_inc}/_hdr.list"
-+if [ $? != 0 ]; then
-+	echo "Failed to locate libiberty.h/bfd.h headers" >&2
-+	exit 1
-+fi
-+
-+# Now go over the list twice. First determine how the compiler printed
-+# the location of <bfd.h> and <libiberty.h>. They themselves may be in
-+# a system include directory. We'll create a mess of symlinks in that case,
-+# but they'll still point to the system headers.
-+while read f; do
-+	case "$f" in
-+	*/bfd.h)	bfd_loc=${f%/bfd.h};;
-+	*/libiberty.h)	binutils_loc=${f%/libiberty.h};;
-+	esac
-+done < $local_inc/_hdr.list
-+
-+# Now symlink the headers that reside in the same directory as the headers
-+# we're looking for, or in any subdirectory thereof.
-+create_link() {
-+	local f=$1
-+	local bd=$2
-+	local relpath lnkname bname src
-+
-+	relpath=${f#${bd}/}
-+	lnkname=${local_inc}/${relpath}
-+	bname=${relpath##*/}
-+	if [ "${bname}" != "${relpath}" ]; then
-+		mkdir -p "${relpath%/*}"
-+	fi
-+	case "${f}" in
-+	/*)	src=${f};;
-+	*)	src=../${f};; # account for one extra path component (DIR)
-+	esac
-+	if [ ! -L "${lnkname}" ]; then
-+		ln -s "${src}" "${lnkname}"
-+	fi
-+}
-+
-+while read f; do
-+	case "$f" in
-+	${bfd_loc}/*)		create_link "$f" "${bfd_loc}";;
-+	${binutils_loc}/*)	create_link "$f" "${binutils_loc}";;
-+	esac
-+done < $local_inc/_hdr.list
-+
-+# Final bit of secret knowledge. We need ELF headers, and the exact headers
-+# depend on the selected target. Fortunately, they are all in the 'elf/'
-+# subdirectory of binutils include directory, which we get by searching for
-+# <libiberty.h>.
-+create_link "${binutils_loc}/elf" "${binutils_loc}"
--- 
-2.9.3
-
diff --git a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/110-macos-use-local-elf.h.patch b/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/110-macos-use-local-elf.h.patch
deleted file mode 100644
index b189b69..0000000
--- a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/110-macos-use-local-elf.h.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1c19bf8cc294e95c8de314cc457bcea6854c3a2d Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Tue, 28 Feb 2017 09:29:21 -0800
-Subject: [PATCH 2/2] Macos does not have <elf.h> and needs a local copy
-
-Also, move <elf/xtensa.h> up - generic <elf.h> does not have
-definitions for xtensa relocations.
-
-Local file, cygwin-elf.h, needs to include <stdint.h> for standard
-integer types which is POSIX - rather than glibc-originated <features.h>.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- cygwin-elf.h | 2 +-
- elf2flt.c    | 7 +++++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/cygwin-elf.h b/cygwin-elf.h
-index bd72b37..8e3dbff 100644
---- a/cygwin-elf.h
-+++ b/cygwin-elf.h
-@@ -26,7 +26,7 @@ typedef uint16_t u_int16_t;
- typedef uint32_t u_int32_t;
- typedef uint64_t u_int64_t;
- #else
--#include <features.h>
-+#include <stdint.h>
- #endif
- /* Standard ELF types.  */
- 
-diff --git a/elf2flt.c b/elf2flt.c
-index 08296cf..19a4d4d 100644
---- a/elf2flt.c
-+++ b/elf2flt.c
-@@ -58,14 +58,17 @@ const char *elf2flt_progname;
- #include <elf/h8.h>      /* TARGET_* ELF support for the BFD library            */
- #elif defined(TARGET_arm)
- #include <elf/arm.h>
--#elif defined(__CYGWIN__) || defined(__MINGW32__) || defined(TARGET_nios) || defined(TARGET_nios2)
--#include "cygwin-elf.h"	/* Cygwin uses a local copy */
- #elif defined(TARGET_xtensa)
- #include <elf/xtensa.h>	/* TARGET_* ELF support for the BFD library */
-+#elif defined(TARGET_nios) || defined(TARGET_nios2)
-+#include "cygwin-elf.h" // <elf/nios2.h> does not have R_NIOS_* declarations
- #elif defined(TARGET_microblaze)
- #include <elf/microblaze.h>	/* TARGET_* ELF support for the BFD library */
- #elif defined(TARGET_v850)
- #include <elf/v850.h>
-+#elif (__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
-+// FIXME: does Cygwin need this? It has <elf.h> in /usr/include
-+#include "cygwin-elf.h" // Some systems don't have <elf.h>
- #else
- #include <elf.h>      /* TARGET_* ELF support for the BFD library            */
- #endif
--- 
-2.9.3
-
diff --git a/patches/gcc/4.8.5/001_gcc_bug_62231.patch b/patches/gcc/4.8.5/001_gcc_bug_62231.patch
deleted file mode 100644
index e7c9cf9..0000000
--- a/patches/gcc/4.8.5/001_gcc_bug_62231.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
-@@ -438,6 +438,11 @@
- #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
- #endif
- 
-+/* The mapping from dwarf CFA reg number to internal dwarf reg numbers.  */
-+#ifndef DWARF_REG_TO_UNWIND_COLUMN
-+#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
-+#endif
-+
- /* Map register numbers held in the call frame info that gcc has
-    collected using DWARF_FRAME_REGNUM to those that should be output in
-    .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
-@@ -225,7 +225,44 @@
-   emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
- }
- 
--/* Generate code to initialize the register size table.  */
-+/* Helper for expand_builtin_init_dwarf_reg_sizes.  Generate code to
-+   initialize the dwarf register size table entry corresponding to register
-+   REGNO in REGMODE.  TABLE is the table base address, SLOTMODE is the mode
-+   to use for the size entry to initialize, and WROTE_RETURN_COLUMN needs to
-+   be set to true if the dwarf register number for REGNO is the dwarf return
-+   column number.  */
-+
-+static
-+void init_one_dwarf_reg_size (int regno, enum machine_mode regmode,
-+			      rtx table, enum machine_mode slotmode,
-+			      bool *wrote_return_column)
-+{
-+  const unsigned int dnum = DWARF_FRAME_REGNUM (regno);
-+  const unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
-+  const unsigned int dcol = DWARF_REG_TO_UNWIND_COLUMN (rnum);
-+  
-+  const HOST_WIDE_INT slotoffset = dcol * GET_MODE_SIZE (slotmode);
-+  const HOST_WIDE_INT regsize = GET_MODE_SIZE (regmode);
-+
-+  if (rnum >= DWARF_FRAME_REGISTERS)
-+    return;
-+
-+  if (dnum == DWARF_FRAME_RETURN_COLUMN)
-+    {
-+      if (regmode == VOIDmode)
-+	return;
-+      *wrote_return_column = true;
-+    }
-+
-+  if (slotoffset < 0)
-+    return;
-+
-+  emit_move_insn (adjust_address (table, slotmode, slotoffset),
-+		  gen_int_mode (regsize, slotmode));
-+}
-+
-+/* Generate code to initialize the dwarf register size table located
-+   at the provided ADDRESS.  */
- 
- void
- expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -238,30 +275,21 @@
- 
-   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
-     {
--      unsigned int dnum = DWARF_FRAME_REGNUM (i);
--      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
--      if (rnum < DWARF_FRAME_REGISTERS)
--	{
--	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
--	  enum machine_mode save_mode = reg_raw_mode[i];
--	  HOST_WIDE_INT size;
--
--	  if (HARD_REGNO_CALL_PART_CLOBBERED (i, save_mode))
--	    save_mode = choose_hard_reg_mode (i, 1, true);
--	  if (dnum == DWARF_FRAME_RETURN_COLUMN)
--	    {
--	      if (save_mode == VOIDmode)
--		continue;
--	      wrote_return_column = true;
--	    }
--	  size = GET_MODE_SIZE (save_mode);
--	  if (offset < 0)
--	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
--	  emit_move_insn (adjust_address (mem, mode, offset),
--			  gen_int_mode (size, mode));
--	}
-+      span = targetm.dwarf_register_span (gen_rtx_REG (save_mode, i));
-+      if (!span)
-+        init_one_dwarf_reg_size (i, save_mode, mem, mode, &wrote_return_column);
-+      else
-+        {
-+          for (int si = 0; si < XVECLEN (span, 0); si++)
-+            {
-+              rtx reg = XVECEXP (span, 0, si);
-+              init_one_dwarf_reg_size
-+              (REGNO (reg), GET_MODE (reg), mem, mode, &wrote_return_column);
-+            }
-+        }
-     }
- 
-   if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
-@@ -55,10 +55,6 @@
- #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
- #endif
- 
--#ifndef DWARF_REG_TO_UNWIND_COLUMN
--#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
--#endif
--
- /* ??? For the public function interfaces, we tend to gcc_assert that the
-    column numbers are in range.  For the dwarf2 unwind info this does happen,
-    although so far in a case that doesn't actually matter.
diff --git a/patches/gcc/4.8.5/002_gcc_bug_62231.patch b/patches/gcc/4.8.5/002_gcc_bug_62231.patch
deleted file mode 100644
index b970ebc..0000000
--- a/patches/gcc/4.8.5/002_gcc_bug_62231.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
-      SCmode so as to pass the value correctly in a pair of
-      registers.  */
-   else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
--	   && !DECIMAL_FLOAT_MODE_P (mode))
-+	   && !DECIMAL_FLOAT_MODE_P (mode) && SPE_SIMD_REGNO_P (regno))
-     reg_size = UNITS_PER_FP_WORD;
- 
-   else
diff --git a/patches/gcc/4.8.5/100-uclibc-conf.patch b/patches/gcc/4.8.5/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a..0000000
--- a/patches/gcc/4.8.5/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/4.8.5/1000-libtool-leave-framework-alone.patch b/patches/gcc/4.8.5/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index 525592e..0000000
--- a/patches/gcc/4.8.5/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional b/patches/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional
deleted file mode 100644
index b7094fe..0000000
--- a/patches/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional
+++ /dev/null
@@ -1,122 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
- libgcc/Makefile.in  |    4 +++-
- libgcc/configure    |   32 ++++++++++++++++++++++++++++++++
- libgcc/configure.ac |   21 +++++++++++++++++++++
- 3 files changed, 56 insertions(+), 1 deletion(-)
-
-Index: gcc-4.8.0/libgcc/Makefile.in
-===================================================================
---- gcc-4.8.0.orig/libgcc/Makefile.in	2013-02-04 20:06:20.000000000 +0100
-+++ gcc-4.8.0/libgcc/Makefile.in	2013-03-24 09:12:43.000000000 +0100
-@@ -41,6 +41,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
- 
- host_noncanonical = @host_noncanonical@
- target_noncanonical = @target_noncanonical@
-@@ -927,9 +928,10 @@
- 		@multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_objs@,$(objects) libgcc.a,$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
-+		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- 		@shlib_map_file@,$(mapfile),$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
--		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
- 
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- 	# @multilib_flags@ is still needed because this may use
-Index: gcc-4.8.0/libgcc/configure
-===================================================================
---- gcc-4.8.0.orig/libgcc/configure	2012-11-05 00:08:42.000000000 +0100
-+++ gcc-4.8.0/libgcc/configure	2013-03-24 09:12:43.000000000 +0100
-@@ -564,6 +564,7 @@
- tmake_file
- sfp_machine_header
- set_use_emutls
-+LIBGCC_LIBM
- set_have_cc_tls
- vis_hide
- fixed_point
-@@ -4481,6 +4482,37 @@
- 	fi
- fi
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
- 
- # Conditionalize the makefile for this target machine.
- tmake_file_=
-Index: gcc-4.8.0/libgcc/configure.ac
-===================================================================
---- gcc-4.8.0.orig/libgcc/configure.ac	2012-10-15 15:10:30.000000000 +0200
-+++ gcc-4.8.0/libgcc/configure.ac	2013-03-24 09:12:43.000000000 +0100
-@@ -326,6 +326,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+  libgcc_cv_copysignl_lib,
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+  ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # See if we have emulated thread-local storage.
- GCC_CHECK_EMUTLS
- set_use_emutls=
diff --git a/patches/gcc/4.8.5/111-pr65730.patch b/patches/gcc/4.8.5/111-pr65730.patch
deleted file mode 100644
index f195e30..0000000
--- a/patches/gcc/4.8.5/111-pr65730.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 10 Apr 2015 17:46:30 +0300
-Subject: [PATCH] Fix PR target/65730
-
-2015-05-20  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (init_alignment_context): Replace MULT
-	by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT).
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
-Changes to ChangeLog are dropped.
-
- gcc/config/xtensa/xtensa.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..7296e36 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem)
-   if (ac->shift != NULL_RTX)
-     {
-       /* Shift is the byte count, but we need the bitcount.  */
--      ac->shift = expand_simple_binop (SImode, MULT, ac->shift,
--				       GEN_INT (BITS_PER_UNIT),
-+      gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0);
-+      ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift,
-+				       GEN_INT (exact_log2 (BITS_PER_UNIT)),
- 				       NULL_RTX, 1, OPTAB_DIRECT);
-       ac->modemask = expand_simple_binop (SImode, ASHIFT,
- 					  GEN_INT (GET_MODE_MASK (mode)),
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.8.5/130-pr43538.patch b/patches/gcc/4.8.5/130-pr43538.patch
deleted file mode 100644
index 19e57bb..0000000
--- a/patches/gcc/4.8.5/130-pr43538.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001
-From: glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 25 Apr 2014 08:03:08 +0000
-Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
-
-	PR target/43538
-	* mt-gnu: Don't reset CXXFLAGS_FOR_TARGET.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-gnu    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
---- a/config/mt-gnu
-+++ b/config/mt-gnu
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/patches/gcc/4.8.5/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/patches/gcc/4.8.5/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
deleted file mode 100644
index 1c49fb0..0000000
--- a/patches/gcc/4.8.5/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9bcf38cd9f382486b3823eb923b50e2e9a89cef7 Mon Sep 17 00:00:00 2001
-From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Nov 2014 22:12:52 +0000
-Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
-
-        * mt-ospace (CFLAGS_FOR_TARGET): Append -g -Os rather than
-        overwriting.
-        (CXXFLAGS_FOR_TARGET): Similarly.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-ospace | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
---- a/config/mt-ospace
-+++ b/config/mt-ospace
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/patches/gcc/4.8.5/132-build_gcc-5_with_gcc-6.patch b/patches/gcc/4.8.5/132-build_gcc-5_with_gcc-6.patch
deleted file mode 100644
index ac1d846..0000000
--- a/patches/gcc/4.8.5/132-build_gcc-5_with_gcc-6.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001
-From: edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Thu, 25 Feb 2016 15:33:50 +0000
-Subject: [PATCH 1/1] 2016-02-25  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-        Backported from mainline
-        2016-02-19  Jakub Jelinek  <jakub@redhat.com>
-                    Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-        * Make-lang.in: Invoke gperf with -L C++.
-        * cfns.gperf: Remove prototypes for hash and libc_name_p
-        inlines.
-        * cfns.h: Regenerated.
-        * except.c (nothrow_libfn_p): Adjust.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4
-diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
---- a/gcc/cp/cfns.gperf	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.gperf	2016-12-05 13:55:20.331616274 -0800
-@@ -1,3 +1,5 @@
-+%language=C++
-+%define class-name libc_name
- %{
- /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
- 
-@@ -16,14 +18,6 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- %}
- %%
- # The standard C library functions, for feeding to gperf; the result is used
-diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
---- a/gcc/cp/cfns.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.h	2016-12-05 13:55:20.331616274 -0800
-@@ -1,5 +1,5 @@
--/* ANSI-C code produced by gperf version 3.0.3 */
--/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
-+/* C++ code produced by gperf version 3.0.4 */
-+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf  */
- 
- #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-@@ -28,7 +28,7 @@
- #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
- #endif
- 
--#line 1 "cfns.gperf"
-+#line 3 "cfns.gperf"
- 
- /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
- 
-@@ -47,25 +47,18 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- /* maximum key range = 391, duplicates = 0 */
- 
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static unsigned int
--hash (register const char *str, register unsigned int len)
-+class libc_name
-+{
-+private:
-+  static inline unsigned int hash (const char *str, unsigned int len);
-+public:
-+  static const char *libc_name_p (const char *str, unsigned int len);
-+};
-+
-+inline unsigned int
-+libc_name::hash (register const char *str, register unsigned int len)
- {
-   static const unsigned short asso_values[] =
-     {
-@@ -122,14 +115,8 @@ hash (register const char *str, register
-   return hval + asso_values[(unsigned char)str[len - 1]];
- }
- 
--#ifdef __GNUC__
--__inline
--#ifdef __GNUC_STDC_INLINE__
--__attribute__ ((__gnu_inline__))
--#endif
--#endif
- const char *
--libc_name_p (register const char *str, register unsigned int len)
-+libc_name::libc_name_p (register const char *str, register unsigned int len)
- {
-   enum
-     {
-diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
---- a/gcc/cp/except.c	2013-10-25 06:49:48.000000000 -0700
-+++ b/gcc/cp/except.c	2016-12-05 13:55:20.331616274 -0800
-@@ -1025,7 +1025,8 @@ nothrow_libfn_p (const_tree fn)
-      unless the system headers are playing rename tricks, and if
-      they are, we don't want to be confused by them.  */
-   id = DECL_NAME (fn);
--  return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
-+  return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
-+				   IDENTIFIER_LENGTH (id));
- }
- 
- /* Returns nonzero if an exception of type FROM will be caught by a
-diff -urpN a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
---- a/gcc/cp/Make-lang.in	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/Make-lang.in	2016-12-05 13:55:20.331616274 -0800
-@@ -115,7 +115,7 @@ else
- # deleting the $(srcdir)/cp/cfns.h file.
- $(srcdir)/cp/cfns.h:
- endif
--	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
-+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \
- 		$(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h
- 
- #
diff --git a/patches/gcc/4.8.5/301-missing-execinfo_h.patch b/patches/gcc/4.8.5/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda2..0000000
--- a/patches/gcc/4.8.5/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/4.8.5/305-libmudflap-susv3-legacy.patch b/patches/gcc/4.8.5/305-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 35d5f50..0000000
--- a/patches/gcc/4.8.5/305-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: gcc-4.8.0/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
-+++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
-@@ -424,7 +424,7 @@
- {
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
--  bzero (s, n);
-+  memset (s, 0, n);
- }
- 
- 
-@@ -434,7 +434,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
-   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
--  bcopy (src, dest, n);
-+  memmove (dest, src, n);
- }
- 
- 
-@@ -444,7 +444,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
-   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
--  return bcmp (s1, s2, n);
-+  return n == 0 ? 0 : memcmp (s1, s2, n);
- }
- 
- 
-@@ -453,7 +453,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
--  return index (s, c);
-+  return strchr (s, c);
- }
- 
- 
-@@ -462,7 +462,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
--  return rindex (s, c);
-+  return strrchr (s, c);
- }
- 
- /* XXX:  stpcpy, memccpy */
diff --git a/patches/gcc/4.8.5/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/4.8.5/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index 3cf66b2..0000000
--- a/patches/gcc/4.8.5/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc/configure
---- gcc-4.8.5.orig/gcc/configure	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure	2017-02-11 16:57:27.424807994 -0800
-@@ -27364,6 +27364,9 @@ fi
- 
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -27375,6 +27378,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -27487,23 +27495,23 @@ fi
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/gcc/configure.ac
---- gcc-4.8.5.orig/gcc/configure.ac	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure.ac	2017-02-11 16:57:27.424807994 -0800
-@@ -5243,6 +5243,9 @@ enable_plugin=$enableval,
- enable_plugin=yes; default_plugin=yes)
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -5254,6 +5257,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -5305,17 +5313,17 @@ if test x"$enable_plugin" = x"yes"; then
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  AC_MSG_CHECKING([for -fPIC -shared])
-+  AC_MSG_CHECKING([for ${PICFLAG} -shared])
-   AC_TRY_LINK(
--    [extern int X;],[return X == 0;],
-+    [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-     [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-     [AC_MSG_RESULT([no]); have_pic_shared=no])
-   if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
diff --git a/patches/gcc/4.8.5/810-arm-softfloat-libgcc.patch b/patches/gcc/4.8.5/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index c8cb377..0000000
--- a/patches/gcc/4.8.5/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.0/gcc/config/arm/linux-elf.h	2013-03-23 17:40:00.000000000 +0100
-@@ -55,7 +55,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: gcc-4.8.0/libgcc/config/arm/t-linux
-===================================================================
---- gcc-4.8.0.orig/libgcc/config/arm/t-linux	2012-03-22 16:14:46.000000000 +0100
-+++ gcc-4.8.0/libgcc/config/arm/t-linux	2013-03-23 17:40:54.000000000 +0100
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/4.8.5/830-arm_unbreak_armv4t.patch b/patches/gcc/4.8.5/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index 37f8f2a..0000000
--- a/patches/gcc/4.8.5/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/4.8.5/841-PR57717-E500v2.patch b/patches/gcc/4.8.5/841-PR57717-E500v2.patch
deleted file mode 100644
index a011e24..0000000
--- a/patches/gcc/4.8.5/841-PR57717-E500v2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717
-
-Upstream-Status: Backport
-Signed-off-by: Julian Brown <Julian_Brown@mentor.com>
-[Gustavo: Update for gcc 4.8.3]
-
-fix for PR57717 (PowerPC E500v2)
-http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html
-
-diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c
---- gcc-4.8.3/gcc/config/rs6000/rs6000.c	2014-05-04 23:18:35.000000000 -0300
-+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c	2014-05-22 15:20:12.554270919 -0300
-@@ -7343,9 +7343,7 @@
-       && GET_CODE (XEXP (x, 1)) == CONST_INT
-       && reg_offset_p
-       && !SPE_VECTOR_MODE (mode)
--      && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
--				  || mode == DDmode || mode == TDmode
--				  || mode == DImode))
-+      && !(TARGET_E500_DOUBLE && GET_MODE_SIZE (mode) > UNITS_PER_WORD)
-       && (!VECTOR_MODE_P (mode) || VECTOR_MEM_NONE_P (mode)))
-     {
-       HOST_WIDE_INT val = INTVAL (XEXP (x, 1));
diff --git a/patches/gcc/4.8.5/842-PR60155.patch b/patches/gcc/4.8.5/842-PR60155.patch
deleted file mode 100644
index 7bc2122..0000000
--- a/patches/gcc/4.8.5/842-PR60155.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From gcc bugzilla https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
-Upstream status: in trunk.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- trunk/gcc/gcse.c	2014/02/12 14:50:06	207726
-+++ trunk/gcc/gcse.c	2014/04/04 22:25:51	209134
-@@ -2502,6 +2502,65 @@
-       }
- }
- 
-+struct set_data
-+{
-+  rtx insn;
-+  const_rtx set;
-+  int nsets;
-+};
-+
-+/* Increment number of sets and record set in DATA.  */
-+
-+static void
-+record_set_data (rtx dest, const_rtx set, void *data)
-+{
-+  struct set_data *s = (struct set_data *)data;
-+
-+  if (GET_CODE (set) == SET)
-+    {
-+      /* We allow insns having multiple sets, where all but one are
-+	 dead as single set insns.  In the common case only a single
-+	 set is present, so we want to avoid checking for REG_UNUSED
-+	 notes unless necessary.  */
-+      if (s->nsets == 1
-+	  && find_reg_note (s->insn, REG_UNUSED, SET_DEST (s->set))
-+	  && !side_effects_p (s->set))
-+	s->nsets = 0;
-+
-+      if (!s->nsets)
-+	{
-+	  /* Record this set.  */
-+	  s->nsets += 1;
-+	  s->set = set;
-+	}
-+      else if (!find_reg_note (s->insn, REG_UNUSED, dest)
-+	       || side_effects_p (set))
-+	s->nsets += 1;
-+    }
-+}
-+
-+static const_rtx
-+single_set_gcse (rtx insn)
-+{
-+  struct set_data s;
-+  rtx pattern;
-+  
-+  gcc_assert (INSN_P (insn));
-+
-+  /* Optimize common case.  */
-+  pattern = PATTERN (insn);
-+  if (GET_CODE (pattern) == SET)
-+    return pattern;
-+
-+  s.insn = insn;
-+  s.nsets = 0;
-+  note_stores (pattern, record_set_data, &s);
-+
-+  /* Considered invariant insns have exactly one set.  */
-+  gcc_assert (s.nsets == 1);
-+  return s.set;
-+}
-+
- /* Emit move from SRC to DEST noting the equivalence with expression computed
-    in INSN.  */
- 
-@@ -2509,7 +2568,8 @@
- gcse_emit_move_after (rtx dest, rtx src, rtx insn)
- {
-   rtx new_rtx;
--  rtx set = single_set (insn), set2;
-+  const_rtx set = single_set_gcse (insn);
-+  rtx set2;
-   rtx note;
-   rtx eqv = NULL_RTX;
- 
-@@ -3369,13 +3429,12 @@
- 	      FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr)
- 		{
- 		  rtx insn;
--		  rtx set;
-+		  const_rtx set;
- 
- 		  gcc_assert (!occr->deleted_p);
- 
- 		  insn = occr->insn;
--		  set = single_set (insn);
--		  gcc_assert (set);
-+		  set = single_set_gcse (insn);
- 
- 		  /* Create a pseudo-reg to store the result of reaching
- 		     expressions into.  Get the mode for the new pseudo
-@@ -3456,10 +3515,8 @@
- {
-   rtx reg;
-   enum reg_class pressure_class;
--  rtx set = single_set (insn);
-+  const_rtx set = single_set_gcse (insn);
- 
--  /* Considered invariant insns have only one set.  */
--  gcc_assert (set != NULL_RTX);
-   reg = SET_DEST (set);
-   if (GET_CODE (reg) == SUBREG)
-     reg = SUBREG_REG (reg);
diff --git a/patches/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch b/patches/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch
deleted file mode 100644
index afa650c..0000000
--- a/patches/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 845478644ba54a6947e9b224f2e5cd342e8257a9 Mon Sep 17 00:00:00 2001
-From: Andrew Hsieh <andrewhsieh@google.com>
-Date: Wed, 25 Jun 2014 22:13:48 -0700
-Subject: [PATCH] Fix a typo in vmlaq_lane_s32
-
-BUG=15526898
-
-Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
-
-diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
-index 73c7e7d..92b0119 100644
---- a/gcc/config/aarch64/arm_neon.h
-+++ b/gcc/config/aarch64/arm_neon.h
-@@ -9984,7 +9984,7 @@
- #define vmlaq_lane_s32(a, b, c, d)                                      \
-   __extension__                                                         \
-     ({                                                                  \
--       int32x4_t c_ = (c);                                              \
-+       int32x2_t c_ = (c);                                              \
-        int32x4_t b_ = (b);                                              \
-        int32x4_t a_ = (a);                                              \
-        int32x4_t result;                                                \
diff --git a/patches/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch b/patches/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 792976f..0000000
--- a/patches/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -2809,7 +2809,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) \
-      && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
- 
- #include <ext/string_conversions.h>
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -987,7 +987,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// First try a buffer perhaps big enough (most probably sufficient
- 	// for non-ios_base::fixed outputs)
- 	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -572,7 +572,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -182,7 +182,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -139,7 +139,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -180,7 +180,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2571,7 +2571,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -787,7 +787,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -139,7 +139,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/4.8.5/851-PR-other-56780.patch b/patches/gcc/4.8.5/851-PR-other-56780.patch
deleted file mode 100644
index feb4339..0000000
--- a/patches/gcc/4.8.5/851-PR-other-56780.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From afe990251bd9b3a063f03da31a3b8d139d033bc3 Mon Sep 17 00:00:00 2001
-From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 1 Jun 2013 00:20:49 +0000
-Subject: [PATCH] PR other/56780
-
-* libiberty/configure.ac: Move test for --enable-install-libiberty
-outside of the 'with_target_subdir' test so that it actually gets
-run.  Add output messages to show the test result.
-* libiberty/configure: Regenerate.
-* libiberty/Makefile.in (install_to_libdir): Place the
-installation of the libiberty library in the same guard as that
-used for the headers to prevent it being installed unless
-requested via --enable-install-libiberty.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199570 138bc75d-0d04-0410-961f-82ee72b054a4
-
-libiberty: fix --enable-install-libiberty flag [PR 56780]
-
-Commit 199570 fixed the --disable-install-libiberty behavior, but it also
-added a bug where the enable path never works because the initial clear
-of target_header_dir wasn't deleted.  So we end up initializing properly
-at the top only to reset it at the end all the time.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
-
-[Romain
-  squash the two upstream commits
-  Remove the ChangeLog]
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- libiberty/Makefile.in  | 24 ++++++++++-----------
- libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
- libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
- 3 files changed, 68 insertions(+), 60 deletions(-)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index f6a3ebd..75ff82d 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -355,19 +355,19 @@ install-strip: install
- # since it will be passed the multilib flags.
- MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
- install_to_libdir: all
--	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
--	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
--	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
--	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
- 	if test -n "${target_header_dir}"; then \
--	  case "${target_header_dir}" in \
--	    /*)    thd=${target_header_dir};; \
--	    *)     thd=${includedir}/${target_header_dir};; \
--	  esac; \
--	  ${mkinstalldirs} $(DESTDIR)$${thd}; \
--	  for h in ${INSTALLED_HEADERS}; do \
--	    ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
--	  done; \
-+		${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
-+		$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
-+		( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
-+		mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
-+		case "${target_header_dir}" in \
-+		  /*)    thd=${target_header_dir};; \
-+		  *)     thd=${includedir}/${target_header_dir};; \
-+		esac; \
-+		${mkinstalldirs} $(DESTDIR)$${thd}; \
-+		for h in ${INSTALLED_HEADERS}; do \
-+		  ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
-+		done; \
- 	fi
- 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
- 
-diff --git a/libiberty/configure b/libiberty/configure
-index 5367027..4feb95a 100755
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -675,8 +675,8 @@ with_cross_host
- with_newlib
- enable_maintainer_mode
- enable_multilib
--enable_largefile
- enable_install_libiberty
-+enable_largefile
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1303,8 +1303,8 @@ Optional Features:
-                           enable make rules and dependencies not useful
-                           (and sometimes confusing) to the casual installer
-   --enable-multilib       build many library versions (default)
-+  --enable-install-libiberty       Install headers and library for end users
-   --disable-largefile     omit support for large files
--  --enable-install-libiberty       Install headers for end users
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
-    cross_compiling=maybe
- fi
- 
-+# We may wish to install the target headers somewhere.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5
-+$as_echo_n "checking whether to install libiberty headers and static library... " >&6; }
-+
-+# Check whether --enable-install-libiberty was given.
-+if test "${enable_install_libiberty+set}" = set; then :
-+  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
-+else
-+  enable_install_libiberty=no
-+fi
-+
-+# Option parsed, now set things appropriately.
-+case x"$enable_install_libiberty" in
-+  xyes|x)
-+    target_header_dir=libiberty
-+    ;;
-+  xno)
-+    target_header_dir=
-+    ;;
-+  *)
-+    # This could be sanity-checked in various ways...
-+    target_header_dir="${enable_install_libiberty}"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5
-+$as_echo "$enable_install_libiberty" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5
-+$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;}
-+
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5476,7 +5505,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -5759,29 +5787,6 @@ _ACEOF
- 
-   esac
- 
--  # We may wish to install the target headers somewhere.
--  # Check whether --enable-install-libiberty was given.
--if test "${enable_install_libiberty+set}" = set; then :
--  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
--else
--  enable_install_libiberty=no
--fi
--
--  # Option parsed, now set things appropriately.
--  case x"$enable_install_libiberty" in
--    xyes|x)
--      target_header_dir=libiberty
--      ;;
--    xno)
--      target_header_dir=
--      ;;
--    *)
--      # This could be sanity-checked in various ways...
--      target_header_dir="${enable_install_libiberty}"
--      ;;
--  esac
--
--
- else
- 
-    # Not a target library, so we set things up to run the test suite.
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index c763894..f17e6b6 100644
---- a/libiberty/configure.ac
-+++ b/libiberty/configure.ac
-@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
-    cross_compiling=maybe
- fi
- 
-+# We may wish to install the target headers somewhere.
-+AC_MSG_CHECKING([whether to install libiberty headers and static library])
-+dnl install-libiberty is disabled by default
-+
-+AC_ARG_ENABLE(install-libiberty,
-+[  --enable-install-libiberty       Install headers and library for end users],
-+enable_install_libiberty=$enableval,
-+enable_install_libiberty=no)dnl
-+
-+# Option parsed, now set things appropriately.
-+case x"$enable_install_libiberty" in
-+  xyes|x)
-+    target_header_dir=libiberty
-+    ;;
-+  xno)   
-+    target_header_dir=
-+    ;;
-+  *) 
-+    # This could be sanity-checked in various ways...
-+    target_header_dir="${enable_install_libiberty}"
-+    ;;
-+esac
-+AC_MSG_RESULT($enable_install_libiberty)
-+AC_MSG_NOTICE([target_header_dir = $target_header_dir])
-+
- GCC_NO_EXECUTABLES
- AC_PROG_CC
- AC_SYS_LARGEFILE
-@@ -380,7 +405,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then
- 
-   esac
- 
--  # We may wish to install the target headers somewhere.
--  AC_ARG_ENABLE(install-libiberty,
--  [  --enable-install-libiberty       Install headers for end users],
--  enable_install_libiberty=$enableval,
--  enable_install_libiberty=no)dnl
--  
--  # Option parsed, now set things appropriately.
--  case x"$enable_install_libiberty" in
--    xyes|x)
--      target_header_dir=libiberty
--      ;;
--    xno)   
--      target_header_dir=
--      ;;
--    *) 
--      # This could be sanity-checked in various ways...
--      target_header_dir="${enable_install_libiberty}"
--      ;;
--  esac
--
--
- else
- 
-    # Not a target library, so we set things up to run the test suite.
--- 
-1.9.3
-
diff --git a/patches/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch b/patches/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index aa1376c..0000000
--- a/patches/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -796,21 +797,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -881,7 +883,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch b/patches/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index abc7a08..0000000
--- a/patches/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
-	CALL12 followed by series of ENTRY to spill windowed registers.
-	(__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
-	instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 	.global	__xtensa_libgcc_window_spill
- 	.type	__xtensa_libgcc_window_spill,@function
- __xtensa_libgcc_window_spill:
--	entry	sp, 32
--	movi	a2, 0
--	syscall
-+	entry	sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+	call12	1f
-+	retw
-+	.align	4
-+1:
-+	.rept	(XCHAL_NUM_AREGS - 24) / 12
-+	_entry	sp, 48
-+	mov	a12, a0
-+	.endr
-+	_entry	sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+	mov	a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+	mov	a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+	mov	a12, a12
-+#endif
-+	retw
-+#else
-+	mov	a8, a8
- 	retw
-+#endif
- 	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
- 
- 
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
- 	entry	sp, 32
- 
- 	/* Flush registers.  */
--	mov	a5, a2
--	movi	a2, 0
--	syscall
--	mov	a2, a5
-+	call8	__xtensa_libgcc_window_spill
- 
- 	/* Because the save area for a0-a3 is stored one frame below
- 	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/patches/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index f23a5c0..0000000
--- a/patches/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-xtensa | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
---- a/libgcc/config/xtensa/t-xtensa
-+++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
- LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
- 
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch b/patches/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index dc40513..0000000
--- a/patches/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.8.5/900-musl-support.patch b/patches/gcc/4.8.5/900-musl-support.patch
deleted file mode 100644
index 6743a88..0000000
--- a/patches/gcc/4.8.5/900-musl-support.patch
+++ /dev/null
@@ -1,648 +0,0 @@
-Add musl support to gcc
-
-This patch comes from the musl-cross project at
-https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
-
- * the config.sub modifications have been removed, because Buildroot
-   already overwrites all config.sub with a more recent config.sub
-   that has musl support.
-
- * change to ensure that a dummy dynamic linker path
-   MUSL_DYNAMIC_LINKER<foo> is defined for all architectures,
-   otherwise building gcc for architectures not supported by musl was
-   causing build failure. Bug reported upstream at
-   https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on.
-
- * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic
-   and only add the musl one as an addition, not as a replacement. Not
-   doing this breaks C++ exception handling with glibc, because
-   USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script
-   not testing dl_iterate_phdr() on any system except Solaris.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: Update for gcc 4.8.3]
-
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
---- a/fixincludes/mkfixinc.sh
-+++ b/fixincludes/mkfixinc.sh
-@@ -19,7 +19,8 @@
-     powerpc-*-eabi*    | \
-     powerpc-*-rtems*   | \
-     powerpcle-*-eabisim* | \
--    powerpcle-*-eabi* )
-+    powerpcle-*-eabi* | \
-+    *-musl* )
- 	#  IF there is no include fixing,
- 	#  THEN create a no-op fixer and exit
- 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -21,7 +21,12 @@
- #ifndef GCC_AARCH64_LINUX_H
- #define GCC_AARCH64_LINUX_H
- 
-+/* The AArch64 port currently supports two dynamic linkers:
-+   - ld-linux-aarch64.so.1 - GLIBC dynamic linker
-+   - ld-musl-aarch64.so.1 - musl libc dynamic linker  */
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
- 
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,23 @@
-     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
-     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
- 
-+/* For ARM musl currently supports four dynamic linkers:
-+   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+   musl does not support the legacy OABI mode.
-+   All the dynamic linkers live in /lib.
-+   We default to soft-float, EL. */
-+#undef  MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux64.h
-===================================================================
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,10 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/i386/linux.h
-===================================================================
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,5 @@
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-@@ -53,18 +55,21 @@
-    uClibc or Bionic is the default C library and whether
-    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
- 
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
--  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
-+  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
- 
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -82,23 +87,32 @@
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
- #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
- 
-+/* Musl dynamic linker paths must be defined on a per-architecture
-+   basis, for each architecture supported by Musl. However, in order
-+   to let other architectures continue to build with other C
-+   libraries, we provide a dummy definition of the following defines. */
-+#define MUSL_DYNAMIC_LINKER "invalid"
-+#define MUSL_DYNAMIC_LINKER32 "invalid"
-+#define MUSL_DYNAMIC_LINKER64 "invalid"
-+#define MUSL_DYNAMIC_LINKERX32 "invalid"
-+
- #define GNU_USER_DYNAMIC_LINKER						\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
--			 BIONIC_DYNAMIC_LINKER)
-+			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
--			 BIONIC_DYNAMIC_LINKER32)
-+			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
--			 BIONIC_DYNAMIC_LINKER64)
-+			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
--			 BIONIC_DYNAMIC_LINKERX32)
-+			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
- 
- /* Determine whether the entire c99 runtime
-    is present in the runtime library.  */
- #undef TARGET_C99_FUNCTIONS
--#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
-+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
- 
- /* Whether we have sincos that follows the GNU extension.  */
- #undef TARGET_HAS_SINCOS
-@@ -107,3 +121,74 @@
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
-+
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP			\
-+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
-+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
-+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS			\
-+    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL			\
-+    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS				\
-+  {							\
-+    INCLUDE_DEFAULTS_MUSL_GPP				\
-+    INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    INCLUDE_DEFAULTS_MUSL_CROSS				\
-+    INCLUDE_DEFAULTS_MUSL_TOOL				\
-+    INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
-+    { 0, 0, 0, 0, 0, 0 }				\
-+  }
-+#endif
-Index: b/gcc/config/linux.opt
-===================================================================
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
---- a/gcc/config/microblaze/linux.h
-+++ b/gcc/config/microblaze/linux.h
-@@ -25,7 +25,23 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
-+
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-   { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/mips/linux64.h
-===================================================================
---- a/gcc/config/mips/linux64.h
-+++ b/gcc/config/mips/linux64.h
-@@ -29,4 +29,4 @@
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--			 BIONIC_DYNAMIC_LINKERN32)
-+			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -18,3 +18,11 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -374,17 +374,23 @@
- #endif
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- 
- #undef  DEFAULT_ASM_ENDIAN
- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
---- a/gcc/config/rs6000/secureplt.h
-+++ b/gcc/config/rs6000/secureplt.h
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -537,6 +537,9 @@
- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
- #define CC1_SECURE_PLT_DEFAULT_SPEC ""
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
- 
- /* Pass -G xxx to the compiler.  */
- #define	CC1_SPEC "%{G*} %(cc1_cpu)" \
-@@ -585,7 +588,8 @@
- 
- /* Override the default target of the linker.  */
- #define	LINK_TARGET_SPEC \
--  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
- 
- /* Any specific OS flags.  */
- #define LINK_OS_SPEC "\
-@@ -763,15 +767,18 @@
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- 
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-@@ -894,6 +901,7 @@
-   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
-   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
-   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
-+  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
-   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
-   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
-   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
---- a/gcc/config/sh/linux.h
-+++ b/gcc/config/sh/linux.h
-@@ -43,7 +43,15 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
-+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
-+#define MUSL_DYNAMIC_LINKER_E "eb"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E
-+#endif
-+
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -550,7 +550,7 @@
- esac
- 
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
- 
- # Common parts for widely ported systems.
- case ${target} in
-@@ -653,6 +653,9 @@
-     *-*-*uclibc*)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
-       ;;
-+    *-*-*musl*)
-+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+      ;;
-     *)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
-       ;;
-@@ -2135,6 +2138,10 @@
- 	    powerpc*-*-linux*paired*)
- 		tm_file="${tm_file} rs6000/750cl.h" ;;
- 	esac
-+        case ${target} in
-+            *-linux*-musl*)
-+                enable_secureplt=yes ;;
-+        esac
- 	if test x${enable_secureplt} = xyes; then
- 		tm_file="rs6000/secureplt.h ${tm_file}"
- 	fi
-Index: b/gcc/configure
-===================================================================
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -26936,6 +26940,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- 
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -4848,6 +4852,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
---- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
-@@ -181,6 +181,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__	/* BeOS */
- #define __SIZE_T__	/* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -197,6 +198,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
-   || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -214,6 +216,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -75,6 +75,13 @@
- # define USE_PT_GNU_EH_FRAME
- #endif
- 
-+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure
-+   script. */
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-+    && defined(TARGET_DL_ITERATE_PHDR)
-+# define USE_PT_GNU_EH_FRAME
-+#endif
-+
- #if defined(USE_PT_GNU_EH_FRAME)
- 
- #include <link.h>
-Index: b/libgomp/config/posix/time.c
-===================================================================
---- a/libgomp/config/posix/time.c
-+++ b/libgomp/config/posix/time.c
-@@ -28,6 +28,8 @@
-    The following implementation uses the most simple POSIX routines.
-    If present, POSIX 4 clocks should be used instead.  */
- 
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,11 @@
- 
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
- 
- static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
-    GLIBC has reserved words 10 through 13 for TM.  */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
- 
- #include "config/generic/tls.h"
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
- 
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
- 
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
- 
- #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -264,6 +264,13 @@
-     os_include_dir="os/bsd/freebsd"
-     ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+    # check for musl by target
-+    case "${host_os}" in
-+      *-musl*)
-+        os_include_dir="os/generic"
-+        ;;
-+      *)
-+
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
-     elif [ "$bionic" = "yes" ]; then
-@@ -272,6 +279,9 @@
-       os_include_dir="os/gnu-linux"
-     fi
-     ;;
-+
-+    esac
-+    ;;
-   hpux*)
-     os_include_dir="os/hpux"
-     ;;
diff --git a/patches/gcc/4.8.5/950-cygwin64.patch b/patches/gcc/4.8.5/950-cygwin64.patch
deleted file mode 100644
index 67182ee..0000000
--- a/patches/gcc/4.8.5/950-cygwin64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.8.5/gcc/config.host.orig	2017-02-10 20:45:10.425515700 -0800
-+++ gcc-4.8.5/gcc/config.host	2017-02-10 20:47:33.935525500 -0800
-@@ -214,7 +214,7 @@
-         ;;
-     esac
-     ;;
--  i[34567]86-*-cygwin*)
-+  i[34567]86-*-cygwin* | x86_64-*-cygwin*)
-     host_xm_file=i386/xm-cygwin.h
-     out_host_hook_obj=host-cygwin.o
-     host_xmake_file="${host_xmake_file} i386/x-cygwin"
diff --git a/patches/gcc/4.9.4/001-gcc_bug_62231.patch b/patches/gcc/4.9.4/001-gcc_bug_62231.patch
deleted file mode 100644
index e7c9cf9..0000000
--- a/patches/gcc/4.9.4/001-gcc_bug_62231.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
-@@ -438,6 +438,11 @@
- #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
- #endif
- 
-+/* The mapping from dwarf CFA reg number to internal dwarf reg numbers.  */
-+#ifndef DWARF_REG_TO_UNWIND_COLUMN
-+#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
-+#endif
-+
- /* Map register numbers held in the call frame info that gcc has
-    collected using DWARF_FRAME_REGNUM to those that should be output in
-    .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
-@@ -225,7 +225,44 @@
-   emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
- }
- 
--/* Generate code to initialize the register size table.  */
-+/* Helper for expand_builtin_init_dwarf_reg_sizes.  Generate code to
-+   initialize the dwarf register size table entry corresponding to register
-+   REGNO in REGMODE.  TABLE is the table base address, SLOTMODE is the mode
-+   to use for the size entry to initialize, and WROTE_RETURN_COLUMN needs to
-+   be set to true if the dwarf register number for REGNO is the dwarf return
-+   column number.  */
-+
-+static
-+void init_one_dwarf_reg_size (int regno, enum machine_mode regmode,
-+			      rtx table, enum machine_mode slotmode,
-+			      bool *wrote_return_column)
-+{
-+  const unsigned int dnum = DWARF_FRAME_REGNUM (regno);
-+  const unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
-+  const unsigned int dcol = DWARF_REG_TO_UNWIND_COLUMN (rnum);
-+  
-+  const HOST_WIDE_INT slotoffset = dcol * GET_MODE_SIZE (slotmode);
-+  const HOST_WIDE_INT regsize = GET_MODE_SIZE (regmode);
-+
-+  if (rnum >= DWARF_FRAME_REGISTERS)
-+    return;
-+
-+  if (dnum == DWARF_FRAME_RETURN_COLUMN)
-+    {
-+      if (regmode == VOIDmode)
-+	return;
-+      *wrote_return_column = true;
-+    }
-+
-+  if (slotoffset < 0)
-+    return;
-+
-+  emit_move_insn (adjust_address (table, slotmode, slotoffset),
-+		  gen_int_mode (regsize, slotmode));
-+}
-+
-+/* Generate code to initialize the dwarf register size table located
-+   at the provided ADDRESS.  */
- 
- void
- expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -238,30 +275,21 @@
- 
-   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
-     {
--      unsigned int dnum = DWARF_FRAME_REGNUM (i);
--      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
--      if (rnum < DWARF_FRAME_REGISTERS)
--	{
--	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
--	  enum machine_mode save_mode = reg_raw_mode[i];
--	  HOST_WIDE_INT size;
--
--	  if (HARD_REGNO_CALL_PART_CLOBBERED (i, save_mode))
--	    save_mode = choose_hard_reg_mode (i, 1, true);
--	  if (dnum == DWARF_FRAME_RETURN_COLUMN)
--	    {
--	      if (save_mode == VOIDmode)
--		continue;
--	      wrote_return_column = true;
--	    }
--	  size = GET_MODE_SIZE (save_mode);
--	  if (offset < 0)
--	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
--	  emit_move_insn (adjust_address (mem, mode, offset),
--			  gen_int_mode (size, mode));
--	}
-+      span = targetm.dwarf_register_span (gen_rtx_REG (save_mode, i));
-+      if (!span)
-+        init_one_dwarf_reg_size (i, save_mode, mem, mode, &wrote_return_column);
-+      else
-+        {
-+          for (int si = 0; si < XVECLEN (span, 0); si++)
-+            {
-+              rtx reg = XVECEXP (span, 0, si);
-+              init_one_dwarf_reg_size
-+              (REGNO (reg), GET_MODE (reg), mem, mode, &wrote_return_column);
-+            }
-+        }
-     }
- 
-   if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
-@@ -55,10 +55,6 @@
- #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
- #endif
- 
--#ifndef DWARF_REG_TO_UNWIND_COLUMN
--#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
--#endif
--
- /* ??? For the public function interfaces, we tend to gcc_assert that the
-    column numbers are in range.  For the dwarf2 unwind info this does happen,
-    although so far in a case that doesn't actually matter.
diff --git a/patches/gcc/4.9.4/002-gcc_bug_62231.patch b/patches/gcc/4.9.4/002-gcc_bug_62231.patch
deleted file mode 100644
index b970ebc..0000000
--- a/patches/gcc/4.9.4/002-gcc_bug_62231.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
-      SCmode so as to pass the value correctly in a pair of
-      registers.  */
-   else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
--	   && !DECIMAL_FLOAT_MODE_P (mode))
-+	   && !DECIMAL_FLOAT_MODE_P (mode) && SPE_SIMD_REGNO_P (regno))
-     reg_size = UNITS_PER_FP_WORD;
- 
-   else
diff --git a/patches/gcc/4.9.4/100-uclibc-conf.patch b/patches/gcc/4.9.4/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a..0000000
--- a/patches/gcc/4.9.4/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/4.9.4/1000-libtool-leave-framework-alone.patch b/patches/gcc/4.9.4/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index 525592e..0000000
--- a/patches/gcc/4.9.4/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional b/patches/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional
deleted file mode 100644
index 5e0484f..0000000
--- a/patches/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional
+++ /dev/null
@@ -1,122 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
- libgcc/Makefile.in  |    4 +++-
- libgcc/configure    |   32 ++++++++++++++++++++++++++++++++
- libgcc/configure.ac |   21 +++++++++++++++++++++
- 3 files changed, 56 insertions(+), 1 deletion(-)
-
-Index: b/libgcc/Makefile.in
-===================================================================
---- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -42,6 +42,7 @@
- enable_vtable_verify = @enable_vtable_verify@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
- 
- host_noncanonical = @host_noncanonical@
- target_noncanonical = @target_noncanonical@
-@@ -943,9 +944,10 @@
- 		@multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_objs@,$(objects) libgcc.a,$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
-+		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- 		@shlib_map_file@,$(mapfile),$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
--		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
- 
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- 	# @multilib_flags@ is still needed because this may use
-Index: b/libgcc/configure
-===================================================================
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -564,6 +564,7 @@
- tmake_file
- sfp_machine_header
- set_use_emutls
-+LIBGCC_LIBM
- set_have_cc_tls
- vis_hide
- fixed_point
-@@ -4535,6 +4536,37 @@
- 	fi
- fi
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
- 
- # Conditionalize the makefile for this target machine.
- tmake_file_=
-Index: b/libgcc/configure.ac
-===================================================================
---- a/libgcc/configure.ac
-+++ b/libgcc/configure.ac
-@@ -357,6 +357,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+  libgcc_cv_copysignl_lib,
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+  ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # See if we have emulated thread-local storage.
- GCC_CHECK_EMUTLS
- set_use_emutls=
diff --git a/patches/gcc/4.9.4/111-pr65730.patch b/patches/gcc/4.9.4/111-pr65730.patch
deleted file mode 100644
index 8a41fd2..0000000
--- a/patches/gcc/4.9.4/111-pr65730.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 10 Apr 2015 17:46:30 +0300
-Subject: [PATCH] Fix PR target/65730
-
-2015-05-20  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (init_alignment_context): Replace MULT
-	by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT).
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
-Changes to ChangeLog are dropped.
-
- gcc/config/xtensa/xtensa.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1436,8 +1436,9 @@
-   if (ac->shift != NULL_RTX)
-     {
-       /* Shift is the byte count, but we need the bitcount.  */
--      ac->shift = expand_simple_binop (SImode, MULT, ac->shift,
--				       GEN_INT (BITS_PER_UNIT),
-+      gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0);
-+      ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift,
-+				       GEN_INT (exact_log2 (BITS_PER_UNIT)),
- 				       NULL_RTX, 1, OPTAB_DIRECT);
-       ac->modemask = expand_simple_binop (SImode, ASHIFT,
- 					  GEN_INT (GET_MODE_MASK (mode)),
diff --git a/patches/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/patches/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
deleted file mode 100644
index bb77c4b..0000000
--- a/patches/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Fri, 6 Nov 2015 14:27:23 +0100
-Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit
-
-Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
-64-bit binaries by default.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -441,7 +441,7 @@
- 	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
- 	need_64bit_hwint=yes
- 	case x$with_cpu in
--	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500)
-+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500)
- 		cpu_is_64bit=yes
- 		;;
- 	esac
diff --git a/patches/gcc/4.9.4/130-pr43538.patch b/patches/gcc/4.9.4/130-pr43538.patch
deleted file mode 100644
index 19e57bb..0000000
--- a/patches/gcc/4.9.4/130-pr43538.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001
-From: glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 25 Apr 2014 08:03:08 +0000
-Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
-
-	PR target/43538
-	* mt-gnu: Don't reset CXXFLAGS_FOR_TARGET.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-gnu    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
---- a/config/mt-gnu
-+++ b/config/mt-gnu
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/patches/gcc/4.9.4/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/patches/gcc/4.9.4/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
deleted file mode 100644
index 1c49fb0..0000000
--- a/patches/gcc/4.9.4/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9bcf38cd9f382486b3823eb923b50e2e9a89cef7 Mon Sep 17 00:00:00 2001
-From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Nov 2014 22:12:52 +0000
-Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
-
-        * mt-ospace (CFLAGS_FOR_TARGET): Append -g -Os rather than
-        overwriting.
-        (CXXFLAGS_FOR_TARGET): Similarly.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-ospace | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
---- a/config/mt-ospace
-+++ b/config/mt-ospace
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/patches/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/patches/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
deleted file mode 100644
index 55f3228..0000000
--- a/patches/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3c536954a67a883630f4a7513a27f02a892c3dcb Mon Sep 17 00:00:00 2001
-From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
-Date: Tue, 21 Oct 2014 21:08:13 +0000
-Subject: [PATCH] [sanitizer] Fix build with _FILE_OFFSET_BITS=64.
-
-Sanitizer source is not affected by _FILE_OFFSET_BITS in general,
-but this one file must be built with 32-bit off_t. More details in the code.
-
-git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220328 91177308-0d34-0410-b5e6-96231b3b80d8
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index bbc1108..fc09522 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -13,7 +13,15 @@
- 
- #include "sanitizer_platform.h"
- #if SANITIZER_LINUX || SANITIZER_MAC
-+// Tests in this file assume that off_t-dependent data structures match the
-+// libc ABI. For example, struct dirent here is what readdir() function (as
-+// exported from libc) returns, and not the user-facing "dirent", which
-+// depends on _FILE_OFFSET_BITS setting.
-+// To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
-+#ifdef _FILE_OFFSET_BITS
-+#undef _FILE_OFFSET_BITS
-+#endif
- 
- #include "sanitizer_internal_defs.h"
- #include "sanitizer_platform_limits_posix.h"
- 
--- 
-2.1.4
-
diff --git a/patches/gcc/4.9.4/301-missing-execinfo_h.patch b/patches/gcc/4.9.4/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda2..0000000
--- a/patches/gcc/4.9.4/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/4.9.4/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/4.9.4/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index c3bab15..0000000
--- a/patches/gcc/4.9.4/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc/configure
---- gcc-4.9.4.orig/gcc/configure	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure	2017-02-11 16:54:52.879474293 -0800
-@@ -28058,6 +28058,9 @@ fi
- 
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -28069,6 +28072,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -28181,23 +28189,23 @@ fi
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/gcc/configure.ac
---- gcc-4.9.4.orig/gcc/configure.ac	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure.ac	2017-02-11 16:49:59.820965424 -0800
-@@ -5583,6 +5583,9 @@ enable_plugin=$enableval,
- enable_plugin=yes; default_plugin=yes)
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -5594,6 +5597,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -5645,17 +5653,17 @@ if test x"$enable_plugin" = x"yes"; then
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  AC_MSG_CHECKING([for -fPIC -shared])
-+  AC_MSG_CHECKING([for ${PICFLAG} -shared])
-   AC_TRY_LINK(
--    [extern int X;],[return X == 0;],
-+    [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-     [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-     [AC_MSG_RESULT([no]); have_pic_shared=no])
-   if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
diff --git a/patches/gcc/4.9.4/810-arm-softfloat-libgcc.patch b/patches/gcc/4.9.4/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd..0000000
--- a/patches/gcc/4.9.4/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/4.9.4/830-arm_unbreak_armv4t.patch b/patches/gcc/4.9.4/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index 37f8f2a..0000000
--- a/patches/gcc/4.9.4/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch b/patches/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch
deleted file mode 100644
index 03fc47f..0000000
--- a/patches/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc
-
-From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001
-From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
-Date: Mon, 18 Jun 2012 20:18:13 +0200
-Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support.
-
-Changelog
-
-2013-03-18  Edgar E. Iglesias <edgar.iglesias@xilinx.com>
-            David Holsgrove <david.holsgrove@xilinx.com>
-
- * common/config/microblaze/microblaze-common.c: Remove
-   TARGET_EXCEPT_UNWIND_INFO definition.
- * config/microblaze/microblaze-protos.h: Add
-   microblaze_eh_return prototype.
- * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register,
-   microblaze_expand_epilogue, microblaze_return_addr): Handle
-   calls_eh_return
-   (microblaze_eh_return): New function.
- * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET,
-   EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX,
-   ASM_PREFERRED_EH_DATA_FORMAT
- * gcc/config/microblaze/microblaze.md: Define eh_return pattern.
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
----
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
- 5 files changed, 52 insertions(+), 7 deletions(-)
-
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
---- a/gcc/common/config/microblaze/microblaze-common.c
-+++ b/gcc/common/config/microblaze/microblaze-common.c
-@@ -37,7 +37,4 @@
- #undef  TARGET_OPTION_OPTIMIZATION_TABLE
- #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table
- 
--#undef TARGET_EXCEPT_UNWIND_INFO
--#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
--
- struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
---- a/gcc/config/microblaze/microblaze-protos.h
-+++ b/gcc/config/microblaze/microblaze-protos.h
-@@ -54,6 +54,7 @@
- extern int symbol_mentioned_p (rtx);
- extern int label_mentioned_p (rtx);
- extern bool microblaze_cannot_force_const_mem (enum machine_mode, rtx);
-+extern void microblaze_eh_return (rtx op0);
- #endif  /* RTX_CODE */
- 
- /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
---- a/gcc/config/microblaze/microblaze.c
-+++ b/gcc/config/microblaze/microblaze.c
-@@ -1906,6 +1906,11 @@
-   if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM))
-     return 1;
- 
-+  if (crtl->calls_eh_return
-+      && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) {
-+    return 1;
-+  }
-+
-   if (!crtl->is_leaf)
-     {
-       if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
-@@ -1933,6 +1938,13 @@
- 	return 1;
-     }
- 
-+  if (crtl->calls_eh_return
-+      && (regno == EH_RETURN_DATA_REGNO (0)
-+          || regno == EH_RETURN_DATA_REGNO (1)))
-+    {
-+      return 1;
-+    }
-+
-   return 0;
- }
- 
-@@ -2962,6 +2974,12 @@
-       emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx));
-     }
- 
-+  if (crtl->calls_eh_return)
-+    emit_insn (gen_addsi3 (stack_pointer_rtx,
-+                           stack_pointer_rtx,
-+                           gen_rtx_raw_REG (SImode,
-+                                            MB_EH_STACKADJ_REGNUM)));
-+
-   emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST +
- 						    MB_ABI_SUB_RETURN_ADDR_REGNUM)));
- }
-@@ -3256,10 +3274,13 @@
-   if (count != 0)
-     return NULL_RTX;
- 
--  return gen_rtx_PLUS (Pmode,
--		       get_hard_reg_initial_val (Pmode,
--						 MB_ABI_SUB_RETURN_ADDR_REGNUM),
--		       GEN_INT (8));
-+  return get_hard_reg_initial_val (Pmode,
-+                                   MB_ABI_SUB_RETURN_ADDR_REGNUM);
-+}
-+
-+void microblaze_eh_return (rtx op0)
-+{
-+  emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0));
- }
- 
- /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
---- a/gcc/config/microblaze/microblaze.h
-+++ b/gcc/config/microblaze/microblaze.h
-@@ -184,6 +184,21 @@
- #define INCOMING_RETURN_ADDR_RTX  			\
-   gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM)
- 
-+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC.  */
-+#define RETURN_ADDR_OFFSET (8)
-+
-+/* Describe how we implement __builtin_eh_return.  */
-+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM)
-+
-+#define MB_EH_STACKADJ_REGNUM  MB_ABI_INT_RETURN_VAL2_REGNUM
-+#define EH_RETURN_STACKADJ_RTX  gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM)
-+
-+/* Select a format to encode pointers in exception handling data.  CODE
-+   is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
-+   true if the symbol may be affected by dynamic relocations.  */
-+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
-+  ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr)
-+
- /* Use DWARF 2 debugging information by default.  */
- #define DWARF2_DEBUGGING_INFO
- #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
---- a/gcc/config/microblaze/microblaze.md
-+++ b/gcc/config/microblaze/microblaze.md
-@@ -2261,4 +2261,15 @@
-   (set_attr "mode"      "SI")
-   (set_attr "length"    "4")])
- 
-+; This is used in compiling the unwind routines.
-+(define_expand "eh_return"
-+  [(use (match_operand 0 "general_operand" ""))]
-+  ""
-+  "
-+{
-+  microblaze_eh_return(operands[0]);
-+  DONE;
-+}")
-+
- (include "sync.md")
-+
diff --git a/patches/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch b/patches/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 533d01f..0000000
--- a/patches/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: update for 4.9.3]
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -2843,7 +2843,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
-+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -572,7 +572,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -987,7 +987,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// First try a buffer perhaps big enough (most probably sufficient
- 	// for non-ios_base::fixed outputs)
- 	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -146,7 +146,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -182,7 +182,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -144,7 +144,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -180,7 +180,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2680,7 +2680,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -788,7 +788,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
diff --git a/patches/gcc/4.9.4/860-cilk-wchar.patch b/patches/gcc/4.9.4/860-cilk-wchar.patch
deleted file mode 100644
index 1837405..0000000
--- a/patches/gcc/4.9.4/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h
-+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/patches/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch b/patches/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index 98c7b3f..0000000
--- a/patches/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-Index: b/gcc/config/xtensa/constraints.md
-===================================================================
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-Index: b/gcc/config/xtensa/elf.h
-===================================================================
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-Index: b/gcc/config/xtensa/linux.h
-===================================================================
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-Index: b/gcc/config/xtensa/predicates.md
-===================================================================
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -477,6 +477,9 @@
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return (mode == SImode
-@@ -1044,7 +1047,7 @@
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2428,6 +2431,20 @@
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-Index: b/gcc/config/xtensa/xtensa.md
-===================================================================
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -799,8 +799,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -812,15 +812,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -834,21 +835,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -919,7 +921,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -934,8 +936,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -950,13 +952,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -997,7 +1000,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1008,8 +1011,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-Index: b/gcc/config/xtensa/xtensa.opt
-===================================================================
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
diff --git a/patches/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch b/patches/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index abc7a08..0000000
--- a/patches/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
-	CALL12 followed by series of ENTRY to spill windowed registers.
-	(__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
-	instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 	.global	__xtensa_libgcc_window_spill
- 	.type	__xtensa_libgcc_window_spill,@function
- __xtensa_libgcc_window_spill:
--	entry	sp, 32
--	movi	a2, 0
--	syscall
-+	entry	sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+	call12	1f
-+	retw
-+	.align	4
-+1:
-+	.rept	(XCHAL_NUM_AREGS - 24) / 12
-+	_entry	sp, 48
-+	mov	a12, a0
-+	.endr
-+	_entry	sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+	mov	a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+	mov	a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+	mov	a12, a12
-+#endif
-+	retw
-+#else
-+	mov	a8, a8
- 	retw
-+#endif
- 	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
- 
- 
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
- 	entry	sp, 32
- 
- 	/* Flush registers.  */
--	mov	a5, a2
--	movi	a2, 0
--	syscall
--	mov	a2, a5
-+	call8	__xtensa_libgcc_window_spill
- 
- 	/* Because the save area for a0-a3 is stored one frame below
- 	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/patches/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index f23a5c0..0000000
--- a/patches/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-xtensa | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
---- a/libgcc/config/xtensa/t-xtensa
-+++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
- LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
- 
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch b/patches/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index dc40513..0000000
--- a/patches/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/patches/gcc/4.9.4/874-xtensa-add-uclinux-support.patch b/patches/gcc/4.9.4/874-xtensa-add-uclinux-support.patch
deleted file mode 100644
index 881aec0..0000000
--- a/patches/gcc/4.9.4/874-xtensa-add-uclinux-support.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 22 Aug 2015 08:44:26 +0300
-Subject: [PATCH] xtensa: add uclinux support
-
-2015-10-03  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config.gcc (xtensa*-*-uclinux*): New configuration.
-	* config/xtensa/uclinux.h: New file.
-	* config/xtensa/uclinux.opt: New file.
-
-libgcc/
-	* config.host (xtensa*-*-uclinux*): New configuration.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r228450
-
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
- 4 files changed, 111 insertions(+)
- create mode 100644 gcc/config/xtensa/uclinux.h
- create mode 100644 gcc/config/xtensa/uclinux.opt
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2871,6 +2871,11 @@
- 	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
- 	tmake_file="${tmake_file} xtensa/t-xtensa"
- 	;;
-+xtensa*-*-uclinux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h"
-+	tmake_file="${tmake_file} xtensa/t-xtensa"
-+	extra_options="${extra_options} xtensa/uclinux.opt"
-+	;;
- am33_2.0-*-linux*)
- 	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
- 	gas=yes gnu_ld=yes
-Index: b/gcc/config/xtensa/uclinux.h
-===================================================================
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -0,0 +1,69 @@
-+/* Xtensa uClinux configuration.
-+   Derived from the configuration for GCC for Intel i386 running Linux.
-+   Copyright (C) 2001-2015 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC 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 3, or (at your option) any later
-+version.
-+
-+GCC 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 GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()				\
-+  do								\
-+    {								\
-+      GNU_USER_TARGET_OS_CPP_BUILTINS ();			\
-+      builtin_define ("__uClinux__");				\
-+    }								\
-+  while (0)
-+
-+#undef SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "long int"
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{mtext-section-literals:--text-section-literals} \
-+  %{mno-text-section-literals:--no-text-section-literals} \
-+  %{mtarget-align:--target-align} \
-+  %{mno-target-align:--no-target-align} \
-+  %{mlongcalls:--longcalls} \
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX	"."
-+
-+/* Always enable "-fpic" for Xtensa Linux.  */
-+#define XTENSA_ALWAYS_PIC 1
-+
-+#undef TARGET_LIBC_HAS_FUNCTION
-+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
-+
-+#undef DBX_REGISTER_NUMBER
-+
-Index: b/gcc/config/xtensa/uclinux.opt
-===================================================================
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.opt
-@@ -0,0 +1,32 @@
-+; Xtensa uClinux options.
-+
-+; Copyright (C) 2015 Free Software Foundation, Inc.
-+;
-+; This file is part of GCC.
-+;
-+; GCC 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 3, or (at your option) any later
-+; version.
-+;
-+; GCC 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 GCC; see the file COPYING3.  If not see
-+; <http://www.gnu.org/licenses/>.
-+
-+; See the GCC internals manual (options.texi) for a description of
-+; this file's format.
-+
-+; Please try to keep this file in ASCII collating order.
-+
-+elf2flt
-+Driver
-+
-+elf2flt=
-+Driver JoinedOrMissing
-+
-+; This comment is to ensure we retain the blank line above.
-Index: b/libgcc/config.host
-===================================================================
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -1213,6 +1213,11 @@
- 	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
- 	md_unwind_header=xtensa/linux-unwind.h
- 	;;
-+xtensa*-*-uclinux*)
-+	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
-+	md_unwind_header=xtensa/linux-unwind.h
-+	extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o"
-+	;;
- am33_2.0-*-linux*)
- 	# Don't need crtbeginT.o from *-*-linux* default.
- 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
diff --git a/patches/gcc/4.9.4/880-nios2_legitimize_address.patch b/patches/gcc/4.9.4/880-nios2_legitimize_address.patch
deleted file mode 100644
index 4623f29..0000000
--- a/patches/gcc/4.9.4/880-nios2_legitimize_address.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b0ea54f3f995754881e0ea6651133aa7b58eeaa2 Mon Sep 17 00:00:00 2001
-From: cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 22 Sep 2015 12:23:20 +0000
-Subject: [PATCH] nios2_legitimize_address 2015-09-22  Chung-Lin Tang 
- <cltang@codesourcery.com>
-
-	Backport from mainline
-	2015-09-22  Chung-Lin Tang  <cltang@codesourcery.com>
-
-	* config/nios2/nios2.c (nios2_legitimize_address): When handling
-	'reg + reloc' cases, allow first operand to be non-REG, and use
-	force_reg() to enforce address pattern.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@228013 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Fixes:
-http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0ccbb0
-
-[backported to 4.9.3]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- gcc/config/nios2/nios2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
-index 047b615..41dd6f9 100644
---- a/gcc/config/nios2/nios2.c
-+++ b/gcc/config/nios2/nios2.c
-@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
- 
-      Which will be output as '%tls_le(var+48)(r23)' in assembly.  */
-   if (GET_CODE (x) == PLUS
--      && GET_CODE (XEXP (x, 0)) == REG
-       && GET_CODE (XEXP (x, 1)) == CONST)
-     {
--      rtx unspec, offset, reg = XEXP (x, 0);
-+      rtx unspec, offset;
-       split_const (XEXP (x, 1), &unspec, &offset);
-       if (GET_CODE (unspec) == UNSPEC
- 	  && !nios2_large_offset_p (XINT (unspec, 1))
- 	  && offset != const0_rtx)
- 	{
-+	  rtx reg = force_reg (Pmode, XEXP (x, 0));
- 	  unspec = copy_rtx (unspec);
- 	  XVECEXP (unspec, 0, 0)
- 	    = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset));
--- 
-2.5.0
-
diff --git a/patches/gcc/4.9.4/890-fix-m68k-compile.patch b/patches/gcc/4.9.4/890-fix-m68k-compile.patch
deleted file mode 100644
index 140977b..0000000
--- a/patches/gcc/4.9.4/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c
---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c	2016-03-18 22:24:40.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/patches/gcc/4.9.4/891-fix-m68k-uclinux.patch b/patches/gcc/4.9.4/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4347642..0000000
--- a/patches/gcc/4.9.4/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host
---- gcc-4.9.3.orig/libgcc/config.host	2014-03-27 16:40:31.000000000 +0100
-+++ gcc-4.9.3/libgcc/config.host	2016-04-05 16:20:53.422809885 +0200
-@@ -750,7 +750,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/patches/gcc/4.9.4/900-musl-support.patch b/patches/gcc/4.9.4/900-musl-support.patch
deleted file mode 100644
index a862d01..0000000
--- a/patches/gcc/4.9.4/900-musl-support.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-Add musl support to gcc
-
-This patch comes from the musl-cross project at
-https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
-
- * the config.sub modifications have been removed, because Buildroot
-   already overwrites all config.sub with a more recent config.sub
-   that has musl support.
-
- * change to ensure that a dummy dynamic linker path
-   MUSL_DYNAMIC_LINKER<foo> is defined for all architectures,
-   otherwise building gcc for architectures not supported by musl was
-   causing build failure. Bug reported upstream at
-   https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on.
-
- * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic
-   and only add the musl one as an addition, not as a replacement. Not
-   doing this breaks C++ exception handling with glibc, because
-   USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script
-   not testing dl_iterate_phdr() on any system except Solaris.
-
-[Gustavo: remove upstream applied gcc/config/sh/sh.c chunk for 4.9.1]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
---- a/fixincludes/mkfixinc.sh
-+++ b/fixincludes/mkfixinc.sh
-@@ -19,7 +19,8 @@
-     powerpc-*-eabi*    | \
-     powerpc-*-rtems*   | \
-     powerpcle-*-eabisim* | \
--    powerpcle-*-eabi* )
-+    powerpcle-*-eabi* | \
-+    *-musl* )
- 	#  IF there is no include fixing,
- 	#  THEN create a no-op fixer and exit
- 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -594,7 +594,7 @@
- esac
- 
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
- 
- # 32-bit x86 processors supported by --with-arch=.  Each processor
- # MUST be separated by exactly one space.
-@@ -719,6 +719,9 @@
-     *-*-*uclibc*)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
-       ;;
-+    *-*-*musl*)
-+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+      ;;
-     *)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
-       ;;
-@@ -2338,6 +2341,10 @@
- 	    powerpc*-*-linux*paired*)
- 		tm_file="${tm_file} rs6000/750cl.h" ;;
- 	esac
-+        case ${target} in
-+            *-linux*-musl*)
-+                enable_secureplt=yes ;;
-+        esac
- 	if test x${enable_secureplt} = xyes; then
- 		tm_file="rs6000/secureplt.h ${tm_file}"
- 	fi
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -22,6 +22,8 @@
- #define GCC_AARCH64_LINUX_H
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
- 
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,23 @@
-     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
-     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
- 
-+/* For ARM musl currently supports four dynamic linkers:
-+   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+   musl does not support the legacy OABI mode.
-+   All the dynamic linkers live in /lib.
-+   We default to soft-float, EL. */
-+#undef  MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux.h
-===================================================================
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,5 @@
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/i386/linux64.h
-===================================================================
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,10 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-@@ -53,18 +55,21 @@
-    uClibc or Bionic is the default C library and whether
-    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
- 
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
--  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
-+  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
- 
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -82,23 +87,103 @@
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
- #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
- 
-+/* Musl dynamic linker paths must be defined on a per-architecture
-+   basis, for each architecture supported by Musl. However, in order
-+   to let other architectures continue to build with other C
-+   libraries, we provide a dummy definition of the following defines. */
-+#define MUSL_DYNAMIC_LINKER "invalid"
-+#define MUSL_DYNAMIC_LINKER32 "invalid"
-+#define MUSL_DYNAMIC_LINKER64 "invalid"
-+#define MUSL_DYNAMIC_LINKERX32 "invalid"
-+
- #define GNU_USER_DYNAMIC_LINKER						\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
--			 BIONIC_DYNAMIC_LINKER)
-+			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
--			 BIONIC_DYNAMIC_LINKER32)
-+			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
--			 BIONIC_DYNAMIC_LINKER64)
-+			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
--			 BIONIC_DYNAMIC_LINKERX32)
-+			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKER32)
- 
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
- 
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP			\
-+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
-+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
-+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS			\
-+    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL			\
-+    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS				\
-+  {							\
-+    INCLUDE_DEFAULTS_MUSL_GPP				\
-+    INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    INCLUDE_DEFAULTS_MUSL_CROSS				\
-+    INCLUDE_DEFAULTS_MUSL_TOOL				\
-+    INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
-+    { 0, 0, 0, 0, 0, 0 }				\
-+  }
-+#endif
-+
- #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
- /* This is a *uclinux* target.  We don't define below macros to normal linux
-    versions, because doing so would require *uclinux* targets to include
-Index: b/gcc/config/linux.opt
-===================================================================
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
---- a/gcc/config/microblaze/linux.h
-+++ b/gcc/config/microblaze/linux.h
-@@ -28,7 +28,23 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
-+
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-   { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -371,17 +371,23 @@
- #endif
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- 
- #undef  DEFAULT_ASM_ENDIAN
- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
---- a/gcc/config/rs6000/secureplt.h
-+++ b/gcc/config/rs6000/secureplt.h
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -537,6 +537,9 @@
- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
- #define CC1_SECURE_PLT_DEFAULT_SPEC ""
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
- 
- /* Pass -G xxx to the compiler.  */
- #define	CC1_SPEC "%{G*} %(cc1_cpu)" \
-@@ -585,7 +588,8 @@
- 
- /* Override the default target of the linker.  */
- #define	LINK_TARGET_SPEC \
--  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
- 
- /* Any specific OS flags.  */
- #define LINK_OS_SPEC "\
-@@ -763,15 +767,18 @@
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- 
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-@@ -894,6 +901,7 @@
-   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
-   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
-   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
-+  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
-   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
-   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
-   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
---- a/gcc/config/sh/linux.h
-+++ b/gcc/config/sh/linux.h
-@@ -43,7 +43,15 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
-+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
-+#define MUSL_DYNAMIC_LINKER_E "eb"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E
-+#endif
-+
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/configure
-===================================================================
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -27601,6 +27601,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- 
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -5173,6 +5173,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
---- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
-@@ -181,6 +181,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__	/* BeOS */
- #define __SIZE_T__	/* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -197,6 +198,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
-   || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -214,6 +216,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -73,6 +73,13 @@
-     && defined(TARGET_DL_ITERATE_PHDR) \
-     && defined(__sun__) && defined(__svr4__)
- # define USE_PT_GNU_EH_FRAME
-+ #endif
-+
-+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure
-+   script. */
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR)	\
-+  && defined(TARGET_DL_ITERATE_PHDR)
-+# define USE_PT_GNU_EH_FRAME
- #endif
- 
- #if defined(USE_PT_GNU_EH_FRAME)
-Index: b/libgomp/config/posix/time.c
-===================================================================
---- a/libgomp/config/posix/time.c
-+++ b/libgomp/config/posix/time.c
-@@ -28,6 +28,8 @@
-    The following implementation uses the most simple POSIX routines.
-    If present, POSIX 4 clocks should be used instead.  */
- 
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,11 @@
- 
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
- 
- static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
-    GLIBC has reserved words 10 through 13 for TM.  */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
- 
- #include "config/generic/tls.h"
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
- 
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
- 
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
- 
- #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -266,6 +266,13 @@
-     os_include_dir="os/bsd/freebsd"
-     ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+    # check for musl by target
-+    case "${host_os}" in
-+      *-musl*)
-+        os_include_dir="os/generic"
-+        ;;
-+      *)
-+
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
-     elif [ "$bionic" = "yes" ]; then
-@@ -274,6 +281,9 @@
-       os_include_dir="os/gnu-linux"
-     fi
-     ;;
-+
-+    esac
-+    ;;
-   hpux*)
-     os_include_dir="os/hpux"
-     ;;
-Index: b/gcc/config/mips/linux64.h
-===================================================================
---- a/gcc/config/mips/linux64.h
-+++ b/gcc/config/mips/linux64.h
-@@ -41,4 +41,4 @@
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--			 BIONIC_DYNAMIC_LINKERN32)
-+			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -23,3 +23,11 @@
- #undef UCLIBC_DYNAMIC_LINKER
- #define UCLIBC_DYNAMIC_LINKER \
-   "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
-+
-+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
diff --git a/patches/gcc/4.9.4/901-microblaze-uclibc.patch b/patches/gcc/4.9.4/901-microblaze-uclibc.patch
deleted file mode 100644
index 82c44e1..0000000
--- a/patches/gcc/4.9.4/901-microblaze-uclibc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Add dynamic linker support for uClibc
-
-Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
-
-diff -Nur gcc-4.9.3.orig/gcc/config/microblaze/linux.h gcc-4.9.3/gcc/config/microblaze/linux.h
---- gcc-4.9.3.orig/gcc/config/microblaze/linux.h	2016-06-04 21:21:09.430646655 +0200
-+++ gcc-4.9.3/gcc/config/microblaze/linux.h	2016-06-04 21:21:44.596003509 +0200
-@@ -36,10 +36,13 @@
- 
- #undef MUSL_DYNAMIC_LINKER
- #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
- #if DEFAULT_LIBC == LIBC_MUSL
- #define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#elif DEFAULT_LIBC == LIBC_UCLIBC
-+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER
- #else
- #define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- #endif
diff --git a/patches/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch b/patches/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 670cf8d..0000000
--- a/patches/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack
---- gcc-4.9.3.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-4.9.3/libgcc/config/t-stack	2016-03-07 01:34:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/patches/gcc/4.9.4/940-uclinux-enable-threads.patch b/patches/gcc/4.9.4/940-uclinux-enable-threads.patch
deleted file mode 100644
index 5108147..0000000
--- a/patches/gcc/4.9.4/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -810,6 +810,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/patches/gcc/5.4.0/100-uclibc-conf.patch b/patches/gcc/5.4.0/100-uclibc-conf.patch
deleted file mode 100644
index 73d1f0d..0000000
--- a/patches/gcc/5.4.0/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/5.4.0/1000-libtool-leave-framework-alone.patch b/patches/gcc/5.4.0/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index 0f4912a..0000000
--- a/patches/gcc/5.4.0/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-5.4.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-5.4.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*|-static-lib*|-shared-lib*|-B*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/5.4.0/110-xtensa-implement-trap-pattern.patch b/patches/gcc/5.4.0/110-xtensa-implement-trap-pattern.patch
deleted file mode 100644
index 3304532..0000000
--- a/patches/gcc/5.4.0/110-xtensa-implement-trap-pattern.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d462e776df56a72f68545054f6d722bf447f0519 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 8 Jun 2015 22:29:11 +0300
-Subject: [PATCH] xtensa: implement trap pattern
-
-gcc/
-	* config/xtensa/xtensa.h (TARGET_DEBUG): New definition.
-	* config/xtensa/xtensa.md (define_attr "type"): New type "trap".
-	(define_insn "trap"): New definition.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.h  |  1 +
- gcc/config/xtensa/xtensa.md | 15 ++++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 011411c..584080b 100644
---- a/gcc/config/xtensa/xtensa.h
-+++ b/gcc/config/xtensa/xtensa.h
-@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size;
- #define TARGET_THREADPTR	XCHAL_HAVE_THREADPTR
- #define TARGET_LOOPS	        XCHAL_HAVE_LOOPS
- #define TARGET_WINDOWED_ABI	(XSHAL_ABI == XTHAL_ABI_WINDOWED)
-+#define TARGET_DEBUG		XCHAL_HAVE_DEBUG
- 
- #define TARGET_DEFAULT \
-   ((XCHAL_HAVE_L32R	? 0 : MASK_CONST16) |				\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..a577aa3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -86,7 +86,7 @@
- ;; Attributes.
- 
- (define_attr "type"
--  "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry"
-+  "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry,trap"
-   (const_string "unknown"))
- 
- (define_attr "mode"
-@@ -1764,6 +1764,19 @@
-   [(set_attr "length" "0")
-    (set_attr "type" "nop")])
- 
-+(define_insn "trap"
-+  [(trap_if (const_int 1) (const_int 0))]
-+  ""
-+{
-+  if (TARGET_DEBUG)
-+    return "break\t1, 15";
-+  else
-+    return (TARGET_DENSITY ? "ill.n" : "ill");
-+}
-+  [(set_attr "type"	"trap")
-+   (set_attr "mode"	"none")
-+   (set_attr "length"	"3")])
-+
- ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't
- ;; know if a frame pointer is required until the reload pass, and
- ;; because there may be an incoming argument value in the hard frame
--- 
-1.8.1.4
-
diff --git a/patches/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/patches/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
deleted file mode 100644
index c11ad35..0000000
--- a/patches/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Fri, 6 Nov 2015 14:27:23 +0100
-Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit
-
-Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
-64-bit binaries by default.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 4a7cbd2..9cc765e 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -439,7 +439,7 @@ powerpc*-*-*)
- 	cpu_type=rs6000
- 	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
- 	case x$with_cpu in
--	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500)
-+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500)
- 		cpu_is_64bit=yes
- 		;;
- 	esac
--- 
-2.6.2
-
diff --git a/patches/gcc/5.4.0/301-missing-execinfo_h.patch b/patches/gcc/5.4.0/301-missing-execinfo_h.patch
deleted file mode 100644
index 2d0e7ba..0000000
--- a/patches/gcc/5.4.0/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
---- a/boehm-gc/include/gc.h
-+++ b/boehm-gc/include/gc.h
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/5.4.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/5.4.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index d8986d5..0000000
--- a/patches/gcc/5.4.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
-@@ -20,6 +20,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -30,6 +33,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -81,17 +89,17 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     AC_MSG_CHECKING([for -fPIC -shared])
-+     AC_MSG_CHECKING([for ${PICFLAG} -shared])
-      AC_TRY_LINK(
--       [extern int X;],[return X == 0;],
-+       [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-        [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-        [AC_MSG_RESULT([no]); have_pic_shared=no])
-      if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
diff --git a/patches/gcc/5.4.0/380-gcc-plugin-POSIX-include-sys-select-h.patch b/patches/gcc/5.4.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48e..0000000
--- a/patches/gcc/5.4.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/patches/gcc/5.4.0/810-arm-softfloat-libgcc.patch b/patches/gcc/5.4.0/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd..0000000
--- a/patches/gcc/5.4.0/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/5.4.0/830-arm_unbreak_armv4t.patch b/patches/gcc/5.4.0/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b730059..0000000
--- a/patches/gcc/5.4.0/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch b/patches/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch
deleted file mode 100644
index 9d29090..0000000
--- a/patches/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc
-
-From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001
-From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
-Date: Mon, 18 Jun 2012 20:18:13 +0200
-Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support.
-
-Changelog
-
-2013-03-18  Edgar E. Iglesias <edgar.iglesias@xilinx.com>
-            David Holsgrove <david.holsgrove@xilinx.com>
-
- * common/config/microblaze/microblaze-common.c: Remove
-   TARGET_EXCEPT_UNWIND_INFO definition.
- * config/microblaze/microblaze-protos.h: Add
-   microblaze_eh_return prototype.
- * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register,
-   microblaze_expand_epilogue, microblaze_return_addr): Handle
-   calls_eh_return
-   (microblaze_eh_return): New function.
- * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET,
-   EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX,
-   ASM_PREFERRED_EH_DATA_FORMAT
- * gcc/config/microblaze/microblaze.md: Define eh_return pattern.
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
----
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
- 5 files changed, 52 insertions(+), 7 deletions(-)
-
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
---- a/gcc/common/config/microblaze/microblaze-common.c
-+++ b/gcc/common/config/microblaze/microblaze-common.c
-@@ -37,7 +37,4 @@
- #undef  TARGET_OPTION_OPTIMIZATION_TABLE
- #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table
- 
--#undef TARGET_EXCEPT_UNWIND_INFO
--#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
--
- struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
---- a/gcc/config/microblaze/microblaze-protos.h
-+++ b/gcc/config/microblaze/microblaze-protos.h
-@@ -56,6 +56,7 @@
- extern int symbol_mentioned_p (rtx);
- extern int label_mentioned_p (rtx);
- extern bool microblaze_cannot_force_const_mem (machine_mode, rtx);
-+extern void microblaze_eh_return (rtx op0);
- #endif  /* RTX_CODE */
- 
- /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
---- a/gcc/config/microblaze/microblaze.c
-+++ b/gcc/config/microblaze/microblaze.c
-@@ -1959,6 +1959,11 @@
-   if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM))
-     return 1;
- 
-+  if (crtl->calls_eh_return
-+      && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) {
-+    return 1;
-+  }
-+
-   if (!crtl->is_leaf)
-     {
-       if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
-@@ -1986,6 +1991,13 @@
- 	return 1;
-     }
- 
-+  if (crtl->calls_eh_return
-+      && (regno == EH_RETURN_DATA_REGNO (0)
-+          || regno == EH_RETURN_DATA_REGNO (1)))
-+    {
-+      return 1;
-+    }
-+
-   return 0;
- }
- 
-@@ -3067,6 +3079,12 @@
-       emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx));
-     }
- 
-+  if (crtl->calls_eh_return)
-+    emit_insn (gen_addsi3 (stack_pointer_rtx,
-+                           stack_pointer_rtx,
-+                           gen_rtx_raw_REG (SImode,
-+                                            MB_EH_STACKADJ_REGNUM)));
-+
-   emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST +
- 						    MB_ABI_SUB_RETURN_ADDR_REGNUM)));
- }
-@@ -3364,10 +3382,13 @@
-   if (count != 0)
-     return NULL_RTX;
- 
--  return gen_rtx_PLUS (Pmode,
--		       get_hard_reg_initial_val (Pmode,
--						 MB_ABI_SUB_RETURN_ADDR_REGNUM),
--		       GEN_INT (8));
-+  return get_hard_reg_initial_val (Pmode,
-+                                   MB_ABI_SUB_RETURN_ADDR_REGNUM);
-+}
-+
-+void microblaze_eh_return (rtx op0)
-+{
-+  emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0));
- }
- 
- /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
---- a/gcc/config/microblaze/microblaze.h
-+++ b/gcc/config/microblaze/microblaze.h
-@@ -184,6 +184,21 @@
- #define INCOMING_RETURN_ADDR_RTX  			\
-   gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM)
- 
-+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC.  */
-+#define RETURN_ADDR_OFFSET (8)
-+
-+/* Describe how we implement __builtin_eh_return.  */
-+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM)
-+
-+#define MB_EH_STACKADJ_REGNUM  MB_ABI_INT_RETURN_VAL2_REGNUM
-+#define EH_RETURN_STACKADJ_RTX  gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM)
-+
-+/* Select a format to encode pointers in exception handling data.  CODE
-+   is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
-+   true if the symbol may be affected by dynamic relocations.  */
-+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
-+  ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr)
-+
- /* Use DWARF 2 debugging information by default.  */
- #define DWARF2_DEBUGGING_INFO
- #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
---- a/gcc/config/microblaze/microblaze.md
-+++ b/gcc/config/microblaze/microblaze.md
-@@ -2272,4 +2272,15 @@
-   (set_attr "mode"      "SI")
-   (set_attr "length"    "4")])
- 
-+; This is used in compiling the unwind routines.
-+(define_expand "eh_return"
-+  [(use (match_operand 0 "general_operand" ""))]
-+  ""
-+  "
-+{
-+  microblaze_eh_return(operands[0]);
-+  DONE;
-+}")
-+
- (include "sync.md")
-+
diff --git a/patches/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch b/patches/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 9e97d94..0000000
--- a/patches/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -5239,7 +5239,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
-+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -992,7 +992,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// Precision is always used except for hexfloat format.
- 	const bool __use_prec =
- 	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -578,7 +578,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -195,7 +195,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -144,7 +144,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -192,7 +192,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2680,7 +2680,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -788,7 +788,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -146,7 +146,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/5.4.0/860-cilk-wchar.patch b/patches/gcc/5.4.0/860-cilk-wchar.patch
deleted file mode 100644
index 1d9916f..0000000
--- a/patches/gcc/5.4.0/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- a/libcilkrts/include/cilk/reducer_min_max.h
-+++ b/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/patches/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch b/patches/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index aa1376c..0000000
--- a/patches/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -796,21 +797,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -881,7 +883,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/patches/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch b/patches/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index 4056f8b..0000000
--- a/patches/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 40507bf199440082ed69b777986d50c31efe2520 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
-	CALL12 followed by series of ENTRY to spill windowed registers.
-	(__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
-	instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 4d451c8..ef0703f 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -34,10 +34,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 	.global	__xtensa_libgcc_window_spill
- 	.type	__xtensa_libgcc_window_spill,@function
- __xtensa_libgcc_window_spill:
--	entry	sp, 32
--	movi	a2, 0
--	syscall
-+	entry	sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+	call12	1f
-+	retw
-+	.align	4
-+1:
-+	.rept	(XCHAL_NUM_AREGS - 24) / 12
-+	_entry	sp, 48
-+	mov	a12, a0
-+	.endr
-+	_entry	sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+	mov	a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+	mov	a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+	mov	a12, a12
-+#endif
- 	retw
-+#else
-+	mov	a8, a8
-+	retw
-+#endif
- 	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
- #endif
- 
-@@ -61,10 +80,7 @@ __xtensa_nonlocal_goto:
- 	entry	sp, 32
- 
- 	/* Flush registers.  */
--	mov	a5, a2
--	movi	a2, 0
--	syscall
--	mov	a2, a5
-+	call8	__xtensa_libgcc_window_spill
- 
- 	/* Because the save area for a0-a3 is stored one frame below
- 	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/patches/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/patches/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index 9707f68..0000000
--- a/patches/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7d7a85f75ba218df4a4226e95865fc8fa561cb86 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-windowed (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-windowed | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index 7d9e9db..a99156c 100644
---- a/libgcc/config/xtensa/t-windowed
-+++ b/libgcc/config/xtensa/t-windowed
-@@ -1,2 +1,2 @@
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/patches/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch b/patches/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index 2d8eb7c..0000000
--- a/patches/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b33905dc310f475ddbde4c9fb7230724b2068a2b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 82b0e63..8e579c7 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/patches/gcc/5.4.0/874-xtensa-add-uclinux-support.patch b/patches/gcc/5.4.0/874-xtensa-add-uclinux-support.patch
deleted file mode 100644
index 23db3d8..0000000
--- a/patches/gcc/5.4.0/874-xtensa-add-uclinux-support.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 22 Aug 2015 08:44:26 +0300
-Subject: [PATCH] xtensa: add uclinux support
-
-2015-10-03  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config.gcc (xtensa*-*-uclinux*): New configuration.
-	* config/xtensa/uclinux.h: New file.
-	* config/xtensa/uclinux.opt: New file.
-
-libgcc/
-	* config.host (xtensa*-*-uclinux*): New configuration.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r228450
-
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
- 4 files changed, 111 insertions(+)
- create mode 100644 gcc/config/xtensa/uclinux.h
- create mode 100644 gcc/config/xtensa/uclinux.opt
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index c52f5a8..56797bd 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2995,6 +2995,11 @@ xtensa*-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
- 	tmake_file="${tmake_file} xtensa/t-xtensa"
- 	;;
-+xtensa*-*-uclinux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h"
-+	tmake_file="${tmake_file} xtensa/t-xtensa"
-+	extra_options="${extra_options} xtensa/uclinux.opt"
-+	;;
- am33_2.0-*-linux*)
- 	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
- 	gas=yes gnu_ld=yes
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-new file mode 100644
-index 0000000..4606020
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -0,0 +1,69 @@
-+/* Xtensa uClinux configuration.
-+   Derived from the configuration for GCC for Intel i386 running Linux.
-+   Copyright (C) 2001-2015 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC 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 3, or (at your option) any later
-+version.
-+
-+GCC 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 GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()				\
-+  do								\
-+    {								\
-+      GNU_USER_TARGET_OS_CPP_BUILTINS ();			\
-+      builtin_define ("__uClinux__");				\
-+    }								\
-+  while (0)
-+
-+#undef SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "long int"
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{mtext-section-literals:--text-section-literals} \
-+  %{mno-text-section-literals:--no-text-section-literals} \
-+  %{mtarget-align:--target-align} \
-+  %{mno-target-align:--no-target-align} \
-+  %{mlongcalls:--longcalls} \
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX	"."
-+
-+/* Always enable "-fpic" for Xtensa Linux.  */
-+#define XTENSA_ALWAYS_PIC 1
-+
-+#undef TARGET_LIBC_HAS_FUNCTION
-+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
-+
-+#undef DBX_REGISTER_NUMBER
-+
-diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt
-new file mode 100644
-index 0000000..95ef777
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.opt
-@@ -0,0 +1,32 @@
-+; Xtensa uClinux options.
-+
-+; Copyright (C) 2015 Free Software Foundation, Inc.
-+;
-+; This file is part of GCC.
-+;
-+; GCC 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 3, or (at your option) any later
-+; version.
-+;
-+; GCC 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 GCC; see the file COPYING3.  If not see
-+; <http://www.gnu.org/licenses/>.
-+
-+; See the GCC internals manual (options.texi) for a description of
-+; this file's format.
-+
-+; Please try to keep this file in ASCII collating order.
-+
-+elf2flt
-+Driver
-+
-+elf2flt=
-+Driver JoinedOrMissing
-+
-+; This comment is to ensure we retain the blank line above.
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 2c64756..2ee92c1 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -1295,6 +1295,11 @@ xtensa*-*-linux*)
- 	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
- 	md_unwind_header=xtensa/linux-unwind.h
- 	;;
-+xtensa*-*-uclinux*)
-+	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
-+	md_unwind_header=xtensa/linux-unwind.h
-+	extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o"
-+	;;
- am33_2.0-*-linux*)
- 	# Don't need crtbeginT.o from *-*-linux* default.
- 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
--- 
-1.8.1.4
-
diff --git a/patches/gcc/5.4.0/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch b/patches/gcc/5.4.0/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
deleted file mode 100644
index d128596..0000000
--- a/patches/gcc/5.4.0/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 7d3692c6933f7ff87bf110dede8e33e922b164c6 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 15 Sep 2015 19:30:32 +0000
-Subject: [PATCH] xtensa: fix xtensa_fallback_frame_state for call0 ABI
-
-2015-09-15  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.h (DWARF_ALT_FRAME_RETURN_COLUMN): New
-	definition.
-	(DWARF_FRAME_REGISTERS): Reserve space for one extra register in
-	call0 ABI.
-
-libgcc/
-	* config/xtensa/linux-unwind.h (xtensa_fallback_frame_state):
-	Add support for call0 ABI.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227809 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.h          |  4 +++-
- libgcc/config/xtensa/linux-unwind.h | 30 ++++++++++++++++++++++++++++--
- 2 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 584080b..e165def 100644
---- a/gcc/config/xtensa/xtensa.h
-+++ b/gcc/config/xtensa/xtensa.h
-@@ -813,7 +813,9 @@ typedef struct xtensa_args
-    for debugging.  */
- #define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, 0)
- #define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM (0)
--#define DWARF_FRAME_REGISTERS 16
-+#define DWARF_ALT_FRAME_RETURN_COLUMN 16
-+#define DWARF_FRAME_REGISTERS (DWARF_ALT_FRAME_RETURN_COLUMN		\
-+			       + (TARGET_WINDOWED_ABI ? 0 : 1))
- #define EH_RETURN_DATA_REGNO(N) ((N) < 2 ? (N) + 2 : INVALID_REGNUM)
- #define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL)			\
-   (flag_pic								\
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738..9a67b5d 100644
---- a/libgcc/config/xtensa/linux-unwind.h
-+++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -52,7 +52,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define ENTRY_BYTE 0x36
- #endif
- 
--#ifdef __XTENSA_WINDOWED_ABI__
- #define MD_FALLBACK_FRAME_STATE_FOR xtensa_fallback_frame_state
- 
- static _Unwind_Reason_Code
-@@ -61,6 +60,10 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
- {
-   unsigned char *pc = context->ra;
-   struct sigcontext *sc;
-+#if defined(__XTENSA_CALL0_ABI__)
-+  _Unwind_Ptr new_cfa;
-+  int i;
-+#endif
- 
-   struct rt_sigframe {
-     siginfo_t info;
-@@ -76,6 +79,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
-       || pc[5] != SYSC_BYTE2)
-     return _URC_END_OF_STACK;
- 
-+#if defined(__XTENSA_WINDOWED_ABI__)
-   rt_ = context->sp;
-   sc = &rt_->uc.uc_mcontext;
-   fs->signal_regs = (_Unwind_Word *) sc->sc_a;
-@@ -90,11 +94,33 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
-    }
-   else
-     fs->signal_ra = sc->sc_pc;
-+#elif defined(__XTENSA_CALL0_ABI__)
-+  rt_ = context->cfa;
-+  sc = &rt_->uc.uc_mcontext;
-+
-+  new_cfa = (_Unwind_Ptr) sc;
-+  fs->regs.cfa_how = CFA_REG_OFFSET;
-+  fs->regs.cfa_reg = __LIBGCC_STACK_POINTER_REGNUM__;
-+  fs->regs.cfa_offset = new_cfa - (_Unwind_Ptr) context->cfa;
-+
-+  for (i = 0; i < 16; i++)
-+    {
-+      fs->regs.reg[i].how = REG_SAVED_OFFSET;
-+      fs->regs.reg[i].loc.offset = (_Unwind_Ptr) &(sc->sc_a[i]) - new_cfa;
-+    }
-+
-+  fs->regs.reg[__LIBGCC_DWARF_ALT_FRAME_RETURN_COLUMN__].how =
-+    REG_SAVED_VAL_OFFSET;
-+  fs->regs.reg[__LIBGCC_DWARF_ALT_FRAME_RETURN_COLUMN__].loc.offset =
-+    (_Unwind_Ptr) (sc->sc_pc) - new_cfa;
-+  fs->retaddr_column = __LIBGCC_DWARF_ALT_FRAME_RETURN_COLUMN__;
-+#else
-+#error Unsupported Xtensa ABI
-+#endif
- 
-   fs->signal_frame = 1;
-   return _URC_NO_REASON;
- }
- 
--#endif /* __XTENSA_WINDOWED_ABI__ */
- 
- #endif /* ifdef inhibit_libc  */
--- 
-2.1.4
-
diff --git a/patches/gcc/5.4.0/876-xtensa-fix-libgcc-build-with-text-section-literals.patch b/patches/gcc/5.4.0/876-xtensa-fix-libgcc-build-with-text-section-literals.patch
deleted file mode 100644
index 4b2334a..0000000
--- a/patches/gcc/5.4.0/876-xtensa-fix-libgcc-build-with-text-section-literals.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 44fbad9f8bed55f690f251b530ab38df1e696d95 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 17 Feb 2016 20:21:48 +0000
-Subject: [PATCH] xtensa: fix libgcc build with --text-section-literals
-
-Functions __muldf3_aux, __divdf3_aux, __mulsf3_aux and __divsf3_aux
-don't start with leaf_entry, so they need explicit .literal_position,
-otherwise libgcc build fails in the presence of --text-section-literals.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/ieee754-df.S (__muldf3_aux, __divdf3_aux): Add
-	.literal_position before the function.
-	* config/xtensa/ieee754-sf.S (__mulsf3_aux, __divsf3_aux):
-	Likewise.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233505 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- libgcc/config/xtensa/ieee754-df.S | 2 ++
- libgcc/config/xtensa/ieee754-sf.S | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/libgcc/config/xtensa/ieee754-df.S b/libgcc/config/xtensa/ieee754-df.S
-index a7ae209..26f2abd 100644
---- a/libgcc/config/xtensa/ieee754-df.S
-+++ b/libgcc/config/xtensa/ieee754-df.S
-@@ -606,6 +606,7 @@ __subdf3:
- #define XCHAL_NO_MUL 1
- #endif
- 
-+	.literal_position
- __muldf3_aux:
- 
- 	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -1216,6 +1217,7 @@ __muldf3:
- 
- #ifdef L_divdf3
- 
-+	.literal_position
- 	/* Division */
- __divdf3_aux:
- 
-diff --git a/libgcc/config/xtensa/ieee754-sf.S b/libgcc/config/xtensa/ieee754-sf.S
-index 7e397dc..a5e6e3c 100644
---- a/libgcc/config/xtensa/ieee754-sf.S
-+++ b/libgcc/config/xtensa/ieee754-sf.S
-@@ -487,6 +487,7 @@ __subsf3:
- #define XCHAL_NO_MUL 1
- #endif
- 
-+	.literal_position
- __mulsf3_aux:
- 
- 	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -884,6 +885,7 @@ __mulsf3:
- 
- #ifdef L_divsf3
- 
-+	.literal_position
- 	/* Division */
- __divsf3_aux:
- 
--- 
-2.1.4
-
diff --git a/patches/gcc/5.4.0/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch b/patches/gcc/5.4.0/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
deleted file mode 100644
index 6e0ce6e..0000000
--- a/patches/gcc/5.4.0/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d28554ee61a1ab1263274d66386e4051bca0ce05 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Oct 2016 19:12:19 +0000
-Subject: [PATCH] xtensa: don't use unwind-dw2-fde-dip with elf targets
-
-Define LIB2ADDEH_XTENSA_UNWIND_DW2_FDE to unwind-dw2-fde.c in
-xtensa/t-elf and to unwind-dw2-fde-dip.c in xtensa/t-linux and use
-LIB2ADDEH_XTENSA_UNWIND_DW2_FDE in LIB2ADDEH definition.
-
-This fixes build for elf target with windowed xtensa core that currently
-breaks with the following error message:
-
-  unwind-dw2-fde-dip.c:36:40: fatal error: elf.h: No such file or directory
-
-2016-10-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-elf (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-linux (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-windowed (LIB2ADDEH): Use
-	LIB2ADDEH_XTENSA_UNWIND_DW2_FDE defined by either xtensa/t-elf
-	or xtensa/t-linux.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241313 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- libgcc/config/xtensa/t-elf      | 2 ++
- libgcc/config/xtensa/t-linux    | 2 ++
- libgcc/config/xtensa/t-windowed | 2 +-
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf
-index 59d5121..967cf9b 100644
---- a/libgcc/config/xtensa/t-elf
-+++ b/libgcc/config/xtensa/t-elf
-@@ -3,3 +3,5 @@ CRTSTUFF_T_CFLAGS += -mlongcalls
- CRTSTUFF_T_CFLAGS_S += -mlongcalls
- 
- HOST_LIBGCC2_CFLAGS += -mlongcalls
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde.c
-diff --git a/libgcc/config/xtensa/t-linux b/libgcc/config/xtensa/t-linux
-index 6f4ae89..412ecca 100644
---- a/libgcc/config/xtensa/t-linux
-+++ b/libgcc/config/xtensa/t-linux
-@@ -1 +1,3 @@
- SHLIB_MAPFILES += $(srcdir)/config/xtensa/libgcc-glibc.ver
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde-dip.c
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index a99156c..f140136 100644
---- a/libgcc/config/xtensa/t-windowed
-+++ b/libgcc/config/xtensa/t-windowed
-@@ -1,2 +1,2 @@
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(LIB2ADDEH_XTENSA_UNWIND_DW2_FDE) $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-2.1.4
-
diff --git a/patches/gcc/5.4.0/878-xtensa-Fix-PR-target-78603.patch b/patches/gcc/5.4.0/878-xtensa-Fix-PR-target-78603.patch
deleted file mode 100644
index 4646d3c..0000000
--- a/patches/gcc/5.4.0/878-xtensa-Fix-PR-target-78603.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b18fe564ed233ee0965b3a980edc5dbe069b80ea Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 29 Nov 2016 13:09:17 -0800
-Subject: [PATCH] xtensa: Fix PR target/78603
-
-2016-11-29  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
-	overhead loop start between a call and its CALL_ARG_LOCATION
-	note.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 206ff80..36ab1e3 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop)
-       entry_after = BB_END (entry_bb);
-       while (DEBUG_INSN_P (entry_after)
-              || (NOTE_P (entry_after)
--                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
-+		 /* Make sure we don't split a call and its corresponding
-+		    CALL_ARG_LOCATION note.  */
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
-         entry_after = PREV_INSN (entry_after);
- 
-       emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/patches/gcc/5.4.0/890-fix-m68k-compile.patch b/patches/gcc/5.4.0/890-fix-m68k-compile.patch
deleted file mode 100644
index 6e63de0..0000000
--- a/patches/gcc/5.4.0/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/patches/gcc/5.4.0/891-fix-m68k-uclinux.patch b/patches/gcc/5.4.0/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4e186bd..0000000
--- a/patches/gcc/5.4.0/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/patches/gcc/5.4.0/892-microblaze-uclibc.patch b/patches/gcc/5.4.0/892-microblaze-uclibc.patch
deleted file mode 100644
index a8eb5a6..0000000
--- a/patches/gcc/5.4.0/892-microblaze-uclibc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Add dynamic linker support for uClibc
-
-Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
-
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
-+++ gcc-5.3.0/gcc/config/microblaze/linux.h	2016-05-13 09:21:01.579262885 +0200
-@@ -28,7 +28,15 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER	"/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+
-+#if DEFAULT_LIBC == LIBC_UCLIBC
-+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-   { "dynamic_linker", DYNAMIC_LINKER }
diff --git a/patches/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch b/patches/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch
deleted file mode 100644
index fdf4ee7..0000000
--- a/patches/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000)
-Subject: libitm fixes for musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338
-
-libitm fixes for musl support
-
-On behalf of Szabolcs.Nagy@arm.com
-
-2015-04-22  Gregor Richards  <gregor.richards@uwaterloo.ca>
-
-       * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h.
-       * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,7 @@
- 
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <elf.h>
- 
- static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
-    GLIBC has reserved words 10 through 13 for TM.  */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
- 
- #include "config/generic/tls.h"
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
- 
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
- 
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
- 
- #endif // LIBITM_X86_TLS_H
diff --git a/patches/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch b/patches/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch
deleted file mode 100644
index 13c08d6..0000000
--- a/patches/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:18:16 +0000 (+0000)
-Subject: fixincludes update for musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2dc727de2e87c2756a514cbb43cea23c99deaa3d
-
-fixincludes update for musl support
-
-On behalf of Szabolcs.Nagy@arm.com
-
-2015-04-22  Gregor Richards  <gregor.richards@uwaterloo.ca>
-
-	* mkfixinc.sh: Add *-musl* with no fixes.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222327 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
---- a/fixincludes/mkfixinc.sh
-+++ b/fixincludes/mkfixinc.sh
-@@ -19,7 +19,8 @@
-     powerpc-*-eabi*    | \
-     powerpc-*-rtems*   | \
-     powerpcle-*-eabisim* | \
--    powerpcle-*-eabi* )
-+    powerpcle-*-eabi* | \
-+    *-musl* )
- 	#  IF there is no include fixing,
- 	#  THEN create a no-op fixer and exit
- 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
diff --git a/patches/gcc/5.4.0/902-unwind-fix-for-musl.patch b/patches/gcc/5.4.0/902-unwind-fix-for-musl.patch
deleted file mode 100644
index ef47054..0000000
--- a/patches/gcc/5.4.0/902-unwind-fix-for-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:20:01 +0000 (+0000)
-Subject: unwind fix for musl
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a2e31d0681d8a47389b8a3552622fbd9827bcef4
-
-unwind fix for musl
-
-On behalf of szabolcs.nagy@arm.com
-
-2015-04-22  Gregor Richards  <gregor.richards@uwaterloo.ca>
-	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* unwind-dw2-fde-dip.c (USE_PT_GNU_EH_FRAME): Define it on
-	Linux if target provides dl_iterate_phdr.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -59,6 +59,12 @@
- 
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-     && defined(TARGET_DL_ITERATE_PHDR) \
-+    && defined(__linux__)
-+# define USE_PT_GNU_EH_FRAME
-+#endif
-+
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-+    && defined(TARGET_DL_ITERATE_PHDR) \
-     && (defined(__DragonFly__) || defined(__FreeBSD__))
- # define ElfW __ElfN
- # define USE_PT_GNU_EH_FRAME
diff --git a/patches/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/patches/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
deleted file mode 100644
index c852131..0000000
--- a/patches/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:24:11 +0000 (+0000)
-Subject: libstdc++, libgfortran gthr workaround for musl
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=1e5f711c11cb80ce609db9e9c1d8b2da0f7b5b61
-
-libstdc++, libgfortran gthr workaround for musl
-
-On behalf of szabolcs.nagy@arm.com
-
-[libstdc++-v3/]
-2015-04-22  Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* config/os/generic/os_defines.h (_GLIBCXX_GTHREAD_USE_WEAK): Define.
-	* configure.host (os_include_dir): Set to "os/generic" for linux-musl*.
-
-[libgfortran/]
-2015-04-22  Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* acinclude.m4 (GTHREAD_USE_WEAK): Define as 0 for *-*-musl*.
-	* configure: Regenerate.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/libgfortran/acinclude.m4
-===================================================================
---- a/libgfortran/acinclude.m4
-+++ b/libgfortran/acinclude.m4
-@@ -100,7 +100,7 @@
- 	      [Define to 1 if the target supports #pragma weak])
-   fi
-   case "$host" in
--    *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
-+    *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* )
-       AC_DEFINE(GTHREAD_USE_WEAK, 0,
- 		[Define to 0 if the target shouldn't use #pragma weak])
-       ;;
-Index: b/libgfortran/configure
-===================================================================
---- a/libgfortran/configure
-+++ b/libgfortran/configure
-@@ -26447,7 +26447,7 @@
- 
-   fi
-   case "$host" in
--    *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
-+    *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* )
- 
- $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
- 
-Index: b/libstdc++-v3/config/os/generic/os_defines.h
-===================================================================
---- a/libstdc++-v3/config/os/generic/os_defines.h
-+++ b/libstdc++-v3/config/os/generic/os_defines.h
-@@ -33,4 +33,9 @@
- // System-specific #define, typedefs, corrections, etc, go here.  This
- // file will come before all others.
- 
-+// Disable the weak reference logic in gthr.h for os/generic because it
-+// is broken on every platform unless there is implementation specific
-+// workaround in gthr-posix.h and at link-time for static linking.
-+#define _GLIBCXX_GTHREAD_USE_WEAK 0
-+
- #endif
-Index: b/libstdc++-v3/configure.host
-===================================================================
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -271,6 +271,9 @@
-   freebsd*)
-     os_include_dir="os/bsd/freebsd"
-     ;;
-+  linux-musl*)
-+    os_include_dir="os/generic"
-+    ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
diff --git a/patches/gcc/5.4.0/904-musl-libc-config.patch b/patches/gcc/5.4.0/904-musl-libc-config.patch
deleted file mode 100644
index 8549140..0000000
--- a/patches/gcc/5.4.0/904-musl-libc-config.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 8 May 2015 08:25:47 +0000 (+0000)
-Subject: [PATCH 2/13] musl libc config
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a9173ceabaf29c16f8ef226fbf98af373a4b2ceb
-
-[PATCH 2/13] musl libc config
-
-2015-05-08  Gregor Richards  <gregor.richards@uwaterloo.ca>
-	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* config.gcc (LIBC_MUSL): New tm_defines macro.
-	* config/linux.h (OPTION_MUSL): Define.
-	(MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER32,)
-	(MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32,)
-	(INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,)
-	(INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,)
-	(INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define.
-	* config/linux.opt (mmusl): New option.
-	* doc/invoke.texi (GNU/Linux Options): Document -mmusl.
-	* configure.ac (gcc_cv_libc_provides_ssp): Add *-*-musl*.
-	(gcc_cv_target_dl_iterate_phdr): Add *-linux-musl*.
-	* configure: Regenerate.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -575,7 +575,7 @@
- esac
- 
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
- 
- # 32-bit x86 processors supported by --with-arch=.  Each processor
- # MUST be separated by exactly one space.
-@@ -720,6 +720,9 @@
-     *-*-*uclibc*)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
-       ;;
-+    *-*-*musl*)
-+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+      ;;
-     *)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
-       ;;
-Index: b/gcc/config/linux.h
-===================================================================
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-@@ -50,21 +52,25 @@
-     } while (0)
- 
- /* Determine which dynamic linker to use depending on whether GLIBC or
--   uClibc or Bionic is the default C library and whether
--   -muclibc or -mglibc or -mbionic has been passed to change the default.  */
-+   uClibc or Bionic or musl is the default C library and whether
-+   -muclibc or -mglibc or -mbionic or -mmusl has been passed to change
-+   the default.  */
- 
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
--  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
-+  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
- 
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -81,24 +87,100 @@
- #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
- #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
-+/* Should be redefined for each target that supports musl.  */
-+#define MUSL_DYNAMIC_LINKER "/dev/null"
-+#define MUSL_DYNAMIC_LINKER32 "/dev/null"
-+#define MUSL_DYNAMIC_LINKER64 "/dev/null"
-+#define MUSL_DYNAMIC_LINKERX32 "/dev/null"
- 
- #define GNU_USER_DYNAMIC_LINKER						\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
--			 BIONIC_DYNAMIC_LINKER)
-+			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
--			 BIONIC_DYNAMIC_LINKER32)
-+			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
--			 BIONIC_DYNAMIC_LINKER64)
-+			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
--			 BIONIC_DYNAMIC_LINKERX32)
-+			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
- 
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
- 
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP			\
-+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
-+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
-+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS			\
-+    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL			\
-+    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS				\
-+  {							\
-+    INCLUDE_DEFAULTS_MUSL_GPP				\
-+    INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    INCLUDE_DEFAULTS_MUSL_CROSS				\
-+    INCLUDE_DEFAULTS_MUSL_TOOL				\
-+    INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
-+    { 0, 0, 0, 0, 0, 0 }				\
-+  }
-+#endif
-+
- #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
- /* This is a *uclinux* target.  We don't define below macros to normal linux
-    versions, because doing so would require *uclinux* targets to include
-Index: b/gcc/config/linux.opt
-===================================================================
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -28,5 +28,9 @@
- Use GNU C library
- 
- muclibc
--Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
-+Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
-+Use musl C library
-Index: b/gcc/configure
-===================================================================
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -27809,6 +27813,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- 
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -5298,6 +5302,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/doc/invoke.texi
-===================================================================
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -667,7 +667,7 @@
- -mcpu=@var{cpu}}
- 
- @emph{GNU/Linux Options}
--@gccoptlist{-mglibc -muclibc -mbionic -mandroid @gol
-+@gccoptlist{-mglibc -muclibc -mmusl -mbionic -mandroid @gol
- -tno-android-cc -tno-android-ld}
- 
- @emph{H8/300 Options}
-@@ -15324,13 +15324,19 @@
- @item -mglibc
- @opindex mglibc
- Use the GNU C library.  This is the default except
--on @samp{*-*-linux-*uclibc*} and @samp{*-*-linux-*android*} targets.
-+on @samp{*-*-linux-*uclibc*}, @samp{*-*-linux-*musl*} and
-+@samp{*-*-linux-*android*} targets.
- 
- @item -muclibc
- @opindex muclibc
- Use uClibc C library.  This is the default on
- @samp{*-*-linux-*uclibc*} targets.
- 
-+@item -mmusl
-+@opindex mmusl
-+Use the musl C library.  This is the default on
-+@samp{*-*-linux-*musl*} targets.
-+
- @item -mbionic
- @opindex mbionic
- Use Bionic C library.  This is the default on
diff --git a/patches/gcc/5.4.0/905-add-musl-support-to-gcc.patch b/patches/gcc/5.4.0/905-add-musl-support-to-gcc.patch
deleted file mode 100644
index 92e7436..0000000
--- a/patches/gcc/5.4.0/905-add-musl-support-to-gcc.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 8 May 2015 08:30:40 +0000 (+0000)
-Subject: [PATCH 0/13] Add musl support to GCC
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b8385d763b93772d73d6bf80a9739e
-
-[PATCH 0/13] Add musl support to GCC
-
-2015-05-08  Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* config/glibc-stdint.h (OPTION_MUSL): Define.
-	(INT_FAST16_TYPE, INT_FAST32_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE):
-	Change the definition based on OPTION_MUSL for 64 bit targets.
-	* config/linux.h (OPTION_MUSL): Redefine.
-	* config/alpha/linux.h (OPTION_MUSL): Redefine.
-	* config/rs6000/linux.h (OPTION_MUSL): Redefine.
-	* config/rs6000/linux64.h (OPTION_MUSL): Redefine.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/gcc/config/alpha/linux.h
-===================================================================
---- a/gcc/config/alpha/linux.h
-+++ b/gcc/config/alpha/linux.h
-@@ -61,10 +61,14 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- /* Determine what functions are present at the runtime;
-Index: b/gcc/config/glibc-stdint.h
-===================================================================
---- a/gcc/config/glibc-stdint.h
-+++ b/gcc/config/glibc-stdint.h
-@@ -22,6 +22,12 @@
- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- <http://www.gnu.org/licenses/>.  */
- 
-+/* Systems using musl libc should use this header and make sure
-+   OPTION_MUSL is defined correctly before using the TYPE macros. */
-+#ifndef OPTION_MUSL
-+#define OPTION_MUSL 0
-+#endif
-+
- #define SIG_ATOMIC_TYPE "int"
- 
- #define INT8_TYPE "signed char"
-@@ -43,12 +49,12 @@
- #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
- 
- #define INT_FAST8_TYPE "signed char"
--#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
--#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
-+#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int")
- #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int")
- #define UINT_FAST8_TYPE "unsigned char"
--#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
--#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
-+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
-+#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int")
- #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
- 
- #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-Index: b/gcc/config/linux.h
-===================================================================
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,11 +32,13 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
- #define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
- #define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
-Index: b/gcc/config/rs6000/linux.h
-===================================================================
---- a/gcc/config/rs6000/linux.h
-+++ b/gcc/config/rs6000/linux.h
-@@ -30,10 +30,14 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- /* Determine what functions are present at the runtime;
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -299,10 +299,14 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- /* Determine what functions are present at the runtime;
diff --git a/patches/gcc/5.4.0/906-mips-musl-support.patch b/patches/gcc/5.4.0/906-mips-musl-support.patch
deleted file mode 100644
index 6b473f9..0000000
--- a/patches/gcc/5.4.0/906-mips-musl-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 8 May 2015 15:16:50 +0000 (+0000)
-Subject: [PATCH 6/13] mips musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2550b6a866c887472b587bef87d433c51cf1ebc8
-
-[PATCH 6/13] mips musl support
-
-2015-05-08  Gregor Richards  <gregor.richards@uwaterloo.ca>
-	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Define.
-	(MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Define.
-	(GNU_USER_DYNAMIC_LINKERN32): Update.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222915 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/gcc/config/mips/linux.h
-===================================================================
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -37,7 +37,13 @@
- #define UCLIBC_DYNAMIC_LINKERN32 \
-   "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
- 
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1"
-+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1"
-+
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--                         BIONIC_DYNAMIC_LINKERN32)
-+                         BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
diff --git a/patches/gcc/5.4.0/907-x86-musl-support.patch b/patches/gcc/5.4.0/907-x86-musl-support.patch
deleted file mode 100644
index 3f2fe5d..0000000
--- a/patches/gcc/5.4.0/907-x86-musl-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 15 May 2015 13:20:01 +0000 (+0000)
-Subject: [PATCH 9/13] x86 musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=5551c8d927c17f60837f15f8dfe46f945ba3fa9c
-
-[PATCH 9/13] x86 musl support
-
-On behalf of Szabolcs Nagy.
-
-2015-05-15  Gregor Richards  <gregor.richards@uwaterloo.ca>
-
-	* config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define.
-	* config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define.
-	(MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/gcc/config/i386/linux.h
-===================================================================
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,6 @@
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/i386/linux64.h
-===================================================================
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,10 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
diff --git a/patches/gcc/5.4.0/908-arm-musl-support.patch b/patches/gcc/5.4.0/908-arm-musl-support.patch
deleted file mode 100644
index 906355a..0000000
--- a/patches/gcc/5.4.0/908-arm-musl-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 27 May 2015 13:17:11 +0000 (+0000)
-Subject: [PATCH 4/13] arm musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=de799bd087ab9a179768fea75bd195a31d3432a4
-
-[PATCH 4/13] arm musl support
-
-On behalf of szabolcs.nagy@arm.com
-
-2015-05-27  Gregor Richards  <gregor.richards@uwaterloo.ca>
-
-	* config/arm/linux-eabi.h (MUSL_DYNAMIC_LINKER): Define.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223749 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,23 @@
-     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
-     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
- 
-+/* For ARM musl currently supports four dynamic linkers:
-+   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+   musl does not support the legacy OABI mode.
-+   All the dynamic linkers live in /lib.
-+   We default to soft-float, EL. */
-+#undef  MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
diff --git a/patches/gcc/5.4.0/909-aarch64-musl-support.patch b/patches/gcc/5.4.0/909-aarch64-musl-support.patch
deleted file mode 100644
index 3d032f5..0000000
--- a/patches/gcc/5.4.0/909-aarch64-musl-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: jgreenhalgh <jgreenhalgh@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 27 May 2015 16:46:39 +0000 (+0000)
-Subject: [PATCH 3/13] aarch64 musl support
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=b3ff21cf0531be91bc3fb8200296a7633090ec78
-
-[PATCH 3/13] aarch64 musl support
-
-gcc/Changelog:
-
-2015-05-27  Gregor Richards  <gregor.richards@uwaterloo.ca>
-	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* config/aarch64/aarch64-linux.h (MUSL_DYNAMIC_LINKER): Define.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223766 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -23,6 +23,9 @@
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
- 
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-+
- #undef  ASAN_CC1_SPEC
- #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
- 
diff --git a/patches/gcc/5.4.0/910-nios2-bad-multilib-default.patch b/patches/gcc/5.4.0/910-nios2-bad-multilib-default.patch
deleted file mode 100644
index d94697f..0000000
--- a/patches/gcc/5.4.0/910-nios2-bad-multilib-default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/nios2.h
---- gcc-5.3.0.orig/gcc/config/nios2/nios2.h	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/nios2.h	2016-04-18 10:37:25.998841674 -0700
-@@ -55,11 +55,11 @@
- #if TARGET_ENDIAN_DEFAULT == 0
- # define ASM_SPEC "%{!meb:-EL} %{meb:-EB}"
- # define LINK_SPEC_ENDIAN "%{!meb:-EL} %{meb:-EB}"
--# define MULTILIB_DEFAULTS { "EL" }
-+# define MULTILIB_DEFAULTS { "mel" }
- #else
- # define ASM_SPEC "%{!mel:-EB} %{mel:-EL}"
- # define LINK_SPEC_ENDIAN "%{!mel:-EB} %{mel:-EL}"
--# define MULTILIB_DEFAULTS { "EB" }
-+# define MULTILIB_DEFAULTS { "meb" }
- #endif
- 
- #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/t-nios2 gcc-5.3.0/gcc/config/nios2/t-nios2
---- gcc-5.3.0.orig/gcc/config/nios2/t-nios2	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/t-nios2	2016-04-18 10:36:41.091312157 -0700
-@@ -22,6 +22,5 @@
- # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
- # MULTILIB_EXCEPTIONS = 
- 
--# MULTILIB_OPTIONS += EL/EB
-+# MULTILIB_OPTIONS += mel/meb
- # MULTILIB_DIRNAMES += le be
--# MULTILIB_MATCHES += EL=mel EB=meb
diff --git a/patches/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch b/patches/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 07f9a73..0000000
--- a/patches/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/patches/gcc/5.4.0/940-uclinux-enable-threads.patch b/patches/gcc/5.4.0/940-uclinux-enable-threads.patch
deleted file mode 100644
index 490a55b..0000000
--- a/patches/gcc/5.4.0/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/patches/gcc/6.3.0/100-uclibc-conf.patch b/patches/gcc/6.3.0/100-uclibc-conf.patch
deleted file mode 100644
index 73d1f0d..0000000
--- a/patches/gcc/6.3.0/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/6.3.0/1000-libtool-leave-framework-alone.patch b/patches/gcc/6.3.0/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index bce09eb..0000000
--- a/patches/gcc/6.3.0/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*|-static-lib*|-shared-lib*|-B*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/6.3.0/301-missing-execinfo_h.patch b/patches/gcc/6.3.0/301-missing-execinfo_h.patch
deleted file mode 100644
index 2d0e7ba..0000000
--- a/patches/gcc/6.3.0/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
---- a/boehm-gc/include/gc.h
-+++ b/boehm-gc/include/gc.h
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/6.3.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/6.3.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index d8986d5..0000000
--- a/patches/gcc/6.3.0/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
-@@ -20,6 +20,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -30,6 +33,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -81,17 +89,17 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     AC_MSG_CHECKING([for -fPIC -shared])
-+     AC_MSG_CHECKING([for ${PICFLAG} -shared])
-      AC_TRY_LINK(
--       [extern int X;],[return X == 0;],
-+       [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-        [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-        [AC_MSG_RESULT([no]); have_pic_shared=no])
-      if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
diff --git a/patches/gcc/6.3.0/380-gcc-plugin-POSIX-include-sys-select-h.patch b/patches/gcc/6.3.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48e..0000000
--- a/patches/gcc/6.3.0/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/patches/gcc/6.3.0/810-arm-softfloat-libgcc.patch b/patches/gcc/6.3.0/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd..0000000
--- a/patches/gcc/6.3.0/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/6.3.0/830-arm_unbreak_armv4t.patch b/patches/gcc/6.3.0/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b730059..0000000
--- a/patches/gcc/6.3.0/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/patches/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
deleted file mode 100644
index af9fb1d..0000000
--- a/patches/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 07453188b18a2cbe815917dbb893b4ebfdd793b6 Mon Sep 17 00:00:00 2001
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 26 Aug 2016 10:23:20 +0000
-Subject: [PATCH] [ARM] PR target/70473: Reduce size of Cortex-A8 automaton
-
-	PR target/70473
-	* config/arm/cortex-a8-neon.md (cortex_a8_vfp_muld): Reduce
-	reservation duration to 15 cycles.
-	(cortex_a8_vfp_macs): Likewise.
-	(cortex_a8_vfp_macd): Likewise.
-	(cortex_a8_vfp_divs): Likewise.
-	(cortex_a8_vfp_divd): Likewise.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772
-138bc75d-0d04-0410-961f-82ee72b054a4
-
-[Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- gcc/config/arm/cortex-a8-neon.md | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md
-index 45f861f..b16c299 100644
---- a/gcc/config/arm/cortex-a8-neon.md
-+++ b/gcc/config/arm/cortex-a8-neon.md
-@@ -357,30 +357,34 @@
-        (eq_attr "type" "fmuls"))
-   "cortex_a8_vfp,cortex_a8_vfplite*11")
- 
-+;; Don't model a reservation for more than 15 cycles as this explodes the
-+;; state space of the automaton for little gain.  It is unlikely that the
-+;; scheduler will find enough instructions to hide the full latency of the
-+;; instructions.
- (define_insn_reservation "cortex_a8_vfp_muld" 17
-   (and (eq_attr "tune" "cortexa8")
-        (eq_attr "type" "fmuld"))
--  "cortex_a8_vfp,cortex_a8_vfplite*16")
-+  "cortex_a8_vfp,cortex_a8_vfplite*15")
- 
- (define_insn_reservation "cortex_a8_vfp_macs" 21
-   (and (eq_attr "tune" "cortexa8")
-        (eq_attr "type" "fmacs,ffmas"))
--  "cortex_a8_vfp,cortex_a8_vfplite*20")
-+  "cortex_a8_vfp,cortex_a8_vfplite*15")
- 
- (define_insn_reservation "cortex_a8_vfp_macd" 26
-   (and (eq_attr "tune" "cortexa8")
-        (eq_attr "type" "fmacd,ffmad"))
--  "cortex_a8_vfp,cortex_a8_vfplite*25")
-+  "cortex_a8_vfp,cortex_a8_vfplite*15")
- 
- (define_insn_reservation "cortex_a8_vfp_divs" 37
-   (and (eq_attr "tune" "cortexa8")
-        (eq_attr "type" "fdivs, fsqrts"))
--  "cortex_a8_vfp,cortex_a8_vfplite*36")
-+  "cortex_a8_vfp,cortex_a8_vfplite*15")
- 
- (define_insn_reservation "cortex_a8_vfp_divd" 65
-   (and (eq_attr "tune" "cortexa8")
-        (eq_attr "type" "fdivd, fsqrtd"))
--  "cortex_a8_vfp,cortex_a8_vfplite*64")
-+  "cortex_a8_vfp,cortex_a8_vfplite*15")
- 
- ;; Comparisons can actually take 7 cycles sometimes instead of four,
- ;; but given all the other instructions lumped into type=ffarith that
--- 
-2.7.4
-
diff --git a/patches/gcc/6.3.0/860-cilk-wchar.patch b/patches/gcc/6.3.0/860-cilk-wchar.patch
deleted file mode 100644
index 1d9916f..0000000
--- a/patches/gcc/6.3.0/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- a/libcilkrts/include/cilk/reducer_min_max.h
-+++ b/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/patches/gcc/6.3.0/870-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch b/patches/gcc/6.3.0/870-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
deleted file mode 100644
index 6e0ce6e..0000000
--- a/patches/gcc/6.3.0/870-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d28554ee61a1ab1263274d66386e4051bca0ce05 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Oct 2016 19:12:19 +0000
-Subject: [PATCH] xtensa: don't use unwind-dw2-fde-dip with elf targets
-
-Define LIB2ADDEH_XTENSA_UNWIND_DW2_FDE to unwind-dw2-fde.c in
-xtensa/t-elf and to unwind-dw2-fde-dip.c in xtensa/t-linux and use
-LIB2ADDEH_XTENSA_UNWIND_DW2_FDE in LIB2ADDEH definition.
-
-This fixes build for elf target with windowed xtensa core that currently
-breaks with the following error message:
-
-  unwind-dw2-fde-dip.c:36:40: fatal error: elf.h: No such file or directory
-
-2016-10-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-elf (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-linux (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-windowed (LIB2ADDEH): Use
-	LIB2ADDEH_XTENSA_UNWIND_DW2_FDE defined by either xtensa/t-elf
-	or xtensa/t-linux.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241313 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- libgcc/config/xtensa/t-elf      | 2 ++
- libgcc/config/xtensa/t-linux    | 2 ++
- libgcc/config/xtensa/t-windowed | 2 +-
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf
-index 59d5121..967cf9b 100644
---- a/libgcc/config/xtensa/t-elf
-+++ b/libgcc/config/xtensa/t-elf
-@@ -3,3 +3,5 @@ CRTSTUFF_T_CFLAGS += -mlongcalls
- CRTSTUFF_T_CFLAGS_S += -mlongcalls
- 
- HOST_LIBGCC2_CFLAGS += -mlongcalls
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde.c
-diff --git a/libgcc/config/xtensa/t-linux b/libgcc/config/xtensa/t-linux
-index 6f4ae89..412ecca 100644
---- a/libgcc/config/xtensa/t-linux
-+++ b/libgcc/config/xtensa/t-linux
-@@ -1 +1,3 @@
- SHLIB_MAPFILES += $(srcdir)/config/xtensa/libgcc-glibc.ver
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde-dip.c
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index a99156c..f140136 100644
---- a/libgcc/config/xtensa/t-windowed
-+++ b/libgcc/config/xtensa/t-windowed
-@@ -1,2 +1,2 @@
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(LIB2ADDEH_XTENSA_UNWIND_DW2_FDE) $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-2.1.4
-
diff --git a/patches/gcc/6.3.0/871-xtensa-Fix-PR-target-78118.patch b/patches/gcc/6.3.0/871-xtensa-Fix-PR-target-78118.patch
deleted file mode 100644
index c6ae103..0000000
--- a/patches/gcc/6.3.0/871-xtensa-Fix-PR-target-78118.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-From bdda1689faf608ad7c83b5bd2e21a236b0047579 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Wed, 26 Oct 2016 08:02:51 +0000
-Subject: [PATCH] xtensa: Fix PR target/78118
-
-It started failing after the following commit: 32e90dc6a0cda45 ("PR
-rtl-optimization/61047").
-
-The change that made xtensa backend go ICE looks completely unrelated,
-and indeed, the issue is caused by the side effect of
-compute_frame_size() function call hidden in the
-INITIAL_ELIMINATION_OFFSET macro. This call updates the value of the
-xtensa_current_frame_size static variable, used in "return" instruction
-predicate. Prior to the change the value of xtensa_current_frame_size was
-set to 0 after the end of epilogue generation, which enabled the "return"
-instruction for the CALL0 ABI, but after the change the additional
-INITIAL_ELIMINATION_OFFSET calls make xtensa_current_frame_size non-zero
-and "return" pattern unavailable.
-
-Get rid of the global xtensa_current_frame_size and
-xtensa_callee_save_size variables by moving them into the
-machine_function structure. Implement predicate for the "return" pattern
-as a function. Don't communicate completion of epilogue generation
-through zeroing of xtensa_current_frame_size, add explicit epilogue_done
-variable to the machine_function structure. Don't update stack frame
-layout after the completion of reload.
-
-2016-10-26  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa-protos.h
-	(xtensa_use_return_instruction_p): New prototype.
-	* config/xtensa/xtensa.c (xtensa_current_frame_size,
-	xtensa_callee_save_size): Remove.
-	(struct machine_function): Add new fields: current_frame_size,
-	callee_save_size, frame_laid_out and epilogue_done.
-	(compute_frame_size, xtensa_expand_prologue,
-	xtensa_expand_epilogue): Replace xtensa_callee_save_size with
-	cfun->machine->callee_save_size and xtensa_current_frame_size
-	with cfun->machine->current_frame_size.
-	(compute_frame_size): Update cfun->machine->frame_laid_out and
-	don't update frame layout after reload completion.
-	(xtensa_expand_epilogue): Set cfun->machine->epilogue_done
-	instead of zeroing xtensa_current_frame_size.
-	(xtensa_use_return_instruction_p): New function.
-	* config/xtensa/xtensa.h (xtensa_current_frame_size): Remove
-	declaration.
-	(INITIAL_ELIMINATION_OFFSET): Use return value of
-	compute_frame_size instead of xtensa_current_frame_size value.
-	* config/xtensa/xtensa.md ("return" pattern): Use new predicate
-	function xtensa_use_return_instruction_p instead of inline code.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa-protos.h |  1 +
- gcc/config/xtensa/xtensa.c        | 82 ++++++++++++++++++++++++---------------
- gcc/config/xtensa/xtensa.h        |  6 +--
- gcc/config/xtensa/xtensa.md       |  2 +-
- 4 files changed, 55 insertions(+), 36 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h
-index f2ca526..873557f 100644
---- a/gcc/config/xtensa/xtensa-protos.h
-+++ b/gcc/config/xtensa/xtensa-protos.h
-@@ -68,6 +68,7 @@ extern rtx xtensa_return_addr (int, rtx);
- extern void xtensa_setup_frame_addresses (void);
- extern int xtensa_dbx_register_number (int);
- extern long compute_frame_size (int);
-+extern bool xtensa_use_return_instruction_p (void);
- extern void xtensa_expand_prologue (void);
- extern void xtensa_expand_epilogue (void);
- extern void order_regs_for_local_alloc (void);
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 64d089b..e49f784 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -78,11 +78,6 @@ enum internal_test
-    can support a given mode.  */
- char xtensa_hard_regno_mode_ok[(int) MAX_MACHINE_MODE][FIRST_PSEUDO_REGISTER];
- 
--/* Current frame size calculated by compute_frame_size.  */
--unsigned xtensa_current_frame_size;
--/* Callee-save area size in the current frame calculated by compute_frame_size. */
--int xtensa_callee_save_size;
--
- /* Largest block move to handle in-line.  */
- #define LARGEST_MOVE_RATIO 15
- 
-@@ -94,6 +89,13 @@ struct GTY(()) machine_function
-   bool vararg_a7;
-   rtx vararg_a7_copy;
-   rtx_insn *set_frame_ptr_insn;
-+  /* Current frame size calculated by compute_frame_size.  */
-+  unsigned current_frame_size;
-+  /* Callee-save area size in the current frame calculated by
-+     compute_frame_size.  */
-+  int callee_save_size;
-+  bool frame_laid_out;
-+  bool epilogue_done;
- };
- 
- /* Vector, indexed by hard register number, which contains 1 for a
-@@ -2628,24 +2630,29 @@ compute_frame_size (int size)
- {
-   int regno;
- 
-+  if (reload_completed && cfun->machine->frame_laid_out)
-+    return cfun->machine->current_frame_size;
-+
-   /* Add space for the incoming static chain value.  */
-   if (cfun->static_chain_decl != NULL)
-     size += (1 * UNITS_PER_WORD);
- 
--  xtensa_callee_save_size = 0;
-+  cfun->machine->callee_save_size = 0;
-   for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno)
-     {
-       if (xtensa_call_save_reg(regno))
--	xtensa_callee_save_size += UNITS_PER_WORD;
-+	cfun->machine->callee_save_size += UNITS_PER_WORD;
-     }
- 
--  xtensa_current_frame_size =
-+  cfun->machine->current_frame_size =
-     XTENSA_STACK_ALIGN (size
--			+ xtensa_callee_save_size
-+			+ cfun->machine->callee_save_size
- 			+ crtl->outgoing_args_size
- 			+ (WINDOW_SIZE * UNITS_PER_WORD));
--  xtensa_callee_save_size = XTENSA_STACK_ALIGN (xtensa_callee_save_size);
--  return xtensa_current_frame_size;
-+  cfun->machine->callee_save_size =
-+    XTENSA_STACK_ALIGN (cfun->machine->callee_save_size);
-+  cfun->machine->frame_laid_out = true;
-+  return cfun->machine->current_frame_size;
- }
- 
- 
-@@ -2696,6 +2703,7 @@ xtensa_expand_prologue (void)
-     {
-       int regno;
-       HOST_WIDE_INT offset = 0;
-+      int callee_save_size = cfun->machine->callee_save_size;
- 
-       /* -128 is a limit of single addi instruction. */
-       if (total_size > 0 && total_size <= 128)
-@@ -2709,7 +2717,7 @@ xtensa_expand_prologue (void)
- 	  add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
- 	  offset = total_size - UNITS_PER_WORD;
- 	}
--      else if (xtensa_callee_save_size)
-+      else if (callee_save_size)
- 	{
- 	  /* 1020 is maximal s32i offset, if the frame is bigger than that
- 	   * we move sp to the end of callee-saved save area, save and then
-@@ -2717,13 +2725,13 @@ xtensa_expand_prologue (void)
- 	  if (total_size > 1024)
- 	    {
- 	      insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
--					    GEN_INT (-xtensa_callee_save_size)));
-+					    GEN_INT (-callee_save_size)));
- 	      RTX_FRAME_RELATED_P (insn) = 1;
- 	      note_rtx = gen_rtx_SET (stack_pointer_rtx,
- 				      plus_constant (Pmode, stack_pointer_rtx,
--						     -xtensa_callee_save_size));
-+						     -callee_save_size));
- 	      add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
--	      offset = xtensa_callee_save_size - UNITS_PER_WORD;
-+	      offset = callee_save_size - UNITS_PER_WORD;
- 	    }
- 	  else
- 	    {
-@@ -2759,13 +2767,13 @@ xtensa_expand_prologue (void)
- 	{
- 	  rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
- 	  emit_move_insn (tmp_reg, GEN_INT (total_size -
--					    xtensa_callee_save_size));
-+					    callee_save_size));
- 	  insn = emit_insn (gen_subsi3 (stack_pointer_rtx,
- 					stack_pointer_rtx, tmp_reg));
- 	  RTX_FRAME_RELATED_P (insn) = 1;
- 	  note_rtx = gen_rtx_SET (stack_pointer_rtx,
- 				  plus_constant (Pmode, stack_pointer_rtx,
--						 xtensa_callee_save_size -
-+						 callee_save_size -
- 						 total_size));
- 	  add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
- 	}
-@@ -2833,21 +2841,21 @@ xtensa_expand_epilogue (void)
-       int regno;
-       HOST_WIDE_INT offset;
- 
--      if (xtensa_current_frame_size > (frame_pointer_needed ? 127 : 1024))
-+      if (cfun->machine->current_frame_size > (frame_pointer_needed ? 127 : 1024))
- 	{
- 	  rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
--	  emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size -
--					    xtensa_callee_save_size));
-+	  emit_move_insn (tmp_reg, GEN_INT (cfun->machine->current_frame_size -
-+					    cfun->machine->callee_save_size));
- 	  emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ?
- 				 hard_frame_pointer_rtx : stack_pointer_rtx,
- 				 tmp_reg));
--	  offset = xtensa_callee_save_size - UNITS_PER_WORD;
-+	  offset = cfun->machine->callee_save_size - UNITS_PER_WORD;
- 	}
-       else
- 	{
- 	  if (frame_pointer_needed)
- 	    emit_move_insn (stack_pointer_rtx, hard_frame_pointer_rtx);
--	  offset = xtensa_current_frame_size - UNITS_PER_WORD;
-+	  offset = cfun->machine->current_frame_size - UNITS_PER_WORD;
- 	}
- 
-       /* Prevent reordering of saved a0 update and loading it back from
-@@ -2867,16 +2875,16 @@ xtensa_expand_epilogue (void)
- 	    }
- 	}
- 
--      if (xtensa_current_frame_size > 0)
-+      if (cfun->machine->current_frame_size > 0)
- 	{
- 	  if (frame_pointer_needed || /* always reachable with addi */
--	      xtensa_current_frame_size > 1024 ||
--	      xtensa_current_frame_size <= 127)
-+	      cfun->machine->current_frame_size > 1024 ||
-+	      cfun->machine->current_frame_size <= 127)
- 	    {
--	      if (xtensa_current_frame_size <= 127)
--		offset = xtensa_current_frame_size;
-+	      if (cfun->machine->current_frame_size <= 127)
-+		offset = cfun->machine->current_frame_size;
- 	      else
--		offset = xtensa_callee_save_size;
-+		offset = cfun->machine->callee_save_size;
- 
- 	      emit_insn (gen_addsi3 (stack_pointer_rtx,
- 				     stack_pointer_rtx,
-@@ -2885,7 +2893,8 @@ xtensa_expand_epilogue (void)
- 	  else
- 	    {
- 	      rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
--	      emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size));
-+	      emit_move_insn (tmp_reg,
-+			      GEN_INT (cfun->machine->current_frame_size));
- 	      emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
- 				     tmp_reg));
- 	    }
-@@ -2896,11 +2905,22 @@ xtensa_expand_epilogue (void)
- 				  stack_pointer_rtx,
- 				  EH_RETURN_STACKADJ_RTX));
-     }
--  xtensa_current_frame_size = 0;
--  xtensa_callee_save_size = 0;
-+  cfun->machine->epilogue_done = true;
-   emit_jump_insn (gen_return ());
- }
- 
-+bool
-+xtensa_use_return_instruction_p (void)
-+{
-+  if (!reload_completed)
-+    return false;
-+  if (TARGET_WINDOWED_ABI)
-+    return true;
-+  if (compute_frame_size (get_frame_size ()) == 0)
-+    return true;
-+  return cfun->machine->epilogue_done;
-+}
-+
- void
- xtensa_set_return_address (rtx address, rtx scratch)
- {
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 82e9900..58eb1b2 100644
---- a/gcc/config/xtensa/xtensa.h
-+++ b/gcc/config/xtensa/xtensa.h
-@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3.  If not see
- 
- /* External variables defined in xtensa.c.  */
- 
--extern unsigned xtensa_current_frame_size;
--
- /* Macros used in the machine description to select various Xtensa
-    configuration options.  */
- #ifndef XCHAL_HAVE_MUL32_HIGH
-@@ -477,14 +475,14 @@ enum reg_class
- /* Specify the initial difference between the specified pair of registers.  */
- #define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET)			\
-   do {									\
--    compute_frame_size (get_frame_size ());				\
-+    long frame_size = compute_frame_size (get_frame_size ());		\
-     switch (FROM)							\
-       {									\
-       case FRAME_POINTER_REGNUM:					\
-         (OFFSET) = 0;							\
- 	break;								\
-       case ARG_POINTER_REGNUM:						\
--        (OFFSET) = xtensa_current_frame_size;				\
-+        (OFFSET) = frame_size;						\
- 	break;								\
-       default:								\
- 	gcc_unreachable ();						\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index db54a12..fcdb6c8 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -1663,7 +1663,7 @@
- (define_insn "return"
-   [(return)
-    (use (reg:SI A0_REG))]
--  "(TARGET_WINDOWED_ABI || !xtensa_current_frame_size) && reload_completed"
-+  "xtensa_use_return_instruction_p ()"
- {
-   return TARGET_WINDOWED_ABI ?
-       (TARGET_DENSITY ? "retw.n" : "retw") :
--- 
-2.1.4
-
diff --git a/patches/gcc/6.3.0/872-xtensa-Fix-PR-target-78603.patch b/patches/gcc/6.3.0/872-xtensa-Fix-PR-target-78603.patch
deleted file mode 100644
index 669097c..0000000
--- a/patches/gcc/6.3.0/872-xtensa-Fix-PR-target-78603.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a568f3a84ff41ca272301a5fcf31071143e97e0f Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 29 Nov 2016 13:09:17 -0800
-Subject: [PATCH] xtensa: Fix PR target/78603
-
-2016-11-29  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
-	overhead loop start between a call and its CALL_ARG_LOCATION
-	note.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index e49f784..70f698a 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -4158,7 +4158,10 @@ hwloop_optimize (hwloop_info loop)
-       entry_after = BB_END (entry_bb);
-       while (DEBUG_INSN_P (entry_after)
-              || (NOTE_P (entry_after)
--                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
-+		 /* Make sure we don't split a call and its corresponding
-+		    CALL_ARG_LOCATION note.  */
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
-         entry_after = PREV_INSN (entry_after);
- 
-       emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/patches/gcc/6.3.0/890-fix-m68k-compile.patch b/patches/gcc/6.3.0/890-fix-m68k-compile.patch
deleted file mode 100644
index 6e63de0..0000000
--- a/patches/gcc/6.3.0/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/patches/gcc/6.3.0/891-fix-m68k-uclinux.patch b/patches/gcc/6.3.0/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4e186bd..0000000
--- a/patches/gcc/6.3.0/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/patches/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch b/patches/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
deleted file mode 100644
index 73ee6c5..0000000
--- a/patches/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ae9c3e354440c4a0f105a9eabfb2f77be085ebc1 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 18 Aug 2016 17:59:16 +0200
-Subject: [PATCH] libgcc/mkmap-symver: support skip_underscore
-
-Some platforms, such as Blackfin, have a special prefix for assembly
-symbols as opposed to C symbols. For this reason, a function named
-"foo()" in C will in fact be visible as a symbol called "_foo" in the
-ELF binary.
-
-The current linker version script logic in libgcc doesn't take into
-account this situation properly. The Blackfin specific
-libgcc/config/bfin/libgcc-glibc.ver has an additional "_" in front of
-every symbol so that it matches the output of "nm" (which gets parsed to
-produce the final linker version script). But due to this additional
-"_", ld no longer matches with the symbols since "ld" does the matching
-with the original symbol name, not the one prefixed with "_".
-
-Due to this, none of the symbols in libgcc/config/bfin/libgcc-glibc.ver
-are actually matched with symbols in libgcc. This causes all libgcc
-symbols to be left as "LOCAL", which causes lots of "undefined
-reference" whenever some C or C++ code that calls a function of libgcc
-is compiled.
-
-To address this, this commit introduces a "skip_underscore" variable to
-the mkmap-symver script. It tells mkmap-symver to ignore the leading
-underscore from the "nm" output.
-
-Note that this new argument is different from the existing
-"leading_underscore" argument, which *adds* an additional underscore to
-the generated linker version script.
-
-Having this functionality paves the way to using the generic linker
-version information for Blackfin, instead of using a custom one.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libgcc/mkmap-symver.awk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk
-index 266832a..30bb179 100644
---- a/libgcc/mkmap-symver.awk
-+++ b/libgcc/mkmap-symver.awk
-@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") {
- 
- state == "nm" && NF == 3 {
-   split ($3, s, "@")
--  def[s[1]] = 1;
-+  if (skip_underscore)
-+      symname = substr(s[1], 2);
-+  else
-+      symname = s[1];
-+  def[symname] = 1;
-   sawsymbol = 1;
-   next;
- }
--- 
-2.7.4
-
diff --git a/patches/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/patches/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
deleted file mode 100644
index 454295d..0000000
--- a/patches/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
+++ /dev/null
@@ -1,1944 +0,0 @@
-From 56d606931716de30a89a40dc69a9282c1b4e2880 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 18 Aug 2016 18:04:06 +0200
-Subject: [PATCH] libgcc/config/bfin: use the generic linker version
- information
-
-This commit makes the Blackfin platform use the generic linker version
-information, rather than a completely duplicated file, specific for the
-Blackfin architecture.
-
-This is made possible using the newly introduced skip_underscore
-variable of the mkmap-symver script.
-
-This also allows to get a correct linker version file, with symbol names
-matching the ones found in libgcc. Thanks to this, the necessary symbols
-are marked "GLOBAL" instead of "LOCAL", which makes them visible at link
-time, and solves a large number of "undefined reference"
-issues. Indeed, the Blackfin specific linker version script had an extra
-underscore in front of all symbols, which meant none of them matched the
-symbols in libgcc, and therefore all libgcc symbols were marked as
-"LOCAL", making them invisible for linking.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libgcc/config/bfin/libgcc-glibc.ver | 1894 +----------------------------------
- libgcc/config/bfin/t-linux          |    3 +-
- 2 files changed, 4 insertions(+), 1893 deletions(-)
-
-diff --git a/libgcc/config/bfin/libgcc-glibc.ver b/libgcc/config/bfin/libgcc-glibc.ver
-index b1bd2df..2af3df7 100644
---- a/libgcc/config/bfin/libgcc-glibc.ver
-+++ b/libgcc/config/bfin/libgcc-glibc.ver
-@@ -16,1898 +16,8 @@
- # along with GCC; see the file COPYING3.  If not see
- # <http://www.gnu.org/licenses/>.
- 
--GCC_3.0 {
--  # libgcc1 integer symbols
--  ___absvsi2
--  ___addvsi3
--  ___ashlsi3
--  ___ashrsi3
--  ___divsi3
--  ___lshrsi3
--  ___modsi3
--  ___mulsi3
--  ___mulvsi3
--  ___negvsi2
--  ___subvsi3
--  ___udivsi3
--  ___umodsi3
--
--  # libgcc1 floating point symbols
--  ___addsf3
--  ___adddf3
--  ___addxf3
--  ___addtf3
--  ___divsf3
--  ___divdf3
--  ___divxf3
--  ___divtf3
--  ___eqsf2
--  ___eqdf2
--  ___eqxf2
--  ___eqtf2
--  ___extenddfxf2
--  ___extenddftf2
--  ___extendsfdf2
--  ___extendsfxf2
--  ___extendsftf2
--  ___fixsfsi
--  ___fixdfsi
--  ___fixxfsi
--  ___fixtfsi
--  ___floatsisf
--  ___floatsidf
--  ___floatsixf
--  ___floatsitf
--  ___gesf2
--  ___gedf2
--  ___gexf2
--  ___getf2
--  ___gtsf2
--  ___gtdf2
--  ___gtxf2
--  ___gttf2
--  ___lesf2
--  ___ledf2
--  ___lexf2
--  ___letf2
--  ___ltsf2
--  ___ltdf2
--  ___ltxf2
--  ___lttf2
--  ___mulsf3
--  ___muldf3
--  ___mulxf3
--  ___multf3
--  ___negsf2
--  ___negdf2
--  ___negxf2
--  ___negtf2
--  ___nesf2
--  ___nedf2
--  ___nexf2
--  ___netf2
--  ___subsf3
--  ___subdf3
--  ___subxf3
--  ___subtf3
--  ___truncdfsf2
--  ___truncxfsf2
--  ___trunctfsf2
--  ___truncxfdf2
--  ___trunctfdf2
--
--  # libgcc2 DImode arithmetic (for 32-bit targets).
--  ___absvdi2
--  ___addvdi3
--  ___ashldi3
--  ___ashrdi3
--  ___cmpdi2
--  ___divdi3
--  ___ffsdi2
--  ___fixdfdi
--  ___fixsfdi
--  ___fixtfdi
--  ___fixxfdi
--  ___fixunsdfdi
--  ___fixunsdfsi
--  ___fixunssfsi
--  ___fixunssfdi
--  ___fixunstfdi
--  ___fixunstfsi
--  ___fixunsxfdi
--  ___fixunsxfsi
--  ___floatdidf
--  ___floatdisf
--  ___floatdixf
--  ___floatditf
--  ___lshrdi3
--  ___moddi3
--  ___muldi3
--  ___mulvdi3
--  ___negdi2
--  ___negvdi2
--  ___subvdi3
--  ___ucmpdi2
--  ___udivdi3
--  ___udivmoddi4
--  ___umoddi3
--
--  # libgcc2 TImode arithmetic (for 64-bit targets).
--  ___ashlti3
--  ___ashrti3
--  ___cmpti2
--  ___divti3
--  ___ffsti2
--  ___fixdfti
--  ___fixsfti
--  ___fixtfti
--  ___fixxfti
--  ___lshrti3
--  ___modti3
--  ___multi3
--  ___negti2
--  ___ucmpti2
--  ___udivmodti4
--  ___udivti3
--  ___umodti3
--  ___fixunsdfti
--  ___fixunssfti
--  ___fixunstfti
--  ___fixunsxfti
--  ___floattidf
--  ___floattisf
--  ___floattixf
--  ___floattitf
--
--  # Used to deal with trampoline initialization on some platforms
--  ___clear_cache
--
--  # EH symbols
--  __Unwind_DeleteException
--  __Unwind_Find_FDE
--  __Unwind_ForcedUnwind
--  __Unwind_GetGR
--  __Unwind_GetIP
--  __Unwind_GetLanguageSpecificData
--  __Unwind_GetRegionStart
--  __Unwind_GetTextRelBase
--  __Unwind_GetDataRelBase
--  __Unwind_RaiseException
--  __Unwind_Resume
--  __Unwind_SetGR
--  __Unwind_SetIP
--  ___deregister_frame
--  ___deregister_frame_info
--  ___deregister_frame_info_bases
--  ___register_frame
--  ___register_frame_info
--  ___register_frame_info_bases
--  ___register_frame_info_table
--  ___register_frame_info_table_bases
--  ___register_frame_table
--
--  # SjLj EH symbols
--  __Unwind_SjLj_Register
--  __Unwind_SjLj_Unregister
--  __Unwind_SjLj_RaiseException
--  __Unwind_SjLj_ForcedUnwind
--  __Unwind_SjLj_Resume
--}
--
--%inherit GCC_3.3 GCC_3.0
--GCC_3.3 {
--  __Unwind_FindEnclosingFunction
--  __Unwind_GetCFA
--  __Unwind_Backtrace
--  __Unwind_Resume_or_Rethrow
--  __Unwind_SjLj_Resume_or_Rethrow
--}
--
--%inherit GCC_3.3.1 GCC_3.3
--GCC_3.3.1 {
--  ___gcc_personality_sj0
--  ___gcc_personality_v0
--}
--
--%inherit GCC_3.3.2 GCC_3.3.1
--GCC_3.3.2 {
--}
--%inherit GCC_3.3.4 GCC_3.3.2
--GCC_3.3.4 {
--  ___unorddf2
--  ___unordsf2
--}
--
--%inherit GCC_3.4 GCC_3.3.4
--GCC_3.4 {
--  # bit scanning and counting built-ins
--  ___clzsi2
--  ___clzdi2
--  ___clzti2
--  ___ctzsi2
--  ___ctzdi2
--  ___ctzti2
--  ___popcountsi2
--  ___popcountdi2
--  ___popcountti2
--  ___paritysi2
--  ___paritydi2
--  ___parityti2
--}
--
--%inherit GCC_3.4.2 GCC_3.4
--GCC_3.4.2 {
--  # Used to deal with trampoline initialization on some platforms
--  ___enable_execute_stack
--  ___trampoline_setup
--}
--
--%inherit GCC_3.4.4 GCC_3.4.2
--GCC_3.4.4 {
--  # libgcc2 TImode arithmetic (for 64-bit targets).
--  ___absvti2
--  ___addvti3
--  ___mulvti3
--  ___negvti2
--  ___subvti3
--}
--
--%inherit GCC_4.0.0 GCC_3.4.4
--GCC_4.0.0 {
--  # libgcc2 __builtin_powi helpers.
--  ___powisf2
--  ___powidf2
--  ___powixf2
--  ___powitf2
--
--  # c99 compliant complex arithmetic
--  ___divsc3
--  ___divdc3
--  ___divxc3
--  ___divtc3
--  ___mulsc3
--  ___muldc3
--  ___mulxc3
--  ___multc3
--}
--
- %inherit GCC_4.1.0 GCC_4.0.0
- GCC_4.1.0 {
--  ___smulsi3_highpart
--  ___umulsi3_highpart
--}
--
--%inherit GCC_4.2.0 GCC_4.1.0
--GCC_4.2.0 {
--  # unsigned-to-floating conversions
--  ___floatunsisf
--  ___floatunsidf
--  ___floatunsixf
--  ___floatunsitf
--  ___floatundidf
--  ___floatundisf
--  ___floatundixf
--  ___floatunditf
--  ___floatuntidf
--  ___floatuntisf
--  ___floatuntixf
--  ___floatuntitf
--  __Unwind_GetIPInfo
--}
--
--%inherit GCC_4.3.0 GCC_4.2.0
--GCC_4.3.0 {
--  # byte swapping routines
--  ___bswapsi2
--  ___bswapdi2
--  ___emutls_get_address
--  ___emutls_register_common
--  ___ffssi2
--  ___extendxftf2
--  ___trunctfxf2
--
--  # fixed-point routines
--  ___addqq3
--  ___addhq3
--  ___addsq3
--  ___adddq3
--  ___addtq3
--  ___adduqq3
--  ___adduhq3
--  ___addusq3
--  ___addudq3
--  ___addutq3
--  ___addha3
--  ___addsa3
--  ___addda3
--  ___addta3
--  ___adduha3
--  ___addusa3
--  ___adduda3
--  ___adduta3
--  ___ssaddqq3
--  ___ssaddhq3
--  ___ssaddsq3
--  ___ssadddq3
--  ___ssaddtq3
--  ___ssaddha3
--  ___ssaddsa3
--  ___ssaddda3
--  ___ssaddta3
--  ___usadduqq3
--  ___usadduhq3
--  ___usaddusq3
--  ___usaddudq3
--  ___usaddutq3
--  ___usadduha3
--  ___usaddusa3
--  ___usadduda3
--  ___usadduta3
--  ___subqq3
--  ___subhq3
--  ___subsq3
--  ___subdq3
--  ___subtq3
--  ___subuqq3
--  ___subuhq3
--  ___subusq3
--  ___subudq3
--  ___subutq3
--  ___subha3
--  ___subsa3
--  ___subda3
--  ___subta3
--  ___subuha3
--  ___subusa3
--  ___subuda3
--  ___subuta3
--  ___sssubqq3
--  ___sssubhq3
--  ___sssubsq3
--  ___sssubdq3
--  ___sssubtq3
--  ___sssubha3
--  ___sssubsa3
--  ___sssubda3
--  ___sssubta3
--  ___ussubuqq3
--  ___ussubuhq3
--  ___ussubusq3
--  ___ussubudq3
--  ___ussubutq3
--  ___ussubuha3
--  ___ussubusa3
--  ___ussubuda3
--  ___ussubuta3
--  ___mulqq3
--  ___mulhq3
--  ___mulsq3
--  ___muldq3
--  ___multq3
--  ___muluqq3
--  ___muluhq3
--  ___mulusq3
--  ___muludq3
--  ___mulutq3
--  ___mulha3
--  ___mulsa3
--  ___mulda3
--  ___multa3
--  ___muluha3
--  ___mulusa3
--  ___muluda3
--  ___muluta3
--  ___ssmulqq3
--  ___ssmulhq3
--  ___ssmulsq3
--  ___ssmuldq3
--  ___ssmultq3
--  ___ssmulha3
--  ___ssmulsa3
--  ___ssmulda3
--  ___ssmulta3
--  ___usmuluqq3
--  ___usmuluhq3
--  ___usmulusq3
--  ___usmuludq3
--  ___usmulutq3
--  ___usmuluha3
--  ___usmulusa3
--  ___usmuluda3
--  ___usmuluta3
--  ___divqq3
--  ___divhq3
--  ___divsq3
--  ___divdq3
--  ___divtq3
--  ___divha3
--  ___divsa3
--  ___divda3
--  ___divta3
--  ___udivuqq3
--  ___udivuhq3
--  ___udivusq3
--  ___udivudq3
--  ___udivutq3
--  ___udivuha3
--  ___udivusa3
--  ___udivuda3
--  ___udivuta3
--  ___ssdivqq3
--  ___ssdivhq3
--  ___ssdivsq3
--  ___ssdivdq3
--  ___ssdivtq3
--  ___ssdivha3
--  ___ssdivsa3
--  ___ssdivda3
--  ___ssdivta3
--  ___usdivuqq3
--  ___usdivuhq3
--  ___usdivusq3
--  ___usdivudq3
--  ___usdivutq3
--  ___usdivuha3
--  ___usdivusa3
--  ___usdivuda3
--  ___usdivuta3
--  ___negqq2
--  ___neghq2
--  ___negsq2
--  ___negdq2
--  ___negtq2
--  ___neguqq2
--  ___neguhq2
--  ___negusq2
--  ___negudq2
--  ___negutq2
--  ___negha2
--  ___negsa2
--  ___negda2
--  ___negta2
--  ___neguha2
--  ___negusa2
--  ___neguda2
--  ___neguta2
--  ___ssnegqq2
--  ___ssneghq2
--  ___ssnegsq2
--  ___ssnegdq2
--  ___ssnegtq2
--  ___ssnegha2
--  ___ssnegsa2
--  ___ssnegda2
--  ___ssnegta2
--  ___usneguqq2
--  ___usneguhq2
--  ___usnegusq2
--  ___usnegudq2
--  ___usnegutq2
--  ___usneguha2
--  ___usnegusa2
--  ___usneguda2
--  ___usneguta2
--  ___ashlqq3
--  ___ashlhq3
--  ___ashlsq3
--  ___ashldq3
--  ___ashltq3
--  ___ashluqq3
--  ___ashluhq3
--  ___ashlusq3
--  ___ashludq3
--  ___ashlutq3
--  ___ashlha3
--  ___ashlsa3
--  ___ashlda3
--  ___ashlta3
--  ___ashluha3
--  ___ashlusa3
--  ___ashluda3
--  ___ashluta3
--  ___ashrqq3
--  ___ashrhq3
--  ___ashrsq3
--  ___ashrdq3
--  ___ashrtq3
--  ___ashrha3
--  ___ashrsa3
--  ___ashrda3
--  ___ashrta3
--  ___lshruqq3
--  ___lshruhq3
--  ___lshrusq3
--  ___lshrudq3
--  ___lshrutq3
--  ___lshruha3
--  ___lshrusa3
--  ___lshruda3
--  ___lshruta3
--  ___ssashlqq3
--  ___ssashlhq3
--  ___ssashlsq3
--  ___ssashldq3
--  ___ssashltq3
--  ___ssashlha3
--  ___ssashlsa3
--  ___ssashlda3
--  ___ssashlta3
--  ___usashluqq3
--  ___usashluhq3
--  ___usashlusq3
--  ___usashludq3
--  ___usashlutq3
--  ___usashluha3
--  ___usashlusa3
--  ___usashluda3
--  ___usashluta3
--  ___cmpqq2
--  ___cmphq2
--  ___cmpsq2
--  ___cmpdq2
--  ___cmptq2
--  ___cmpuqq2
--  ___cmpuhq2
--  ___cmpusq2
--  ___cmpudq2
--  ___cmputq2
--  ___cmpha2
--  ___cmpsa2
--  ___cmpda2
--  ___cmpta2
--  ___cmpuha2
--  ___cmpusa2
--  ___cmpuda2
--  ___cmputa2
--  ___fractqqhq2
--  ___fractqqsq2
--  ___fractqqdq2
--  ___fractqqtq2
--  ___fractqqha
--  ___fractqqsa
--  ___fractqqda
--  ___fractqqta
--  ___fractqquqq
--  ___fractqquhq
--  ___fractqqusq
--  ___fractqqudq
--  ___fractqqutq
--  ___fractqquha
--  ___fractqqusa
--  ___fractqquda
--  ___fractqquta
--  ___fractqqqi
--  ___fractqqhi
--  ___fractqqsi
--  ___fractqqdi
--  ___fractqqti
--  ___fractqqsf
--  ___fractqqdf
--  ___fracthqqq2
--  ___fracthqsq2
--  ___fracthqdq2
--  ___fracthqtq2
--  ___fracthqha
--  ___fracthqsa
--  ___fracthqda
--  ___fracthqta
--  ___fracthquqq
--  ___fracthquhq
--  ___fracthqusq
--  ___fracthqudq
--  ___fracthqutq
--  ___fracthquha
--  ___fracthqusa
--  ___fracthquda
--  ___fracthquta
--  ___fracthqqi
--  ___fracthqhi
--  ___fracthqsi
--  ___fracthqdi
--  ___fracthqti
--  ___fracthqsf
--  ___fracthqdf
--  ___fractsqqq2
--  ___fractsqhq2
--  ___fractsqdq2
--  ___fractsqtq2
--  ___fractsqha
--  ___fractsqsa
--  ___fractsqda
--  ___fractsqta
--  ___fractsquqq
--  ___fractsquhq
--  ___fractsqusq
--  ___fractsqudq
--  ___fractsqutq
--  ___fractsquha
--  ___fractsqusa
--  ___fractsquda
--  ___fractsquta
--  ___fractsqqi
--  ___fractsqhi
--  ___fractsqsi
--  ___fractsqdi
--  ___fractsqti
--  ___fractsqsf
--  ___fractsqdf
--  ___fractdqqq2
--  ___fractdqhq2
--  ___fractdqsq2
--  ___fractdqtq2
--  ___fractdqha
--  ___fractdqsa
--  ___fractdqda
--  ___fractdqta
--  ___fractdquqq
--  ___fractdquhq
--  ___fractdqusq
--  ___fractdqudq
--  ___fractdqutq
--  ___fractdquha
--  ___fractdqusa
--  ___fractdquda
--  ___fractdquta
--  ___fractdqqi
--  ___fractdqhi
--  ___fractdqsi
--  ___fractdqdi
--  ___fractdqti
--  ___fractdqsf
--  ___fractdqdf
--  ___fracttqqq2
--  ___fracttqhq2
--  ___fracttqsq2
--  ___fracttqdq2
--  ___fracttqha
--  ___fracttqsa
--  ___fracttqda
--  ___fracttqta
--  ___fracttquqq
--  ___fracttquhq
--  ___fracttqusq
--  ___fracttqudq
--  ___fracttqutq
--  ___fracttquha
--  ___fracttqusa
--  ___fracttquda
--  ___fracttquta
--  ___fracttqqi
--  ___fracttqhi
--  ___fracttqsi
--  ___fracttqdi
--  ___fracttqti
--  ___fracttqsf
--  ___fracttqdf
--  ___fracthaqq
--  ___fracthahq
--  ___fracthasq
--  ___fracthadq
--  ___fracthatq
--  ___fracthasa2
--  ___fracthada2
--  ___fracthata2
--  ___fracthauqq
--  ___fracthauhq
--  ___fracthausq
--  ___fracthaudq
--  ___fracthautq
--  ___fracthauha
--  ___fracthausa
--  ___fracthauda
--  ___fracthauta
--  ___fracthaqi
--  ___fracthahi
--  ___fracthasi
--  ___fracthadi
--  ___fracthati
--  ___fracthasf
--  ___fracthadf
--  ___fractsaqq
--  ___fractsahq
--  ___fractsasq
--  ___fractsadq
--  ___fractsatq
--  ___fractsaha2
--  ___fractsada2
--  ___fractsata2
--  ___fractsauqq
--  ___fractsauhq
--  ___fractsausq
--  ___fractsaudq
--  ___fractsautq
--  ___fractsauha
--  ___fractsausa
--  ___fractsauda
--  ___fractsauta
--  ___fractsaqi
--  ___fractsahi
--  ___fractsasi
--  ___fractsadi
--  ___fractsati
--  ___fractsasf
--  ___fractsadf
--  ___fractdaqq
--  ___fractdahq
--  ___fractdasq
--  ___fractdadq
--  ___fractdatq
--  ___fractdaha2
--  ___fractdasa2
--  ___fractdata2
--  ___fractdauqq
--  ___fractdauhq
--  ___fractdausq
--  ___fractdaudq
--  ___fractdautq
--  ___fractdauha
--  ___fractdausa
--  ___fractdauda
--  ___fractdauta
--  ___fractdaqi
--  ___fractdahi
--  ___fractdasi
--  ___fractdadi
--  ___fractdati
--  ___fractdasf
--  ___fractdadf
--  ___fracttaqq
--  ___fracttahq
--  ___fracttasq
--  ___fracttadq
--  ___fracttatq
--  ___fracttaha2
--  ___fracttasa2
--  ___fracttada2
--  ___fracttauqq
--  ___fracttauhq
--  ___fracttausq
--  ___fracttaudq
--  ___fracttautq
--  ___fracttauha
--  ___fracttausa
--  ___fracttauda
--  ___fracttauta
--  ___fracttaqi
--  ___fracttahi
--  ___fracttasi
--  ___fracttadi
--  ___fracttati
--  ___fracttasf
--  ___fracttadf
--  ___fractuqqqq
--  ___fractuqqhq
--  ___fractuqqsq
--  ___fractuqqdq
--  ___fractuqqtq
--  ___fractuqqha
--  ___fractuqqsa
--  ___fractuqqda
--  ___fractuqqta
--  ___fractuqquhq2
--  ___fractuqqusq2
--  ___fractuqqudq2
--  ___fractuqqutq2
--  ___fractuqquha
--  ___fractuqqusa
--  ___fractuqquda
--  ___fractuqquta
--  ___fractuqqqi
--  ___fractuqqhi
--  ___fractuqqsi
--  ___fractuqqdi
--  ___fractuqqti
--  ___fractuqqsf
--  ___fractuqqdf
--  ___fractuhqqq
--  ___fractuhqhq
--  ___fractuhqsq
--  ___fractuhqdq
--  ___fractuhqtq
--  ___fractuhqha
--  ___fractuhqsa
--  ___fractuhqda
--  ___fractuhqta
--  ___fractuhquqq2
--  ___fractuhqusq2
--  ___fractuhqudq2
--  ___fractuhqutq2
--  ___fractuhquha
--  ___fractuhqusa
--  ___fractuhquda
--  ___fractuhquta
--  ___fractuhqqi
--  ___fractuhqhi
--  ___fractuhqsi
--  ___fractuhqdi
--  ___fractuhqti
--  ___fractuhqsf
--  ___fractuhqdf
--  ___fractusqqq
--  ___fractusqhq
--  ___fractusqsq
--  ___fractusqdq
--  ___fractusqtq
--  ___fractusqha
--  ___fractusqsa
--  ___fractusqda
--  ___fractusqta
--  ___fractusquqq2
--  ___fractusquhq2
--  ___fractusqudq2
--  ___fractusqutq2
--  ___fractusquha
--  ___fractusqusa
--  ___fractusquda
--  ___fractusquta
--  ___fractusqqi
--  ___fractusqhi
--  ___fractusqsi
--  ___fractusqdi
--  ___fractusqti
--  ___fractusqsf
--  ___fractusqdf
--  ___fractudqqq
--  ___fractudqhq
--  ___fractudqsq
--  ___fractudqdq
--  ___fractudqtq
--  ___fractudqha
--  ___fractudqsa
--  ___fractudqda
--  ___fractudqta
--  ___fractudquqq2
--  ___fractudquhq2
--  ___fractudqusq2
--  ___fractudqutq2
--  ___fractudquha
--  ___fractudqusa
--  ___fractudquda
--  ___fractudquta
--  ___fractudqqi
--  ___fractudqhi
--  ___fractudqsi
--  ___fractudqdi
--  ___fractudqti
--  ___fractudqsf
--  ___fractudqdf
--  ___fractutqqq
--  ___fractutqhq
--  ___fractutqsq
--  ___fractutqdq
--  ___fractutqtq
--  ___fractutqha
--  ___fractutqsa
--  ___fractutqda
--  ___fractutqta
--  ___fractutquqq2
--  ___fractutquhq2
--  ___fractutqusq2
--  ___fractutqudq2
--  ___fractutquha
--  ___fractutqusa
--  ___fractutquda
--  ___fractutquta
--  ___fractutqqi
--  ___fractutqhi
--  ___fractutqsi
--  ___fractutqdi
--  ___fractutqti
--  ___fractutqsf
--  ___fractutqdf
--  ___fractuhaqq
--  ___fractuhahq
--  ___fractuhasq
--  ___fractuhadq
--  ___fractuhatq
--  ___fractuhaha
--  ___fractuhasa
--  ___fractuhada
--  ___fractuhata
--  ___fractuhauqq
--  ___fractuhauhq
--  ___fractuhausq
--  ___fractuhaudq
--  ___fractuhautq
--  ___fractuhausa2
--  ___fractuhauda2
--  ___fractuhauta2
--  ___fractuhaqi
--  ___fractuhahi
--  ___fractuhasi
--  ___fractuhadi
--  ___fractuhati
--  ___fractuhasf
--  ___fractuhadf
--  ___fractusaqq
--  ___fractusahq
--  ___fractusasq
--  ___fractusadq
--  ___fractusatq
--  ___fractusaha
--  ___fractusasa
--  ___fractusada
--  ___fractusata
--  ___fractusauqq
--  ___fractusauhq
--  ___fractusausq
--  ___fractusaudq
--  ___fractusautq
--  ___fractusauha2
--  ___fractusauda2
--  ___fractusauta2
--  ___fractusaqi
--  ___fractusahi
--  ___fractusasi
--  ___fractusadi
--  ___fractusati
--  ___fractusasf
--  ___fractusadf
--  ___fractudaqq
--  ___fractudahq
--  ___fractudasq
--  ___fractudadq
--  ___fractudatq
--  ___fractudaha
--  ___fractudasa
--  ___fractudada
--  ___fractudata
--  ___fractudauqq
--  ___fractudauhq
--  ___fractudausq
--  ___fractudaudq
--  ___fractudautq
--  ___fractudauha2
--  ___fractudausa2
--  ___fractudauta2
--  ___fractudaqi
--  ___fractudahi
--  ___fractudasi
--  ___fractudadi
--  ___fractudati
--  ___fractudasf
--  ___fractudadf
--  ___fractutaqq
--  ___fractutahq
--  ___fractutasq
--  ___fractutadq
--  ___fractutatq
--  ___fractutaha
--  ___fractutasa
--  ___fractutada
--  ___fractutata
--  ___fractutauqq
--  ___fractutauhq
--  ___fractutausq
--  ___fractutaudq
--  ___fractutautq
--  ___fractutauha2
--  ___fractutausa2
--  ___fractutauda2
--  ___fractutaqi
--  ___fractutahi
--  ___fractutasi
--  ___fractutadi
--  ___fractutati
--  ___fractutasf
--  ___fractutadf
--  ___fractqiqq
--  ___fractqihq
--  ___fractqisq
--  ___fractqidq
--  ___fractqitq
--  ___fractqiha
--  ___fractqisa
--  ___fractqida
--  ___fractqita
--  ___fractqiuqq
--  ___fractqiuhq
--  ___fractqiusq
--  ___fractqiudq
--  ___fractqiutq
--  ___fractqiuha
--  ___fractqiusa
--  ___fractqiuda
--  ___fractqiuta
--  ___fracthiqq
--  ___fracthihq
--  ___fracthisq
--  ___fracthidq
--  ___fracthitq
--  ___fracthiha
--  ___fracthisa
--  ___fracthida
--  ___fracthita
--  ___fracthiuqq
--  ___fracthiuhq
--  ___fracthiusq
--  ___fracthiudq
--  ___fracthiutq
--  ___fracthiuha
--  ___fracthiusa
--  ___fracthiuda
--  ___fracthiuta
--  ___fractsiqq
--  ___fractsihq
--  ___fractsisq
--  ___fractsidq
--  ___fractsitq
--  ___fractsiha
--  ___fractsisa
--  ___fractsida
--  ___fractsita
--  ___fractsiuqq
--  ___fractsiuhq
--  ___fractsiusq
--  ___fractsiudq
--  ___fractsiutq
--  ___fractsiuha
--  ___fractsiusa
--  ___fractsiuda
--  ___fractsiuta
--  ___fractdiqq
--  ___fractdihq
--  ___fractdisq
--  ___fractdidq
--  ___fractditq
--  ___fractdiha
--  ___fractdisa
--  ___fractdida
--  ___fractdita
--  ___fractdiuqq
--  ___fractdiuhq
--  ___fractdiusq
--  ___fractdiudq
--  ___fractdiutq
--  ___fractdiuha
--  ___fractdiusa
--  ___fractdiuda
--  ___fractdiuta
--  ___fracttiqq
--  ___fracttihq
--  ___fracttisq
--  ___fracttidq
--  ___fracttitq
--  ___fracttiha
--  ___fracttisa
--  ___fracttida
--  ___fracttita
--  ___fracttiuqq
--  ___fracttiuhq
--  ___fracttiusq
--  ___fracttiudq
--  ___fracttiutq
--  ___fracttiuha
--  ___fracttiusa
--  ___fracttiuda
--  ___fracttiuta
--  ___fractsfqq
--  ___fractsfhq
--  ___fractsfsq
--  ___fractsfdq
--  ___fractsftq
--  ___fractsfha
--  ___fractsfsa
--  ___fractsfda
--  ___fractsfta
--  ___fractsfuqq
--  ___fractsfuhq
--  ___fractsfusq
--  ___fractsfudq
--  ___fractsfutq
--  ___fractsfuha
--  ___fractsfusa
--  ___fractsfuda
--  ___fractsfuta
--  ___fractdfqq
--  ___fractdfhq
--  ___fractdfsq
--  ___fractdfdq
--  ___fractdftq
--  ___fractdfha
--  ___fractdfsa
--  ___fractdfda
--  ___fractdfta
--  ___fractdfuqq
--  ___fractdfuhq
--  ___fractdfusq
--  ___fractdfudq
--  ___fractdfutq
--  ___fractdfuha
--  ___fractdfusa
--  ___fractdfuda
--  ___fractdfuta
--  ___satfractqqhq2
--  ___satfractqqsq2
--  ___satfractqqdq2
--  ___satfractqqtq2
--  ___satfractqqha
--  ___satfractqqsa
--  ___satfractqqda
--  ___satfractqqta
--  ___satfractqquqq
--  ___satfractqquhq
--  ___satfractqqusq
--  ___satfractqqudq
--  ___satfractqqutq
--  ___satfractqquha
--  ___satfractqqusa
--  ___satfractqquda
--  ___satfractqquta
--  ___satfracthqqq2
--  ___satfracthqsq2
--  ___satfracthqdq2
--  ___satfracthqtq2
--  ___satfracthqha
--  ___satfracthqsa
--  ___satfracthqda
--  ___satfracthqta
--  ___satfracthquqq
--  ___satfracthquhq
--  ___satfracthqusq
--  ___satfracthqudq
--  ___satfracthqutq
--  ___satfracthquha
--  ___satfracthqusa
--  ___satfracthquda
--  ___satfracthquta
--  ___satfractsqqq2
--  ___satfractsqhq2
--  ___satfractsqdq2
--  ___satfractsqtq2
--  ___satfractsqha
--  ___satfractsqsa
--  ___satfractsqda
--  ___satfractsqta
--  ___satfractsquqq
--  ___satfractsquhq
--  ___satfractsqusq
--  ___satfractsqudq
--  ___satfractsqutq
--  ___satfractsquha
--  ___satfractsqusa
--  ___satfractsquda
--  ___satfractsquta
--  ___satfractdqqq2
--  ___satfractdqhq2
--  ___satfractdqsq2
--  ___satfractdqtq2
--  ___satfractdqha
--  ___satfractdqsa
--  ___satfractdqda
--  ___satfractdqta
--  ___satfractdquqq
--  ___satfractdquhq
--  ___satfractdqusq
--  ___satfractdqudq
--  ___satfractdqutq
--  ___satfractdquha
--  ___satfractdqusa
--  ___satfractdquda
--  ___satfractdquta
--  ___satfracttqqq2
--  ___satfracttqhq2
--  ___satfracttqsq2
--  ___satfracttqdq2
--  ___satfracttqha
--  ___satfracttqsa
--  ___satfracttqda
--  ___satfracttqta
--  ___satfracttquqq
--  ___satfracttquhq
--  ___satfracttqusq
--  ___satfracttqudq
--  ___satfracttqutq
--  ___satfracttquha
--  ___satfracttqusa
--  ___satfracttquda
--  ___satfracttquta
--  ___satfracthaqq
--  ___satfracthahq
--  ___satfracthasq
--  ___satfracthadq
--  ___satfracthatq
--  ___satfracthasa2
--  ___satfracthada2
--  ___satfracthata2
--  ___satfracthauqq
--  ___satfracthauhq
--  ___satfracthausq
--  ___satfracthaudq
--  ___satfracthautq
--  ___satfracthauha
--  ___satfracthausa
--  ___satfracthauda
--  ___satfracthauta
--  ___satfractsaqq
--  ___satfractsahq
--  ___satfractsasq
--  ___satfractsadq
--  ___satfractsatq
--  ___satfractsaha2
--  ___satfractsada2
--  ___satfractsata2
--  ___satfractsauqq
--  ___satfractsauhq
--  ___satfractsausq
--  ___satfractsaudq
--  ___satfractsautq
--  ___satfractsauha
--  ___satfractsausa
--  ___satfractsauda
--  ___satfractsauta
--  ___satfractdaqq
--  ___satfractdahq
--  ___satfractdasq
--  ___satfractdadq
--  ___satfractdatq
--  ___satfractdaha2
--  ___satfractdasa2
--  ___satfractdata2
--  ___satfractdauqq
--  ___satfractdauhq
--  ___satfractdausq
--  ___satfractdaudq
--  ___satfractdautq
--  ___satfractdauha
--  ___satfractdausa
--  ___satfractdauda
--  ___satfractdauta
--  ___satfracttaqq
--  ___satfracttahq
--  ___satfracttasq
--  ___satfracttadq
--  ___satfracttatq
--  ___satfracttaha2
--  ___satfracttasa2
--  ___satfracttada2
--  ___satfracttauqq
--  ___satfracttauhq
--  ___satfracttausq
--  ___satfracttaudq
--  ___satfracttautq
--  ___satfracttauha
--  ___satfracttausa
--  ___satfracttauda
--  ___satfracttauta
--  ___satfractuqqqq
--  ___satfractuqqhq
--  ___satfractuqqsq
--  ___satfractuqqdq
--  ___satfractuqqtq
--  ___satfractuqqha
--  ___satfractuqqsa
--  ___satfractuqqda
--  ___satfractuqqta
--  ___satfractuqquhq2
--  ___satfractuqqusq2
--  ___satfractuqqudq2
--  ___satfractuqqutq2
--  ___satfractuqquha
--  ___satfractuqqusa
--  ___satfractuqquda
--  ___satfractuqquta
--  ___satfractuhqqq
--  ___satfractuhqhq
--  ___satfractuhqsq
--  ___satfractuhqdq
--  ___satfractuhqtq
--  ___satfractuhqha
--  ___satfractuhqsa
--  ___satfractuhqda
--  ___satfractuhqta
--  ___satfractuhquqq2
--  ___satfractuhqusq2
--  ___satfractuhqudq2
--  ___satfractuhqutq2
--  ___satfractuhquha
--  ___satfractuhqusa
--  ___satfractuhquda
--  ___satfractuhquta
--  ___satfractusqqq
--  ___satfractusqhq
--  ___satfractusqsq
--  ___satfractusqdq
--  ___satfractusqtq
--  ___satfractusqha
--  ___satfractusqsa
--  ___satfractusqda
--  ___satfractusqta
--  ___satfractusquqq2
--  ___satfractusquhq2
--  ___satfractusqudq2
--  ___satfractusqutq2
--  ___satfractusquha
--  ___satfractusqusa
--  ___satfractusquda
--  ___satfractusquta
--  ___satfractudqqq
--  ___satfractudqhq
--  ___satfractudqsq
--  ___satfractudqdq
--  ___satfractudqtq
--  ___satfractudqha
--  ___satfractudqsa
--  ___satfractudqda
--  ___satfractudqta
--  ___satfractudquqq2
--  ___satfractudquhq2
--  ___satfractudqusq2
--  ___satfractudqutq2
--  ___satfractudquha
--  ___satfractudqusa
--  ___satfractudquda
--  ___satfractudquta
--  ___satfractutqqq
--  ___satfractutqhq
--  ___satfractutqsq
--  ___satfractutqdq
--  ___satfractutqtq
--  ___satfractutqha
--  ___satfractutqsa
--  ___satfractutqda
--  ___satfractutqta
--  ___satfractutquqq2
--  ___satfractutquhq2
--  ___satfractutqusq2
--  ___satfractutqudq2
--  ___satfractutquha
--  ___satfractutqusa
--  ___satfractutquda
--  ___satfractutquta
--  ___satfractuhaqq
--  ___satfractuhahq
--  ___satfractuhasq
--  ___satfractuhadq
--  ___satfractuhatq
--  ___satfractuhaha
--  ___satfractuhasa
--  ___satfractuhada
--  ___satfractuhata
--  ___satfractuhauqq
--  ___satfractuhauhq
--  ___satfractuhausq
--  ___satfractuhaudq
--  ___satfractuhautq
--  ___satfractuhausa2
--  ___satfractuhauda2
--  ___satfractuhauta2
--  ___satfractusaqq
--  ___satfractusahq
--  ___satfractusasq
--  ___satfractusadq
--  ___satfractusatq
--  ___satfractusaha
--  ___satfractusasa
--  ___satfractusada
--  ___satfractusata
--  ___satfractusauqq
--  ___satfractusauhq
--  ___satfractusausq
--  ___satfractusaudq
--  ___satfractusautq
--  ___satfractusauha2
--  ___satfractusauda2
--  ___satfractusauta2
--  ___satfractudaqq
--  ___satfractudahq
--  ___satfractudasq
--  ___satfractudadq
--  ___satfractudatq
--  ___satfractudaha
--  ___satfractudasa
--  ___satfractudada
--  ___satfractudata
--  ___satfractudauqq
--  ___satfractudauhq
--  ___satfractudausq
--  ___satfractudaudq
--  ___satfractudautq
--  ___satfractudauha2
--  ___satfractudausa2
--  ___satfractudauta2
--  ___satfractutaqq
--  ___satfractutahq
--  ___satfractutasq
--  ___satfractutadq
--  ___satfractutatq
--  ___satfractutaha
--  ___satfractutasa
--  ___satfractutada
--  ___satfractutata
--  ___satfractutauqq
--  ___satfractutauhq
--  ___satfractutausq
--  ___satfractutaudq
--  ___satfractutautq
--  ___satfractutauha2
--  ___satfractutausa2
--  ___satfractutauda2
--  ___satfractqiqq
--  ___satfractqihq
--  ___satfractqisq
--  ___satfractqidq
--  ___satfractqitq
--  ___satfractqiha
--  ___satfractqisa
--  ___satfractqida
--  ___satfractqita
--  ___satfractqiuqq
--  ___satfractqiuhq
--  ___satfractqiusq
--  ___satfractqiudq
--  ___satfractqiutq
--  ___satfractqiuha
--  ___satfractqiusa
--  ___satfractqiuda
--  ___satfractqiuta
--  ___satfracthiqq
--  ___satfracthihq
--  ___satfracthisq
--  ___satfracthidq
--  ___satfracthitq
--  ___satfracthiha
--  ___satfracthisa
--  ___satfracthida
--  ___satfracthita
--  ___satfracthiuqq
--  ___satfracthiuhq
--  ___satfracthiusq
--  ___satfracthiudq
--  ___satfracthiutq
--  ___satfracthiuha
--  ___satfracthiusa
--  ___satfracthiuda
--  ___satfracthiuta
--  ___satfractsiqq
--  ___satfractsihq
--  ___satfractsisq
--  ___satfractsidq
--  ___satfractsitq
--  ___satfractsiha
--  ___satfractsisa
--  ___satfractsida
--  ___satfractsita
--  ___satfractsiuqq
--  ___satfractsiuhq
--  ___satfractsiusq
--  ___satfractsiudq
--  ___satfractsiutq
--  ___satfractsiuha
--  ___satfractsiusa
--  ___satfractsiuda
--  ___satfractsiuta
--  ___satfractdiqq
--  ___satfractdihq
--  ___satfractdisq
--  ___satfractdidq
--  ___satfractditq
--  ___satfractdiha
--  ___satfractdisa
--  ___satfractdida
--  ___satfractdita
--  ___satfractdiuqq
--  ___satfractdiuhq
--  ___satfractdiusq
--  ___satfractdiudq
--  ___satfractdiutq
--  ___satfractdiuha
--  ___satfractdiusa
--  ___satfractdiuda
--  ___satfractdiuta
--  ___satfracttiqq
--  ___satfracttihq
--  ___satfracttisq
--  ___satfracttidq
--  ___satfracttitq
--  ___satfracttiha
--  ___satfracttisa
--  ___satfracttida
--  ___satfracttita
--  ___satfracttiuqq
--  ___satfracttiuhq
--  ___satfracttiusq
--  ___satfracttiudq
--  ___satfracttiutq
--  ___satfracttiuha
--  ___satfracttiusa
--  ___satfracttiuda
--  ___satfracttiuta
--  ___satfractsfqq
--  ___satfractsfhq
--  ___satfractsfsq
--  ___satfractsfdq
--  ___satfractsftq
--  ___satfractsfha
--  ___satfractsfsa
--  ___satfractsfda
--  ___satfractsfta
--  ___satfractsfuqq
--  ___satfractsfuhq
--  ___satfractsfusq
--  ___satfractsfudq
--  ___satfractsfutq
--  ___satfractsfuha
--  ___satfractsfusa
--  ___satfractsfuda
--  ___satfractsfuta
--  ___satfractdfqq
--  ___satfractdfhq
--  ___satfractdfsq
--  ___satfractdfdq
--  ___satfractdftq
--  ___satfractdfha
--  ___satfractdfsa
--  ___satfractdfda
--  ___satfractdfta
--  ___satfractdfuqq
--  ___satfractdfuhq
--  ___satfractdfusq
--  ___satfractdfudq
--  ___satfractdfutq
--  ___satfractdfuha
--  ___satfractdfusa
--  ___satfractdfuda
--  ___satfractdfuta
--  ___fractunsqqqi
--  ___fractunsqqhi
--  ___fractunsqqsi
--  ___fractunsqqdi
--  ___fractunsqqti
--  ___fractunshqqi
--  ___fractunshqhi
--  ___fractunshqsi
--  ___fractunshqdi
--  ___fractunshqti
--  ___fractunssqqi
--  ___fractunssqhi
--  ___fractunssqsi
--  ___fractunssqdi
--  ___fractunssqti
--  ___fractunsdqqi
--  ___fractunsdqhi
--  ___fractunsdqsi
--  ___fractunsdqdi
--  ___fractunsdqti
--  ___fractunstqqi
--  ___fractunstqhi
--  ___fractunstqsi
--  ___fractunstqdi
--  ___fractunstqti
--  ___fractunshaqi
--  ___fractunshahi
--  ___fractunshasi
--  ___fractunshadi
--  ___fractunshati
--  ___fractunssaqi
--  ___fractunssahi
--  ___fractunssasi
--  ___fractunssadi
--  ___fractunssati
--  ___fractunsdaqi
--  ___fractunsdahi
--  ___fractunsdasi
--  ___fractunsdadi
--  ___fractunsdati
--  ___fractunstaqi
--  ___fractunstahi
--  ___fractunstasi
--  ___fractunstadi
--  ___fractunstati
--  ___fractunsuqqqi
--  ___fractunsuqqhi
--  ___fractunsuqqsi
--  ___fractunsuqqdi
--  ___fractunsuqqti
--  ___fractunsuhqqi
--  ___fractunsuhqhi
--  ___fractunsuhqsi
--  ___fractunsuhqdi
--  ___fractunsuhqti
--  ___fractunsusqqi
--  ___fractunsusqhi
--  ___fractunsusqsi
--  ___fractunsusqdi
--  ___fractunsusqti
--  ___fractunsudqqi
--  ___fractunsudqhi
--  ___fractunsudqsi
--  ___fractunsudqdi
--  ___fractunsudqti
--  ___fractunsutqqi
--  ___fractunsutqhi
--  ___fractunsutqsi
--  ___fractunsutqdi
--  ___fractunsutqti
--  ___fractunsuhaqi
--  ___fractunsuhahi
--  ___fractunsuhasi
--  ___fractunsuhadi
--  ___fractunsuhati
--  ___fractunsusaqi
--  ___fractunsusahi
--  ___fractunsusasi
--  ___fractunsusadi
--  ___fractunsusati
--  ___fractunsudaqi
--  ___fractunsudahi
--  ___fractunsudasi
--  ___fractunsudadi
--  ___fractunsudati
--  ___fractunsutaqi
--  ___fractunsutahi
--  ___fractunsutasi
--  ___fractunsutadi
--  ___fractunsutati
--  ___fractunsqiqq
--  ___fractunsqihq
--  ___fractunsqisq
--  ___fractunsqidq
--  ___fractunsqitq
--  ___fractunsqiha
--  ___fractunsqisa
--  ___fractunsqida
--  ___fractunsqita
--  ___fractunsqiuqq
--  ___fractunsqiuhq
--  ___fractunsqiusq
--  ___fractunsqiudq
--  ___fractunsqiutq
--  ___fractunsqiuha
--  ___fractunsqiusa
--  ___fractunsqiuda
--  ___fractunsqiuta
--  ___fractunshiqq
--  ___fractunshihq
--  ___fractunshisq
--  ___fractunshidq
--  ___fractunshitq
--  ___fractunshiha
--  ___fractunshisa
--  ___fractunshida
--  ___fractunshita
--  ___fractunshiuqq
--  ___fractunshiuhq
--  ___fractunshiusq
--  ___fractunshiudq
--  ___fractunshiutq
--  ___fractunshiuha
--  ___fractunshiusa
--  ___fractunshiuda
--  ___fractunshiuta
--  ___fractunssiqq
--  ___fractunssihq
--  ___fractunssisq
--  ___fractunssidq
--  ___fractunssitq
--  ___fractunssiha
--  ___fractunssisa
--  ___fractunssida
--  ___fractunssita
--  ___fractunssiuqq
--  ___fractunssiuhq
--  ___fractunssiusq
--  ___fractunssiudq
--  ___fractunssiutq
--  ___fractunssiuha
--  ___fractunssiusa
--  ___fractunssiuda
--  ___fractunssiuta
--  ___fractunsdiqq
--  ___fractunsdihq
--  ___fractunsdisq
--  ___fractunsdidq
--  ___fractunsditq
--  ___fractunsdiha
--  ___fractunsdisa
--  ___fractunsdida
--  ___fractunsdita
--  ___fractunsdiuqq
--  ___fractunsdiuhq
--  ___fractunsdiusq
--  ___fractunsdiudq
--  ___fractunsdiutq
--  ___fractunsdiuha
--  ___fractunsdiusa
--  ___fractunsdiuda
--  ___fractunsdiuta
--  ___fractunstiqq
--  ___fractunstihq
--  ___fractunstisq
--  ___fractunstidq
--  ___fractunstitq
--  ___fractunstiha
--  ___fractunstisa
--  ___fractunstida
--  ___fractunstita
--  ___fractunstiuqq
--  ___fractunstiuhq
--  ___fractunstiusq
--  ___fractunstiudq
--  ___fractunstiutq
--  ___fractunstiuha
--  ___fractunstiusa
--  ___fractunstiuda
--  ___fractunstiuta
--  ___satfractunsqiqq
--  ___satfractunsqihq
--  ___satfractunsqisq
--  ___satfractunsqidq
--  ___satfractunsqitq
--  ___satfractunsqiha
--  ___satfractunsqisa
--  ___satfractunsqida
--  ___satfractunsqita
--  ___satfractunsqiuqq
--  ___satfractunsqiuhq
--  ___satfractunsqiusq
--  ___satfractunsqiudq
--  ___satfractunsqiutq
--  ___satfractunsqiuha
--  ___satfractunsqiusa
--  ___satfractunsqiuda
--  ___satfractunsqiuta
--  ___satfractunshiqq
--  ___satfractunshihq
--  ___satfractunshisq
--  ___satfractunshidq
--  ___satfractunshitq
--  ___satfractunshiha
--  ___satfractunshisa
--  ___satfractunshida
--  ___satfractunshita
--  ___satfractunshiuqq
--  ___satfractunshiuhq
--  ___satfractunshiusq
--  ___satfractunshiudq
--  ___satfractunshiutq
--  ___satfractunshiuha
--  ___satfractunshiusa
--  ___satfractunshiuda
--  ___satfractunshiuta
--  ___satfractunssiqq
--  ___satfractunssihq
--  ___satfractunssisq
--  ___satfractunssidq
--  ___satfractunssitq
--  ___satfractunssiha
--  ___satfractunssisa
--  ___satfractunssida
--  ___satfractunssita
--  ___satfractunssiuqq
--  ___satfractunssiuhq
--  ___satfractunssiusq
--  ___satfractunssiudq
--  ___satfractunssiutq
--  ___satfractunssiuha
--  ___satfractunssiusa
--  ___satfractunssiuda
--  ___satfractunssiuta
--  ___satfractunsdiqq
--  ___satfractunsdihq
--  ___satfractunsdisq
--  ___satfractunsdidq
--  ___satfractunsditq
--  ___satfractunsdiha
--  ___satfractunsdisa
--  ___satfractunsdida
--  ___satfractunsdita
--  ___satfractunsdiuqq
--  ___satfractunsdiuhq
--  ___satfractunsdiusq
--  ___satfractunsdiudq
--  ___satfractunsdiutq
--  ___satfractunsdiuha
--  ___satfractunsdiusa
--  ___satfractunsdiuda
--  ___satfractunsdiuta
--  ___satfractunstiqq
--  ___satfractunstihq
--  ___satfractunstisq
--  ___satfractunstidq
--  ___satfractunstitq
--  ___satfractunstiha
--  ___satfractunstisa
--  ___satfractunstida
--  ___satfractunstita
--  ___satfractunstiuqq
--  ___satfractunstiuhq
--  ___satfractunstiusq
--  ___satfractunstiudq
--  ___satfractunstiutq
--  ___satfractunstiuha
--  ___satfractunstiusa
--  ___satfractunstiuda
--  ___satfractunstiuta
--}
--
--%inherit GCC_4.4.0 GCC_4.3.0
--GCC_4.4.0 {
--  ___sync_fetch_and_add_1
--  ___sync_fetch_and_sub_1
--  ___sync_fetch_and_or_1
--  ___sync_fetch_and_and_1
--  ___sync_fetch_and_xor_1
--  ___sync_fetch_and_nand_1
--  ___sync_add_and_fetch_1
--  ___sync_sub_and_fetch_1
--  ___sync_or_and_fetch_1
--  ___sync_and_and_fetch_1
--  ___sync_xor_and_fetch_1
--  ___sync_nand_and_fetch_1
--  ___sync_bool_compare_and_swap_1
--  ___sync_val_compare_and_swap_1
--  ___sync_lock_test_and_set_1
--
--  ___sync_fetch_and_add_2
--  ___sync_fetch_and_sub_2
--  ___sync_fetch_and_or_2
--  ___sync_fetch_and_and_2
--  ___sync_fetch_and_xor_2
--  ___sync_fetch_and_nand_2
--  ___sync_add_and_fetch_2
--  ___sync_sub_and_fetch_2
--  ___sync_or_and_fetch_2
--  ___sync_and_and_fetch_2
--  ___sync_xor_and_fetch_2
--  ___sync_nand_and_fetch_2
--  ___sync_bool_compare_and_swap_2
--  ___sync_val_compare_and_swap_2
--  ___sync_lock_test_and_set_2
--
--  ___sync_fetch_and_add_4
--  ___sync_fetch_and_sub_4
--  ___sync_fetch_and_or_4
--  ___sync_fetch_and_and_4
--  ___sync_fetch_and_xor_4
--  ___sync_fetch_and_nand_4
--  ___sync_add_and_fetch_4
--  ___sync_sub_and_fetch_4
--  ___sync_or_and_fetch_4
--  ___sync_and_and_fetch_4
--  ___sync_xor_and_fetch_4
--  ___sync_nand_and_fetch_4
--  ___sync_bool_compare_and_swap_4
--  ___sync_val_compare_and_swap_4
--  ___sync_lock_test_and_set_4
--
--  ___sync_fetch_and_add_8
--  ___sync_fetch_and_sub_8
--  ___sync_fetch_and_or_8
--  ___sync_fetch_and_and_8
--  ___sync_fetch_and_xor_8
--  ___sync_fetch_and_nand_8
--  ___sync_add_and_fetch_8
--  ___sync_sub_and_fetch_8
--  ___sync_or_and_fetch_8
--  ___sync_and_and_fetch_8
--  ___sync_xor_and_fetch_8
--  ___sync_nand_and_fetch_8
--  ___sync_bool_compare_and_swap_8
--  ___sync_val_compare_and_swap_8
--  ___sync_lock_test_and_set_8
--
--  ___sync_fetch_and_add_16
--  ___sync_fetch_and_sub_16
--  ___sync_fetch_and_or_16
--  ___sync_fetch_and_and_16
--  ___sync_fetch_and_xor_16
--  ___sync_fetch_and_nand_16
--  ___sync_add_and_fetch_16
--  ___sync_sub_and_fetch_16
--  ___sync_or_and_fetch_16
--  ___sync_and_and_fetch_16
--  ___sync_xor_and_fetch_16
--  ___sync_nand_and_fetch_16
--  ___sync_bool_compare_and_swap_16
--  ___sync_val_compare_and_swap_16
--  ___sync_lock_test_and_set_16
--
--  ___sync_synchronize
--}
--
--%inherit GCC_4.5.0 GCC_4.4.0
--GCC_4.5.0 {
--  ___unordxf2
--  ___unordtf2
-+  __smulsi3_highpart
-+  __umulsi3_highpart
- }
-diff --git a/libgcc/config/bfin/t-linux b/libgcc/config/bfin/t-linux
-index 1c42e48..8898157 100644
---- a/libgcc/config/bfin/t-linux
-+++ b/libgcc/config/bfin/t-linux
-@@ -1 +1,2 @@
--SHLIB_MAPFILES = $(srcdir)/config/bfin/libgcc-glibc.ver
-+SHLIB_MAPFILES += $(srcdir)/config/bfin/libgcc-glibc.ver
-+SHLIB_MKMAP_OPTS = -v skip_underscore=1
--- 
-2.7.4
-
diff --git a/patches/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/patches/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
deleted file mode 100644
index ce49de7..0000000
--- a/patches/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9d9f97ca5d1ceba66677bf406c9b31027dc1f22e Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Fri, 19 Aug 2016 13:54:46 +0200
-Subject: [PATCH] libgcc: fix DWARF compilation with FDPIC targets
-
-The build of unwind-dw2-fde-dip.c currently fails for FDPIC targets with
-the following error:
-
-libgcc/unwind-dw2-fde-dip.c:167:31: error: storage size of 'load_base' isn't known
-   struct elf32_fdpic_loadaddr load_base;
-
-This patch addresses that by defining load_base with the appropriate
-type on FDPIC targets. It has been tested on FRV and Blackfin.
-
-Fixes PR gcc/68468.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libgcc/unwind-dw2-fde-dip.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
-index f7a1c3f..801bce8 100644
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -124,7 +124,11 @@ static struct frame_hdr_cache_element
- {
-   _Unwind_Ptr pc_low;
-   _Unwind_Ptr pc_high;
-+#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__
-+  struct elf32_fdpic_loadaddr load_base;
-+#else
-   _Unwind_Ptr load_base;
-+#endif
-   const ElfW(Phdr) *p_eh_frame_hdr;
-   const ElfW(Phdr) *p_dynamic;
-   struct frame_hdr_cache_element *link;
-@@ -163,7 +167,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
-   struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr;
-   const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic;
-   long n, match;
--#ifdef __FRV_FDPIC__
-+#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__
-   struct elf32_fdpic_loadaddr load_base;
- #else
-   _Unwind_Ptr load_base;
-@@ -347,7 +351,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
- 	    break;
- 	  }
-     }
--# elif defined __FRV_FDPIC__ && defined __linux__
-+# elif (defined __FRV_FDPIC__ || defined __BFIN_FDPIC__) && defined __linux__
-   data->dbase = load_base.got_value;
- # else
- #  error What is DW_EH_PE_datarel base on this platform?
--- 
-2.7.4
-
diff --git a/patches/gcc/6.3.0/895-bfin-define-REENTRANT.patch b/patches/gcc/6.3.0/895-bfin-define-REENTRANT.patch
deleted file mode 100644
index e2828a5..0000000
--- a/patches/gcc/6.3.0/895-bfin-define-REENTRANT.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-enable _REENTRANT when -lpthread is used
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-6.2.0.orig/gcc/config/bfin/linux.h gcc-6.2.0/gcc/config/bfin/linux.h
---- gcc-6.2.0.orig/gcc/config/bfin/linux.h	2016-01-04 15:30:50.000000000 +0100
-+++ gcc-6.2.0/gcc/config/bfin/linux.h	2016-09-30 20:48:17.446636819 +0200
-@@ -38,6 +38,9 @@
-   "%{static:--start-group} %{mfast-fp:-lbffastfp} %G %L %{static:--end-group} \
-    %{!static:%{mfast-fp:-lbffastfp} %G}"
- 
-+#undef CPP_SPEC
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
- #undef LINK_SPEC
- #define LINK_SPEC "\
-   %{mfdpic: -m elf32bfinfd -z text} %{shared} %{pie} \
diff --git a/patches/gcc/6.3.0/900-libgfortran-missing-include.patch b/patches/gcc/6.3.0/900-libgfortran-missing-include.patch
deleted file mode 100644
index 1f47469..0000000
--- a/patches/gcc/6.3.0/900-libgfortran-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
-@@ -25,6 +25,7 @@
- #include "io.h"
- #include "unix.h"
- #include <limits.h>
-+#include <stdlib.h>
- 
- typedef enum
- { CLOSE_DELETE, CLOSE_KEEP, CLOSE_UNSPECIFIED }
diff --git a/patches/gcc/6.3.0/910-nios2-bad-multilib-default.patch b/patches/gcc/6.3.0/910-nios2-bad-multilib-default.patch
deleted file mode 100644
index 61989e5..0000000
--- a/patches/gcc/6.3.0/910-nios2-bad-multilib-default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
-@@ -63,11 +63,11 @@
- #if TARGET_ENDIAN_DEFAULT == 0
- # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
- # define LINK_SPEC_ENDIAN "%{!meb:-EL} %{meb:-EB}"
--# define MULTILIB_DEFAULTS { "EL" }
-+# define MULTILIB_DEFAULTS { "mel" }
- #else
- # define ASM_SPEC "%{!mel:-EB} %{mel:-EL} %{march=*:-march=%*}"
- # define LINK_SPEC_ENDIAN "%{!mel:-EB} %{mel:-EL}"
--# define MULTILIB_DEFAULTS { "EB" }
-+# define MULTILIB_DEFAULTS { "meb" }
- #endif
- 
- #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
-@@ -22,6 +22,5 @@
- # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
- # MULTILIB_EXCEPTIONS = 
- 
--# MULTILIB_OPTIONS += EL/EB
-+# MULTILIB_OPTIONS += mel/meb
- # MULTILIB_DIRNAMES += le be
--# MULTILIB_MATCHES += EL=mel EB=meb
diff --git a/patches/gcc/6.3.0/930-libgcc-disable-split-stack-nothreads.patch b/patches/gcc/6.3.0/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 07f9a73..0000000
--- a/patches/gcc/6.3.0/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/patches/gcc/6.3.0/940-uclinux-enable-threads.patch b/patches/gcc/6.3.0/940-uclinux-enable-threads.patch
deleted file mode 100644
index 490a55b..0000000
--- a/patches/gcc/6.3.0/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/patches/gcc/linaro-4.8-2015.06/001_gcc_bug_62231.patch b/patches/gcc/linaro-4.8-2015.06/001_gcc_bug_62231.patch
deleted file mode 100644
index e7c9cf9..0000000
--- a/patches/gcc/linaro-4.8-2015.06/001_gcc_bug_62231.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
-@@ -438,6 +438,11 @@
- #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
- #endif
- 
-+/* The mapping from dwarf CFA reg number to internal dwarf reg numbers.  */
-+#ifndef DWARF_REG_TO_UNWIND_COLUMN
-+#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
-+#endif
-+
- /* Map register numbers held in the call frame info that gcc has
-    collected using DWARF_FRAME_REGNUM to those that should be output in
-    .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
-@@ -225,7 +225,44 @@
-   emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
- }
- 
--/* Generate code to initialize the register size table.  */
-+/* Helper for expand_builtin_init_dwarf_reg_sizes.  Generate code to
-+   initialize the dwarf register size table entry corresponding to register
-+   REGNO in REGMODE.  TABLE is the table base address, SLOTMODE is the mode
-+   to use for the size entry to initialize, and WROTE_RETURN_COLUMN needs to
-+   be set to true if the dwarf register number for REGNO is the dwarf return
-+   column number.  */
-+
-+static
-+void init_one_dwarf_reg_size (int regno, enum machine_mode regmode,
-+			      rtx table, enum machine_mode slotmode,
-+			      bool *wrote_return_column)
-+{
-+  const unsigned int dnum = DWARF_FRAME_REGNUM (regno);
-+  const unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
-+  const unsigned int dcol = DWARF_REG_TO_UNWIND_COLUMN (rnum);
-+  
-+  const HOST_WIDE_INT slotoffset = dcol * GET_MODE_SIZE (slotmode);
-+  const HOST_WIDE_INT regsize = GET_MODE_SIZE (regmode);
-+
-+  if (rnum >= DWARF_FRAME_REGISTERS)
-+    return;
-+
-+  if (dnum == DWARF_FRAME_RETURN_COLUMN)
-+    {
-+      if (regmode == VOIDmode)
-+	return;
-+      *wrote_return_column = true;
-+    }
-+
-+  if (slotoffset < 0)
-+    return;
-+
-+  emit_move_insn (adjust_address (table, slotmode, slotoffset),
-+		  gen_int_mode (regsize, slotmode));
-+}
-+
-+/* Generate code to initialize the dwarf register size table located
-+   at the provided ADDRESS.  */
- 
- void
- expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -238,30 +275,21 @@
- 
-   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
-     {
--      unsigned int dnum = DWARF_FRAME_REGNUM (i);
--      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
--      if (rnum < DWARF_FRAME_REGISTERS)
--	{
--	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
--	  enum machine_mode save_mode = reg_raw_mode[i];
--	  HOST_WIDE_INT size;
--
--	  if (HARD_REGNO_CALL_PART_CLOBBERED (i, save_mode))
--	    save_mode = choose_hard_reg_mode (i, 1, true);
--	  if (dnum == DWARF_FRAME_RETURN_COLUMN)
--	    {
--	      if (save_mode == VOIDmode)
--		continue;
--	      wrote_return_column = true;
--	    }
--	  size = GET_MODE_SIZE (save_mode);
--	  if (offset < 0)
--	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
--	  emit_move_insn (adjust_address (mem, mode, offset),
--			  gen_int_mode (size, mode));
--	}
-+      span = targetm.dwarf_register_span (gen_rtx_REG (save_mode, i));
-+      if (!span)
-+        init_one_dwarf_reg_size (i, save_mode, mem, mode, &wrote_return_column);
-+      else
-+        {
-+          for (int si = 0; si < XVECLEN (span, 0); si++)
-+            {
-+              rtx reg = XVECEXP (span, 0, si);
-+              init_one_dwarf_reg_size
-+              (REGNO (reg), GET_MODE (reg), mem, mode, &wrote_return_column);
-+            }
-+        }
-     }
- 
-   if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
-@@ -55,10 +55,6 @@
- #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
- #endif
- 
--#ifndef DWARF_REG_TO_UNWIND_COLUMN
--#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
--#endif
--
- /* ??? For the public function interfaces, we tend to gcc_assert that the
-    column numbers are in range.  For the dwarf2 unwind info this does happen,
-    although so far in a case that doesn't actually matter.
diff --git a/patches/gcc/linaro-4.8-2015.06/002_gcc_bug_62231.patch b/patches/gcc/linaro-4.8-2015.06/002_gcc_bug_62231.patch
deleted file mode 100644
index b970ebc..0000000
--- a/patches/gcc/linaro-4.8-2015.06/002_gcc_bug_62231.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
-      SCmode so as to pass the value correctly in a pair of
-      registers.  */
-   else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
--	   && !DECIMAL_FLOAT_MODE_P (mode))
-+	   && !DECIMAL_FLOAT_MODE_P (mode) && SPE_SIMD_REGNO_P (regno))
-     reg_size = UNITS_PER_FP_WORD;
- 
-   else
diff --git a/patches/gcc/linaro-4.8-2015.06/100-uclibc-conf.patch b/patches/gcc/linaro-4.8-2015.06/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a..0000000
--- a/patches/gcc/linaro-4.8-2015.06/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/linaro-4.8-2015.06/1000-libtool-leave-framework-alone.patch b/patches/gcc/linaro-4.8-2015.06/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index 525592e..0000000
--- a/patches/gcc/linaro-4.8-2015.06/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/linaro-4.8-2015.06/1000-powerpc-link-with-math-lib.patch.conditional b/patches/gcc/linaro-4.8-2015.06/1000-powerpc-link-with-math-lib.patch.conditional
deleted file mode 100644
index b7094fe..0000000
--- a/patches/gcc/linaro-4.8-2015.06/1000-powerpc-link-with-math-lib.patch.conditional
+++ /dev/null
@@ -1,122 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
- libgcc/Makefile.in  |    4 +++-
- libgcc/configure    |   32 ++++++++++++++++++++++++++++++++
- libgcc/configure.ac |   21 +++++++++++++++++++++
- 3 files changed, 56 insertions(+), 1 deletion(-)
-
-Index: gcc-4.8.0/libgcc/Makefile.in
-===================================================================
---- gcc-4.8.0.orig/libgcc/Makefile.in	2013-02-04 20:06:20.000000000 +0100
-+++ gcc-4.8.0/libgcc/Makefile.in	2013-03-24 09:12:43.000000000 +0100
-@@ -41,6 +41,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
- 
- host_noncanonical = @host_noncanonical@
- target_noncanonical = @target_noncanonical@
-@@ -927,9 +928,10 @@
- 		@multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_objs@,$(objects) libgcc.a,$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
-+		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- 		@shlib_map_file@,$(mapfile),$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
--		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
- 
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- 	# @multilib_flags@ is still needed because this may use
-Index: gcc-4.8.0/libgcc/configure
-===================================================================
---- gcc-4.8.0.orig/libgcc/configure	2012-11-05 00:08:42.000000000 +0100
-+++ gcc-4.8.0/libgcc/configure	2013-03-24 09:12:43.000000000 +0100
-@@ -564,6 +564,7 @@
- tmake_file
- sfp_machine_header
- set_use_emutls
-+LIBGCC_LIBM
- set_have_cc_tls
- vis_hide
- fixed_point
-@@ -4481,6 +4482,37 @@
- 	fi
- fi
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
- 
- # Conditionalize the makefile for this target machine.
- tmake_file_=
-Index: gcc-4.8.0/libgcc/configure.ac
-===================================================================
---- gcc-4.8.0.orig/libgcc/configure.ac	2012-10-15 15:10:30.000000000 +0200
-+++ gcc-4.8.0/libgcc/configure.ac	2013-03-24 09:12:43.000000000 +0100
-@@ -326,6 +326,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+  libgcc_cv_copysignl_lib,
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+  ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # See if we have emulated thread-local storage.
- GCC_CHECK_EMUTLS
- set_use_emutls=
diff --git a/patches/gcc/linaro-4.8-2015.06/111-pr65730.patch b/patches/gcc/linaro-4.8-2015.06/111-pr65730.patch
deleted file mode 100644
index f195e30..0000000
--- a/patches/gcc/linaro-4.8-2015.06/111-pr65730.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 10 Apr 2015 17:46:30 +0300
-Subject: [PATCH] Fix PR target/65730
-
-2015-05-20  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (init_alignment_context): Replace MULT
-	by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT).
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
-Changes to ChangeLog are dropped.
-
- gcc/config/xtensa/xtensa.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..7296e36 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem)
-   if (ac->shift != NULL_RTX)
-     {
-       /* Shift is the byte count, but we need the bitcount.  */
--      ac->shift = expand_simple_binop (SImode, MULT, ac->shift,
--				       GEN_INT (BITS_PER_UNIT),
-+      gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0);
-+      ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift,
-+				       GEN_INT (exact_log2 (BITS_PER_UNIT)),
- 				       NULL_RTX, 1, OPTAB_DIRECT);
-       ac->modemask = expand_simple_binop (SImode, ASHIFT,
- 					  GEN_INT (GET_MODE_MASK (mode)),
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.8-2015.06/130-pr43538.patch b/patches/gcc/linaro-4.8-2015.06/130-pr43538.patch
deleted file mode 100644
index 19e57bb..0000000
--- a/patches/gcc/linaro-4.8-2015.06/130-pr43538.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001
-From: glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 25 Apr 2014 08:03:08 +0000
-Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
-
-	PR target/43538
-	* mt-gnu: Don't reset CXXFLAGS_FOR_TARGET.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-gnu    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
---- a/config/mt-gnu
-+++ b/config/mt-gnu
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/patches/gcc/linaro-4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
deleted file mode 100644
index 1c49fb0..0000000
--- a/patches/gcc/linaro-4.8-2015.06/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9bcf38cd9f382486b3823eb923b50e2e9a89cef7 Mon Sep 17 00:00:00 2001
-From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Nov 2014 22:12:52 +0000
-Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
-
-        * mt-ospace (CFLAGS_FOR_TARGET): Append -g -Os rather than
-        overwriting.
-        (CXXFLAGS_FOR_TARGET): Similarly.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-ospace | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
---- a/config/mt-ospace
-+++ b/config/mt-ospace
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-4.8-2015.06/132-build_gcc-5_with_gcc-6.patch b/patches/gcc/linaro-4.8-2015.06/132-build_gcc-5_with_gcc-6.patch
deleted file mode 100644
index ac1d846..0000000
--- a/patches/gcc/linaro-4.8-2015.06/132-build_gcc-5_with_gcc-6.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001
-From: edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Thu, 25 Feb 2016 15:33:50 +0000
-Subject: [PATCH 1/1] 2016-02-25  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-        Backported from mainline
-        2016-02-19  Jakub Jelinek  <jakub@redhat.com>
-                    Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-        * Make-lang.in: Invoke gperf with -L C++.
-        * cfns.gperf: Remove prototypes for hash and libc_name_p
-        inlines.
-        * cfns.h: Regenerated.
-        * except.c (nothrow_libfn_p): Adjust.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4
-diff -urpN a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
---- a/gcc/cp/cfns.gperf	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.gperf	2016-12-05 13:55:20.331616274 -0800
-@@ -1,3 +1,5 @@
-+%language=C++
-+%define class-name libc_name
- %{
- /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
- 
-@@ -16,14 +18,6 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- %}
- %%
- # The standard C library functions, for feeding to gperf; the result is used
-diff -urpN a/gcc/cp/cfns.h b/gcc/cp/cfns.h
---- a/gcc/cp/cfns.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/cfns.h	2016-12-05 13:55:20.331616274 -0800
-@@ -1,5 +1,5 @@
--/* ANSI-C code produced by gperf version 3.0.3 */
--/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
-+/* C++ code produced by gperf version 3.0.4 */
-+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf  */
- 
- #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-@@ -28,7 +28,7 @@
- #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
- #endif
- 
--#line 1 "cfns.gperf"
-+#line 3 "cfns.gperf"
- 
- /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
- 
-@@ -47,25 +47,18 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- /* maximum key range = 391, duplicates = 0 */
- 
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static unsigned int
--hash (register const char *str, register unsigned int len)
-+class libc_name
-+{
-+private:
-+  static inline unsigned int hash (const char *str, unsigned int len);
-+public:
-+  static const char *libc_name_p (const char *str, unsigned int len);
-+};
-+
-+inline unsigned int
-+libc_name::hash (register const char *str, register unsigned int len)
- {
-   static const unsigned short asso_values[] =
-     {
-@@ -122,14 +115,8 @@ hash (register const char *str, register
-   return hval + asso_values[(unsigned char)str[len - 1]];
- }
- 
--#ifdef __GNUC__
--__inline
--#ifdef __GNUC_STDC_INLINE__
--__attribute__ ((__gnu_inline__))
--#endif
--#endif
- const char *
--libc_name_p (register const char *str, register unsigned int len)
-+libc_name::libc_name_p (register const char *str, register unsigned int len)
- {
-   enum
-     {
-diff -urpN a/gcc/cp/except.c b/gcc/cp/except.c
---- a/gcc/cp/except.c	2013-10-25 06:49:48.000000000 -0700
-+++ b/gcc/cp/except.c	2016-12-05 13:55:20.331616274 -0800
-@@ -1025,7 +1025,8 @@ nothrow_libfn_p (const_tree fn)
-      unless the system headers are playing rename tricks, and if
-      they are, we don't want to be confused by them.  */
-   id = DECL_NAME (fn);
--  return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
-+  return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
-+				   IDENTIFIER_LENGTH (id));
- }
- 
- /* Returns nonzero if an exception of type FROM will be caught by a
-diff -urpN a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
---- a/gcc/cp/Make-lang.in	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/cp/Make-lang.in	2016-12-05 13:55:20.331616274 -0800
-@@ -115,7 +115,7 @@ else
- # deleting the $(srcdir)/cp/cfns.h file.
- $(srcdir)/cp/cfns.h:
- endif
--	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
-+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \
- 		$(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h
- 
- #
diff --git a/patches/gcc/linaro-4.8-2015.06/301-missing-execinfo_h.patch b/patches/gcc/linaro-4.8-2015.06/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda2..0000000
--- a/patches/gcc/linaro-4.8-2015.06/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/linaro-4.8-2015.06/305-libmudflap-susv3-legacy.patch b/patches/gcc/linaro-4.8-2015.06/305-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 35d5f50..0000000
--- a/patches/gcc/linaro-4.8-2015.06/305-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: gcc-4.8.0/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
-+++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
-@@ -424,7 +424,7 @@
- {
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
--  bzero (s, n);
-+  memset (s, 0, n);
- }
- 
- 
-@@ -434,7 +434,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
-   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
--  bcopy (src, dest, n);
-+  memmove (dest, src, n);
- }
- 
- 
-@@ -444,7 +444,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
-   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
--  return bcmp (s1, s2, n);
-+  return n == 0 ? 0 : memcmp (s1, s2, n);
- }
- 
- 
-@@ -453,7 +453,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
--  return index (s, c);
-+  return strchr (s, c);
- }
- 
- 
-@@ -462,7 +462,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
--  return rindex (s, c);
-+  return strrchr (s, c);
- }
- 
- /* XXX:  stpcpy, memccpy */
diff --git a/patches/gcc/linaro-4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/linaro-4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index 3cf66b2..0000000
--- a/patches/gcc/linaro-4.8-2015.06/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure gcc-4.8.5/gcc/configure
---- gcc-4.8.5.orig/gcc/configure	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure	2017-02-11 16:57:27.424807994 -0800
-@@ -27364,6 +27364,9 @@ fi
- 
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -27375,6 +27378,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -27487,23 +27495,23 @@ fi
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urpN '--exclude=autom4te.cache' gcc-4.8.5.orig/gcc/configure.ac gcc-4.8.5/gcc/configure.ac
---- gcc-4.8.5.orig/gcc/configure.ac	2014-12-08 03:29:43.000000000 -0800
-+++ gcc-4.8.5/gcc/configure.ac	2017-02-11 16:57:27.424807994 -0800
-@@ -5243,6 +5243,9 @@ enable_plugin=$enableval,
- enable_plugin=yes; default_plugin=yes)
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -5254,6 +5257,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -5305,17 +5313,17 @@ if test x"$enable_plugin" = x"yes"; then
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  AC_MSG_CHECKING([for -fPIC -shared])
-+  AC_MSG_CHECKING([for ${PICFLAG} -shared])
-   AC_TRY_LINK(
--    [extern int X;],[return X == 0;],
-+    [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-     [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-     [AC_MSG_RESULT([no]); have_pic_shared=no])
-   if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
diff --git a/patches/gcc/linaro-4.8-2015.06/810-arm-softfloat-libgcc.patch b/patches/gcc/linaro-4.8-2015.06/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index c8cb377..0000000
--- a/patches/gcc/linaro-4.8-2015.06/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.0/gcc/config/arm/linux-elf.h	2013-03-23 17:40:00.000000000 +0100
-@@ -55,7 +55,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: gcc-4.8.0/libgcc/config/arm/t-linux
-===================================================================
---- gcc-4.8.0.orig/libgcc/config/arm/t-linux	2012-03-22 16:14:46.000000000 +0100
-+++ gcc-4.8.0/libgcc/config/arm/t-linux	2013-03-23 17:40:54.000000000 +0100
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/linaro-4.8-2015.06/830-arm_unbreak_armv4t.patch b/patches/gcc/linaro-4.8-2015.06/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index 37f8f2a..0000000
--- a/patches/gcc/linaro-4.8-2015.06/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/linaro-4.8-2015.06/841-PR57717-E500v2.patch b/patches/gcc/linaro-4.8-2015.06/841-PR57717-E500v2.patch
deleted file mode 100644
index a011e24..0000000
--- a/patches/gcc/linaro-4.8-2015.06/841-PR57717-E500v2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717
-
-Upstream-Status: Backport
-Signed-off-by: Julian Brown <Julian_Brown@mentor.com>
-[Gustavo: Update for gcc 4.8.3]
-
-fix for PR57717 (PowerPC E500v2)
-http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html
-
-diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c
---- gcc-4.8.3/gcc/config/rs6000/rs6000.c	2014-05-04 23:18:35.000000000 -0300
-+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c	2014-05-22 15:20:12.554270919 -0300
-@@ -7343,9 +7343,7 @@
-       && GET_CODE (XEXP (x, 1)) == CONST_INT
-       && reg_offset_p
-       && !SPE_VECTOR_MODE (mode)
--      && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
--				  || mode == DDmode || mode == TDmode
--				  || mode == DImode))
-+      && !(TARGET_E500_DOUBLE && GET_MODE_SIZE (mode) > UNITS_PER_WORD)
-       && (!VECTOR_MODE_P (mode) || VECTOR_MEM_NONE_P (mode)))
-     {
-       HOST_WIDE_INT val = INTVAL (XEXP (x, 1));
diff --git a/patches/gcc/linaro-4.8-2015.06/842-PR60155.patch b/patches/gcc/linaro-4.8-2015.06/842-PR60155.patch
deleted file mode 100644
index 7bc2122..0000000
--- a/patches/gcc/linaro-4.8-2015.06/842-PR60155.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From gcc bugzilla https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
-Upstream status: in trunk.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- trunk/gcc/gcse.c	2014/02/12 14:50:06	207726
-+++ trunk/gcc/gcse.c	2014/04/04 22:25:51	209134
-@@ -2502,6 +2502,65 @@
-       }
- }
- 
-+struct set_data
-+{
-+  rtx insn;
-+  const_rtx set;
-+  int nsets;
-+};
-+
-+/* Increment number of sets and record set in DATA.  */
-+
-+static void
-+record_set_data (rtx dest, const_rtx set, void *data)
-+{
-+  struct set_data *s = (struct set_data *)data;
-+
-+  if (GET_CODE (set) == SET)
-+    {
-+      /* We allow insns having multiple sets, where all but one are
-+	 dead as single set insns.  In the common case only a single
-+	 set is present, so we want to avoid checking for REG_UNUSED
-+	 notes unless necessary.  */
-+      if (s->nsets == 1
-+	  && find_reg_note (s->insn, REG_UNUSED, SET_DEST (s->set))
-+	  && !side_effects_p (s->set))
-+	s->nsets = 0;
-+
-+      if (!s->nsets)
-+	{
-+	  /* Record this set.  */
-+	  s->nsets += 1;
-+	  s->set = set;
-+	}
-+      else if (!find_reg_note (s->insn, REG_UNUSED, dest)
-+	       || side_effects_p (set))
-+	s->nsets += 1;
-+    }
-+}
-+
-+static const_rtx
-+single_set_gcse (rtx insn)
-+{
-+  struct set_data s;
-+  rtx pattern;
-+  
-+  gcc_assert (INSN_P (insn));
-+
-+  /* Optimize common case.  */
-+  pattern = PATTERN (insn);
-+  if (GET_CODE (pattern) == SET)
-+    return pattern;
-+
-+  s.insn = insn;
-+  s.nsets = 0;
-+  note_stores (pattern, record_set_data, &s);
-+
-+  /* Considered invariant insns have exactly one set.  */
-+  gcc_assert (s.nsets == 1);
-+  return s.set;
-+}
-+
- /* Emit move from SRC to DEST noting the equivalence with expression computed
-    in INSN.  */
- 
-@@ -2509,7 +2568,8 @@
- gcse_emit_move_after (rtx dest, rtx src, rtx insn)
- {
-   rtx new_rtx;
--  rtx set = single_set (insn), set2;
-+  const_rtx set = single_set_gcse (insn);
-+  rtx set2;
-   rtx note;
-   rtx eqv = NULL_RTX;
- 
-@@ -3369,13 +3429,12 @@
- 	      FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr)
- 		{
- 		  rtx insn;
--		  rtx set;
-+		  const_rtx set;
- 
- 		  gcc_assert (!occr->deleted_p);
- 
- 		  insn = occr->insn;
--		  set = single_set (insn);
--		  gcc_assert (set);
-+		  set = single_set_gcse (insn);
- 
- 		  /* Create a pseudo-reg to store the result of reaching
- 		     expressions into.  Get the mode for the new pseudo
-@@ -3456,10 +3515,8 @@
- {
-   rtx reg;
-   enum reg_class pressure_class;
--  rtx set = single_set (insn);
-+  const_rtx set = single_set_gcse (insn);
- 
--  /* Considered invariant insns have only one set.  */
--  gcc_assert (set != NULL_RTX);
-   reg = SET_DEST (set);
-   if (GET_CODE (reg) == SUBREG)
-     reg = SUBREG_REG (reg);
diff --git a/patches/gcc/linaro-4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch b/patches/gcc/linaro-4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch
deleted file mode 100644
index afa650c..0000000
--- a/patches/gcc/linaro-4.8-2015.06/843-aarch64-vmlaq_lane_s32-typo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 845478644ba54a6947e9b224f2e5cd342e8257a9 Mon Sep 17 00:00:00 2001
-From: Andrew Hsieh <andrewhsieh@google.com>
-Date: Wed, 25 Jun 2014 22:13:48 -0700
-Subject: [PATCH] Fix a typo in vmlaq_lane_s32
-
-BUG=15526898
-
-Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
-
-diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
-index 73c7e7d..92b0119 100644
---- a/gcc/config/aarch64/arm_neon.h
-+++ b/gcc/config/aarch64/arm_neon.h
-@@ -9984,7 +9984,7 @@
- #define vmlaq_lane_s32(a, b, c, d)                                      \
-   __extension__                                                         \
-     ({                                                                  \
--       int32x4_t c_ = (c);                                              \
-+       int32x2_t c_ = (c);                                              \
-        int32x4_t b_ = (b);                                              \
-        int32x4_t a_ = (a);                                              \
-        int32x4_t result;                                                \
diff --git a/patches/gcc/linaro-4.8-2015.06/850-libstdcxx-uclibc-c99.patch b/patches/gcc/linaro-4.8-2015.06/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 792976f..0000000
--- a/patches/gcc/linaro-4.8-2015.06/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -2809,7 +2809,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) \
-      && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
- 
- #include <ext/string_conversions.h>
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -987,7 +987,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// First try a buffer perhaps big enough (most probably sufficient
- 	// for non-ios_base::fixed outputs)
- 	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -572,7 +572,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -182,7 +182,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -139,7 +139,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -180,7 +180,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2571,7 +2571,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -787,7 +787,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -139,7 +139,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/linaro-4.8-2015.06/851-PR-other-56780.patch b/patches/gcc/linaro-4.8-2015.06/851-PR-other-56780.patch
deleted file mode 100644
index feb4339..0000000
--- a/patches/gcc/linaro-4.8-2015.06/851-PR-other-56780.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From afe990251bd9b3a063f03da31a3b8d139d033bc3 Mon Sep 17 00:00:00 2001
-From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 1 Jun 2013 00:20:49 +0000
-Subject: [PATCH] PR other/56780
-
-* libiberty/configure.ac: Move test for --enable-install-libiberty
-outside of the 'with_target_subdir' test so that it actually gets
-run.  Add output messages to show the test result.
-* libiberty/configure: Regenerate.
-* libiberty/Makefile.in (install_to_libdir): Place the
-installation of the libiberty library in the same guard as that
-used for the headers to prevent it being installed unless
-requested via --enable-install-libiberty.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199570 138bc75d-0d04-0410-961f-82ee72b054a4
-
-libiberty: fix --enable-install-libiberty flag [PR 56780]
-
-Commit 199570 fixed the --disable-install-libiberty behavior, but it also
-added a bug where the enable path never works because the initial clear
-of target_header_dir wasn't deleted.  So we end up initializing properly
-at the top only to reset it at the end all the time.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
-
-[Romain
-  squash the two upstream commits
-  Remove the ChangeLog]
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- libiberty/Makefile.in  | 24 ++++++++++-----------
- libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
- libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
- 3 files changed, 68 insertions(+), 60 deletions(-)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index f6a3ebd..75ff82d 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -355,19 +355,19 @@ install-strip: install
- # since it will be passed the multilib flags.
- MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
- install_to_libdir: all
--	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
--	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
--	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
--	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
- 	if test -n "${target_header_dir}"; then \
--	  case "${target_header_dir}" in \
--	    /*)    thd=${target_header_dir};; \
--	    *)     thd=${includedir}/${target_header_dir};; \
--	  esac; \
--	  ${mkinstalldirs} $(DESTDIR)$${thd}; \
--	  for h in ${INSTALLED_HEADERS}; do \
--	    ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
--	  done; \
-+		${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
-+		$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
-+		( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
-+		mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
-+		case "${target_header_dir}" in \
-+		  /*)    thd=${target_header_dir};; \
-+		  *)     thd=${includedir}/${target_header_dir};; \
-+		esac; \
-+		${mkinstalldirs} $(DESTDIR)$${thd}; \
-+		for h in ${INSTALLED_HEADERS}; do \
-+		  ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
-+		done; \
- 	fi
- 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
- 
-diff --git a/libiberty/configure b/libiberty/configure
-index 5367027..4feb95a 100755
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -675,8 +675,8 @@ with_cross_host
- with_newlib
- enable_maintainer_mode
- enable_multilib
--enable_largefile
- enable_install_libiberty
-+enable_largefile
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1303,8 +1303,8 @@ Optional Features:
-                           enable make rules and dependencies not useful
-                           (and sometimes confusing) to the casual installer
-   --enable-multilib       build many library versions (default)
-+  --enable-install-libiberty       Install headers and library for end users
-   --disable-largefile     omit support for large files
--  --enable-install-libiberty       Install headers for end users
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
-    cross_compiling=maybe
- fi
- 
-+# We may wish to install the target headers somewhere.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5
-+$as_echo_n "checking whether to install libiberty headers and static library... " >&6; }
-+
-+# Check whether --enable-install-libiberty was given.
-+if test "${enable_install_libiberty+set}" = set; then :
-+  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
-+else
-+  enable_install_libiberty=no
-+fi
-+
-+# Option parsed, now set things appropriately.
-+case x"$enable_install_libiberty" in
-+  xyes|x)
-+    target_header_dir=libiberty
-+    ;;
-+  xno)
-+    target_header_dir=
-+    ;;
-+  *)
-+    # This could be sanity-checked in various ways...
-+    target_header_dir="${enable_install_libiberty}"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5
-+$as_echo "$enable_install_libiberty" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5
-+$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;}
-+
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5476,7 +5505,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -5759,29 +5787,6 @@ _ACEOF
- 
-   esac
- 
--  # We may wish to install the target headers somewhere.
--  # Check whether --enable-install-libiberty was given.
--if test "${enable_install_libiberty+set}" = set; then :
--  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
--else
--  enable_install_libiberty=no
--fi
--
--  # Option parsed, now set things appropriately.
--  case x"$enable_install_libiberty" in
--    xyes|x)
--      target_header_dir=libiberty
--      ;;
--    xno)
--      target_header_dir=
--      ;;
--    *)
--      # This could be sanity-checked in various ways...
--      target_header_dir="${enable_install_libiberty}"
--      ;;
--  esac
--
--
- else
- 
-    # Not a target library, so we set things up to run the test suite.
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index c763894..f17e6b6 100644
---- a/libiberty/configure.ac
-+++ b/libiberty/configure.ac
-@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
-    cross_compiling=maybe
- fi
- 
-+# We may wish to install the target headers somewhere.
-+AC_MSG_CHECKING([whether to install libiberty headers and static library])
-+dnl install-libiberty is disabled by default
-+
-+AC_ARG_ENABLE(install-libiberty,
-+[  --enable-install-libiberty       Install headers and library for end users],
-+enable_install_libiberty=$enableval,
-+enable_install_libiberty=no)dnl
-+
-+# Option parsed, now set things appropriately.
-+case x"$enable_install_libiberty" in
-+  xyes|x)
-+    target_header_dir=libiberty
-+    ;;
-+  xno)   
-+    target_header_dir=
-+    ;;
-+  *) 
-+    # This could be sanity-checked in various ways...
-+    target_header_dir="${enable_install_libiberty}"
-+    ;;
-+esac
-+AC_MSG_RESULT($enable_install_libiberty)
-+AC_MSG_NOTICE([target_header_dir = $target_header_dir])
-+
- GCC_NO_EXECUTABLES
- AC_PROG_CC
- AC_SYS_LARGEFILE
-@@ -380,7 +405,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then
- 
-   esac
- 
--  # We may wish to install the target headers somewhere.
--  AC_ARG_ENABLE(install-libiberty,
--  [  --enable-install-libiberty       Install headers for end users],
--  enable_install_libiberty=$enableval,
--  enable_install_libiberty=no)dnl
--  
--  # Option parsed, now set things appropriately.
--  case x"$enable_install_libiberty" in
--    xyes|x)
--      target_header_dir=libiberty
--      ;;
--    xno)   
--      target_header_dir=
--      ;;
--    *) 
--      # This could be sanity-checked in various ways...
--      target_header_dir="${enable_install_libiberty}"
--      ;;
--  esac
--
--
- else
- 
-    # Not a target library, so we set things up to run the test suite.
--- 
-1.9.3
-
diff --git a/patches/gcc/linaro-4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch b/patches/gcc/linaro-4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index aa1376c..0000000
--- a/patches/gcc/linaro-4.8-2015.06/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -796,21 +797,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -881,7 +883,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.8-2015.06/871-xtensa-reimplement-register-spilling.patch b/patches/gcc/linaro-4.8-2015.06/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index abc7a08..0000000
--- a/patches/gcc/linaro-4.8-2015.06/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
-	CALL12 followed by series of ENTRY to spill windowed registers.
-	(__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
-	instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 	.global	__xtensa_libgcc_window_spill
- 	.type	__xtensa_libgcc_window_spill,@function
- __xtensa_libgcc_window_spill:
--	entry	sp, 32
--	movi	a2, 0
--	syscall
-+	entry	sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+	call12	1f
-+	retw
-+	.align	4
-+1:
-+	.rept	(XCHAL_NUM_AREGS - 24) / 12
-+	_entry	sp, 48
-+	mov	a12, a0
-+	.endr
-+	_entry	sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+	mov	a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+	mov	a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+	mov	a12, a12
-+#endif
-+	retw
-+#else
-+	mov	a8, a8
- 	retw
-+#endif
- 	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
- 
- 
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
- 	entry	sp, 32
- 
- 	/* Flush registers.  */
--	mov	a5, a2
--	movi	a2, 0
--	syscall
--	mov	a2, a5
-+	call8	__xtensa_libgcc_window_spill
- 
- 	/* Because the save area for a0-a3 is stored one frame below
- 	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/patches/gcc/linaro-4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index f23a5c0..0000000
--- a/patches/gcc/linaro-4.8-2015.06/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-xtensa | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
---- a/libgcc/config/xtensa/t-xtensa
-+++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
- LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
- 
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch b/patches/gcc/linaro-4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index dc40513..0000000
--- a/patches/gcc/linaro-4.8-2015.06/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.8-2015.06/900-musl-support.patch b/patches/gcc/linaro-4.8-2015.06/900-musl-support.patch
deleted file mode 100644
index 6743a88..0000000
--- a/patches/gcc/linaro-4.8-2015.06/900-musl-support.patch
+++ /dev/null
@@ -1,648 +0,0 @@
-Add musl support to gcc
-
-This patch comes from the musl-cross project at
-https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
-
- * the config.sub modifications have been removed, because Buildroot
-   already overwrites all config.sub with a more recent config.sub
-   that has musl support.
-
- * change to ensure that a dummy dynamic linker path
-   MUSL_DYNAMIC_LINKER<foo> is defined for all architectures,
-   otherwise building gcc for architectures not supported by musl was
-   causing build failure. Bug reported upstream at
-   https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on.
-
- * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic
-   and only add the musl one as an addition, not as a replacement. Not
-   doing this breaks C++ exception handling with glibc, because
-   USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script
-   not testing dl_iterate_phdr() on any system except Solaris.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: Update for gcc 4.8.3]
-
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
---- a/fixincludes/mkfixinc.sh
-+++ b/fixincludes/mkfixinc.sh
-@@ -19,7 +19,8 @@
-     powerpc-*-eabi*    | \
-     powerpc-*-rtems*   | \
-     powerpcle-*-eabisim* | \
--    powerpcle-*-eabi* )
-+    powerpcle-*-eabi* | \
-+    *-musl* )
- 	#  IF there is no include fixing,
- 	#  THEN create a no-op fixer and exit
- 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -21,7 +21,12 @@
- #ifndef GCC_AARCH64_LINUX_H
- #define GCC_AARCH64_LINUX_H
- 
-+/* The AArch64 port currently supports two dynamic linkers:
-+   - ld-linux-aarch64.so.1 - GLIBC dynamic linker
-+   - ld-musl-aarch64.so.1 - musl libc dynamic linker  */
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
- 
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,23 @@
-     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
-     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
- 
-+/* For ARM musl currently supports four dynamic linkers:
-+   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+   musl does not support the legacy OABI mode.
-+   All the dynamic linkers live in /lib.
-+   We default to soft-float, EL. */
-+#undef  MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux64.h
-===================================================================
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,10 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/i386/linux.h
-===================================================================
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,5 @@
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-@@ -53,18 +55,21 @@
-    uClibc or Bionic is the default C library and whether
-    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
- 
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
--  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
-+  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
- 
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -82,23 +87,32 @@
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
- #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
- 
-+/* Musl dynamic linker paths must be defined on a per-architecture
-+   basis, for each architecture supported by Musl. However, in order
-+   to let other architectures continue to build with other C
-+   libraries, we provide a dummy definition of the following defines. */
-+#define MUSL_DYNAMIC_LINKER "invalid"
-+#define MUSL_DYNAMIC_LINKER32 "invalid"
-+#define MUSL_DYNAMIC_LINKER64 "invalid"
-+#define MUSL_DYNAMIC_LINKERX32 "invalid"
-+
- #define GNU_USER_DYNAMIC_LINKER						\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
--			 BIONIC_DYNAMIC_LINKER)
-+			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
--			 BIONIC_DYNAMIC_LINKER32)
-+			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
--			 BIONIC_DYNAMIC_LINKER64)
-+			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
--			 BIONIC_DYNAMIC_LINKERX32)
-+			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
- 
- /* Determine whether the entire c99 runtime
-    is present in the runtime library.  */
- #undef TARGET_C99_FUNCTIONS
--#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
-+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
- 
- /* Whether we have sincos that follows the GNU extension.  */
- #undef TARGET_HAS_SINCOS
-@@ -107,3 +121,74 @@
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
-+
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP			\
-+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
-+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
-+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS			\
-+    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL			\
-+    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS				\
-+  {							\
-+    INCLUDE_DEFAULTS_MUSL_GPP				\
-+    INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    INCLUDE_DEFAULTS_MUSL_CROSS				\
-+    INCLUDE_DEFAULTS_MUSL_TOOL				\
-+    INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
-+    { 0, 0, 0, 0, 0, 0 }				\
-+  }
-+#endif
-Index: b/gcc/config/linux.opt
-===================================================================
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
---- a/gcc/config/microblaze/linux.h
-+++ b/gcc/config/microblaze/linux.h
-@@ -25,7 +25,23 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
-+
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-   { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/mips/linux64.h
-===================================================================
---- a/gcc/config/mips/linux64.h
-+++ b/gcc/config/mips/linux64.h
-@@ -29,4 +29,4 @@
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--			 BIONIC_DYNAMIC_LINKERN32)
-+			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -18,3 +18,11 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -374,17 +374,23 @@
- #endif
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- 
- #undef  DEFAULT_ASM_ENDIAN
- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
---- a/gcc/config/rs6000/secureplt.h
-+++ b/gcc/config/rs6000/secureplt.h
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -537,6 +537,9 @@
- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
- #define CC1_SECURE_PLT_DEFAULT_SPEC ""
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
- 
- /* Pass -G xxx to the compiler.  */
- #define	CC1_SPEC "%{G*} %(cc1_cpu)" \
-@@ -585,7 +588,8 @@
- 
- /* Override the default target of the linker.  */
- #define	LINK_TARGET_SPEC \
--  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
- 
- /* Any specific OS flags.  */
- #define LINK_OS_SPEC "\
-@@ -763,15 +767,18 @@
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- 
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-@@ -894,6 +901,7 @@
-   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
-   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
-   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
-+  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
-   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
-   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
-   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
---- a/gcc/config/sh/linux.h
-+++ b/gcc/config/sh/linux.h
-@@ -43,7 +43,15 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
-+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
-+#define MUSL_DYNAMIC_LINKER_E "eb"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E
-+#endif
-+
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -550,7 +550,7 @@
- esac
- 
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
- 
- # Common parts for widely ported systems.
- case ${target} in
-@@ -653,6 +653,9 @@
-     *-*-*uclibc*)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
-       ;;
-+    *-*-*musl*)
-+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+      ;;
-     *)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
-       ;;
-@@ -2135,6 +2138,10 @@
- 	    powerpc*-*-linux*paired*)
- 		tm_file="${tm_file} rs6000/750cl.h" ;;
- 	esac
-+        case ${target} in
-+            *-linux*-musl*)
-+                enable_secureplt=yes ;;
-+        esac
- 	if test x${enable_secureplt} = xyes; then
- 		tm_file="rs6000/secureplt.h ${tm_file}"
- 	fi
-Index: b/gcc/configure
-===================================================================
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -26936,6 +26940,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- 
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -4848,6 +4852,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
---- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
-@@ -181,6 +181,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__	/* BeOS */
- #define __SIZE_T__	/* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -197,6 +198,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
-   || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -214,6 +216,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -75,6 +75,13 @@
- # define USE_PT_GNU_EH_FRAME
- #endif
- 
-+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure
-+   script. */
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-+    && defined(TARGET_DL_ITERATE_PHDR)
-+# define USE_PT_GNU_EH_FRAME
-+#endif
-+
- #if defined(USE_PT_GNU_EH_FRAME)
- 
- #include <link.h>
-Index: b/libgomp/config/posix/time.c
-===================================================================
---- a/libgomp/config/posix/time.c
-+++ b/libgomp/config/posix/time.c
-@@ -28,6 +28,8 @@
-    The following implementation uses the most simple POSIX routines.
-    If present, POSIX 4 clocks should be used instead.  */
- 
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,11 @@
- 
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
- 
- static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
-    GLIBC has reserved words 10 through 13 for TM.  */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
- 
- #include "config/generic/tls.h"
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
- 
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
- 
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
- 
- #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -264,6 +264,13 @@
-     os_include_dir="os/bsd/freebsd"
-     ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+    # check for musl by target
-+    case "${host_os}" in
-+      *-musl*)
-+        os_include_dir="os/generic"
-+        ;;
-+      *)
-+
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
-     elif [ "$bionic" = "yes" ]; then
-@@ -272,6 +279,9 @@
-       os_include_dir="os/gnu-linux"
-     fi
-     ;;
-+
-+    esac
-+    ;;
-   hpux*)
-     os_include_dir="os/hpux"
-     ;;
diff --git a/patches/gcc/linaro-4.8-2015.06/950-cygwin64.patch b/patches/gcc/linaro-4.8-2015.06/950-cygwin64.patch
deleted file mode 100644
index 67182ee..0000000
--- a/patches/gcc/linaro-4.8-2015.06/950-cygwin64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.8.5/gcc/config.host.orig	2017-02-10 20:45:10.425515700 -0800
-+++ gcc-4.8.5/gcc/config.host	2017-02-10 20:47:33.935525500 -0800
-@@ -214,7 +214,7 @@
-         ;;
-     esac
-     ;;
--  i[34567]86-*-cygwin*)
-+  i[34567]86-*-cygwin* | x86_64-*-cygwin*)
-     host_xm_file=i386/xm-cygwin.h
-     out_host_hook_obj=host-cygwin.o
-     host_xmake_file="${host_xmake_file} i386/x-cygwin"
diff --git a/patches/gcc/linaro-4.9-2017.01/001-gcc_bug_62231.patch b/patches/gcc/linaro-4.9-2017.01/001-gcc_bug_62231.patch
deleted file mode 100644
index e7c9cf9..0000000
--- a/patches/gcc/linaro-4.9-2017.01/001-gcc_bug_62231.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-09/msg02625.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/defaults.h b/gcc/defaults.h
---- a/gcc/defaults.h	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/defaults.h	2014-12-15 13:26:13.498904465 -0800
-@@ -438,6 +438,11 @@
- #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
- #endif
- 
-+/* The mapping from dwarf CFA reg number to internal dwarf reg numbers.  */
-+#ifndef DWARF_REG_TO_UNWIND_COLUMN
-+#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
-+#endif
-+
- /* Map register numbers held in the call frame info that gcc has
-    collected using DWARF_FRAME_REGNUM to those that should be output in
-    .debug_frame and .eh_frame.  */
-diff -durN a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
---- a/gcc/dwarf2cfi.c	2013-01-10 12:38:27.000000000 -0800
-+++ b/gcc/dwarf2cfi.c	2014-12-15 13:50:24.554883694 -0800
-@@ -225,7 +225,44 @@
-   emit_move_insn (adjust_address (mem, mode, offset), GEN_INT (size));
- }
- 
--/* Generate code to initialize the register size table.  */
-+/* Helper for expand_builtin_init_dwarf_reg_sizes.  Generate code to
-+   initialize the dwarf register size table entry corresponding to register
-+   REGNO in REGMODE.  TABLE is the table base address, SLOTMODE is the mode
-+   to use for the size entry to initialize, and WROTE_RETURN_COLUMN needs to
-+   be set to true if the dwarf register number for REGNO is the dwarf return
-+   column number.  */
-+
-+static
-+void init_one_dwarf_reg_size (int regno, enum machine_mode regmode,
-+			      rtx table, enum machine_mode slotmode,
-+			      bool *wrote_return_column)
-+{
-+  const unsigned int dnum = DWARF_FRAME_REGNUM (regno);
-+  const unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
-+  const unsigned int dcol = DWARF_REG_TO_UNWIND_COLUMN (rnum);
-+  
-+  const HOST_WIDE_INT slotoffset = dcol * GET_MODE_SIZE (slotmode);
-+  const HOST_WIDE_INT regsize = GET_MODE_SIZE (regmode);
-+
-+  if (rnum >= DWARF_FRAME_REGISTERS)
-+    return;
-+
-+  if (dnum == DWARF_FRAME_RETURN_COLUMN)
-+    {
-+      if (regmode == VOIDmode)
-+	return;
-+      *wrote_return_column = true;
-+    }
-+
-+  if (slotoffset < 0)
-+    return;
-+
-+  emit_move_insn (adjust_address (table, slotmode, slotoffset),
-+		  gen_int_mode (regsize, slotmode));
-+}
-+
-+/* Generate code to initialize the dwarf register size table located
-+   at the provided ADDRESS.  */
- 
- void
- expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -238,30 +275,21 @@
- 
-   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
-     {
--      unsigned int dnum = DWARF_FRAME_REGNUM (i);
--      unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
--
--      if (rnum < DWARF_FRAME_REGISTERS)
--	{
--	  HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
--	  enum machine_mode save_mode = reg_raw_mode[i];
--	  HOST_WIDE_INT size;
--
--	  if (HARD_REGNO_CALL_PART_CLOBBERED (i, save_mode))
--	    save_mode = choose_hard_reg_mode (i, 1, true);
--	  if (dnum == DWARF_FRAME_RETURN_COLUMN)
--	    {
--	      if (save_mode == VOIDmode)
--		continue;
--	      wrote_return_column = true;
--	    }
--	  size = GET_MODE_SIZE (save_mode);
--	  if (offset < 0)
--	    continue;
-+      enum machine_mode save_mode = reg_raw_mode[i];
-+      rtx span;
- 
--	  emit_move_insn (adjust_address (mem, mode, offset),
--			  gen_int_mode (size, mode));
--	}
-+      span = targetm.dwarf_register_span (gen_rtx_REG (save_mode, i));
-+      if (!span)
-+        init_one_dwarf_reg_size (i, save_mode, mem, mode, &wrote_return_column);
-+      else
-+        {
-+          for (int si = 0; si < XVECLEN (span, 0); si++)
-+            {
-+              rtx reg = XVECEXP (span, 0, si);
-+              init_one_dwarf_reg_size
-+              (REGNO (reg), GET_MODE (reg), mem, mode, &wrote_return_column);
-+            }
-+        }
-     }
- 
-   if (!wrote_return_column)
-diff -durN a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
---- a/libgcc/unwind-dw2.c	2013-05-31 16:21:46.000000000 -0700
-+++ b/libgcc/unwind-dw2.c	2014-12-15 13:26:13.570904866 -0800
-@@ -55,10 +55,6 @@
- #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
- #endif
- 
--#ifndef DWARF_REG_TO_UNWIND_COLUMN
--#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
--#endif
--
- /* ??? For the public function interfaces, we tend to gcc_assert that the
-    column numbers are in range.  For the dwarf2 unwind info this does happen,
-    although so far in a case that doesn't actually matter.
diff --git a/patches/gcc/linaro-4.9-2017.01/002-gcc_bug_62231.patch b/patches/gcc/linaro-4.9-2017.01/002-gcc_bug_62231.patch
deleted file mode 100644
index b970ebc..0000000
--- a/patches/gcc/linaro-4.9-2017.01/002-gcc_bug_62231.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-As-applied.  From:
-
-https://gcc.gnu.org/ml/gcc-patches/2014-10/msg02605.html
-
-Linked from bug62231 comment 4 there
-
-diff -durN a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
---- a/gcc/config/rs6000/rs6000.c	2014-12-08 17:29:04.000000000 -0800
-+++ b/gcc/config/rs6000/rs6000.c	2014-12-15 14:44:46.568801843 -0800
-@@ -1673,7 +1673,7 @@
-      SCmode so as to pass the value correctly in a pair of
-      registers.  */
-   else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
--	   && !DECIMAL_FLOAT_MODE_P (mode))
-+	   && !DECIMAL_FLOAT_MODE_P (mode) && SPE_SIMD_REGNO_P (regno))
-     reg_size = UNITS_PER_FP_WORD;
- 
-   else
diff --git a/patches/gcc/linaro-4.9-2017.01/100-uclibc-conf.patch b/patches/gcc/linaro-4.9-2017.01/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a..0000000
--- a/patches/gcc/linaro-4.9-2017.01/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/linaro-4.9-2017.01/1000-libtool-leave-framework-alone.patch b/patches/gcc/linaro-4.9-2017.01/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index 525592e..0000000
--- a/patches/gcc/linaro-4.9-2017.01/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-4.9.4/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-4.9.4/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/linaro-4.9-2017.01/1000-powerpc-link-with-math-lib.patch.conditional b/patches/gcc/linaro-4.9-2017.01/1000-powerpc-link-with-math-lib.patch.conditional
deleted file mode 100644
index 5e0484f..0000000
--- a/patches/gcc/linaro-4.9-2017.01/1000-powerpc-link-with-math-lib.patch.conditional
+++ /dev/null
@@ -1,122 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
- libgcc/Makefile.in  |    4 +++-
- libgcc/configure    |   32 ++++++++++++++++++++++++++++++++
- libgcc/configure.ac |   21 +++++++++++++++++++++
- 3 files changed, 56 insertions(+), 1 deletion(-)
-
-Index: b/libgcc/Makefile.in
-===================================================================
---- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -42,6 +42,7 @@
- enable_vtable_verify = @enable_vtable_verify@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
- 
- host_noncanonical = @host_noncanonical@
- target_noncanonical = @target_noncanonical@
-@@ -943,9 +944,10 @@
- 		@multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_objs@,$(objects) libgcc.a,$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
-+		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- 		@shlib_map_file@,$(mapfile),$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
--		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
- 
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- 	# @multilib_flags@ is still needed because this may use
-Index: b/libgcc/configure
-===================================================================
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -564,6 +564,7 @@
- tmake_file
- sfp_machine_header
- set_use_emutls
-+LIBGCC_LIBM
- set_have_cc_tls
- vis_hide
- fixed_point
-@@ -4535,6 +4536,37 @@
- 	fi
- fi
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
- 
- # Conditionalize the makefile for this target machine.
- tmake_file_=
-Index: b/libgcc/configure.ac
-===================================================================
---- a/libgcc/configure.ac
-+++ b/libgcc/configure.ac
-@@ -357,6 +357,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+  libgcc_cv_copysignl_lib,
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+  ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # See if we have emulated thread-local storage.
- GCC_CHECK_EMUTLS
- set_use_emutls=
diff --git a/patches/gcc/linaro-4.9-2017.01/111-pr65730.patch b/patches/gcc/linaro-4.9-2017.01/111-pr65730.patch
deleted file mode 100644
index 8a41fd2..0000000
--- a/patches/gcc/linaro-4.9-2017.01/111-pr65730.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 10 Apr 2015 17:46:30 +0300
-Subject: [PATCH] Fix PR target/65730
-
-2015-05-20  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (init_alignment_context): Replace MULT
-	by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT).
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
-Changes to ChangeLog are dropped.
-
- gcc/config/xtensa/xtensa.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1436,8 +1436,9 @@
-   if (ac->shift != NULL_RTX)
-     {
-       /* Shift is the byte count, but we need the bitcount.  */
--      ac->shift = expand_simple_binop (SImode, MULT, ac->shift,
--				       GEN_INT (BITS_PER_UNIT),
-+      gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0);
-+      ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift,
-+				       GEN_INT (exact_log2 (BITS_PER_UNIT)),
- 				       NULL_RTX, 1, OPTAB_DIRECT);
-       ac->modemask = expand_simple_binop (SImode, ASHIFT,
- 					  GEN_INT (GET_MODE_MASK (mode)),
diff --git a/patches/gcc/linaro-4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/patches/gcc/linaro-4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
deleted file mode 100644
index bb77c4b..0000000
--- a/patches/gcc/linaro-4.9-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Fri, 6 Nov 2015 14:27:23 +0100
-Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit
-
-Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
-64-bit binaries by default.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -441,7 +441,7 @@
- 	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
- 	need_64bit_hwint=yes
- 	case x$with_cpu in
--	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500)
-+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500)
- 		cpu_is_64bit=yes
- 		;;
- 	esac
diff --git a/patches/gcc/linaro-4.9-2017.01/130-pr43538.patch b/patches/gcc/linaro-4.9-2017.01/130-pr43538.patch
deleted file mode 100644
index 19e57bb..0000000
--- a/patches/gcc/linaro-4.9-2017.01/130-pr43538.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001
-From: glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 25 Apr 2014 08:03:08 +0000
-Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
-
-	PR target/43538
-	* mt-gnu: Don't reset CXXFLAGS_FOR_TARGET.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-gnu    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
---- a/config/mt-gnu
-+++ b/config/mt-gnu
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-4.9-2017.01/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch b/patches/gcc/linaro-4.9-2017.01/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
deleted file mode 100644
index 1c49fb0..0000000
--- a/patches/gcc/linaro-4.9-2017.01/131-mt-ospace-preserve-FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9bcf38cd9f382486b3823eb923b50e2e9a89cef7 Mon Sep 17 00:00:00 2001
-From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Nov 2014 22:12:52 +0000
-Subject: [PATCH] 2014-11-17  Bob Dunlop  <bob.dunlop@xyzzy.org.uk>
-
-        * mt-ospace (CFLAGS_FOR_TARGET): Append -g -Os rather than
-        overwriting.
-        (CXXFLAGS_FOR_TARGET): Similarly.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217739 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-ospace | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/mt-ospace b/config/mt-ospace
-index 7f09104..ce29ff4 100644
---- a/config/mt-ospace
-+++ b/config/mt-ospace
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-4.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/patches/gcc/linaro-4.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
deleted file mode 100644
index 55f3228..0000000
--- a/patches/gcc/linaro-4.9-2017.01/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3c536954a67a883630f4a7513a27f02a892c3dcb Mon Sep 17 00:00:00 2001
-From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
-Date: Tue, 21 Oct 2014 21:08:13 +0000
-Subject: [PATCH] [sanitizer] Fix build with _FILE_OFFSET_BITS=64.
-
-Sanitizer source is not affected by _FILE_OFFSET_BITS in general,
-but this one file must be built with 32-bit off_t. More details in the code.
-
-git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220328 91177308-0d34-0410-b5e6-96231b3b80d8
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index bbc1108..fc09522 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -13,7 +13,15 @@
- 
- #include "sanitizer_platform.h"
- #if SANITIZER_LINUX || SANITIZER_MAC
-+// Tests in this file assume that off_t-dependent data structures match the
-+// libc ABI. For example, struct dirent here is what readdir() function (as
-+// exported from libc) returns, and not the user-facing "dirent", which
-+// depends on _FILE_OFFSET_BITS setting.
-+// To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below.
-+#ifdef _FILE_OFFSET_BITS
-+#undef _FILE_OFFSET_BITS
-+#endif
- 
- #include "sanitizer_internal_defs.h"
- #include "sanitizer_platform_limits_posix.h"
- 
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-4.9-2017.01/301-missing-execinfo_h.patch b/patches/gcc/linaro-4.9-2017.01/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda2..0000000
--- a/patches/gcc/linaro-4.9-2017.01/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/linaro-4.9-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/linaro-4.9-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index c3bab15..0000000
--- a/patches/gcc/linaro-4.9-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure gcc-4.9.4/gcc/configure
---- gcc-4.9.4.orig/gcc/configure	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure	2017-02-11 16:54:52.879474293 -0800
-@@ -28058,6 +28058,9 @@ fi
- 
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -28069,6 +28072,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -28181,23 +28189,23 @@ fi
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urpN '--exclude=autom4te.cache' gcc-4.9.4.orig/gcc/configure.ac gcc-4.9.4/gcc/configure.ac
---- gcc-4.9.4.orig/gcc/configure.ac	2016-05-22 01:53:32.000000000 -0700
-+++ gcc-4.9.4/gcc/configure.ac	2017-02-11 16:49:59.820965424 -0800
-@@ -5583,6 +5583,9 @@ enable_plugin=$enableval,
- enable_plugin=yes; default_plugin=yes)
- 
- pluginlibs=
-+PICFLAG="-fPIC"
-+UNDEFINEDPREAMBLE="extern int X;"
-+UNDEFINEDCODE="return X == 0;"
- 
- case "${host}" in
-   *-*-darwin*)
-@@ -5594,6 +5597,11 @@ case "${host}" in
-       export_sym_check=
-     fi
-   ;;
-+  *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+    PICFLAG=""
-+    UNDEFINEDPREAMBLE=""
-+    UNDEFINEDCODE=""
-+  ;;
-   *)
-     if test x$build = x$host; then
-       export_sym_check="objdump${exeext} -T"
-@@ -5645,17 +5653,17 @@ if test x"$enable_plugin" = x"yes"; then
-   case "${host}" in
-     *-*-darwin*)
-       CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--      CFLAGS="$CFLAGS -fPIC"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-       LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-     ;;
-     *)
--      CFLAGS="$CFLAGS -fPIC"
--      LDFLAGS="$LDFLAGS -fPIC -shared"
-+      CFLAGS="$CFLAGS ${PICFLAG}"
-+      LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-     ;;
-   esac
--  AC_MSG_CHECKING([for -fPIC -shared])
-+  AC_MSG_CHECKING([for ${PICFLAG} -shared])
-   AC_TRY_LINK(
--    [extern int X;],[return X == 0;],
-+    [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-     [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-     [AC_MSG_RESULT([no]); have_pic_shared=no])
-   if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
diff --git a/patches/gcc/linaro-4.9-2017.01/810-arm-softfloat-libgcc.patch b/patches/gcc/linaro-4.9-2017.01/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd..0000000
--- a/patches/gcc/linaro-4.9-2017.01/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/linaro-4.9-2017.01/830-arm_unbreak_armv4t.patch b/patches/gcc/linaro-4.9-2017.01/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index 37f8f2a..0000000
--- a/patches/gcc/linaro-4.9-2017.01/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/linaro-4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch b/patches/gcc/linaro-4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch
deleted file mode 100644
index 03fc47f..0000000
--- a/patches/gcc/linaro-4.9-2017.01/840-microblaze-enable-dwarf-eh-support.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc
-
-From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001
-From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
-Date: Mon, 18 Jun 2012 20:18:13 +0200
-Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support.
-
-Changelog
-
-2013-03-18  Edgar E. Iglesias <edgar.iglesias@xilinx.com>
-            David Holsgrove <david.holsgrove@xilinx.com>
-
- * common/config/microblaze/microblaze-common.c: Remove
-   TARGET_EXCEPT_UNWIND_INFO definition.
- * config/microblaze/microblaze-protos.h: Add
-   microblaze_eh_return prototype.
- * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register,
-   microblaze_expand_epilogue, microblaze_return_addr): Handle
-   calls_eh_return
-   (microblaze_eh_return): New function.
- * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET,
-   EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX,
-   ASM_PREFERRED_EH_DATA_FORMAT
- * gcc/config/microblaze/microblaze.md: Define eh_return pattern.
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
----
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
- 5 files changed, 52 insertions(+), 7 deletions(-)
-
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
---- a/gcc/common/config/microblaze/microblaze-common.c
-+++ b/gcc/common/config/microblaze/microblaze-common.c
-@@ -37,7 +37,4 @@
- #undef  TARGET_OPTION_OPTIMIZATION_TABLE
- #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table
- 
--#undef TARGET_EXCEPT_UNWIND_INFO
--#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
--
- struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
---- a/gcc/config/microblaze/microblaze-protos.h
-+++ b/gcc/config/microblaze/microblaze-protos.h
-@@ -54,6 +54,7 @@
- extern int symbol_mentioned_p (rtx);
- extern int label_mentioned_p (rtx);
- extern bool microblaze_cannot_force_const_mem (enum machine_mode, rtx);
-+extern void microblaze_eh_return (rtx op0);
- #endif  /* RTX_CODE */
- 
- /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
---- a/gcc/config/microblaze/microblaze.c
-+++ b/gcc/config/microblaze/microblaze.c
-@@ -1906,6 +1906,11 @@
-   if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM))
-     return 1;
- 
-+  if (crtl->calls_eh_return
-+      && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) {
-+    return 1;
-+  }
-+
-   if (!crtl->is_leaf)
-     {
-       if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
-@@ -1933,6 +1938,13 @@
- 	return 1;
-     }
- 
-+  if (crtl->calls_eh_return
-+      && (regno == EH_RETURN_DATA_REGNO (0)
-+          || regno == EH_RETURN_DATA_REGNO (1)))
-+    {
-+      return 1;
-+    }
-+
-   return 0;
- }
- 
-@@ -2962,6 +2974,12 @@
-       emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx));
-     }
- 
-+  if (crtl->calls_eh_return)
-+    emit_insn (gen_addsi3 (stack_pointer_rtx,
-+                           stack_pointer_rtx,
-+                           gen_rtx_raw_REG (SImode,
-+                                            MB_EH_STACKADJ_REGNUM)));
-+
-   emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST +
- 						    MB_ABI_SUB_RETURN_ADDR_REGNUM)));
- }
-@@ -3256,10 +3274,13 @@
-   if (count != 0)
-     return NULL_RTX;
- 
--  return gen_rtx_PLUS (Pmode,
--		       get_hard_reg_initial_val (Pmode,
--						 MB_ABI_SUB_RETURN_ADDR_REGNUM),
--		       GEN_INT (8));
-+  return get_hard_reg_initial_val (Pmode,
-+                                   MB_ABI_SUB_RETURN_ADDR_REGNUM);
-+}
-+
-+void microblaze_eh_return (rtx op0)
-+{
-+  emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0));
- }
- 
- /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
---- a/gcc/config/microblaze/microblaze.h
-+++ b/gcc/config/microblaze/microblaze.h
-@@ -184,6 +184,21 @@
- #define INCOMING_RETURN_ADDR_RTX  			\
-   gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM)
- 
-+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC.  */
-+#define RETURN_ADDR_OFFSET (8)
-+
-+/* Describe how we implement __builtin_eh_return.  */
-+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM)
-+
-+#define MB_EH_STACKADJ_REGNUM  MB_ABI_INT_RETURN_VAL2_REGNUM
-+#define EH_RETURN_STACKADJ_RTX  gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM)
-+
-+/* Select a format to encode pointers in exception handling data.  CODE
-+   is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
-+   true if the symbol may be affected by dynamic relocations.  */
-+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
-+  ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr)
-+
- /* Use DWARF 2 debugging information by default.  */
- #define DWARF2_DEBUGGING_INFO
- #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
---- a/gcc/config/microblaze/microblaze.md
-+++ b/gcc/config/microblaze/microblaze.md
-@@ -2261,4 +2261,15 @@
-   (set_attr "mode"      "SI")
-   (set_attr "length"    "4")])
- 
-+; This is used in compiling the unwind routines.
-+(define_expand "eh_return"
-+  [(use (match_operand 0 "general_operand" ""))]
-+  ""
-+  "
-+{
-+  microblaze_eh_return(operands[0]);
-+  DONE;
-+}")
-+
- (include "sync.md")
-+
diff --git a/patches/gcc/linaro-4.9-2017.01/850-libstdcxx-uclibc-c99.patch b/patches/gcc/linaro-4.9-2017.01/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 533d01f..0000000
--- a/patches/gcc/linaro-4.9-2017.01/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: update for 4.9.3]
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -2843,7 +2843,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
-+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -572,7 +572,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -987,7 +987,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// First try a buffer perhaps big enough (most probably sufficient
- 	// for non-ios_base::fixed outputs)
- 	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -146,7 +146,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -182,7 +182,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -144,7 +144,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -180,7 +180,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2680,7 +2680,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -788,7 +788,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
diff --git a/patches/gcc/linaro-4.9-2017.01/860-cilk-wchar.patch b/patches/gcc/linaro-4.9-2017.01/860-cilk-wchar.patch
deleted file mode 100644
index 1837405..0000000
--- a/patches/gcc/linaro-4.9-2017.01/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h
-+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/patches/gcc/linaro-4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch b/patches/gcc/linaro-4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index 98c7b3f..0000000
--- a/patches/gcc/linaro-4.9-2017.01/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-Index: b/gcc/config/xtensa/constraints.md
-===================================================================
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-Index: b/gcc/config/xtensa/elf.h
-===================================================================
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-Index: b/gcc/config/xtensa/linux.h
-===================================================================
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-Index: b/gcc/config/xtensa/predicates.md
-===================================================================
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-Index: b/gcc/config/xtensa/xtensa.c
-===================================================================
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -477,6 +477,9 @@
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return (mode == SImode
-@@ -1044,7 +1047,7 @@
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2428,6 +2431,20 @@
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-Index: b/gcc/config/xtensa/xtensa.md
-===================================================================
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -799,8 +799,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -812,15 +812,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -834,21 +835,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -919,7 +921,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -934,8 +936,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -950,13 +952,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -997,7 +1000,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1008,8 +1011,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-Index: b/gcc/config/xtensa/xtensa.opt
-===================================================================
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
diff --git a/patches/gcc/linaro-4.9-2017.01/871-xtensa-reimplement-register-spilling.patch b/patches/gcc/linaro-4.9-2017.01/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index abc7a08..0000000
--- a/patches/gcc/linaro-4.9-2017.01/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
-	CALL12 followed by series of ENTRY to spill windowed registers.
-	(__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
-	instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 	.global	__xtensa_libgcc_window_spill
- 	.type	__xtensa_libgcc_window_spill,@function
- __xtensa_libgcc_window_spill:
--	entry	sp, 32
--	movi	a2, 0
--	syscall
-+	entry	sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+	call12	1f
-+	retw
-+	.align	4
-+1:
-+	.rept	(XCHAL_NUM_AREGS - 24) / 12
-+	_entry	sp, 48
-+	mov	a12, a0
-+	.endr
-+	_entry	sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+	mov	a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+	mov	a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+	mov	a12, a12
-+#endif
-+	retw
-+#else
-+	mov	a8, a8
- 	retw
-+#endif
- 	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
- 
- 
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
- 	entry	sp, 32
- 
- 	/* Flush registers.  */
--	mov	a5, a2
--	movi	a2, 0
--	syscall
--	mov	a2, a5
-+	call8	__xtensa_libgcc_window_spill
- 
- 	/* Because the save area for a0-a3 is stored one frame below
- 	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.9-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/patches/gcc/linaro-4.9-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index f23a5c0..0000000
--- a/patches/gcc/linaro-4.9-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-xtensa | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
---- a/libgcc/config/xtensa/t-xtensa
-+++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
- LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
- 
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch b/patches/gcc/linaro-4.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index dc40513..0000000
--- a/patches/gcc/linaro-4.9-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-4.9-2017.01/874-xtensa-add-uclinux-support.patch b/patches/gcc/linaro-4.9-2017.01/874-xtensa-add-uclinux-support.patch
deleted file mode 100644
index 881aec0..0000000
--- a/patches/gcc/linaro-4.9-2017.01/874-xtensa-add-uclinux-support.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 22 Aug 2015 08:44:26 +0300
-Subject: [PATCH] xtensa: add uclinux support
-
-2015-10-03  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config.gcc (xtensa*-*-uclinux*): New configuration.
-	* config/xtensa/uclinux.h: New file.
-	* config/xtensa/uclinux.opt: New file.
-
-libgcc/
-	* config.host (xtensa*-*-uclinux*): New configuration.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r228450
-
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
- 4 files changed, 111 insertions(+)
- create mode 100644 gcc/config/xtensa/uclinux.h
- create mode 100644 gcc/config/xtensa/uclinux.opt
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2871,6 +2871,11 @@
- 	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
- 	tmake_file="${tmake_file} xtensa/t-xtensa"
- 	;;
-+xtensa*-*-uclinux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h"
-+	tmake_file="${tmake_file} xtensa/t-xtensa"
-+	extra_options="${extra_options} xtensa/uclinux.opt"
-+	;;
- am33_2.0-*-linux*)
- 	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
- 	gas=yes gnu_ld=yes
-Index: b/gcc/config/xtensa/uclinux.h
-===================================================================
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -0,0 +1,69 @@
-+/* Xtensa uClinux configuration.
-+   Derived from the configuration for GCC for Intel i386 running Linux.
-+   Copyright (C) 2001-2015 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC 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 3, or (at your option) any later
-+version.
-+
-+GCC 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 GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()				\
-+  do								\
-+    {								\
-+      GNU_USER_TARGET_OS_CPP_BUILTINS ();			\
-+      builtin_define ("__uClinux__");				\
-+    }								\
-+  while (0)
-+
-+#undef SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "long int"
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{mtext-section-literals:--text-section-literals} \
-+  %{mno-text-section-literals:--no-text-section-literals} \
-+  %{mtarget-align:--target-align} \
-+  %{mno-target-align:--no-target-align} \
-+  %{mlongcalls:--longcalls} \
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX	"."
-+
-+/* Always enable "-fpic" for Xtensa Linux.  */
-+#define XTENSA_ALWAYS_PIC 1
-+
-+#undef TARGET_LIBC_HAS_FUNCTION
-+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
-+
-+#undef DBX_REGISTER_NUMBER
-+
-Index: b/gcc/config/xtensa/uclinux.opt
-===================================================================
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.opt
-@@ -0,0 +1,32 @@
-+; Xtensa uClinux options.
-+
-+; Copyright (C) 2015 Free Software Foundation, Inc.
-+;
-+; This file is part of GCC.
-+;
-+; GCC 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 3, or (at your option) any later
-+; version.
-+;
-+; GCC 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 GCC; see the file COPYING3.  If not see
-+; <http://www.gnu.org/licenses/>.
-+
-+; See the GCC internals manual (options.texi) for a description of
-+; this file's format.
-+
-+; Please try to keep this file in ASCII collating order.
-+
-+elf2flt
-+Driver
-+
-+elf2flt=
-+Driver JoinedOrMissing
-+
-+; This comment is to ensure we retain the blank line above.
-Index: b/libgcc/config.host
-===================================================================
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -1213,6 +1213,11 @@
- 	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
- 	md_unwind_header=xtensa/linux-unwind.h
- 	;;
-+xtensa*-*-uclinux*)
-+	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
-+	md_unwind_header=xtensa/linux-unwind.h
-+	extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o"
-+	;;
- am33_2.0-*-linux*)
- 	# Don't need crtbeginT.o from *-*-linux* default.
- 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
diff --git a/patches/gcc/linaro-4.9-2017.01/880-nios2_legitimize_address.patch b/patches/gcc/linaro-4.9-2017.01/880-nios2_legitimize_address.patch
deleted file mode 100644
index 4623f29..0000000
--- a/patches/gcc/linaro-4.9-2017.01/880-nios2_legitimize_address.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b0ea54f3f995754881e0ea6651133aa7b58eeaa2 Mon Sep 17 00:00:00 2001
-From: cltang <cltang@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 22 Sep 2015 12:23:20 +0000
-Subject: [PATCH] nios2_legitimize_address 2015-09-22  Chung-Lin Tang 
- <cltang@codesourcery.com>
-
-	Backport from mainline
-	2015-09-22  Chung-Lin Tang  <cltang@codesourcery.com>
-
-	* config/nios2/nios2.c (nios2_legitimize_address): When handling
-	'reg + reloc' cases, allow first operand to be non-REG, and use
-	force_reg() to enforce address pattern.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@228013 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Fixes:
-http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0ccbb0
-
-[backported to 4.9.3]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- gcc/config/nios2/nios2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
-index 047b615..41dd6f9 100644
---- a/gcc/config/nios2/nios2.c
-+++ b/gcc/config/nios2/nios2.c
-@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
- 
-      Which will be output as '%tls_le(var+48)(r23)' in assembly.  */
-   if (GET_CODE (x) == PLUS
--      && GET_CODE (XEXP (x, 0)) == REG
-       && GET_CODE (XEXP (x, 1)) == CONST)
-     {
--      rtx unspec, offset, reg = XEXP (x, 0);
-+      rtx unspec, offset;
-       split_const (XEXP (x, 1), &unspec, &offset);
-       if (GET_CODE (unspec) == UNSPEC
- 	  && !nios2_large_offset_p (XINT (unspec, 1))
- 	  && offset != const0_rtx)
- 	{
-+	  rtx reg = force_reg (Pmode, XEXP (x, 0));
- 	  unspec = copy_rtx (unspec);
- 	  XVECEXP (unspec, 0, 0)
- 	    = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset));
--- 
-2.5.0
-
diff --git a/patches/gcc/linaro-4.9-2017.01/890-fix-m68k-compile.patch b/patches/gcc/linaro-4.9-2017.01/890-fix-m68k-compile.patch
deleted file mode 100644
index 140977b..0000000
--- a/patches/gcc/linaro-4.9-2017.01/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c
---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c	2014-01-02 23:25:22.000000000 +0100
-+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c	2016-03-18 22:24:40.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/patches/gcc/linaro-4.9-2017.01/891-fix-m68k-uclinux.patch b/patches/gcc/linaro-4.9-2017.01/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4347642..0000000
--- a/patches/gcc/linaro-4.9-2017.01/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host
---- gcc-4.9.3.orig/libgcc/config.host	2014-03-27 16:40:31.000000000 +0100
-+++ gcc-4.9.3/libgcc/config.host	2016-04-05 16:20:53.422809885 +0200
-@@ -750,7 +750,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/patches/gcc/linaro-4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch b/patches/gcc/linaro-4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 670cf8d..0000000
--- a/patches/gcc/linaro-4.9-2017.01/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack
---- gcc-4.9.3.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-4.9.3/libgcc/config/t-stack	2016-03-07 01:34:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/patches/gcc/linaro-4.9-2017.01/940-uclinux-enable-threads.patch b/patches/gcc/linaro-4.9-2017.01/940-uclinux-enable-threads.patch
deleted file mode 100644
index 5108147..0000000
--- a/patches/gcc/linaro-4.9-2017.01/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -810,6 +810,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/patches/gcc/linaro-5.4-2017.01/100-uclibc-conf.patch b/patches/gcc/linaro-5.4-2017.01/100-uclibc-conf.patch
deleted file mode 100644
index 73d1f0d..0000000
--- a/patches/gcc/linaro-5.4-2017.01/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/linaro-5.4-2017.01/1000-libtool-leave-framework-alone.patch b/patches/gcc/linaro-5.4-2017.01/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index 0f4912a..0000000
--- a/patches/gcc/linaro-5.4-2017.01/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-5.4.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-5.4.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*|-static-lib*|-shared-lib*|-B*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/linaro-5.4-2017.01/110-xtensa-implement-trap-pattern.patch b/patches/gcc/linaro-5.4-2017.01/110-xtensa-implement-trap-pattern.patch
deleted file mode 100644
index 3304532..0000000
--- a/patches/gcc/linaro-5.4-2017.01/110-xtensa-implement-trap-pattern.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d462e776df56a72f68545054f6d722bf447f0519 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 8 Jun 2015 22:29:11 +0300
-Subject: [PATCH] xtensa: implement trap pattern
-
-gcc/
-	* config/xtensa/xtensa.h (TARGET_DEBUG): New definition.
-	* config/xtensa/xtensa.md (define_attr "type"): New type "trap".
-	(define_insn "trap"): New definition.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.h  |  1 +
- gcc/config/xtensa/xtensa.md | 15 ++++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 011411c..584080b 100644
---- a/gcc/config/xtensa/xtensa.h
-+++ b/gcc/config/xtensa/xtensa.h
-@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size;
- #define TARGET_THREADPTR	XCHAL_HAVE_THREADPTR
- #define TARGET_LOOPS	        XCHAL_HAVE_LOOPS
- #define TARGET_WINDOWED_ABI	(XSHAL_ABI == XTHAL_ABI_WINDOWED)
-+#define TARGET_DEBUG		XCHAL_HAVE_DEBUG
- 
- #define TARGET_DEFAULT \
-   ((XCHAL_HAVE_L32R	? 0 : MASK_CONST16) |				\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..a577aa3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -86,7 +86,7 @@
- ;; Attributes.
- 
- (define_attr "type"
--  "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry"
-+  "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry,trap"
-   (const_string "unknown"))
- 
- (define_attr "mode"
-@@ -1764,6 +1764,19 @@
-   [(set_attr "length" "0")
-    (set_attr "type" "nop")])
- 
-+(define_insn "trap"
-+  [(trap_if (const_int 1) (const_int 0))]
-+  ""
-+{
-+  if (TARGET_DEBUG)
-+    return "break\t1, 15";
-+  else
-+    return (TARGET_DENSITY ? "ill.n" : "ill");
-+}
-+  [(set_attr "type"	"trap")
-+   (set_attr "mode"	"none")
-+   (set_attr "length"	"3")])
-+
- ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't
- ;; know if a frame pointer is required until the reload pass, and
- ;; because there may be an incoming argument value in the hard frame
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/patches/gcc/linaro-5.4-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
deleted file mode 100644
index c11ad35..0000000
--- a/patches/gcc/linaro-5.4-2017.01/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Fri, 6 Nov 2015 14:27:23 +0100
-Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit
-
-Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
-64-bit binaries by default.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 4a7cbd2..9cc765e 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -439,7 +439,7 @@ powerpc*-*-*)
- 	cpu_type=rs6000
- 	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
- 	case x$with_cpu in
--	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500)
-+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500)
- 		cpu_is_64bit=yes
- 		;;
- 	esac
--- 
-2.6.2
-
diff --git a/patches/gcc/linaro-5.4-2017.01/301-missing-execinfo_h.patch b/patches/gcc/linaro-5.4-2017.01/301-missing-execinfo_h.patch
deleted file mode 100644
index 2d0e7ba..0000000
--- a/patches/gcc/linaro-5.4-2017.01/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
---- a/boehm-gc/include/gc.h
-+++ b/boehm-gc/include/gc.h
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/linaro-5.4-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/linaro-5.4-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index d8986d5..0000000
--- a/patches/gcc/linaro-5.4-2017.01/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
-@@ -20,6 +20,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -30,6 +33,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -81,17 +89,17 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     AC_MSG_CHECKING([for -fPIC -shared])
-+     AC_MSG_CHECKING([for ${PICFLAG} -shared])
-      AC_TRY_LINK(
--       [extern int X;],[return X == 0;],
-+       [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-        [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-        [AC_MSG_RESULT([no]); have_pic_shared=no])
-      if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
diff --git a/patches/gcc/linaro-5.4-2017.01/380-gcc-plugin-POSIX-include-sys-select-h.patch b/patches/gcc/linaro-5.4-2017.01/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48e..0000000
--- a/patches/gcc/linaro-5.4-2017.01/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/patches/gcc/linaro-5.4-2017.01/810-arm-softfloat-libgcc.patch b/patches/gcc/linaro-5.4-2017.01/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd..0000000
--- a/patches/gcc/linaro-5.4-2017.01/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/linaro-5.4-2017.01/830-arm_unbreak_armv4t.patch b/patches/gcc/linaro-5.4-2017.01/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b730059..0000000
--- a/patches/gcc/linaro-5.4-2017.01/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/linaro-5.4-2017.01/840-microblaze-enable-dwarf-eh-support.patch b/patches/gcc/linaro-5.4-2017.01/840-microblaze-enable-dwarf-eh-support.patch
deleted file mode 100644
index 9d29090..0000000
--- a/patches/gcc/linaro-5.4-2017.01/840-microblaze-enable-dwarf-eh-support.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc
-
-From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001
-From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
-Date: Mon, 18 Jun 2012 20:18:13 +0200
-Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support.
-
-Changelog
-
-2013-03-18  Edgar E. Iglesias <edgar.iglesias@xilinx.com>
-            David Holsgrove <david.holsgrove@xilinx.com>
-
- * common/config/microblaze/microblaze-common.c: Remove
-   TARGET_EXCEPT_UNWIND_INFO definition.
- * config/microblaze/microblaze-protos.h: Add
-   microblaze_eh_return prototype.
- * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register,
-   microblaze_expand_epilogue, microblaze_return_addr): Handle
-   calls_eh_return
-   (microblaze_eh_return): New function.
- * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET,
-   EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX,
-   ASM_PREFERRED_EH_DATA_FORMAT
- * gcc/config/microblaze/microblaze.md: Define eh_return pattern.
-
-Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
-Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
----
- gcc/common/config/microblaze/microblaze-common.c |  3 ---
- gcc/config/microblaze/microblaze-protos.h        |  1 +
- gcc/config/microblaze/microblaze.c               | 29 ++++++++++++++++++++----
- gcc/config/microblaze/microblaze.h               | 15 ++++++++++++
- gcc/config/microblaze/microblaze.md              | 11 +++++++++
- 5 files changed, 52 insertions(+), 7 deletions(-)
-
-Index: b/gcc/common/config/microblaze/microblaze-common.c
-===================================================================
---- a/gcc/common/config/microblaze/microblaze-common.c
-+++ b/gcc/common/config/microblaze/microblaze-common.c
-@@ -37,7 +37,4 @@
- #undef  TARGET_OPTION_OPTIMIZATION_TABLE
- #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table
- 
--#undef TARGET_EXCEPT_UNWIND_INFO
--#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
--
- struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/gcc/config/microblaze/microblaze-protos.h
-===================================================================
---- a/gcc/config/microblaze/microblaze-protos.h
-+++ b/gcc/config/microblaze/microblaze-protos.h
-@@ -56,6 +56,7 @@
- extern int symbol_mentioned_p (rtx);
- extern int label_mentioned_p (rtx);
- extern bool microblaze_cannot_force_const_mem (machine_mode, rtx);
-+extern void microblaze_eh_return (rtx op0);
- #endif  /* RTX_CODE */
- 
- /* Declare functions in microblaze-c.c.  */
-Index: b/gcc/config/microblaze/microblaze.c
-===================================================================
---- a/gcc/config/microblaze/microblaze.c
-+++ b/gcc/config/microblaze/microblaze.c
-@@ -1959,6 +1959,11 @@
-   if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM))
-     return 1;
- 
-+  if (crtl->calls_eh_return
-+      && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) {
-+    return 1;
-+  }
-+
-   if (!crtl->is_leaf)
-     {
-       if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
-@@ -1986,6 +1991,13 @@
- 	return 1;
-     }
- 
-+  if (crtl->calls_eh_return
-+      && (regno == EH_RETURN_DATA_REGNO (0)
-+          || regno == EH_RETURN_DATA_REGNO (1)))
-+    {
-+      return 1;
-+    }
-+
-   return 0;
- }
- 
-@@ -3067,6 +3079,12 @@
-       emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx));
-     }
- 
-+  if (crtl->calls_eh_return)
-+    emit_insn (gen_addsi3 (stack_pointer_rtx,
-+                           stack_pointer_rtx,
-+                           gen_rtx_raw_REG (SImode,
-+                                            MB_EH_STACKADJ_REGNUM)));
-+
-   emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST +
- 						    MB_ABI_SUB_RETURN_ADDR_REGNUM)));
- }
-@@ -3364,10 +3382,13 @@
-   if (count != 0)
-     return NULL_RTX;
- 
--  return gen_rtx_PLUS (Pmode,
--		       get_hard_reg_initial_val (Pmode,
--						 MB_ABI_SUB_RETURN_ADDR_REGNUM),
--		       GEN_INT (8));
-+  return get_hard_reg_initial_val (Pmode,
-+                                   MB_ABI_SUB_RETURN_ADDR_REGNUM);
-+}
-+
-+void microblaze_eh_return (rtx op0)
-+{
-+  emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0));
- }
- 
- /* Queue an .ident string in the queue of top-level asm statements.
-Index: b/gcc/config/microblaze/microblaze.h
-===================================================================
---- a/gcc/config/microblaze/microblaze.h
-+++ b/gcc/config/microblaze/microblaze.h
-@@ -184,6 +184,21 @@
- #define INCOMING_RETURN_ADDR_RTX  			\
-   gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM)
- 
-+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC.  */
-+#define RETURN_ADDR_OFFSET (8)
-+
-+/* Describe how we implement __builtin_eh_return.  */
-+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM)
-+
-+#define MB_EH_STACKADJ_REGNUM  MB_ABI_INT_RETURN_VAL2_REGNUM
-+#define EH_RETURN_STACKADJ_RTX  gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM)
-+
-+/* Select a format to encode pointers in exception handling data.  CODE
-+   is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
-+   true if the symbol may be affected by dynamic relocations.  */
-+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
-+  ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr)
-+
- /* Use DWARF 2 debugging information by default.  */
- #define DWARF2_DEBUGGING_INFO
- #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-Index: b/gcc/config/microblaze/microblaze.md
-===================================================================
---- a/gcc/config/microblaze/microblaze.md
-+++ b/gcc/config/microblaze/microblaze.md
-@@ -2272,4 +2272,15 @@
-   (set_attr "mode"      "SI")
-   (set_attr "length"    "4")])
- 
-+; This is used in compiling the unwind routines.
-+(define_expand "eh_return"
-+  [(use (match_operand 0 "general_operand" ""))]
-+  ""
-+  "
-+{
-+  microblaze_eh_return(operands[0]);
-+  DONE;
-+}")
-+
- (include "sync.md")
-+
diff --git a/patches/gcc/linaro-5.4-2017.01/850-libstdcxx-uclibc-c99.patch b/patches/gcc/linaro-5.4-2017.01/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 9e97d94..0000000
--- a/patches/gcc/linaro-5.4-2017.01/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -5239,7 +5239,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
-+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -992,7 +992,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// Precision is always used except for hexfloat format.
- 	const bool __use_prec =
- 	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -578,7 +578,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -195,7 +195,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -144,7 +144,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -192,7 +192,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2680,7 +2680,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -788,7 +788,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -146,7 +146,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc/linaro-5.4-2017.01/860-cilk-wchar.patch b/patches/gcc/linaro-5.4-2017.01/860-cilk-wchar.patch
deleted file mode 100644
index 1d9916f..0000000
--- a/patches/gcc/linaro-5.4-2017.01/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- a/libcilkrts/include/cilk/reducer_min_max.h
-+++ b/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/patches/gcc/linaro-5.4-2017.01/870-xtensa-add-mauto-litpools-option.patch b/patches/gcc/linaro-5.4-2017.01/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index aa1376c..0000000
--- a/patches/gcc/linaro-5.4-2017.01/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -796,21 +797,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -881,7 +883,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/871-xtensa-reimplement-register-spilling.patch b/patches/gcc/linaro-5.4-2017.01/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index 4056f8b..0000000
--- a/patches/gcc/linaro-5.4-2017.01/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 40507bf199440082ed69b777986d50c31efe2520 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
-	CALL12 followed by series of ENTRY to spill windowed registers.
-	(__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
-	instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 4d451c8..ef0703f 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -34,10 +34,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 	.global	__xtensa_libgcc_window_spill
- 	.type	__xtensa_libgcc_window_spill,@function
- __xtensa_libgcc_window_spill:
--	entry	sp, 32
--	movi	a2, 0
--	syscall
-+	entry	sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+	call12	1f
-+	retw
-+	.align	4
-+1:
-+	.rept	(XCHAL_NUM_AREGS - 24) / 12
-+	_entry	sp, 48
-+	mov	a12, a0
-+	.endr
-+	_entry	sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+	mov	a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+	mov	a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+	mov	a12, a12
-+#endif
- 	retw
-+#else
-+	mov	a8, a8
-+	retw
-+#endif
- 	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
- #endif
- 
-@@ -61,10 +80,7 @@ __xtensa_nonlocal_goto:
- 	entry	sp, 32
- 
- 	/* Flush registers.  */
--	mov	a5, a2
--	movi	a2, 0
--	syscall
--	mov	a2, a5
-+	call8	__xtensa_libgcc_window_spill
- 
- 	/* Because the save area for a0-a3 is stored one frame below
- 	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/patches/gcc/linaro-5.4-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index 9707f68..0000000
--- a/patches/gcc/linaro-5.4-2017.01/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7d7a85f75ba218df4a4226e95865fc8fa561cb86 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-windowed (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-windowed | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index 7d9e9db..a99156c 100644
---- a/libgcc/config/xtensa/t-windowed
-+++ b/libgcc/config/xtensa/t-windowed
-@@ -1,2 +1,2 @@
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch b/patches/gcc/linaro-5.4-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index 2d8eb7c..0000000
--- a/patches/gcc/linaro-5.4-2017.01/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b33905dc310f475ddbde4c9fb7230724b2068a2b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 82b0e63..8e579c7 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/874-xtensa-add-uclinux-support.patch b/patches/gcc/linaro-5.4-2017.01/874-xtensa-add-uclinux-support.patch
deleted file mode 100644
index 23db3d8..0000000
--- a/patches/gcc/linaro-5.4-2017.01/874-xtensa-add-uclinux-support.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 22 Aug 2015 08:44:26 +0300
-Subject: [PATCH] xtensa: add uclinux support
-
-2015-10-03  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config.gcc (xtensa*-*-uclinux*): New configuration.
-	* config/xtensa/uclinux.h: New file.
-	* config/xtensa/uclinux.opt: New file.
-
-libgcc/
-	* config.host (xtensa*-*-uclinux*): New configuration.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r228450
-
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
- 4 files changed, 111 insertions(+)
- create mode 100644 gcc/config/xtensa/uclinux.h
- create mode 100644 gcc/config/xtensa/uclinux.opt
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index c52f5a8..56797bd 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2995,6 +2995,11 @@ xtensa*-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
- 	tmake_file="${tmake_file} xtensa/t-xtensa"
- 	;;
-+xtensa*-*-uclinux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h"
-+	tmake_file="${tmake_file} xtensa/t-xtensa"
-+	extra_options="${extra_options} xtensa/uclinux.opt"
-+	;;
- am33_2.0-*-linux*)
- 	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
- 	gas=yes gnu_ld=yes
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-new file mode 100644
-index 0000000..4606020
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -0,0 +1,69 @@
-+/* Xtensa uClinux configuration.
-+   Derived from the configuration for GCC for Intel i386 running Linux.
-+   Copyright (C) 2001-2015 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC 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 3, or (at your option) any later
-+version.
-+
-+GCC 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 GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()				\
-+  do								\
-+    {								\
-+      GNU_USER_TARGET_OS_CPP_BUILTINS ();			\
-+      builtin_define ("__uClinux__");				\
-+    }								\
-+  while (0)
-+
-+#undef SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "long int"
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{mtext-section-literals:--text-section-literals} \
-+  %{mno-text-section-literals:--no-text-section-literals} \
-+  %{mtarget-align:--target-align} \
-+  %{mno-target-align:--no-target-align} \
-+  %{mlongcalls:--longcalls} \
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX	"."
-+
-+/* Always enable "-fpic" for Xtensa Linux.  */
-+#define XTENSA_ALWAYS_PIC 1
-+
-+#undef TARGET_LIBC_HAS_FUNCTION
-+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
-+
-+#undef DBX_REGISTER_NUMBER
-+
-diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt
-new file mode 100644
-index 0000000..95ef777
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.opt
-@@ -0,0 +1,32 @@
-+; Xtensa uClinux options.
-+
-+; Copyright (C) 2015 Free Software Foundation, Inc.
-+;
-+; This file is part of GCC.
-+;
-+; GCC 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 3, or (at your option) any later
-+; version.
-+;
-+; GCC 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 GCC; see the file COPYING3.  If not see
-+; <http://www.gnu.org/licenses/>.
-+
-+; See the GCC internals manual (options.texi) for a description of
-+; this file's format.
-+
-+; Please try to keep this file in ASCII collating order.
-+
-+elf2flt
-+Driver
-+
-+elf2flt=
-+Driver JoinedOrMissing
-+
-+; This comment is to ensure we retain the blank line above.
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 2c64756..2ee92c1 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -1295,6 +1295,11 @@ xtensa*-*-linux*)
- 	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
- 	md_unwind_header=xtensa/linux-unwind.h
- 	;;
-+xtensa*-*-uclinux*)
-+	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
-+	md_unwind_header=xtensa/linux-unwind.h
-+	extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o"
-+	;;
- am33_2.0-*-linux*)
- 	# Don't need crtbeginT.o from *-*-linux* default.
- 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
--- 
-1.8.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch b/patches/gcc/linaro-5.4-2017.01/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
deleted file mode 100644
index d128596..0000000
--- a/patches/gcc/linaro-5.4-2017.01/875-xtensa-fix-xtensa_fallback_frame_state-for-call0-ABI.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 7d3692c6933f7ff87bf110dede8e33e922b164c6 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 15 Sep 2015 19:30:32 +0000
-Subject: [PATCH] xtensa: fix xtensa_fallback_frame_state for call0 ABI
-
-2015-09-15  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.h (DWARF_ALT_FRAME_RETURN_COLUMN): New
-	definition.
-	(DWARF_FRAME_REGISTERS): Reserve space for one extra register in
-	call0 ABI.
-
-libgcc/
-	* config/xtensa/linux-unwind.h (xtensa_fallback_frame_state):
-	Add support for call0 ABI.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227809 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.h          |  4 +++-
- libgcc/config/xtensa/linux-unwind.h | 30 ++++++++++++++++++++++++++++--
- 2 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 584080b..e165def 100644
---- a/gcc/config/xtensa/xtensa.h
-+++ b/gcc/config/xtensa/xtensa.h
-@@ -813,7 +813,9 @@ typedef struct xtensa_args
-    for debugging.  */
- #define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, 0)
- #define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM (0)
--#define DWARF_FRAME_REGISTERS 16
-+#define DWARF_ALT_FRAME_RETURN_COLUMN 16
-+#define DWARF_FRAME_REGISTERS (DWARF_ALT_FRAME_RETURN_COLUMN		\
-+			       + (TARGET_WINDOWED_ABI ? 0 : 1))
- #define EH_RETURN_DATA_REGNO(N) ((N) < 2 ? (N) + 2 : INVALID_REGNUM)
- #define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL)			\
-   (flag_pic								\
-diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
-index 9daf738..9a67b5d 100644
---- a/libgcc/config/xtensa/linux-unwind.h
-+++ b/libgcc/config/xtensa/linux-unwind.h
-@@ -52,7 +52,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define ENTRY_BYTE 0x36
- #endif
- 
--#ifdef __XTENSA_WINDOWED_ABI__
- #define MD_FALLBACK_FRAME_STATE_FOR xtensa_fallback_frame_state
- 
- static _Unwind_Reason_Code
-@@ -61,6 +60,10 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
- {
-   unsigned char *pc = context->ra;
-   struct sigcontext *sc;
-+#if defined(__XTENSA_CALL0_ABI__)
-+  _Unwind_Ptr new_cfa;
-+  int i;
-+#endif
- 
-   struct rt_sigframe {
-     siginfo_t info;
-@@ -76,6 +79,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
-       || pc[5] != SYSC_BYTE2)
-     return _URC_END_OF_STACK;
- 
-+#if defined(__XTENSA_WINDOWED_ABI__)
-   rt_ = context->sp;
-   sc = &rt_->uc.uc_mcontext;
-   fs->signal_regs = (_Unwind_Word *) sc->sc_a;
-@@ -90,11 +94,33 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
-    }
-   else
-     fs->signal_ra = sc->sc_pc;
-+#elif defined(__XTENSA_CALL0_ABI__)
-+  rt_ = context->cfa;
-+  sc = &rt_->uc.uc_mcontext;
-+
-+  new_cfa = (_Unwind_Ptr) sc;
-+  fs->regs.cfa_how = CFA_REG_OFFSET;
-+  fs->regs.cfa_reg = __LIBGCC_STACK_POINTER_REGNUM__;
-+  fs->regs.cfa_offset = new_cfa - (_Unwind_Ptr) context->cfa;
-+
-+  for (i = 0; i < 16; i++)
-+    {
-+      fs->regs.reg[i].how = REG_SAVED_OFFSET;
-+      fs->regs.reg[i].loc.offset = (_Unwind_Ptr) &(sc->sc_a[i]) - new_cfa;
-+    }
-+
-+  fs->regs.reg[__LIBGCC_DWARF_ALT_FRAME_RETURN_COLUMN__].how =
-+    REG_SAVED_VAL_OFFSET;
-+  fs->regs.reg[__LIBGCC_DWARF_ALT_FRAME_RETURN_COLUMN__].loc.offset =
-+    (_Unwind_Ptr) (sc->sc_pc) - new_cfa;
-+  fs->retaddr_column = __LIBGCC_DWARF_ALT_FRAME_RETURN_COLUMN__;
-+#else
-+#error Unsupported Xtensa ABI
-+#endif
- 
-   fs->signal_frame = 1;
-   return _URC_NO_REASON;
- }
- 
--#endif /* __XTENSA_WINDOWED_ABI__ */
- 
- #endif /* ifdef inhibit_libc  */
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/876-xtensa-fix-libgcc-build-with-text-section-literals.patch b/patches/gcc/linaro-5.4-2017.01/876-xtensa-fix-libgcc-build-with-text-section-literals.patch
deleted file mode 100644
index 4b2334a..0000000
--- a/patches/gcc/linaro-5.4-2017.01/876-xtensa-fix-libgcc-build-with-text-section-literals.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 44fbad9f8bed55f690f251b530ab38df1e696d95 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 17 Feb 2016 20:21:48 +0000
-Subject: [PATCH] xtensa: fix libgcc build with --text-section-literals
-
-Functions __muldf3_aux, __divdf3_aux, __mulsf3_aux and __divsf3_aux
-don't start with leaf_entry, so they need explicit .literal_position,
-otherwise libgcc build fails in the presence of --text-section-literals.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/ieee754-df.S (__muldf3_aux, __divdf3_aux): Add
-	.literal_position before the function.
-	* config/xtensa/ieee754-sf.S (__mulsf3_aux, __divsf3_aux):
-	Likewise.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233505 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- libgcc/config/xtensa/ieee754-df.S | 2 ++
- libgcc/config/xtensa/ieee754-sf.S | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/libgcc/config/xtensa/ieee754-df.S b/libgcc/config/xtensa/ieee754-df.S
-index a7ae209..26f2abd 100644
---- a/libgcc/config/xtensa/ieee754-df.S
-+++ b/libgcc/config/xtensa/ieee754-df.S
-@@ -606,6 +606,7 @@ __subdf3:
- #define XCHAL_NO_MUL 1
- #endif
- 
-+	.literal_position
- __muldf3_aux:
- 
- 	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -1216,6 +1217,7 @@ __muldf3:
- 
- #ifdef L_divdf3
- 
-+	.literal_position
- 	/* Division */
- __divdf3_aux:
- 
-diff --git a/libgcc/config/xtensa/ieee754-sf.S b/libgcc/config/xtensa/ieee754-sf.S
-index 7e397dc..a5e6e3c 100644
---- a/libgcc/config/xtensa/ieee754-sf.S
-+++ b/libgcc/config/xtensa/ieee754-sf.S
-@@ -487,6 +487,7 @@ __subsf3:
- #define XCHAL_NO_MUL 1
- #endif
- 
-+	.literal_position
- __mulsf3_aux:
- 
- 	/* Handle unusual cases (zeros, subnormals, NaNs and Infinities).
-@@ -884,6 +885,7 @@ __mulsf3:
- 
- #ifdef L_divsf3
- 
-+	.literal_position
- 	/* Division */
- __divsf3_aux:
- 
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch b/patches/gcc/linaro-5.4-2017.01/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
deleted file mode 100644
index 6e0ce6e..0000000
--- a/patches/gcc/linaro-5.4-2017.01/877-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d28554ee61a1ab1263274d66386e4051bca0ce05 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Oct 2016 19:12:19 +0000
-Subject: [PATCH] xtensa: don't use unwind-dw2-fde-dip with elf targets
-
-Define LIB2ADDEH_XTENSA_UNWIND_DW2_FDE to unwind-dw2-fde.c in
-xtensa/t-elf and to unwind-dw2-fde-dip.c in xtensa/t-linux and use
-LIB2ADDEH_XTENSA_UNWIND_DW2_FDE in LIB2ADDEH definition.
-
-This fixes build for elf target with windowed xtensa core that currently
-breaks with the following error message:
-
-  unwind-dw2-fde-dip.c:36:40: fatal error: elf.h: No such file or directory
-
-2016-10-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-elf (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-linux (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-windowed (LIB2ADDEH): Use
-	LIB2ADDEH_XTENSA_UNWIND_DW2_FDE defined by either xtensa/t-elf
-	or xtensa/t-linux.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241313 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- libgcc/config/xtensa/t-elf      | 2 ++
- libgcc/config/xtensa/t-linux    | 2 ++
- libgcc/config/xtensa/t-windowed | 2 +-
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf
-index 59d5121..967cf9b 100644
---- a/libgcc/config/xtensa/t-elf
-+++ b/libgcc/config/xtensa/t-elf
-@@ -3,3 +3,5 @@ CRTSTUFF_T_CFLAGS += -mlongcalls
- CRTSTUFF_T_CFLAGS_S += -mlongcalls
- 
- HOST_LIBGCC2_CFLAGS += -mlongcalls
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde.c
-diff --git a/libgcc/config/xtensa/t-linux b/libgcc/config/xtensa/t-linux
-index 6f4ae89..412ecca 100644
---- a/libgcc/config/xtensa/t-linux
-+++ b/libgcc/config/xtensa/t-linux
-@@ -1 +1,3 @@
- SHLIB_MAPFILES += $(srcdir)/config/xtensa/libgcc-glibc.ver
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde-dip.c
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index a99156c..f140136 100644
---- a/libgcc/config/xtensa/t-windowed
-+++ b/libgcc/config/xtensa/t-windowed
-@@ -1,2 +1,2 @@
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(LIB2ADDEH_XTENSA_UNWIND_DW2_FDE) $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/878-xtensa-Fix-PR-target-78603.patch b/patches/gcc/linaro-5.4-2017.01/878-xtensa-Fix-PR-target-78603.patch
deleted file mode 100644
index 4646d3c..0000000
--- a/patches/gcc/linaro-5.4-2017.01/878-xtensa-Fix-PR-target-78603.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b18fe564ed233ee0965b3a980edc5dbe069b80ea Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 29 Nov 2016 13:09:17 -0800
-Subject: [PATCH] xtensa: Fix PR target/78603
-
-2016-11-29  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
-	overhead loop start between a call and its CALL_ARG_LOCATION
-	note.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 206ff80..36ab1e3 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop)
-       entry_after = BB_END (entry_bb);
-       while (DEBUG_INSN_P (entry_after)
-              || (NOTE_P (entry_after)
--                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
-+		 /* Make sure we don't split a call and its corresponding
-+		    CALL_ARG_LOCATION note.  */
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
-         entry_after = PREV_INSN (entry_after);
- 
-       emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-5.4-2017.01/890-fix-m68k-compile.patch b/patches/gcc/linaro-5.4-2017.01/890-fix-m68k-compile.patch
deleted file mode 100644
index 6e63de0..0000000
--- a/patches/gcc/linaro-5.4-2017.01/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/patches/gcc/linaro-5.4-2017.01/891-fix-m68k-uclinux.patch b/patches/gcc/linaro-5.4-2017.01/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4e186bd..0000000
--- a/patches/gcc/linaro-5.4-2017.01/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/patches/gcc/linaro-5.4-2017.01/892-microblaze-uclibc.patch b/patches/gcc/linaro-5.4-2017.01/892-microblaze-uclibc.patch
deleted file mode 100644
index a8eb5a6..0000000
--- a/patches/gcc/linaro-5.4-2017.01/892-microblaze-uclibc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Add dynamic linker support for uClibc
-
-Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
-
-diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h
---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h	2015-05-28 16:08:19.000000000 +0200
-+++ gcc-5.3.0/gcc/config/microblaze/linux.h	2016-05-13 09:21:01.579262885 +0200
-@@ -28,7 +28,15 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER	"/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+
-+#if DEFAULT_LIBC == LIBC_UCLIBC
-+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-   { "dynamic_linker", DYNAMIC_LINKER }
diff --git a/patches/gcc/linaro-5.4-2017.01/902-unwind-fix-for-musl.patch b/patches/gcc/linaro-5.4-2017.01/902-unwind-fix-for-musl.patch
deleted file mode 100644
index ef47054..0000000
--- a/patches/gcc/linaro-5.4-2017.01/902-unwind-fix-for-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Wed, 22 Apr 2015 14:20:01 +0000 (+0000)
-Subject: unwind fix for musl
-X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a2e31d0681d8a47389b8a3552622fbd9827bcef4
-
-unwind fix for musl
-
-On behalf of szabolcs.nagy@arm.com
-
-2015-04-22  Gregor Richards  <gregor.richards@uwaterloo.ca>
-	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
-
-	* unwind-dw2-fde-dip.c (USE_PT_GNU_EH_FRAME): Define it on
-	Linux if target provides dl_iterate_phdr.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -59,6 +59,12 @@
- 
- #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-     && defined(TARGET_DL_ITERATE_PHDR) \
-+    && defined(__linux__)
-+# define USE_PT_GNU_EH_FRAME
-+#endif
-+
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-+    && defined(TARGET_DL_ITERATE_PHDR) \
-     && (defined(__DragonFly__) || defined(__FreeBSD__))
- # define ElfW __ElfN
- # define USE_PT_GNU_EH_FRAME
diff --git a/patches/gcc/linaro-5.4-2017.01/910-nios2-bad-multilib-default.patch b/patches/gcc/linaro-5.4-2017.01/910-nios2-bad-multilib-default.patch
deleted file mode 100644
index d94697f..0000000
--- a/patches/gcc/linaro-5.4-2017.01/910-nios2-bad-multilib-default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/nios2.h gcc-5.3.0/gcc/config/nios2/nios2.h
---- gcc-5.3.0.orig/gcc/config/nios2/nios2.h	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/nios2.h	2016-04-18 10:37:25.998841674 -0700
-@@ -55,11 +55,11 @@
- #if TARGET_ENDIAN_DEFAULT == 0
- # define ASM_SPEC "%{!meb:-EL} %{meb:-EB}"
- # define LINK_SPEC_ENDIAN "%{!meb:-EL} %{meb:-EB}"
--# define MULTILIB_DEFAULTS { "EL" }
-+# define MULTILIB_DEFAULTS { "mel" }
- #else
- # define ASM_SPEC "%{!mel:-EB} %{mel:-EL}"
- # define LINK_SPEC_ENDIAN "%{!mel:-EB} %{mel:-EL}"
--# define MULTILIB_DEFAULTS { "EB" }
-+# define MULTILIB_DEFAULTS { "meb" }
- #endif
- 
- #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -urpN gcc-5.3.0.orig/gcc/config/nios2/t-nios2 gcc-5.3.0/gcc/config/nios2/t-nios2
---- gcc-5.3.0.orig/gcc/config/nios2/t-nios2	2016-04-18 10:32:41.046254061 -0700
-+++ gcc-5.3.0/gcc/config/nios2/t-nios2	2016-04-18 10:36:41.091312157 -0700
-@@ -22,6 +22,5 @@
- # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
- # MULTILIB_EXCEPTIONS = 
- 
--# MULTILIB_OPTIONS += EL/EB
-+# MULTILIB_OPTIONS += mel/meb
- # MULTILIB_DIRNAMES += le be
--# MULTILIB_MATCHES += EL=mel EB=meb
diff --git a/patches/gcc/linaro-5.4-2017.01/930-libgcc-disable-split-stack-nothreads.patch b/patches/gcc/linaro-5.4-2017.01/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 07f9a73..0000000
--- a/patches/gcc/linaro-5.4-2017.01/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/patches/gcc/linaro-5.4-2017.01/940-uclinux-enable-threads.patch b/patches/gcc/linaro-5.4-2017.01/940-uclinux-enable-threads.patch
deleted file mode 100644
index 490a55b..0000000
--- a/patches/gcc/linaro-5.4-2017.01/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/patches/gcc/linaro-6.3-2017.02/100-uclibc-conf.patch b/patches/gcc/linaro-6.3-2017.02/100-uclibc-conf.patch
deleted file mode 100644
index 73d1f0d..0000000
--- a/patches/gcc/linaro-6.3-2017.02/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: b/contrib/regression/objs-gcc.sh
-===================================================================
---- a/contrib/regression/objs-gcc.sh
-+++ b/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/patches/gcc/linaro-6.3-2017.02/1000-libtool-leave-framework-alone.patch b/patches/gcc/linaro-6.3-2017.02/1000-libtool-leave-framework-alone.patch
deleted file mode 100644
index bce09eb..0000000
--- a/patches/gcc/linaro-6.3-2017.02/1000-libtool-leave-framework-alone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc-6.2.0/libtool-ldflags	2016-12-20 11:13:12.669668125 -0800
-+++ gcc-6.2.0/libtool-ldflags	2016-12-20 11:28:34.894826286 -0800
-@@ -36,6 +36,11 @@
- for arg
- do
-     case $arg in
-+	-framework)
-+	    # libtool handles this option. It should not be prefixed with
-+	    # -Xcompiler, as that would split it from the argument that
-+	    # follows.
-+	    ;;
- 	-f*|--*|-static-lib*|-shared-lib*|-B*)
- 	    # Libtool does not ascribe any special meaning options
- 	    # that begin with -f or with a double-dash.  So, it will
diff --git a/patches/gcc/linaro-6.3-2017.02/301-missing-execinfo_h.patch b/patches/gcc/linaro-6.3-2017.02/301-missing-execinfo_h.patch
deleted file mode 100644
index 2d0e7ba..0000000
--- a/patches/gcc/linaro-6.3-2017.02/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
---- a/boehm-gc/include/gc.h
-+++ b/boehm-gc/include/gc.h
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/patches/gcc/linaro-6.3-2017.02/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch b/patches/gcc/linaro-6.3-2017.02/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
deleted file mode 100644
index d8986d5..0000000
--- a/patches/gcc/linaro-6.3-2017.02/370-gcc-plugin-Win-Dont-need-undefined-extern-var-refs-nor-fpic.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
---- gcc-5.3.0.orig/config/gcc-plugin.m4	2015-12-19 14:39:04.120734900 +0000
-+++ gcc-5.3.0/config/gcc-plugin.m4	2015-12-20 01:28:45.381965300 +0000
-@@ -20,6 +20,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -30,6 +33,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -81,17 +89,17 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     AC_MSG_CHECKING([for -fPIC -shared])
-+     AC_MSG_CHECKING([for ${PICFLAG} -shared])
-      AC_TRY_LINK(
--       [extern int X;],[return X == 0;],
-+       [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
-        [AC_MSG_RESULT([yes]); have_pic_shared=yes],
-        [AC_MSG_RESULT([no]); have_pic_shared=no])
-      if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
-diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
---- gcc-5.3.0.orig/gcc/configure	2015-12-19 14:40:16.893975900 +0000
-+++ gcc-5.3.0/gcc/configure	2015-12-20 01:28:45.472476700 +0000
-@@ -28386,6 +28386,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -28396,6 +28399,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -28508,23 +28516,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
-diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
---- gcc-5.3.0.orig/libcc1/configure	2015-12-19 14:40:20.855979000 +0000
-+++ gcc-5.3.0/libcc1/configure	2015-12-20 01:28:45.504980900 +0000
-@@ -14500,6 +14500,9 @@
- 
-    pluginlibs=
- 
-+   PICFLAG="-fPIC"
-+   UNDEFINEDPREAMBLE="extern int X;"
-+   UNDEFINEDCODE="return X == 0;"
-    case "${host}" in
-      *-*-darwin*)
-        if test x$build = x$host; then
-@@ -14510,6 +14513,11 @@
- 	 export_sym_check=
-        fi
-      ;;
-+     *-*-mingw*|*-*-cygwin*|*-*-msys*)
-+       PICFLAG=""
-+       UNDEFINEDPREAMBLE=""
-+       UNDEFINEDCODE=""
-+     ;;
-      *)
-        if test x$build = x$host; then
- 	 export_sym_check="objdump${exeext} -T"
-@@ -14622,23 +14630,23 @@
-      case "${host}" in
-        *-*-darwin*)
- 	 CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
--	 CFLAGS="$CFLAGS -fPIC"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
- 	 LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
-        ;;
-        *)
--	 CFLAGS="$CFLAGS -fPIC"
--	 LDFLAGS="$LDFLAGS -fPIC -shared"
-+	 CFLAGS="$CFLAGS ${PICFLAG}"
-+	 LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
-        ;;
-      esac
--     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
--$as_echo_n "checking for -fPIC -shared... " >&6; }
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
-+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--extern int X;
-+${UNDEFINEDPREAMBLE}
- int
- main ()
- {
--return X == 0;
-+${UNDEFINEDCODE}
-   ;
-   return 0;
- }
diff --git a/patches/gcc/linaro-6.3-2017.02/380-gcc-plugin-POSIX-include-sys-select-h.patch b/patches/gcc/linaro-6.3-2017.02/380-gcc-plugin-POSIX-include-sys-select-h.patch
deleted file mode 100644
index 12ef48e..0000000
--- a/patches/gcc/linaro-6.3-2017.02/380-gcc-plugin-POSIX-include-sys-select-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN gcc-5.3.0.orig/libcc1/connection.cc gcc-5.3.0/libcc1/connection.cc
---- gcc-5.3.0.orig/libcc1/connection.cc	2015-12-19 14:40:20.860479600 +0000
-+++ gcc-5.3.0/libcc1/connection.cc	2015-12-20 01:31:04.346611500 +0000
-@@ -21,6 +21,7 @@
- #include <string>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/select.h>
- #include <string.h>
- #include <errno.h>
- #include "marshall.hh"
diff --git a/patches/gcc/linaro-6.3-2017.02/810-arm-softfloat-libgcc.patch b/patches/gcc/linaro-6.3-2017.02/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index 5efa7fd..0000000
--- a/patches/gcc/linaro-6.3-2017.02/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: b/libgcc/config/arm/t-linux
-===================================================================
---- a/libgcc/config/arm/t-linux
-+++ b/libgcc/config/arm/t-linux
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/patches/gcc/linaro-6.3-2017.02/830-arm_unbreak_armv4t.patch b/patches/gcc/linaro-6.3-2017.02/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index b730059..0000000
--- a/patches/gcc/linaro-6.3-2017.02/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/patches/gcc/linaro-6.3-2017.02/860-cilk-wchar.patch b/patches/gcc/linaro-6.3-2017.02/860-cilk-wchar.patch
deleted file mode 100644
index 1d9916f..0000000
--- a/patches/gcc/linaro-6.3-2017.02/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- a/libcilkrts/include/cilk/reducer_min_max.h
-+++ b/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/patches/gcc/linaro-6.3-2017.02/870-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch b/patches/gcc/linaro-6.3-2017.02/870-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
deleted file mode 100644
index 6e0ce6e..0000000
--- a/patches/gcc/linaro-6.3-2017.02/870-xtensa-don-t-use-unwind-dw2-fde-dip-with-elf-targets.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d28554ee61a1ab1263274d66386e4051bca0ce05 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Tue, 18 Oct 2016 19:12:19 +0000
-Subject: [PATCH] xtensa: don't use unwind-dw2-fde-dip with elf targets
-
-Define LIB2ADDEH_XTENSA_UNWIND_DW2_FDE to unwind-dw2-fde.c in
-xtensa/t-elf and to unwind-dw2-fde-dip.c in xtensa/t-linux and use
-LIB2ADDEH_XTENSA_UNWIND_DW2_FDE in LIB2ADDEH definition.
-
-This fixes build for elf target with windowed xtensa core that currently
-breaks with the following error message:
-
-  unwind-dw2-fde-dip.c:36:40: fatal error: elf.h: No such file or directory
-
-2016-10-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-elf (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-linux (LIB2ADDEH_XTENSA_UNWIND_DW2_FDE): New
-	definition.
-	* config/xtensa/t-windowed (LIB2ADDEH): Use
-	LIB2ADDEH_XTENSA_UNWIND_DW2_FDE defined by either xtensa/t-elf
-	or xtensa/t-linux.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241313 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- libgcc/config/xtensa/t-elf      | 2 ++
- libgcc/config/xtensa/t-linux    | 2 ++
- libgcc/config/xtensa/t-windowed | 2 +-
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-elf b/libgcc/config/xtensa/t-elf
-index 59d5121..967cf9b 100644
---- a/libgcc/config/xtensa/t-elf
-+++ b/libgcc/config/xtensa/t-elf
-@@ -3,3 +3,5 @@ CRTSTUFF_T_CFLAGS += -mlongcalls
- CRTSTUFF_T_CFLAGS_S += -mlongcalls
- 
- HOST_LIBGCC2_CFLAGS += -mlongcalls
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde.c
-diff --git a/libgcc/config/xtensa/t-linux b/libgcc/config/xtensa/t-linux
-index 6f4ae89..412ecca 100644
---- a/libgcc/config/xtensa/t-linux
-+++ b/libgcc/config/xtensa/t-linux
-@@ -1 +1,3 @@
- SHLIB_MAPFILES += $(srcdir)/config/xtensa/libgcc-glibc.ver
-+
-+LIB2ADDEH_XTENSA_UNWIND_DW2_FDE = $(srcdir)/unwind-dw2-fde-dip.c
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index a99156c..f140136 100644
---- a/libgcc/config/xtensa/t-windowed
-+++ b/libgcc/config/xtensa/t-windowed
-@@ -1,2 +1,2 @@
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(LIB2ADDEH_XTENSA_UNWIND_DW2_FDE) $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-6.3-2017.02/871-xtensa-Fix-PR-target-78118.patch b/patches/gcc/linaro-6.3-2017.02/871-xtensa-Fix-PR-target-78118.patch
deleted file mode 100644
index c6ae103..0000000
--- a/patches/gcc/linaro-6.3-2017.02/871-xtensa-Fix-PR-target-78118.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-From bdda1689faf608ad7c83b5bd2e21a236b0047579 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Wed, 26 Oct 2016 08:02:51 +0000
-Subject: [PATCH] xtensa: Fix PR target/78118
-
-It started failing after the following commit: 32e90dc6a0cda45 ("PR
-rtl-optimization/61047").
-
-The change that made xtensa backend go ICE looks completely unrelated,
-and indeed, the issue is caused by the side effect of
-compute_frame_size() function call hidden in the
-INITIAL_ELIMINATION_OFFSET macro. This call updates the value of the
-xtensa_current_frame_size static variable, used in "return" instruction
-predicate. Prior to the change the value of xtensa_current_frame_size was
-set to 0 after the end of epilogue generation, which enabled the "return"
-instruction for the CALL0 ABI, but after the change the additional
-INITIAL_ELIMINATION_OFFSET calls make xtensa_current_frame_size non-zero
-and "return" pattern unavailable.
-
-Get rid of the global xtensa_current_frame_size and
-xtensa_callee_save_size variables by moving them into the
-machine_function structure. Implement predicate for the "return" pattern
-as a function. Don't communicate completion of epilogue generation
-through zeroing of xtensa_current_frame_size, add explicit epilogue_done
-variable to the machine_function structure. Don't update stack frame
-layout after the completion of reload.
-
-2016-10-26  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa-protos.h
-	(xtensa_use_return_instruction_p): New prototype.
-	* config/xtensa/xtensa.c (xtensa_current_frame_size,
-	xtensa_callee_save_size): Remove.
-	(struct machine_function): Add new fields: current_frame_size,
-	callee_save_size, frame_laid_out and epilogue_done.
-	(compute_frame_size, xtensa_expand_prologue,
-	xtensa_expand_epilogue): Replace xtensa_callee_save_size with
-	cfun->machine->callee_save_size and xtensa_current_frame_size
-	with cfun->machine->current_frame_size.
-	(compute_frame_size): Update cfun->machine->frame_laid_out and
-	don't update frame layout after reload completion.
-	(xtensa_expand_epilogue): Set cfun->machine->epilogue_done
-	instead of zeroing xtensa_current_frame_size.
-	(xtensa_use_return_instruction_p): New function.
-	* config/xtensa/xtensa.h (xtensa_current_frame_size): Remove
-	declaration.
-	(INITIAL_ELIMINATION_OFFSET): Use return value of
-	compute_frame_size instead of xtensa_current_frame_size value.
-	* config/xtensa/xtensa.md ("return" pattern): Use new predicate
-	function xtensa_use_return_instruction_p instead of inline code.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa-protos.h |  1 +
- gcc/config/xtensa/xtensa.c        | 82 ++++++++++++++++++++++++---------------
- gcc/config/xtensa/xtensa.h        |  6 +--
- gcc/config/xtensa/xtensa.md       |  2 +-
- 4 files changed, 55 insertions(+), 36 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h
-index f2ca526..873557f 100644
---- a/gcc/config/xtensa/xtensa-protos.h
-+++ b/gcc/config/xtensa/xtensa-protos.h
-@@ -68,6 +68,7 @@ extern rtx xtensa_return_addr (int, rtx);
- extern void xtensa_setup_frame_addresses (void);
- extern int xtensa_dbx_register_number (int);
- extern long compute_frame_size (int);
-+extern bool xtensa_use_return_instruction_p (void);
- extern void xtensa_expand_prologue (void);
- extern void xtensa_expand_epilogue (void);
- extern void order_regs_for_local_alloc (void);
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 64d089b..e49f784 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -78,11 +78,6 @@ enum internal_test
-    can support a given mode.  */
- char xtensa_hard_regno_mode_ok[(int) MAX_MACHINE_MODE][FIRST_PSEUDO_REGISTER];
- 
--/* Current frame size calculated by compute_frame_size.  */
--unsigned xtensa_current_frame_size;
--/* Callee-save area size in the current frame calculated by compute_frame_size. */
--int xtensa_callee_save_size;
--
- /* Largest block move to handle in-line.  */
- #define LARGEST_MOVE_RATIO 15
- 
-@@ -94,6 +89,13 @@ struct GTY(()) machine_function
-   bool vararg_a7;
-   rtx vararg_a7_copy;
-   rtx_insn *set_frame_ptr_insn;
-+  /* Current frame size calculated by compute_frame_size.  */
-+  unsigned current_frame_size;
-+  /* Callee-save area size in the current frame calculated by
-+     compute_frame_size.  */
-+  int callee_save_size;
-+  bool frame_laid_out;
-+  bool epilogue_done;
- };
- 
- /* Vector, indexed by hard register number, which contains 1 for a
-@@ -2628,24 +2630,29 @@ compute_frame_size (int size)
- {
-   int regno;
- 
-+  if (reload_completed && cfun->machine->frame_laid_out)
-+    return cfun->machine->current_frame_size;
-+
-   /* Add space for the incoming static chain value.  */
-   if (cfun->static_chain_decl != NULL)
-     size += (1 * UNITS_PER_WORD);
- 
--  xtensa_callee_save_size = 0;
-+  cfun->machine->callee_save_size = 0;
-   for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno)
-     {
-       if (xtensa_call_save_reg(regno))
--	xtensa_callee_save_size += UNITS_PER_WORD;
-+	cfun->machine->callee_save_size += UNITS_PER_WORD;
-     }
- 
--  xtensa_current_frame_size =
-+  cfun->machine->current_frame_size =
-     XTENSA_STACK_ALIGN (size
--			+ xtensa_callee_save_size
-+			+ cfun->machine->callee_save_size
- 			+ crtl->outgoing_args_size
- 			+ (WINDOW_SIZE * UNITS_PER_WORD));
--  xtensa_callee_save_size = XTENSA_STACK_ALIGN (xtensa_callee_save_size);
--  return xtensa_current_frame_size;
-+  cfun->machine->callee_save_size =
-+    XTENSA_STACK_ALIGN (cfun->machine->callee_save_size);
-+  cfun->machine->frame_laid_out = true;
-+  return cfun->machine->current_frame_size;
- }
- 
- 
-@@ -2696,6 +2703,7 @@ xtensa_expand_prologue (void)
-     {
-       int regno;
-       HOST_WIDE_INT offset = 0;
-+      int callee_save_size = cfun->machine->callee_save_size;
- 
-       /* -128 is a limit of single addi instruction. */
-       if (total_size > 0 && total_size <= 128)
-@@ -2709,7 +2717,7 @@ xtensa_expand_prologue (void)
- 	  add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
- 	  offset = total_size - UNITS_PER_WORD;
- 	}
--      else if (xtensa_callee_save_size)
-+      else if (callee_save_size)
- 	{
- 	  /* 1020 is maximal s32i offset, if the frame is bigger than that
- 	   * we move sp to the end of callee-saved save area, save and then
-@@ -2717,13 +2725,13 @@ xtensa_expand_prologue (void)
- 	  if (total_size > 1024)
- 	    {
- 	      insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
--					    GEN_INT (-xtensa_callee_save_size)));
-+					    GEN_INT (-callee_save_size)));
- 	      RTX_FRAME_RELATED_P (insn) = 1;
- 	      note_rtx = gen_rtx_SET (stack_pointer_rtx,
- 				      plus_constant (Pmode, stack_pointer_rtx,
--						     -xtensa_callee_save_size));
-+						     -callee_save_size));
- 	      add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
--	      offset = xtensa_callee_save_size - UNITS_PER_WORD;
-+	      offset = callee_save_size - UNITS_PER_WORD;
- 	    }
- 	  else
- 	    {
-@@ -2759,13 +2767,13 @@ xtensa_expand_prologue (void)
- 	{
- 	  rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
- 	  emit_move_insn (tmp_reg, GEN_INT (total_size -
--					    xtensa_callee_save_size));
-+					    callee_save_size));
- 	  insn = emit_insn (gen_subsi3 (stack_pointer_rtx,
- 					stack_pointer_rtx, tmp_reg));
- 	  RTX_FRAME_RELATED_P (insn) = 1;
- 	  note_rtx = gen_rtx_SET (stack_pointer_rtx,
- 				  plus_constant (Pmode, stack_pointer_rtx,
--						 xtensa_callee_save_size -
-+						 callee_save_size -
- 						 total_size));
- 	  add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
- 	}
-@@ -2833,21 +2841,21 @@ xtensa_expand_epilogue (void)
-       int regno;
-       HOST_WIDE_INT offset;
- 
--      if (xtensa_current_frame_size > (frame_pointer_needed ? 127 : 1024))
-+      if (cfun->machine->current_frame_size > (frame_pointer_needed ? 127 : 1024))
- 	{
- 	  rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
--	  emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size -
--					    xtensa_callee_save_size));
-+	  emit_move_insn (tmp_reg, GEN_INT (cfun->machine->current_frame_size -
-+					    cfun->machine->callee_save_size));
- 	  emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ?
- 				 hard_frame_pointer_rtx : stack_pointer_rtx,
- 				 tmp_reg));
--	  offset = xtensa_callee_save_size - UNITS_PER_WORD;
-+	  offset = cfun->machine->callee_save_size - UNITS_PER_WORD;
- 	}
-       else
- 	{
- 	  if (frame_pointer_needed)
- 	    emit_move_insn (stack_pointer_rtx, hard_frame_pointer_rtx);
--	  offset = xtensa_current_frame_size - UNITS_PER_WORD;
-+	  offset = cfun->machine->current_frame_size - UNITS_PER_WORD;
- 	}
- 
-       /* Prevent reordering of saved a0 update and loading it back from
-@@ -2867,16 +2875,16 @@ xtensa_expand_epilogue (void)
- 	    }
- 	}
- 
--      if (xtensa_current_frame_size > 0)
-+      if (cfun->machine->current_frame_size > 0)
- 	{
- 	  if (frame_pointer_needed || /* always reachable with addi */
--	      xtensa_current_frame_size > 1024 ||
--	      xtensa_current_frame_size <= 127)
-+	      cfun->machine->current_frame_size > 1024 ||
-+	      cfun->machine->current_frame_size <= 127)
- 	    {
--	      if (xtensa_current_frame_size <= 127)
--		offset = xtensa_current_frame_size;
-+	      if (cfun->machine->current_frame_size <= 127)
-+		offset = cfun->machine->current_frame_size;
- 	      else
--		offset = xtensa_callee_save_size;
-+		offset = cfun->machine->callee_save_size;
- 
- 	      emit_insn (gen_addsi3 (stack_pointer_rtx,
- 				     stack_pointer_rtx,
-@@ -2885,7 +2893,8 @@ xtensa_expand_epilogue (void)
- 	  else
- 	    {
- 	      rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
--	      emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size));
-+	      emit_move_insn (tmp_reg,
-+			      GEN_INT (cfun->machine->current_frame_size));
- 	      emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
- 				     tmp_reg));
- 	    }
-@@ -2896,11 +2905,22 @@ xtensa_expand_epilogue (void)
- 				  stack_pointer_rtx,
- 				  EH_RETURN_STACKADJ_RTX));
-     }
--  xtensa_current_frame_size = 0;
--  xtensa_callee_save_size = 0;
-+  cfun->machine->epilogue_done = true;
-   emit_jump_insn (gen_return ());
- }
- 
-+bool
-+xtensa_use_return_instruction_p (void)
-+{
-+  if (!reload_completed)
-+    return false;
-+  if (TARGET_WINDOWED_ABI)
-+    return true;
-+  if (compute_frame_size (get_frame_size ()) == 0)
-+    return true;
-+  return cfun->machine->epilogue_done;
-+}
-+
- void
- xtensa_set_return_address (rtx address, rtx scratch)
- {
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 82e9900..58eb1b2 100644
---- a/gcc/config/xtensa/xtensa.h
-+++ b/gcc/config/xtensa/xtensa.h
-@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3.  If not see
- 
- /* External variables defined in xtensa.c.  */
- 
--extern unsigned xtensa_current_frame_size;
--
- /* Macros used in the machine description to select various Xtensa
-    configuration options.  */
- #ifndef XCHAL_HAVE_MUL32_HIGH
-@@ -477,14 +475,14 @@ enum reg_class
- /* Specify the initial difference between the specified pair of registers.  */
- #define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET)			\
-   do {									\
--    compute_frame_size (get_frame_size ());				\
-+    long frame_size = compute_frame_size (get_frame_size ());		\
-     switch (FROM)							\
-       {									\
-       case FRAME_POINTER_REGNUM:					\
-         (OFFSET) = 0;							\
- 	break;								\
-       case ARG_POINTER_REGNUM:						\
--        (OFFSET) = xtensa_current_frame_size;				\
-+        (OFFSET) = frame_size;						\
- 	break;								\
-       default:								\
- 	gcc_unreachable ();						\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index db54a12..fcdb6c8 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -1663,7 +1663,7 @@
- (define_insn "return"
-   [(return)
-    (use (reg:SI A0_REG))]
--  "(TARGET_WINDOWED_ABI || !xtensa_current_frame_size) && reload_completed"
-+  "xtensa_use_return_instruction_p ()"
- {
-   return TARGET_WINDOWED_ABI ?
-       (TARGET_DENSITY ? "retw.n" : "retw") :
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-6.3-2017.02/872-xtensa-Fix-PR-target-78603.patch b/patches/gcc/linaro-6.3-2017.02/872-xtensa-Fix-PR-target-78603.patch
deleted file mode 100644
index 669097c..0000000
--- a/patches/gcc/linaro-6.3-2017.02/872-xtensa-Fix-PR-target-78603.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a568f3a84ff41ca272301a5fcf31071143e97e0f Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 29 Nov 2016 13:09:17 -0800
-Subject: [PATCH] xtensa: Fix PR target/78603
-
-2016-11-29  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
-	overhead loop start between a call and its CALL_ARG_LOCATION
-	note.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index e49f784..70f698a 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -4158,7 +4158,10 @@ hwloop_optimize (hwloop_info loop)
-       entry_after = BB_END (entry_bb);
-       while (DEBUG_INSN_P (entry_after)
-              || (NOTE_P (entry_after)
--                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
-+		 /* Make sure we don't split a call and its corresponding
-+		    CALL_ARG_LOCATION note.  */
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
-         entry_after = PREV_INSN (entry_after);
- 
-       emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/patches/gcc/linaro-6.3-2017.02/890-fix-m68k-compile.patch b/patches/gcc/linaro-6.3-2017.02/890-fix-m68k-compile.patch
deleted file mode 100644
index 6e63de0..0000000
--- a/patches/gcc/linaro-6.3-2017.02/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c
---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c	2015-01-05 13:33:28.000000000 +0100
-+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c	2016-03-19 09:25:07.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/patches/gcc/linaro-6.3-2017.02/891-fix-m68k-uclinux.patch b/patches/gcc/linaro-6.3-2017.02/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 4e186bd..0000000
--- a/patches/gcc/linaro-6.3-2017.02/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host
---- gcc-5.3.0.orig/libgcc/config.host	2015-10-01 14:01:18.000000000 +0200
-+++ gcc-5.3.0/libgcc/config.host	2016-04-26 21:30:25.353691745 +0200
-@@ -794,7 +794,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/patches/gcc/linaro-6.3-2017.02/892-libgcc-mkmap-symver-support-skip_underscore.patch b/patches/gcc/linaro-6.3-2017.02/892-libgcc-mkmap-symver-support-skip_underscore.patch
deleted file mode 100644
index 73ee6c5..0000000
--- a/patches/gcc/linaro-6.3-2017.02/892-libgcc-mkmap-symver-support-skip_underscore.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ae9c3e354440c4a0f105a9eabfb2f77be085ebc1 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 18 Aug 2016 17:59:16 +0200
-Subject: [PATCH] libgcc/mkmap-symver: support skip_underscore
-
-Some platforms, such as Blackfin, have a special prefix for assembly
-symbols as opposed to C symbols. For this reason, a function named
-"foo()" in C will in fact be visible as a symbol called "_foo" in the
-ELF binary.
-
-The current linker version script logic in libgcc doesn't take into
-account this situation properly. The Blackfin specific
-libgcc/config/bfin/libgcc-glibc.ver has an additional "_" in front of
-every symbol so that it matches the output of "nm" (which gets parsed to
-produce the final linker version script). But due to this additional
-"_", ld no longer matches with the symbols since "ld" does the matching
-with the original symbol name, not the one prefixed with "_".
-
-Due to this, none of the symbols in libgcc/config/bfin/libgcc-glibc.ver
-are actually matched with symbols in libgcc. This causes all libgcc
-symbols to be left as "LOCAL", which causes lots of "undefined
-reference" whenever some C or C++ code that calls a function of libgcc
-is compiled.
-
-To address this, this commit introduces a "skip_underscore" variable to
-the mkmap-symver script. It tells mkmap-symver to ignore the leading
-underscore from the "nm" output.
-
-Note that this new argument is different from the existing
-"leading_underscore" argument, which *adds* an additional underscore to
-the generated linker version script.
-
-Having this functionality paves the way to using the generic linker
-version information for Blackfin, instead of using a custom one.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libgcc/mkmap-symver.awk | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk
-index 266832a..30bb179 100644
---- a/libgcc/mkmap-symver.awk
-+++ b/libgcc/mkmap-symver.awk
-@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") {
- 
- state == "nm" && NF == 3 {
-   split ($3, s, "@")
--  def[s[1]] = 1;
-+  if (skip_underscore)
-+      symname = substr(s[1], 2);
-+  else
-+      symname = s[1];
-+  def[symname] = 1;
-   sawsymbol = 1;
-   next;
- }
--- 
-2.7.4
-
diff --git a/patches/gcc/linaro-6.3-2017.02/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/patches/gcc/linaro-6.3-2017.02/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
deleted file mode 100644
index 454295d..0000000
--- a/patches/gcc/linaro-6.3-2017.02/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
+++ /dev/null
@@ -1,1944 +0,0 @@
-From 56d606931716de30a89a40dc69a9282c1b4e2880 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 18 Aug 2016 18:04:06 +0200
-Subject: [PATCH] libgcc/config/bfin: use the generic linker version
- information
-
-This commit makes the Blackfin platform use the generic linker version
-information, rather than a completely duplicated file, specific for the
-Blackfin architecture.
-
-This is made possible using the newly introduced skip_underscore
-variable of the mkmap-symver script.
-
-This also allows to get a correct linker version file, with symbol names
-matching the ones found in libgcc. Thanks to this, the necessary symbols
-are marked "GLOBAL" instead of "LOCAL", which makes them visible at link
-time, and solves a large number of "undefined reference"
-issues. Indeed, the Blackfin specific linker version script had an extra
-underscore in front of all symbols, which meant none of them matched the
-symbols in libgcc, and therefore all libgcc symbols were marked as
-"LOCAL", making them invisible for linking.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libgcc/config/bfin/libgcc-glibc.ver | 1894 +----------------------------------
- libgcc/config/bfin/t-linux          |    3 +-
- 2 files changed, 4 insertions(+), 1893 deletions(-)
-
-diff --git a/libgcc/config/bfin/libgcc-glibc.ver b/libgcc/config/bfin/libgcc-glibc.ver
-index b1bd2df..2af3df7 100644
---- a/libgcc/config/bfin/libgcc-glibc.ver
-+++ b/libgcc/config/bfin/libgcc-glibc.ver
-@@ -16,1898 +16,8 @@
- # along with GCC; see the file COPYING3.  If not see
- # <http://www.gnu.org/licenses/>.
- 
--GCC_3.0 {
--  # libgcc1 integer symbols
--  ___absvsi2
--  ___addvsi3
--  ___ashlsi3
--  ___ashrsi3
--  ___divsi3
--  ___lshrsi3
--  ___modsi3
--  ___mulsi3
--  ___mulvsi3
--  ___negvsi2
--  ___subvsi3
--  ___udivsi3
--  ___umodsi3
--
--  # libgcc1 floating point symbols
--  ___addsf3
--  ___adddf3
--  ___addxf3
--  ___addtf3
--  ___divsf3
--  ___divdf3
--  ___divxf3
--  ___divtf3
--  ___eqsf2
--  ___eqdf2
--  ___eqxf2
--  ___eqtf2
--  ___extenddfxf2
--  ___extenddftf2
--  ___extendsfdf2
--  ___extendsfxf2
--  ___extendsftf2
--  ___fixsfsi
--  ___fixdfsi
--  ___fixxfsi
--  ___fixtfsi
--  ___floatsisf
--  ___floatsidf
--  ___floatsixf
--  ___floatsitf
--  ___gesf2
--  ___gedf2
--  ___gexf2
--  ___getf2
--  ___gtsf2
--  ___gtdf2
--  ___gtxf2
--  ___gttf2
--  ___lesf2
--  ___ledf2
--  ___lexf2
--  ___letf2
--  ___ltsf2
--  ___ltdf2
--  ___ltxf2
--  ___lttf2
--  ___mulsf3
--  ___muldf3
--  ___mulxf3
--  ___multf3
--  ___negsf2
--  ___negdf2
--  ___negxf2
--  ___negtf2
--  ___nesf2
--  ___nedf2
--  ___nexf2
--  ___netf2
--  ___subsf3
--  ___subdf3
--  ___subxf3
--  ___subtf3
--  ___truncdfsf2
--  ___truncxfsf2
--  ___trunctfsf2
--  ___truncxfdf2
--  ___trunctfdf2
--
--  # libgcc2 DImode arithmetic (for 32-bit targets).
--  ___absvdi2
--  ___addvdi3
--  ___ashldi3
--  ___ashrdi3
--  ___cmpdi2
--  ___divdi3
--  ___ffsdi2
--  ___fixdfdi
--  ___fixsfdi
--  ___fixtfdi
--  ___fixxfdi
--  ___fixunsdfdi
--  ___fixunsdfsi
--  ___fixunssfsi
--  ___fixunssfdi
--  ___fixunstfdi
--  ___fixunstfsi
--  ___fixunsxfdi
--  ___fixunsxfsi
--  ___floatdidf
--  ___floatdisf
--  ___floatdixf
--  ___floatditf
--  ___lshrdi3
--  ___moddi3
--  ___muldi3
--  ___mulvdi3
--  ___negdi2
--  ___negvdi2
--  ___subvdi3
--  ___ucmpdi2
--  ___udivdi3
--  ___udivmoddi4
--  ___umoddi3
--
--  # libgcc2 TImode arithmetic (for 64-bit targets).
--  ___ashlti3
--  ___ashrti3
--  ___cmpti2
--  ___divti3
--  ___ffsti2
--  ___fixdfti
--  ___fixsfti
--  ___fixtfti
--  ___fixxfti
--  ___lshrti3
--  ___modti3
--  ___multi3
--  ___negti2
--  ___ucmpti2
--  ___udivmodti4
--  ___udivti3
--  ___umodti3
--  ___fixunsdfti
--  ___fixunssfti
--  ___fixunstfti
--  ___fixunsxfti
--  ___floattidf
--  ___floattisf
--  ___floattixf
--  ___floattitf
--
--  # Used to deal with trampoline initialization on some platforms
--  ___clear_cache
--
--  # EH symbols
--  __Unwind_DeleteException
--  __Unwind_Find_FDE
--  __Unwind_ForcedUnwind
--  __Unwind_GetGR
--  __Unwind_GetIP
--  __Unwind_GetLanguageSpecificData
--  __Unwind_GetRegionStart
--  __Unwind_GetTextRelBase
--  __Unwind_GetDataRelBase
--  __Unwind_RaiseException
--  __Unwind_Resume
--  __Unwind_SetGR
--  __Unwind_SetIP
--  ___deregister_frame
--  ___deregister_frame_info
--  ___deregister_frame_info_bases
--  ___register_frame
--  ___register_frame_info
--  ___register_frame_info_bases
--  ___register_frame_info_table
--  ___register_frame_info_table_bases
--  ___register_frame_table
--
--  # SjLj EH symbols
--  __Unwind_SjLj_Register
--  __Unwind_SjLj_Unregister
--  __Unwind_SjLj_RaiseException
--  __Unwind_SjLj_ForcedUnwind
--  __Unwind_SjLj_Resume
--}
--
--%inherit GCC_3.3 GCC_3.0
--GCC_3.3 {
--  __Unwind_FindEnclosingFunction
--  __Unwind_GetCFA
--  __Unwind_Backtrace
--  __Unwind_Resume_or_Rethrow
--  __Unwind_SjLj_Resume_or_Rethrow
--}
--
--%inherit GCC_3.3.1 GCC_3.3
--GCC_3.3.1 {
--  ___gcc_personality_sj0
--  ___gcc_personality_v0
--}
--
--%inherit GCC_3.3.2 GCC_3.3.1
--GCC_3.3.2 {
--}
--%inherit GCC_3.3.4 GCC_3.3.2
--GCC_3.3.4 {
--  ___unorddf2
--  ___unordsf2
--}
--
--%inherit GCC_3.4 GCC_3.3.4
--GCC_3.4 {
--  # bit scanning and counting built-ins
--  ___clzsi2
--  ___clzdi2
--  ___clzti2
--  ___ctzsi2
--  ___ctzdi2
--  ___ctzti2
--  ___popcountsi2
--  ___popcountdi2
--  ___popcountti2
--  ___paritysi2
--  ___paritydi2
--  ___parityti2
--}
--
--%inherit GCC_3.4.2 GCC_3.4
--GCC_3.4.2 {
--  # Used to deal with trampoline initialization on some platforms
--  ___enable_execute_stack
--  ___trampoline_setup
--}
--
--%inherit GCC_3.4.4 GCC_3.4.2
--GCC_3.4.4 {
--  # libgcc2 TImode arithmetic (for 64-bit targets).
--  ___absvti2
--  ___addvti3
--  ___mulvti3
--  ___negvti2
--  ___subvti3
--}
--
--%inherit GCC_4.0.0 GCC_3.4.4
--GCC_4.0.0 {
--  # libgcc2 __builtin_powi helpers.
--  ___powisf2
--  ___powidf2
--  ___powixf2
--  ___powitf2
--
--  # c99 compliant complex arithmetic
--  ___divsc3
--  ___divdc3
--  ___divxc3
--  ___divtc3
--  ___mulsc3
--  ___muldc3
--  ___mulxc3
--  ___multc3
--}
--
- %inherit GCC_4.1.0 GCC_4.0.0
- GCC_4.1.0 {
--  ___smulsi3_highpart
--  ___umulsi3_highpart
--}
--
--%inherit GCC_4.2.0 GCC_4.1.0
--GCC_4.2.0 {
--  # unsigned-to-floating conversions
--  ___floatunsisf
--  ___floatunsidf
--  ___floatunsixf
--  ___floatunsitf
--  ___floatundidf
--  ___floatundisf
--  ___floatundixf
--  ___floatunditf
--  ___floatuntidf
--  ___floatuntisf
--  ___floatuntixf
--  ___floatuntitf
--  __Unwind_GetIPInfo
--}
--
--%inherit GCC_4.3.0 GCC_4.2.0
--GCC_4.3.0 {
--  # byte swapping routines
--  ___bswapsi2
--  ___bswapdi2
--  ___emutls_get_address
--  ___emutls_register_common
--  ___ffssi2
--  ___extendxftf2
--  ___trunctfxf2
--
--  # fixed-point routines
--  ___addqq3
--  ___addhq3
--  ___addsq3
--  ___adddq3
--  ___addtq3
--  ___adduqq3
--  ___adduhq3
--  ___addusq3
--  ___addudq3
--  ___addutq3
--  ___addha3
--  ___addsa3
--  ___addda3
--  ___addta3
--  ___adduha3
--  ___addusa3
--  ___adduda3
--  ___adduta3
--  ___ssaddqq3
--  ___ssaddhq3
--  ___ssaddsq3
--  ___ssadddq3
--  ___ssaddtq3
--  ___ssaddha3
--  ___ssaddsa3
--  ___ssaddda3
--  ___ssaddta3
--  ___usadduqq3
--  ___usadduhq3
--  ___usaddusq3
--  ___usaddudq3
--  ___usaddutq3
--  ___usadduha3
--  ___usaddusa3
--  ___usadduda3
--  ___usadduta3
--  ___subqq3
--  ___subhq3
--  ___subsq3
--  ___subdq3
--  ___subtq3
--  ___subuqq3
--  ___subuhq3
--  ___subusq3
--  ___subudq3
--  ___subutq3
--  ___subha3
--  ___subsa3
--  ___subda3
--  ___subta3
--  ___subuha3
--  ___subusa3
--  ___subuda3
--  ___subuta3
--  ___sssubqq3
--  ___sssubhq3
--  ___sssubsq3
--  ___sssubdq3
--  ___sssubtq3
--  ___sssubha3
--  ___sssubsa3
--  ___sssubda3
--  ___sssubta3
--  ___ussubuqq3
--  ___ussubuhq3
--  ___ussubusq3
--  ___ussubudq3
--  ___ussubutq3
--  ___ussubuha3
--  ___ussubusa3
--  ___ussubuda3
--  ___ussubuta3
--  ___mulqq3
--  ___mulhq3
--  ___mulsq3
--  ___muldq3
--  ___multq3
--  ___muluqq3
--  ___muluhq3
--  ___mulusq3
--  ___muludq3
--  ___mulutq3
--  ___mulha3
--  ___mulsa3
--  ___mulda3
--  ___multa3
--  ___muluha3
--  ___mulusa3
--  ___muluda3
--  ___muluta3
--  ___ssmulqq3
--  ___ssmulhq3
--  ___ssmulsq3
--  ___ssmuldq3
--  ___ssmultq3
--  ___ssmulha3
--  ___ssmulsa3
--  ___ssmulda3
--  ___ssmulta3
--  ___usmuluqq3
--  ___usmuluhq3
--  ___usmulusq3
--  ___usmuludq3
--  ___usmulutq3
--  ___usmuluha3
--  ___usmulusa3
--  ___usmuluda3
--  ___usmuluta3
--  ___divqq3
--  ___divhq3
--  ___divsq3
--  ___divdq3
--  ___divtq3
--  ___divha3
--  ___divsa3
--  ___divda3
--  ___divta3
--  ___udivuqq3
--  ___udivuhq3
--  ___udivusq3
--  ___udivudq3
--  ___udivutq3
--  ___udivuha3
--  ___udivusa3
--  ___udivuda3
--  ___udivuta3
--  ___ssdivqq3
--  ___ssdivhq3
--  ___ssdivsq3
--  ___ssdivdq3
--  ___ssdivtq3
--  ___ssdivha3
--  ___ssdivsa3
--  ___ssdivda3
--  ___ssdivta3
--  ___usdivuqq3
--  ___usdivuhq3
--  ___usdivusq3
--  ___usdivudq3
--  ___usdivutq3
--  ___usdivuha3
--  ___usdivusa3
--  ___usdivuda3
--  ___usdivuta3
--  ___negqq2
--  ___neghq2
--  ___negsq2
--  ___negdq2
--  ___negtq2
--  ___neguqq2
--  ___neguhq2
--  ___negusq2
--  ___negudq2
--  ___negutq2
--  ___negha2
--  ___negsa2
--  ___negda2
--  ___negta2
--  ___neguha2
--  ___negusa2
--  ___neguda2
--  ___neguta2
--  ___ssnegqq2
--  ___ssneghq2
--  ___ssnegsq2
--  ___ssnegdq2
--  ___ssnegtq2
--  ___ssnegha2
--  ___ssnegsa2
--  ___ssnegda2
--  ___ssnegta2
--  ___usneguqq2
--  ___usneguhq2
--  ___usnegusq2
--  ___usnegudq2
--  ___usnegutq2
--  ___usneguha2
--  ___usnegusa2
--  ___usneguda2
--  ___usneguta2
--  ___ashlqq3
--  ___ashlhq3
--  ___ashlsq3
--  ___ashldq3
--  ___ashltq3
--  ___ashluqq3
--  ___ashluhq3
--  ___ashlusq3
--  ___ashludq3
--  ___ashlutq3
--  ___ashlha3
--  ___ashlsa3
--  ___ashlda3
--  ___ashlta3
--  ___ashluha3
--  ___ashlusa3
--  ___ashluda3
--  ___ashluta3
--  ___ashrqq3
--  ___ashrhq3
--  ___ashrsq3
--  ___ashrdq3
--  ___ashrtq3
--  ___ashrha3
--  ___ashrsa3
--  ___ashrda3
--  ___ashrta3
--  ___lshruqq3
--  ___lshruhq3
--  ___lshrusq3
--  ___lshrudq3
--  ___lshrutq3
--  ___lshruha3
--  ___lshrusa3
--  ___lshruda3
--  ___lshruta3
--  ___ssashlqq3
--  ___ssashlhq3
--  ___ssashlsq3
--  ___ssashldq3
--  ___ssashltq3
--  ___ssashlha3
--  ___ssashlsa3
--  ___ssashlda3
--  ___ssashlta3
--  ___usashluqq3
--  ___usashluhq3
--  ___usashlusq3
--  ___usashludq3
--  ___usashlutq3
--  ___usashluha3
--  ___usashlusa3
--  ___usashluda3
--  ___usashluta3
--  ___cmpqq2
--  ___cmphq2
--  ___cmpsq2
--  ___cmpdq2
--  ___cmptq2
--  ___cmpuqq2
--  ___cmpuhq2
--  ___cmpusq2
--  ___cmpudq2
--  ___cmputq2
--  ___cmpha2
--  ___cmpsa2
--  ___cmpda2
--  ___cmpta2
--  ___cmpuha2
--  ___cmpusa2
--  ___cmpuda2
--  ___cmputa2
--  ___fractqqhq2
--  ___fractqqsq2
--  ___fractqqdq2
--  ___fractqqtq2
--  ___fractqqha
--  ___fractqqsa
--  ___fractqqda
--  ___fractqqta
--  ___fractqquqq
--  ___fractqquhq
--  ___fractqqusq
--  ___fractqqudq
--  ___fractqqutq
--  ___fractqquha
--  ___fractqqusa
--  ___fractqquda
--  ___fractqquta
--  ___fractqqqi
--  ___fractqqhi
--  ___fractqqsi
--  ___fractqqdi
--  ___fractqqti
--  ___fractqqsf
--  ___fractqqdf
--  ___fracthqqq2
--  ___fracthqsq2
--  ___fracthqdq2
--  ___fracthqtq2
--  ___fracthqha
--  ___fracthqsa
--  ___fracthqda
--  ___fracthqta
--  ___fracthquqq
--  ___fracthquhq
--  ___fracthqusq
--  ___fracthqudq
--  ___fracthqutq
--  ___fracthquha
--  ___fracthqusa
--  ___fracthquda
--  ___fracthquta
--  ___fracthqqi
--  ___fracthqhi
--  ___fracthqsi
--  ___fracthqdi
--  ___fracthqti
--  ___fracthqsf
--  ___fracthqdf
--  ___fractsqqq2
--  ___fractsqhq2
--  ___fractsqdq2
--  ___fractsqtq2
--  ___fractsqha
--  ___fractsqsa
--  ___fractsqda
--  ___fractsqta
--  ___fractsquqq
--  ___fractsquhq
--  ___fractsqusq
--  ___fractsqudq
--  ___fractsqutq
--  ___fractsquha
--  ___fractsqusa
--  ___fractsquda
--  ___fractsquta
--  ___fractsqqi
--  ___fractsqhi
--  ___fractsqsi
--  ___fractsqdi
--  ___fractsqti
--  ___fractsqsf
--  ___fractsqdf
--  ___fractdqqq2
--  ___fractdqhq2
--  ___fractdqsq2
--  ___fractdqtq2
--  ___fractdqha
--  ___fractdqsa
--  ___fractdqda
--  ___fractdqta
--  ___fractdquqq
--  ___fractdquhq
--  ___fractdqusq
--  ___fractdqudq
--  ___fractdqutq
--  ___fractdquha
--  ___fractdqusa
--  ___fractdquda
--  ___fractdquta
--  ___fractdqqi
--  ___fractdqhi
--  ___fractdqsi
--  ___fractdqdi
--  ___fractdqti
--  ___fractdqsf
--  ___fractdqdf
--  ___fracttqqq2
--  ___fracttqhq2
--  ___fracttqsq2
--  ___fracttqdq2
--  ___fracttqha
--  ___fracttqsa
--  ___fracttqda
--  ___fracttqta
--  ___fracttquqq
--  ___fracttquhq
--  ___fracttqusq
--  ___fracttqudq
--  ___fracttqutq
--  ___fracttquha
--  ___fracttqusa
--  ___fracttquda
--  ___fracttquta
--  ___fracttqqi
--  ___fracttqhi
--  ___fracttqsi
--  ___fracttqdi
--  ___fracttqti
--  ___fracttqsf
--  ___fracttqdf
--  ___fracthaqq
--  ___fracthahq
--  ___fracthasq
--  ___fracthadq
--  ___fracthatq
--  ___fracthasa2
--  ___fracthada2
--  ___fracthata2
--  ___fracthauqq
--  ___fracthauhq
--  ___fracthausq
--  ___fracthaudq
--  ___fracthautq
--  ___fracthauha
--  ___fracthausa
--  ___fracthauda
--  ___fracthauta
--  ___fracthaqi
--  ___fracthahi
--  ___fracthasi
--  ___fracthadi
--  ___fracthati
--  ___fracthasf
--  ___fracthadf
--  ___fractsaqq
--  ___fractsahq
--  ___fractsasq
--  ___fractsadq
--  ___fractsatq
--  ___fractsaha2
--  ___fractsada2
--  ___fractsata2
--  ___fractsauqq
--  ___fractsauhq
--  ___fractsausq
--  ___fractsaudq
--  ___fractsautq
--  ___fractsauha
--  ___fractsausa
--  ___fractsauda
--  ___fractsauta
--  ___fractsaqi
--  ___fractsahi
--  ___fractsasi
--  ___fractsadi
--  ___fractsati
--  ___fractsasf
--  ___fractsadf
--  ___fractdaqq
--  ___fractdahq
--  ___fractdasq
--  ___fractdadq
--  ___fractdatq
--  ___fractdaha2
--  ___fractdasa2
--  ___fractdata2
--  ___fractdauqq
--  ___fractdauhq
--  ___fractdausq
--  ___fractdaudq
--  ___fractdautq
--  ___fractdauha
--  ___fractdausa
--  ___fractdauda
--  ___fractdauta
--  ___fractdaqi
--  ___fractdahi
--  ___fractdasi
--  ___fractdadi
--  ___fractdati
--  ___fractdasf
--  ___fractdadf
--  ___fracttaqq
--  ___fracttahq
--  ___fracttasq
--  ___fracttadq
--  ___fracttatq
--  ___fracttaha2
--  ___fracttasa2
--  ___fracttada2
--  ___fracttauqq
--  ___fracttauhq
--  ___fracttausq
--  ___fracttaudq
--  ___fracttautq
--  ___fracttauha
--  ___fracttausa
--  ___fracttauda
--  ___fracttauta
--  ___fracttaqi
--  ___fracttahi
--  ___fracttasi
--  ___fracttadi
--  ___fracttati
--  ___fracttasf
--  ___fracttadf
--  ___fractuqqqq
--  ___fractuqqhq
--  ___fractuqqsq
--  ___fractuqqdq
--  ___fractuqqtq
--  ___fractuqqha
--  ___fractuqqsa
--  ___fractuqqda
--  ___fractuqqta
--  ___fractuqquhq2
--  ___fractuqqusq2
--  ___fractuqqudq2
--  ___fractuqqutq2
--  ___fractuqquha
--  ___fractuqqusa
--  ___fractuqquda
--  ___fractuqquta
--  ___fractuqqqi
--  ___fractuqqhi
--  ___fractuqqsi
--  ___fractuqqdi
--  ___fractuqqti
--  ___fractuqqsf
--  ___fractuqqdf
--  ___fractuhqqq
--  ___fractuhqhq
--  ___fractuhqsq
--  ___fractuhqdq
--  ___fractuhqtq
--  ___fractuhqha
--  ___fractuhqsa
--  ___fractuhqda
--  ___fractuhqta
--  ___fractuhquqq2
--  ___fractuhqusq2
--  ___fractuhqudq2
--  ___fractuhqutq2
--  ___fractuhquha
--  ___fractuhqusa
--  ___fractuhquda
--  ___fractuhquta
--  ___fractuhqqi
--  ___fractuhqhi
--  ___fractuhqsi
--  ___fractuhqdi
--  ___fractuhqti
--  ___fractuhqsf
--  ___fractuhqdf
--  ___fractusqqq
--  ___fractusqhq
--  ___fractusqsq
--  ___fractusqdq
--  ___fractusqtq
--  ___fractusqha
--  ___fractusqsa
--  ___fractusqda
--  ___fractusqta
--  ___fractusquqq2
--  ___fractusquhq2
--  ___fractusqudq2
--  ___fractusqutq2
--  ___fractusquha
--  ___fractusqusa
--  ___fractusquda
--  ___fractusquta
--  ___fractusqqi
--  ___fractusqhi
--  ___fractusqsi
--  ___fractusqdi
--  ___fractusqti
--  ___fractusqsf
--  ___fractusqdf
--  ___fractudqqq
--  ___fractudqhq
--  ___fractudqsq
--  ___fractudqdq
--  ___fractudqtq
--  ___fractudqha
--  ___fractudqsa
--  ___fractudqda
--  ___fractudqta
--  ___fractudquqq2
--  ___fractudquhq2
--  ___fractudqusq2
--  ___fractudqutq2
--  ___fractudquha
--  ___fractudqusa
--  ___fractudquda
--  ___fractudquta
--  ___fractudqqi
--  ___fractudqhi
--  ___fractudqsi
--  ___fractudqdi
--  ___fractudqti
--  ___fractudqsf
--  ___fractudqdf
--  ___fractutqqq
--  ___fractutqhq
--  ___fractutqsq
--  ___fractutqdq
--  ___fractutqtq
--  ___fractutqha
--  ___fractutqsa
--  ___fractutqda
--  ___fractutqta
--  ___fractutquqq2
--  ___fractutquhq2
--  ___fractutqusq2
--  ___fractutqudq2
--  ___fractutquha
--  ___fractutqusa
--  ___fractutquda
--  ___fractutquta
--  ___fractutqqi
--  ___fractutqhi
--  ___fractutqsi
--  ___fractutqdi
--  ___fractutqti
--  ___fractutqsf
--  ___fractutqdf
--  ___fractuhaqq
--  ___fractuhahq
--  ___fractuhasq
--  ___fractuhadq
--  ___fractuhatq
--  ___fractuhaha
--  ___fractuhasa
--  ___fractuhada
--  ___fractuhata
--  ___fractuhauqq
--  ___fractuhauhq
--  ___fractuhausq
--  ___fractuhaudq
--  ___fractuhautq
--  ___fractuhausa2
--  ___fractuhauda2
--  ___fractuhauta2
--  ___fractuhaqi
--  ___fractuhahi
--  ___fractuhasi
--  ___fractuhadi
--  ___fractuhati
--  ___fractuhasf
--  ___fractuhadf
--  ___fractusaqq
--  ___fractusahq
--  ___fractusasq
--  ___fractusadq
--  ___fractusatq
--  ___fractusaha
--  ___fractusasa
--  ___fractusada
--  ___fractusata
--  ___fractusauqq
--  ___fractusauhq
--  ___fractusausq
--  ___fractusaudq
--  ___fractusautq
--  ___fractusauha2
--  ___fractusauda2
--  ___fractusauta2
--  ___fractusaqi
--  ___fractusahi
--  ___fractusasi
--  ___fractusadi
--  ___fractusati
--  ___fractusasf
--  ___fractusadf
--  ___fractudaqq
--  ___fractudahq
--  ___fractudasq
--  ___fractudadq
--  ___fractudatq
--  ___fractudaha
--  ___fractudasa
--  ___fractudada
--  ___fractudata
--  ___fractudauqq
--  ___fractudauhq
--  ___fractudausq
--  ___fractudaudq
--  ___fractudautq
--  ___fractudauha2
--  ___fractudausa2
--  ___fractudauta2
--  ___fractudaqi
--  ___fractudahi
--  ___fractudasi
--  ___fractudadi
--  ___fractudati
--  ___fractudasf
--  ___fractudadf
--  ___fractutaqq
--  ___fractutahq
--  ___fractutasq
--  ___fractutadq
--  ___fractutatq
--  ___fractutaha
--  ___fractutasa
--  ___fractutada
--  ___fractutata
--  ___fractutauqq
--  ___fractutauhq
--  ___fractutausq
--  ___fractutaudq
--  ___fractutautq
--  ___fractutauha2
--  ___fractutausa2
--  ___fractutauda2
--  ___fractutaqi
--  ___fractutahi
--  ___fractutasi
--  ___fractutadi
--  ___fractutati
--  ___fractutasf
--  ___fractutadf
--  ___fractqiqq
--  ___fractqihq
--  ___fractqisq
--  ___fractqidq
--  ___fractqitq
--  ___fractqiha
--  ___fractqisa
--  ___fractqida
--  ___fractqita
--  ___fractqiuqq
--  ___fractqiuhq
--  ___fractqiusq
--  ___fractqiudq
--  ___fractqiutq
--  ___fractqiuha
--  ___fractqiusa
--  ___fractqiuda
--  ___fractqiuta
--  ___fracthiqq
--  ___fracthihq
--  ___fracthisq
--  ___fracthidq
--  ___fracthitq
--  ___fracthiha
--  ___fracthisa
--  ___fracthida
--  ___fracthita
--  ___fracthiuqq
--  ___fracthiuhq
--  ___fracthiusq
--  ___fracthiudq
--  ___fracthiutq
--  ___fracthiuha
--  ___fracthiusa
--  ___fracthiuda
--  ___fracthiuta
--  ___fractsiqq
--  ___fractsihq
--  ___fractsisq
--  ___fractsidq
--  ___fractsitq
--  ___fractsiha
--  ___fractsisa
--  ___fractsida
--  ___fractsita
--  ___fractsiuqq
--  ___fractsiuhq
--  ___fractsiusq
--  ___fractsiudq
--  ___fractsiutq
--  ___fractsiuha
--  ___fractsiusa
--  ___fractsiuda
--  ___fractsiuta
--  ___fractdiqq
--  ___fractdihq
--  ___fractdisq
--  ___fractdidq
--  ___fractditq
--  ___fractdiha
--  ___fractdisa
--  ___fractdida
--  ___fractdita
--  ___fractdiuqq
--  ___fractdiuhq
--  ___fractdiusq
--  ___fractdiudq
--  ___fractdiutq
--  ___fractdiuha
--  ___fractdiusa
--  ___fractdiuda
--  ___fractdiuta
--  ___fracttiqq
--  ___fracttihq
--  ___fracttisq
--  ___fracttidq
--  ___fracttitq
--  ___fracttiha
--  ___fracttisa
--  ___fracttida
--  ___fracttita
--  ___fracttiuqq
--  ___fracttiuhq
--  ___fracttiusq
--  ___fracttiudq
--  ___fracttiutq
--  ___fracttiuha
--  ___fracttiusa
--  ___fracttiuda
--  ___fracttiuta
--  ___fractsfqq
--  ___fractsfhq
--  ___fractsfsq
--  ___fractsfdq
--  ___fractsftq
--  ___fractsfha
--  ___fractsfsa
--  ___fractsfda
--  ___fractsfta
--  ___fractsfuqq
--  ___fractsfuhq
--  ___fractsfusq
--  ___fractsfudq
--  ___fractsfutq
--  ___fractsfuha
--  ___fractsfusa
--  ___fractsfuda
--  ___fractsfuta
--  ___fractdfqq
--  ___fractdfhq
--  ___fractdfsq
--  ___fractdfdq
--  ___fractdftq
--  ___fractdfha
--  ___fractdfsa
--  ___fractdfda
--  ___fractdfta
--  ___fractdfuqq
--  ___fractdfuhq
--  ___fractdfusq
--  ___fractdfudq
--  ___fractdfutq
--  ___fractdfuha
--  ___fractdfusa
--  ___fractdfuda
--  ___fractdfuta
--  ___satfractqqhq2
--  ___satfractqqsq2
--  ___satfractqqdq2
--  ___satfractqqtq2
--  ___satfractqqha
--  ___satfractqqsa
--  ___satfractqqda
--  ___satfractqqta
--  ___satfractqquqq
--  ___satfractqquhq
--  ___satfractqqusq
--  ___satfractqqudq
--  ___satfractqqutq
--  ___satfractqquha
--  ___satfractqqusa
--  ___satfractqquda
--  ___satfractqquta
--  ___satfracthqqq2
--  ___satfracthqsq2
--  ___satfracthqdq2
--  ___satfracthqtq2
--  ___satfracthqha
--  ___satfracthqsa
--  ___satfracthqda
--  ___satfracthqta
--  ___satfracthquqq
--  ___satfracthquhq
--  ___satfracthqusq
--  ___satfracthqudq
--  ___satfracthqutq
--  ___satfracthquha
--  ___satfracthqusa
--  ___satfracthquda
--  ___satfracthquta
--  ___satfractsqqq2
--  ___satfractsqhq2
--  ___satfractsqdq2
--  ___satfractsqtq2
--  ___satfractsqha
--  ___satfractsqsa
--  ___satfractsqda
--  ___satfractsqta
--  ___satfractsquqq
--  ___satfractsquhq
--  ___satfractsqusq
--  ___satfractsqudq
--  ___satfractsqutq
--  ___satfractsquha
--  ___satfractsqusa
--  ___satfractsquda
--  ___satfractsquta
--  ___satfractdqqq2
--  ___satfractdqhq2
--  ___satfractdqsq2
--  ___satfractdqtq2
--  ___satfractdqha
--  ___satfractdqsa
--  ___satfractdqda
--  ___satfractdqta
--  ___satfractdquqq
--  ___satfractdquhq
--  ___satfractdqusq
--  ___satfractdqudq
--  ___satfractdqutq
--  ___satfractdquha
--  ___satfractdqusa
--  ___satfractdquda
--  ___satfractdquta
--  ___satfracttqqq2
--  ___satfracttqhq2
--  ___satfracttqsq2
--  ___satfracttqdq2
--  ___satfracttqha
--  ___satfracttqsa
--  ___satfracttqda
--  ___satfracttqta
--  ___satfracttquqq
--  ___satfracttquhq
--  ___satfracttqusq
--  ___satfracttqudq
--  ___satfracttqutq
--  ___satfracttquha
--  ___satfracttqusa
--  ___satfracttquda
--  ___satfracttquta
--  ___satfracthaqq
--  ___satfracthahq
--  ___satfracthasq
--  ___satfracthadq
--  ___satfracthatq
--  ___satfracthasa2
--  ___satfracthada2
--  ___satfracthata2
--  ___satfracthauqq
--  ___satfracthauhq
--  ___satfracthausq
--  ___satfracthaudq
--  ___satfracthautq
--  ___satfracthauha
--  ___satfracthausa
--  ___satfracthauda
--  ___satfracthauta
--  ___satfractsaqq
--  ___satfractsahq
--  ___satfractsasq
--  ___satfractsadq
--  ___satfractsatq
--  ___satfractsaha2
--  ___satfractsada2
--  ___satfractsata2
--  ___satfractsauqq
--  ___satfractsauhq
--  ___satfractsausq
--  ___satfractsaudq
--  ___satfractsautq
--  ___satfractsauha
--  ___satfractsausa
--  ___satfractsauda
--  ___satfractsauta
--  ___satfractdaqq
--  ___satfractdahq
--  ___satfractdasq
--  ___satfractdadq
--  ___satfractdatq
--  ___satfractdaha2
--  ___satfractdasa2
--  ___satfractdata2
--  ___satfractdauqq
--  ___satfractdauhq
--  ___satfractdausq
--  ___satfractdaudq
--  ___satfractdautq
--  ___satfractdauha
--  ___satfractdausa
--  ___satfractdauda
--  ___satfractdauta
--  ___satfracttaqq
--  ___satfracttahq
--  ___satfracttasq
--  ___satfracttadq
--  ___satfracttatq
--  ___satfracttaha2
--  ___satfracttasa2
--  ___satfracttada2
--  ___satfracttauqq
--  ___satfracttauhq
--  ___satfracttausq
--  ___satfracttaudq
--  ___satfracttautq
--  ___satfracttauha
--  ___satfracttausa
--  ___satfracttauda
--  ___satfracttauta
--  ___satfractuqqqq
--  ___satfractuqqhq
--  ___satfractuqqsq
--  ___satfractuqqdq
--  ___satfractuqqtq
--  ___satfractuqqha
--  ___satfractuqqsa
--  ___satfractuqqda
--  ___satfractuqqta
--  ___satfractuqquhq2
--  ___satfractuqqusq2
--  ___satfractuqqudq2
--  ___satfractuqqutq2
--  ___satfractuqquha
--  ___satfractuqqusa
--  ___satfractuqquda
--  ___satfractuqquta
--  ___satfractuhqqq
--  ___satfractuhqhq
--  ___satfractuhqsq
--  ___satfractuhqdq
--  ___satfractuhqtq
--  ___satfractuhqha
--  ___satfractuhqsa
--  ___satfractuhqda
--  ___satfractuhqta
--  ___satfractuhquqq2
--  ___satfractuhqusq2
--  ___satfractuhqudq2
--  ___satfractuhqutq2
--  ___satfractuhquha
--  ___satfractuhqusa
--  ___satfractuhquda
--  ___satfractuhquta
--  ___satfractusqqq
--  ___satfractusqhq
--  ___satfractusqsq
--  ___satfractusqdq
--  ___satfractusqtq
--  ___satfractusqha
--  ___satfractusqsa
--  ___satfractusqda
--  ___satfractusqta
--  ___satfractusquqq2
--  ___satfractusquhq2
--  ___satfractusqudq2
--  ___satfractusqutq2
--  ___satfractusquha
--  ___satfractusqusa
--  ___satfractusquda
--  ___satfractusquta
--  ___satfractudqqq
--  ___satfractudqhq
--  ___satfractudqsq
--  ___satfractudqdq
--  ___satfractudqtq
--  ___satfractudqha
--  ___satfractudqsa
--  ___satfractudqda
--  ___satfractudqta
--  ___satfractudquqq2
--  ___satfractudquhq2
--  ___satfractudqusq2
--  ___satfractudqutq2
--  ___satfractudquha
--  ___satfractudqusa
--  ___satfractudquda
--  ___satfractudquta
--  ___satfractutqqq
--  ___satfractutqhq
--  ___satfractutqsq
--  ___satfractutqdq
--  ___satfractutqtq
--  ___satfractutqha
--  ___satfractutqsa
--  ___satfractutqda
--  ___satfractutqta
--  ___satfractutquqq2
--  ___satfractutquhq2
--  ___satfractutqusq2
--  ___satfractutqudq2
--  ___satfractutquha
--  ___satfractutqusa
--  ___satfractutquda
--  ___satfractutquta
--  ___satfractuhaqq
--  ___satfractuhahq
--  ___satfractuhasq
--  ___satfractuhadq
--  ___satfractuhatq
--  ___satfractuhaha
--  ___satfractuhasa
--  ___satfractuhada
--  ___satfractuhata
--  ___satfractuhauqq
--  ___satfractuhauhq
--  ___satfractuhausq
--  ___satfractuhaudq
--  ___satfractuhautq
--  ___satfractuhausa2
--  ___satfractuhauda2
--  ___satfractuhauta2
--  ___satfractusaqq
--  ___satfractusahq
--  ___satfractusasq
--  ___satfractusadq
--  ___satfractusatq
--  ___satfractusaha
--  ___satfractusasa
--  ___satfractusada
--  ___satfractusata
--  ___satfractusauqq
--  ___satfractusauhq
--  ___satfractusausq
--  ___satfractusaudq
--  ___satfractusautq
--  ___satfractusauha2
--  ___satfractusauda2
--  ___satfractusauta2
--  ___satfractudaqq
--  ___satfractudahq
--  ___satfractudasq
--  ___satfractudadq
--  ___satfractudatq
--  ___satfractudaha
--  ___satfractudasa
--  ___satfractudada
--  ___satfractudata
--  ___satfractudauqq
--  ___satfractudauhq
--  ___satfractudausq
--  ___satfractudaudq
--  ___satfractudautq
--  ___satfractudauha2
--  ___satfractudausa2
--  ___satfractudauta2
--  ___satfractutaqq
--  ___satfractutahq
--  ___satfractutasq
--  ___satfractutadq
--  ___satfractutatq
--  ___satfractutaha
--  ___satfractutasa
--  ___satfractutada
--  ___satfractutata
--  ___satfractutauqq
--  ___satfractutauhq
--  ___satfractutausq
--  ___satfractutaudq
--  ___satfractutautq
--  ___satfractutauha2
--  ___satfractutausa2
--  ___satfractutauda2
--  ___satfractqiqq
--  ___satfractqihq
--  ___satfractqisq
--  ___satfractqidq
--  ___satfractqitq
--  ___satfractqiha
--  ___satfractqisa
--  ___satfractqida
--  ___satfractqita
--  ___satfractqiuqq
--  ___satfractqiuhq
--  ___satfractqiusq
--  ___satfractqiudq
--  ___satfractqiutq
--  ___satfractqiuha
--  ___satfractqiusa
--  ___satfractqiuda
--  ___satfractqiuta
--  ___satfracthiqq
--  ___satfracthihq
--  ___satfracthisq
--  ___satfracthidq
--  ___satfracthitq
--  ___satfracthiha
--  ___satfracthisa
--  ___satfracthida
--  ___satfracthita
--  ___satfracthiuqq
--  ___satfracthiuhq
--  ___satfracthiusq
--  ___satfracthiudq
--  ___satfracthiutq
--  ___satfracthiuha
--  ___satfracthiusa
--  ___satfracthiuda
--  ___satfracthiuta
--  ___satfractsiqq
--  ___satfractsihq
--  ___satfractsisq
--  ___satfractsidq
--  ___satfractsitq
--  ___satfractsiha
--  ___satfractsisa
--  ___satfractsida
--  ___satfractsita
--  ___satfractsiuqq
--  ___satfractsiuhq
--  ___satfractsiusq
--  ___satfractsiudq
--  ___satfractsiutq
--  ___satfractsiuha
--  ___satfractsiusa
--  ___satfractsiuda
--  ___satfractsiuta
--  ___satfractdiqq
--  ___satfractdihq
--  ___satfractdisq
--  ___satfractdidq
--  ___satfractditq
--  ___satfractdiha
--  ___satfractdisa
--  ___satfractdida
--  ___satfractdita
--  ___satfractdiuqq
--  ___satfractdiuhq
--  ___satfractdiusq
--  ___satfractdiudq
--  ___satfractdiutq
--  ___satfractdiuha
--  ___satfractdiusa
--  ___satfractdiuda
--  ___satfractdiuta
--  ___satfracttiqq
--  ___satfracttihq
--  ___satfracttisq
--  ___satfracttidq
--  ___satfracttitq
--  ___satfracttiha
--  ___satfracttisa
--  ___satfracttida
--  ___satfracttita
--  ___satfracttiuqq
--  ___satfracttiuhq
--  ___satfracttiusq
--  ___satfracttiudq
--  ___satfracttiutq
--  ___satfracttiuha
--  ___satfracttiusa
--  ___satfracttiuda
--  ___satfracttiuta
--  ___satfractsfqq
--  ___satfractsfhq
--  ___satfractsfsq
--  ___satfractsfdq
--  ___satfractsftq
--  ___satfractsfha
--  ___satfractsfsa
--  ___satfractsfda
--  ___satfractsfta
--  ___satfractsfuqq
--  ___satfractsfuhq
--  ___satfractsfusq
--  ___satfractsfudq
--  ___satfractsfutq
--  ___satfractsfuha
--  ___satfractsfusa
--  ___satfractsfuda
--  ___satfractsfuta
--  ___satfractdfqq
--  ___satfractdfhq
--  ___satfractdfsq
--  ___satfractdfdq
--  ___satfractdftq
--  ___satfractdfha
--  ___satfractdfsa
--  ___satfractdfda
--  ___satfractdfta
--  ___satfractdfuqq
--  ___satfractdfuhq
--  ___satfractdfusq
--  ___satfractdfudq
--  ___satfractdfutq
--  ___satfractdfuha
--  ___satfractdfusa
--  ___satfractdfuda
--  ___satfractdfuta
--  ___fractunsqqqi
--  ___fractunsqqhi
--  ___fractunsqqsi
--  ___fractunsqqdi
--  ___fractunsqqti
--  ___fractunshqqi
--  ___fractunshqhi
--  ___fractunshqsi
--  ___fractunshqdi
--  ___fractunshqti
--  ___fractunssqqi
--  ___fractunssqhi
--  ___fractunssqsi
--  ___fractunssqdi
--  ___fractunssqti
--  ___fractunsdqqi
--  ___fractunsdqhi
--  ___fractunsdqsi
--  ___fractunsdqdi
--  ___fractunsdqti
--  ___fractunstqqi
--  ___fractunstqhi
--  ___fractunstqsi
--  ___fractunstqdi
--  ___fractunstqti
--  ___fractunshaqi
--  ___fractunshahi
--  ___fractunshasi
--  ___fractunshadi
--  ___fractunshati
--  ___fractunssaqi
--  ___fractunssahi
--  ___fractunssasi
--  ___fractunssadi
--  ___fractunssati
--  ___fractunsdaqi
--  ___fractunsdahi
--  ___fractunsdasi
--  ___fractunsdadi
--  ___fractunsdati
--  ___fractunstaqi
--  ___fractunstahi
--  ___fractunstasi
--  ___fractunstadi
--  ___fractunstati
--  ___fractunsuqqqi
--  ___fractunsuqqhi
--  ___fractunsuqqsi
--  ___fractunsuqqdi
--  ___fractunsuqqti
--  ___fractunsuhqqi
--  ___fractunsuhqhi
--  ___fractunsuhqsi
--  ___fractunsuhqdi
--  ___fractunsuhqti
--  ___fractunsusqqi
--  ___fractunsusqhi
--  ___fractunsusqsi
--  ___fractunsusqdi
--  ___fractunsusqti
--  ___fractunsudqqi
--  ___fractunsudqhi
--  ___fractunsudqsi
--  ___fractunsudqdi
--  ___fractunsudqti
--  ___fractunsutqqi
--  ___fractunsutqhi
--  ___fractunsutqsi
--  ___fractunsutqdi
--  ___fractunsutqti
--  ___fractunsuhaqi
--  ___fractunsuhahi
--  ___fractunsuhasi
--  ___fractunsuhadi
--  ___fractunsuhati
--  ___fractunsusaqi
--  ___fractunsusahi
--  ___fractunsusasi
--  ___fractunsusadi
--  ___fractunsusati
--  ___fractunsudaqi
--  ___fractunsudahi
--  ___fractunsudasi
--  ___fractunsudadi
--  ___fractunsudati
--  ___fractunsutaqi
--  ___fractunsutahi
--  ___fractunsutasi
--  ___fractunsutadi
--  ___fractunsutati
--  ___fractunsqiqq
--  ___fractunsqihq
--  ___fractunsqisq
--  ___fractunsqidq
--  ___fractunsqitq
--  ___fractunsqiha
--  ___fractunsqisa
--  ___fractunsqida
--  ___fractunsqita
--  ___fractunsqiuqq
--  ___fractunsqiuhq
--  ___fractunsqiusq
--  ___fractunsqiudq
--  ___fractunsqiutq
--  ___fractunsqiuha
--  ___fractunsqiusa
--  ___fractunsqiuda
--  ___fractunsqiuta
--  ___fractunshiqq
--  ___fractunshihq
--  ___fractunshisq
--  ___fractunshidq
--  ___fractunshitq
--  ___fractunshiha
--  ___fractunshisa
--  ___fractunshida
--  ___fractunshita
--  ___fractunshiuqq
--  ___fractunshiuhq
--  ___fractunshiusq
--  ___fractunshiudq
--  ___fractunshiutq
--  ___fractunshiuha
--  ___fractunshiusa
--  ___fractunshiuda
--  ___fractunshiuta
--  ___fractunssiqq
--  ___fractunssihq
--  ___fractunssisq
--  ___fractunssidq
--  ___fractunssitq
--  ___fractunssiha
--  ___fractunssisa
--  ___fractunssida
--  ___fractunssita
--  ___fractunssiuqq
--  ___fractunssiuhq
--  ___fractunssiusq
--  ___fractunssiudq
--  ___fractunssiutq
--  ___fractunssiuha
--  ___fractunssiusa
--  ___fractunssiuda
--  ___fractunssiuta
--  ___fractunsdiqq
--  ___fractunsdihq
--  ___fractunsdisq
--  ___fractunsdidq
--  ___fractunsditq
--  ___fractunsdiha
--  ___fractunsdisa
--  ___fractunsdida
--  ___fractunsdita
--  ___fractunsdiuqq
--  ___fractunsdiuhq
--  ___fractunsdiusq
--  ___fractunsdiudq
--  ___fractunsdiutq
--  ___fractunsdiuha
--  ___fractunsdiusa
--  ___fractunsdiuda
--  ___fractunsdiuta
--  ___fractunstiqq
--  ___fractunstihq
--  ___fractunstisq
--  ___fractunstidq
--  ___fractunstitq
--  ___fractunstiha
--  ___fractunstisa
--  ___fractunstida
--  ___fractunstita
--  ___fractunstiuqq
--  ___fractunstiuhq
--  ___fractunstiusq
--  ___fractunstiudq
--  ___fractunstiutq
--  ___fractunstiuha
--  ___fractunstiusa
--  ___fractunstiuda
--  ___fractunstiuta
--  ___satfractunsqiqq
--  ___satfractunsqihq
--  ___satfractunsqisq
--  ___satfractunsqidq
--  ___satfractunsqitq
--  ___satfractunsqiha
--  ___satfractunsqisa
--  ___satfractunsqida
--  ___satfractunsqita
--  ___satfractunsqiuqq
--  ___satfractunsqiuhq
--  ___satfractunsqiusq
--  ___satfractunsqiudq
--  ___satfractunsqiutq
--  ___satfractunsqiuha
--  ___satfractunsqiusa
--  ___satfractunsqiuda
--  ___satfractunsqiuta
--  ___satfractunshiqq
--  ___satfractunshihq
--  ___satfractunshisq
--  ___satfractunshidq
--  ___satfractunshitq
--  ___satfractunshiha
--  ___satfractunshisa
--  ___satfractunshida
--  ___satfractunshita
--  ___satfractunshiuqq
--  ___satfractunshiuhq
--  ___satfractunshiusq
--  ___satfractunshiudq
--  ___satfractunshiutq
--  ___satfractunshiuha
--  ___satfractunshiusa
--  ___satfractunshiuda
--  ___satfractunshiuta
--  ___satfractunssiqq
--  ___satfractunssihq
--  ___satfractunssisq
--  ___satfractunssidq
--  ___satfractunssitq
--  ___satfractunssiha
--  ___satfractunssisa
--  ___satfractunssida
--  ___satfractunssita
--  ___satfractunssiuqq
--  ___satfractunssiuhq
--  ___satfractunssiusq
--  ___satfractunssiudq
--  ___satfractunssiutq
--  ___satfractunssiuha
--  ___satfractunssiusa
--  ___satfractunssiuda
--  ___satfractunssiuta
--  ___satfractunsdiqq
--  ___satfractunsdihq
--  ___satfractunsdisq
--  ___satfractunsdidq
--  ___satfractunsditq
--  ___satfractunsdiha
--  ___satfractunsdisa
--  ___satfractunsdida
--  ___satfractunsdita
--  ___satfractunsdiuqq
--  ___satfractunsdiuhq
--  ___satfractunsdiusq
--  ___satfractunsdiudq
--  ___satfractunsdiutq
--  ___satfractunsdiuha
--  ___satfractunsdiusa
--  ___satfractunsdiuda
--  ___satfractunsdiuta
--  ___satfractunstiqq
--  ___satfractunstihq
--  ___satfractunstisq
--  ___satfractunstidq
--  ___satfractunstitq
--  ___satfractunstiha
--  ___satfractunstisa
--  ___satfractunstida
--  ___satfractunstita
--  ___satfractunstiuqq
--  ___satfractunstiuhq
--  ___satfractunstiusq
--  ___satfractunstiudq
--  ___satfractunstiutq
--  ___satfractunstiuha
--  ___satfractunstiusa
--  ___satfractunstiuda
--  ___satfractunstiuta
--}
--
--%inherit GCC_4.4.0 GCC_4.3.0
--GCC_4.4.0 {
--  ___sync_fetch_and_add_1
--  ___sync_fetch_and_sub_1
--  ___sync_fetch_and_or_1
--  ___sync_fetch_and_and_1
--  ___sync_fetch_and_xor_1
--  ___sync_fetch_and_nand_1
--  ___sync_add_and_fetch_1
--  ___sync_sub_and_fetch_1
--  ___sync_or_and_fetch_1
--  ___sync_and_and_fetch_1
--  ___sync_xor_and_fetch_1
--  ___sync_nand_and_fetch_1
--  ___sync_bool_compare_and_swap_1
--  ___sync_val_compare_and_swap_1
--  ___sync_lock_test_and_set_1
--
--  ___sync_fetch_and_add_2
--  ___sync_fetch_and_sub_2
--  ___sync_fetch_and_or_2
--  ___sync_fetch_and_and_2
--  ___sync_fetch_and_xor_2
--  ___sync_fetch_and_nand_2
--  ___sync_add_and_fetch_2
--  ___sync_sub_and_fetch_2
--  ___sync_or_and_fetch_2
--  ___sync_and_and_fetch_2
--  ___sync_xor_and_fetch_2
--  ___sync_nand_and_fetch_2
--  ___sync_bool_compare_and_swap_2
--  ___sync_val_compare_and_swap_2
--  ___sync_lock_test_and_set_2
--
--  ___sync_fetch_and_add_4
--  ___sync_fetch_and_sub_4
--  ___sync_fetch_and_or_4
--  ___sync_fetch_and_and_4
--  ___sync_fetch_and_xor_4
--  ___sync_fetch_and_nand_4
--  ___sync_add_and_fetch_4
--  ___sync_sub_and_fetch_4
--  ___sync_or_and_fetch_4
--  ___sync_and_and_fetch_4
--  ___sync_xor_and_fetch_4
--  ___sync_nand_and_fetch_4
--  ___sync_bool_compare_and_swap_4
--  ___sync_val_compare_and_swap_4
--  ___sync_lock_test_and_set_4
--
--  ___sync_fetch_and_add_8
--  ___sync_fetch_and_sub_8
--  ___sync_fetch_and_or_8
--  ___sync_fetch_and_and_8
--  ___sync_fetch_and_xor_8
--  ___sync_fetch_and_nand_8
--  ___sync_add_and_fetch_8
--  ___sync_sub_and_fetch_8
--  ___sync_or_and_fetch_8
--  ___sync_and_and_fetch_8
--  ___sync_xor_and_fetch_8
--  ___sync_nand_and_fetch_8
--  ___sync_bool_compare_and_swap_8
--  ___sync_val_compare_and_swap_8
--  ___sync_lock_test_and_set_8
--
--  ___sync_fetch_and_add_16
--  ___sync_fetch_and_sub_16
--  ___sync_fetch_and_or_16
--  ___sync_fetch_and_and_16
--  ___sync_fetch_and_xor_16
--  ___sync_fetch_and_nand_16
--  ___sync_add_and_fetch_16
--  ___sync_sub_and_fetch_16
--  ___sync_or_and_fetch_16
--  ___sync_and_and_fetch_16
--  ___sync_xor_and_fetch_16
--  ___sync_nand_and_fetch_16
--  ___sync_bool_compare_and_swap_16
--  ___sync_val_compare_and_swap_16
--  ___sync_lock_test_and_set_16
--
--  ___sync_synchronize
--}
--
--%inherit GCC_4.5.0 GCC_4.4.0
--GCC_4.5.0 {
--  ___unordxf2
--  ___unordtf2
-+  __smulsi3_highpart
-+  __umulsi3_highpart
- }
-diff --git a/libgcc/config/bfin/t-linux b/libgcc/config/bfin/t-linux
-index 1c42e48..8898157 100644
---- a/libgcc/config/bfin/t-linux
-+++ b/libgcc/config/bfin/t-linux
-@@ -1 +1,2 @@
--SHLIB_MAPFILES = $(srcdir)/config/bfin/libgcc-glibc.ver
-+SHLIB_MAPFILES += $(srcdir)/config/bfin/libgcc-glibc.ver
-+SHLIB_MKMAP_OPTS = -v skip_underscore=1
--- 
-2.7.4
-
diff --git a/patches/gcc/linaro-6.3-2017.02/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/patches/gcc/linaro-6.3-2017.02/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
deleted file mode 100644
index ce49de7..0000000
--- a/patches/gcc/linaro-6.3-2017.02/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9d9f97ca5d1ceba66677bf406c9b31027dc1f22e Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Fri, 19 Aug 2016 13:54:46 +0200
-Subject: [PATCH] libgcc: fix DWARF compilation with FDPIC targets
-
-The build of unwind-dw2-fde-dip.c currently fails for FDPIC targets with
-the following error:
-
-libgcc/unwind-dw2-fde-dip.c:167:31: error: storage size of 'load_base' isn't known
-   struct elf32_fdpic_loadaddr load_base;
-
-This patch addresses that by defining load_base with the appropriate
-type on FDPIC targets. It has been tested on FRV and Blackfin.
-
-Fixes PR gcc/68468.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libgcc/unwind-dw2-fde-dip.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
-index f7a1c3f..801bce8 100644
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -124,7 +124,11 @@ static struct frame_hdr_cache_element
- {
-   _Unwind_Ptr pc_low;
-   _Unwind_Ptr pc_high;
-+#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__
-+  struct elf32_fdpic_loadaddr load_base;
-+#else
-   _Unwind_Ptr load_base;
-+#endif
-   const ElfW(Phdr) *p_eh_frame_hdr;
-   const ElfW(Phdr) *p_dynamic;
-   struct frame_hdr_cache_element *link;
-@@ -163,7 +167,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
-   struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr;
-   const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic;
-   long n, match;
--#ifdef __FRV_FDPIC__
-+#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__
-   struct elf32_fdpic_loadaddr load_base;
- #else
-   _Unwind_Ptr load_base;
-@@ -347,7 +351,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
- 	    break;
- 	  }
-     }
--# elif defined __FRV_FDPIC__ && defined __linux__
-+# elif (defined __FRV_FDPIC__ || defined __BFIN_FDPIC__) && defined __linux__
-   data->dbase = load_base.got_value;
- # else
- #  error What is DW_EH_PE_datarel base on this platform?
--- 
-2.7.4
-
diff --git a/patches/gcc/linaro-6.3-2017.02/895-bfin-define-REENTRANT.patch b/patches/gcc/linaro-6.3-2017.02/895-bfin-define-REENTRANT.patch
deleted file mode 100644
index e2828a5..0000000
--- a/patches/gcc/linaro-6.3-2017.02/895-bfin-define-REENTRANT.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-enable _REENTRANT when -lpthread is used
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-6.2.0.orig/gcc/config/bfin/linux.h gcc-6.2.0/gcc/config/bfin/linux.h
---- gcc-6.2.0.orig/gcc/config/bfin/linux.h	2016-01-04 15:30:50.000000000 +0100
-+++ gcc-6.2.0/gcc/config/bfin/linux.h	2016-09-30 20:48:17.446636819 +0200
-@@ -38,6 +38,9 @@
-   "%{static:--start-group} %{mfast-fp:-lbffastfp} %G %L %{static:--end-group} \
-    %{!static:%{mfast-fp:-lbffastfp} %G}"
- 
-+#undef CPP_SPEC
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
- #undef LINK_SPEC
- #define LINK_SPEC "\
-   %{mfdpic: -m elf32bfinfd -z text} %{shared} %{pie} \
diff --git a/patches/gcc/linaro-6.3-2017.02/900-libgfortran-missing-include.patch b/patches/gcc/linaro-6.3-2017.02/900-libgfortran-missing-include.patch
deleted file mode 100644
index 1f47469..0000000
--- a/patches/gcc/linaro-6.3-2017.02/900-libgfortran-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc-6.3.0/libgfortran/io/close.c.org	2017-01-17 09:43:48.395850000 +0100
-+++ gcc-6.3.0/libgfortran/io/close.c	2017-01-17 09:21:05.000000000 +0100
-@@ -25,6 +25,7 @@
- #include "io.h"
- #include "unix.h"
- #include <limits.h>
-+#include <stdlib.h>
- 
- typedef enum
- { CLOSE_DELETE, CLOSE_KEEP, CLOSE_UNSPECIFIED }
diff --git a/patches/gcc/linaro-6.3-2017.02/910-nios2-bad-multilib-default.patch b/patches/gcc/linaro-6.3-2017.02/910-nios2-bad-multilib-default.patch
deleted file mode 100644
index 61989e5..0000000
--- a/patches/gcc/linaro-6.3-2017.02/910-nios2-bad-multilib-default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/nios2.h gcc-6.2.0/gcc/config/nios2/nios2.h
---- gcc-6.2.0.orig/gcc/config/nios2/nios2.h	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/nios2.h	2016-11-29 10:29:55.069624746 -0800
-@@ -63,11 +63,11 @@
- #if TARGET_ENDIAN_DEFAULT == 0
- # define ASM_SPEC "%{!meb:-EL} %{meb:-EB} %{march=*:-march=%*}"
- # define LINK_SPEC_ENDIAN "%{!meb:-EL} %{meb:-EB}"
--# define MULTILIB_DEFAULTS { "EL" }
-+# define MULTILIB_DEFAULTS { "mel" }
- #else
- # define ASM_SPEC "%{!mel:-EB} %{mel:-EL} %{march=*:-march=%*}"
- # define LINK_SPEC_ENDIAN "%{!mel:-EB} %{mel:-EL}"
--# define MULTILIB_DEFAULTS { "EB" }
-+# define MULTILIB_DEFAULTS { "meb" }
- #endif
- 
- #define LINK_SPEC LINK_SPEC_ENDIAN \
-diff -ur gcc-6.2.0.orig/gcc/config/nios2/t-nios2 gcc-6.2.0/gcc/config/nios2/t-nios2
---- gcc-6.2.0.orig/gcc/config/nios2/t-nios2	2016-11-29 10:27:50.364479625 -0800
-+++ gcc-6.2.0/gcc/config/nios2/t-nios2	2016-11-29 10:29:03.517151014 -0800
-@@ -22,6 +22,5 @@
- # MULTILIB_DIRNAMES = nomul mulx fpu-60-1 fpu-60-2
- # MULTILIB_EXCEPTIONS = 
- 
--# MULTILIB_OPTIONS += EL/EB
-+# MULTILIB_OPTIONS += mel/meb
- # MULTILIB_DIRNAMES += le be
--# MULTILIB_MATCHES += EL=mel EB=meb
diff --git a/patches/gcc/linaro-6.3-2017.02/930-libgcc-disable-split-stack-nothreads.patch b/patches/gcc/linaro-6.3-2017.02/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 07f9a73..0000000
--- a/patches/gcc/linaro-6.3-2017.02/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
---- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/patches/gcc/linaro-6.3-2017.02/940-uclinux-enable-threads.patch b/patches/gcc/linaro-6.3-2017.02/940-uclinux-enable-threads.patch
deleted file mode 100644
index 490a55b..0000000
--- a/patches/gcc/linaro-6.3-2017.02/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
---- gcc-5.4.0.orig/gcc/config.gcc	2015-09-10 16:17:53.000000000 +0200
-+++ gcc-5.4.0/gcc/config.gcc	2016-07-01 21:26:02.772958441 +0200
-@@ -808,6 +808,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/patches/gdb/6.8a/100-dwarf-stack-overflow.patch b/patches/gdb/6.8a/100-dwarf-stack-overflow.patch
deleted file mode 100644
index 344d5a3..0000000
--- a/patches/gdb/6.8a/100-dwarf-stack-overflow.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/80_all_gdb-6.5-dwarf-stack-overflow.patch
--= BEGIN original header =-
-http://bugs.gentoo.org/144833
-
-for gdb/ChangeLog:
-2006-08-22  Will Drewry <wad@google.com>
-	    Tavis Ormandy <taviso@google.com>
-
-	* dwarf2read.c (decode_locdesc): Enforce location description stack
-	boundaries.
-	* dwarfread.c (locval): Likewise.
-
--= END original header =-
-diff -durN gdb-6.8.orig/gdb/dwarf2read.c gdb-6.8/gdb/dwarf2read.c
---- gdb-6.8.orig/gdb/dwarf2read.c	2008-03-10 15:18:10.000000000 +0100
-+++ gdb-6.8/gdb/dwarf2read.c	2008-06-17 16:07:31.000000000 +0200
-@@ -9124,8 +9124,7 @@
-    callers will only want a very basic result and this can become a
-    complaint.
- 
--   Note that stack[0] is unused except as a default error return.
--   Note that stack overflow is not yet handled.  */
-+   Note that stack[0] is unused except as a default error return. */
- 
- static CORE_ADDR
- decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
-@@ -9142,7 +9141,7 @@
- 
-   i = 0;
-   stacki = 0;
--  stack[stacki] = 0;
-+  stack[++stacki] = 0;
- 
-   while (i < size)
-     {
-@@ -9324,6 +9323,16 @@
- 		     dwarf_stack_op_name (op));
- 	  return (stack[stacki]);
- 	}
-+      /* Enforce maximum stack depth of size-1 to avoid ++stacki writing
-+         outside of the allocated space. Also enforce minimum > 0.
-+         -- wad@google.com 14 Aug 2006 */
-+      if (stacki >= sizeof (stack) / sizeof (*stack) - 1)
-+	internal_error (__FILE__, __LINE__,
-+	                _("location description stack too deep: %d"),
-+	                stacki);
-+      if (stacki <= 0)
-+	internal_error (__FILE__, __LINE__,
-+	                _("location description stack too shallow"));
-     }
-   return (stack[stacki]);
- }
diff --git a/patches/gdb/6.8a/110-security-errata-20050610.patch b/patches/gdb/6.8a/110-security-errata-20050610.patch
deleted file mode 100644
index 27e8174..0000000
--- a/patches/gdb/6.8a/110-security-errata-20050610.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/35_all_gdb-6.3-security-errata-20050610.patch
--= BEGIN original header =-
-2005-06-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * gdb.base/gdbinit.exp: New testcase.
-        * gdb.base/gdbinit.sample: Sample .gdbinit for gdbinit.exp.
-
-2005-06-08  Daniel Jacobowitz  <dan@codesourcery.com>
-            Jeff Johnston  <jjohnstn@redhat.com>
-
-        * Makefile.in (cli-cmds.o): Update.
-        * configure.in: Add check for getuid.
-        * configure: Regenerated.
-        * config.in: Ditto.
-        * main.c (captured_main): Pass -1 to source_command when loading
-        gdbinit files.
-        * cli/cli-cmds.c: Include "gdb_stat.h" and <fcntl.h>.
-        (source_command): Update documentation.  Check permissions if
-        FROM_TTY is -1.
-
--= END original header =-
-diff -durN gdb-6.8.orig/gdb/Makefile.in gdb-6.8/gdb/Makefile.in
---- gdb-6.8.orig/gdb/Makefile.in	2008-03-17 13:15:08.000000000 +0100
-+++ gdb-6.8/gdb/Makefile.in	2008-06-17 16:07:33.000000000 +0200
-@@ -3004,7 +3004,7 @@
- 	$(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \
- 	$(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \
- 	$(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \
--	$(tui_h)
-+	$(tui_h) $(gdb_stat_h)
- 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c
- cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \
- 	$(gdb_regex_h) $(gdb_string_h) $(completer_h) $(ui_out_h) \
-diff -durN gdb-6.8.orig/gdb/cli/cli-cmds.c gdb-6.8/gdb/cli/cli-cmds.c
---- gdb-6.8.orig/gdb/cli/cli-cmds.c	2008-01-01 23:53:14.000000000 +0100
-+++ gdb-6.8/gdb/cli/cli-cmds.c	2008-06-17 16:07:33.000000000 +0200
-@@ -36,6 +36,7 @@
- #include "objfiles.h"
- #include "source.h"
- #include "disasm.h"
-+#include "gdb_stat.h"
- 
- #include "ui-out.h"
- 
-@@ -459,12 +460,31 @@
- 
-   if (fd == -1)
-     {
--      if (from_tty)
-+      if (from_tty > 0)
- 	perror_with_name (file);
-       else
- 	return;
-     }
- 
-+#ifdef HAVE_GETUID
-+  if (from_tty == -1)
-+    {
-+      struct stat statbuf;
-+      if (fstat (fd, &statbuf) < 0)
-+	{
-+	  perror_with_name (file);
-+	  close (fd);
-+	  return;
-+	}
-+      if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH))
-+	{
-+          warning (_("not using untrusted file \"%s\""), file);
-+	  close (fd);
-+	  return;
-+	}
-+    }
-+#endif
-+
-   stream = fdopen (fd, FOPEN_RT);
-   script_from_file (stream, file);
- 
-diff -durN gdb-6.8.orig/gdb/main.c gdb-6.8/gdb/main.c
---- gdb-6.8.orig/gdb/main.c	2008-01-05 17:49:53.000000000 +0100
-+++ gdb-6.8/gdb/main.c	2008-06-17 16:07:33.000000000 +0200
-@@ -690,7 +690,7 @@
- 
-       if (!inhibit_gdbinit)
- 	{
--	  catch_command_errors (source_script, homeinit, 0, RETURN_MASK_ALL);
-+	  catch_command_errors (source_script, homeinit, -1, RETURN_MASK_ALL);
- 	}
- 
-       /* Do stats; no need to do them elsewhere since we'll only
-@@ -778,7 +778,7 @@
-       || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat)))
-     if (!inhibit_gdbinit)
-       {
--	catch_command_errors (source_script, gdbinit, 0, RETURN_MASK_ALL);
-+	catch_command_errors (source_script, gdbinit, -1, RETURN_MASK_ALL);
-       }
- 
-   for (i = 0; i < ncmd; i++)
-diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp gdb-6.8/gdb/testsuite/gdb.base/gdbinit.exp
---- gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.exp	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/gdbinit.exp	2008-06-17 16:07:33.000000000 +0200
-@@ -0,0 +1,98 @@
-+#   Copyright 2005
-+#   Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-+
-+# Please email any bugs, comments, and/or additions to this file to:
-+# bug-gdb@prep.ai.mit.edu
-+
-+# This file was written by Jeff Johnston <jjohnstn@redhat.com>.
-+
-+if $tracelevel then {
-+    strace $tracelevel
-+}
-+
-+set prms_id 0
-+set bug_id 0
-+
-+# are we on a target board
-+if [is_remote target] {
-+    return
-+}
-+
-+
-+global verbose
-+global GDB
-+global GDBFLAGS
-+global gdb_prompt
-+global timeout
-+global gdb_spawn_id;
-+                                                                                
-+gdb_stop_suppressing_tests;
-+                                                                                
-+verbose "Spawning $GDB -nw"
-+                                                                                
-+if [info exists gdb_spawn_id] {
-+    return 0;
-+}
-+                                                                                
-+if ![is_remote host] {
-+   if { [which $GDB] == 0 } then {
-+        perror "$GDB does not exist."
-+        exit 1
-+    }
-+}
-+
-+set env(HOME) [pwd]
-+remote_exec build "rm .gdbinit"
-+remote_exec build "cp ${srcdir}/${subdir}/gdbinit.sample .gdbinit"
-+remote_exec build "chmod 646 .gdbinit"
-+
-+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $GDB failed."
-+    return 1;
-+}
-+gdb_expect 360 {
-+    -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
-+        pass "untrusted .gdbinit caught."
-+    }
-+    -re "$gdb_prompt $"     {
-+        fail "untrusted .gdbinit caught."
-+    }
-+    timeout {
-+        fail "(timeout) untrusted .gdbinit caught."
-+    }
-+}
-+
-+remote_exec build "chmod 644 .gdbinit"
-+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
-+if { $res < 0 || $res == "" } {
-+    perror "Spawning $GDB failed."
-+    return 1;
-+}
-+gdb_expect 360 {
-+    -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
-+        fail "trusted .gdbinit allowed."
-+    }
-+    -re "in gdbinit.*$gdb_prompt $"     {
-+        pass "trusted .gdbinit allowed."
-+    }
-+    timeout {
-+        fail "(timeout) trusted .gdbinit allowed."
-+    }
-+}
-+
-+remote_exec build "rm .gdbinit"
-diff -durN gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.sample gdb-6.8/gdb/testsuite/gdb.base/gdbinit.sample
---- gdb-6.8.orig/gdb/testsuite/gdb.base/gdbinit.sample	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/gdbinit.sample	2008-06-17 16:07:33.000000000 +0200
-@@ -0,0 +1 @@
-+echo "\nin gdbinit"
diff --git a/patches/gdb/6.8a/120-tdep-opcode-include-workaround.patch b/patches/gdb/6.8a/120-tdep-opcode-include-workaround.patch
deleted file mode 100644
index 61fdef4..0000000
--- a/patches/gdb/6.8a/120-tdep-opcode-include-workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Original patch from gentoo: gentoo/src/patchsets/gdb/6.8/20_all_gdb-tdep-opcode-include-workaround.patch
--= BEGIN original header =-
-workaround build failure
-
-http://bugs.gentoo.org/216368
-
--= END original header =-
-diff -durN gdb-6.8.orig/gdb/frv-tdep.c gdb-6.8/gdb/frv-tdep.c
---- gdb-6.8.orig/gdb/frv-tdep.c	2008-01-11 14:19:59.000000000 +0100
-+++ gdb-6.8/gdb/frv-tdep.c	2008-06-17 16:07:34.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "gdb_assert.h"
- #include "sim-regno.h"
- #include "gdb/sim-frv.h"
--#include "opcodes/frv-desc.h"	/* for the H_SPR_... enums */
-+#include "../opcodes/frv-desc.h"	/* for the H_SPR_... enums */
- #include "symtab.h"
- #include "elf-bfd.h"
- #include "elf/frv.h"
-diff -durN gdb-6.8.orig/gdb/mep-tdep.c gdb-6.8/gdb/mep-tdep.c
---- gdb-6.8.orig/gdb/mep-tdep.c	2008-01-11 14:20:02.000000000 +0100
-+++ gdb-6.8/gdb/mep-tdep.c	2008-06-17 16:07:34.000000000 +0200
-@@ -53,8 +53,8 @@
- 
- /* Get the user's customized MeP coprocessor register names from
-    libopcodes.  */
--#include "opcodes/mep-desc.h"
--#include "opcodes/mep-opc.h"
-+#include "../opcodes/mep-desc.h"
-+#include "../opcodes/mep-opc.h"
- 
- 
- /* The gdbarch_tdep structure.  */
diff --git a/patches/gdb/6.8a/130-reg-no-longer-active.patch b/patches/gdb/6.8a/130-reg-no-longer-active.patch
deleted file mode 100644
index 1c7e7e0..0000000
--- a/patches/gdb/6.8a/130-reg-no-longer-active.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix bug reported by Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:
-See: http://sourceware.org/ml/crossgcc/2009-05/msg00055.html
-     https://bugzilla.redhat.com/show_bug.cgi?id=436037
-
-Fix from: http://cvs.fedoraproject.org/viewvc/devel/gdb/gdb-6.8-bz436037-reg-no-longer-active.patch?revision=1.1
-
-diff -d -urpN src.0/gdb/valops.c src.1/gdb/valops.c
---- src.0/gdb/valops.c	2008-07-27 04:00:03.000000000 +0200
-+++ src.1/gdb/valops.c	2008-07-31 15:17:42.000000000 +0200
-@@ -813,10 +813,18 @@ value_assign (struct value *toval, struc
- 	struct frame_info *frame;
- 	int value_reg;
- 
--	/* Figure out which frame this is in currently.  */
--	frame = frame_find_by_id (VALUE_FRAME_ID (toval));
- 	value_reg = VALUE_REGNUM (toval);
- 
-+	/* Figure out which frame this is in currently.  */
-+	frame = frame_find_by_id (VALUE_FRAME_ID (toval));
-+	/* "set $reg+=1" should work on programs with no debug info,
-+	   but frame_find_by_id returns NULL here (RH bug 436037).
-+	   Use current frame, it represents CPU state in this case.
-+	   If frame_find_by_id is changed to do it internally
-+	   (it is contemplated there), remove this.  */
-+	if (!frame)
-+	  frame = get_current_frame ();
-+	/* Probably never happens.  */
- 	if (!frame)
- 	  error (_("Value being assigned to is no longer active."));
- 	
diff --git a/patches/gdb/6.8a/140-sim-ppc-have-config-h.patch b/patches/gdb/6.8a/140-sim-ppc-have-config-h.patch
deleted file mode 100644
index f3723b5..0000000
--- a/patches/gdb/6.8a/140-sim-ppc-have-config-h.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Fix for canadian cross build of sim/ppc
-
-Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
-
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
-@@ -61,7 +61,7 @@
- AR = @AR@
- AR_FLAGS = rc
- CC = @CC@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- BISON = bison
-@@ -115,8 +115,8 @@
-   $(DEVZERO_CFLAGS)
- SIM_FPU_CFLAGS = @sim_fpu_cflags@
- 
--STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
--NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
-+STD_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
-+NOWARN_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
- BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
- 
- BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
-@@ -86,7 +86,9 @@
- 
- /* Basic configuration */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "inline.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _DEBUG_C_
- #define _DEBUG_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
-@@ -27,7 +27,9 @@
- #include <ctype.h>
- #include <stdarg.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
-@@ -21,7 +21,9 @@
- 
- #include <stdio.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef HAVE_STRING_H
- #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
-@@ -18,7 +18,9 @@
-  
-     */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "filter_filename.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
-@@ -25,7 +25,9 @@
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include "filter.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _INLINE_C_
- #define _INLINE_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- 
- #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- 
- #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
-@@ -21,7 +21,9 @@
- 
- /* Frustrating header junk */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include <stdio.h>
- #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _SIM_ENDIAN_C_
- #define _SIM_ENDIAN_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- 
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
-@@ -25,7 +25,9 @@
- #include <fcntl.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
diff --git a/patches/gdb/6.8a/150-handle-stpcpy-define.patch b/patches/gdb/6.8a/150-handle-stpcpy-define.patch
deleted file mode 100644
index 88d703f..0000000
--- a/patches/gdb/6.8a/150-handle-stpcpy-define.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru gdb-6.8.orig/bfd/sysdep.h gdb-6.8/bfd/sysdep.h
---- gdb-6.8.orig/bfd/sysdep.h	2007-07-03 16:26:42.000000000 +0200
-+++ gdb-6.8/bfd/sysdep.h	2011-08-21 13:33:47.000000000 +0200
-@@ -131,7 +131,7 @@
- extern PTR realloc ();
- #endif
- 
--#if !HAVE_DECL_STPCPY
-+#if !HAVE_DECL_STPCPY && !defined(stpcpy)
- extern char *stpcpy (char *__dest, const char *__src);
- #endif
- 
diff --git a/patches/gdb/7.0.1a/100-sim-ppc-have-config-h.patch b/patches/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
deleted file mode 100644
index f3723b5..0000000
--- a/patches/gdb/7.0.1a/100-sim-ppc-have-config-h.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Fix for canadian cross build of sim/ppc
-
-Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
-
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
-@@ -61,7 +61,7 @@
- AR = @AR@
- AR_FLAGS = rc
- CC = @CC@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- BISON = bison
-@@ -115,8 +115,8 @@
-   $(DEVZERO_CFLAGS)
- SIM_FPU_CFLAGS = @sim_fpu_cflags@
- 
--STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
--NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
-+STD_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
-+NOWARN_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
- BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
- 
- BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
-@@ -86,7 +86,9 @@
- 
- /* Basic configuration */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "inline.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _DEBUG_C_
- #define _DEBUG_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
-@@ -27,7 +27,9 @@
- #include <ctype.h>
- #include <stdarg.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
-@@ -21,7 +21,9 @@
- 
- #include <stdio.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef HAVE_STRING_H
- #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
-@@ -18,7 +18,9 @@
-  
-     */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "filter_filename.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
-@@ -25,7 +25,9 @@
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include "filter.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _INLINE_C_
- #define _INLINE_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- 
- #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- 
- #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
-@@ -21,7 +21,9 @@
- 
- /* Frustrating header junk */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include <stdio.h>
- #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _SIM_ENDIAN_C_
- #define _SIM_ENDIAN_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- 
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
-@@ -25,7 +25,9 @@
- #include <fcntl.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
diff --git a/patches/gdb/7.0a/100-sim-ppc-have-config-h.patch b/patches/gdb/7.0a/100-sim-ppc-have-config-h.patch
deleted file mode 100644
index f3723b5..0000000
--- a/patches/gdb/7.0a/100-sim-ppc-have-config-h.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Fix for canadian cross build of sim/ppc
-
-Orignal patch info see: http://sources.redhat.com/bugzilla/show_bug.cgi?id=9638
-
-diff -urN gdb-6.8-pl1/sim/ppc/Makefile.in gdb-6.8-pl2/sim/ppc/Makefile.in
---- gdb-6.8-pl1/sim/ppc/Makefile.in	2006-05-31 17:14:45.000000000 +0200
-+++ gdb-6.8-pl2/sim/ppc/Makefile.in	2008-09-30 15:56:33.000000000 +0200
-@@ -61,7 +61,7 @@
- AR = @AR@
- AR_FLAGS = rc
- CC = @CC@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
- BISON = bison
-@@ -115,8 +115,8 @@
-   $(DEVZERO_CFLAGS)
- SIM_FPU_CFLAGS = @sim_fpu_cflags@
- 
--STD_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
--NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
-+STD_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
-+NOWARN_CFLAGS	= $(CFLAGS) -DHAVE_CONFIG_H $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)  $(SIM_FPU_CFLAGS)
- BUILD_CFLAGS	= $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
- 
- BUILD_LDFLAGS	=
-diff -urN gdb-6.8-orig/sim/ppc/basics.h gdb-6.8-pl1/sim/ppc/basics.h
---- gdb-6.8-orig/sim/ppc/basics.h	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/basics.h	2008-09-30 15:12:32.000000000 +0200
-@@ -86,7 +86,9 @@
- 
- /* Basic configuration */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "inline.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/debug.c gdb-6.8-pl1/sim/ppc/debug.c
---- gdb-6.8-orig/sim/ppc/debug.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/debug.c	2008-09-30 15:12:27.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _DEBUG_C_
- #define _DEBUG_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/dgen.c gdb-6.8-pl1/sim/ppc/dgen.c
---- gdb-6.8-orig/sim/ppc/dgen.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/dgen.c	2008-09-30 15:12:22.000000000 +0200
-@@ -27,7 +27,9 @@
- #include <ctype.h>
- #include <stdarg.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-diff -urN gdb-6.8-orig/sim/ppc/filter.c gdb-6.8-pl1/sim/ppc/filter.c
---- gdb-6.8-orig/sim/ppc/filter.c	1999-04-16 03:35:09.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter.c	2008-09-30 15:12:15.000000000 +0200
-@@ -21,7 +21,9 @@
- 
- #include <stdio.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef HAVE_STRING_H
- #include <string.h>
-diff -urN gdb-6.8-orig/sim/ppc/filter_filename.c gdb-6.8-pl1/sim/ppc/filter_filename.c
---- gdb-6.8-orig/sim/ppc/filter_filename.c	1999-04-16 03:35:08.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/filter_filename.c	2008-09-30 15:12:11.000000000 +0200
-@@ -18,7 +18,9 @@
-  
-     */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- #include "filter_filename.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/igen.c gdb-6.8-pl1/sim/ppc/igen.c
---- gdb-6.8-orig/sim/ppc/igen.c	2003-06-20 05:59:33.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/igen.c	2008-09-30 15:12:06.000000000 +0200
-@@ -25,7 +25,9 @@
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include "filter.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/inline.c gdb-6.8-pl1/sim/ppc/inline.c
---- gdb-6.8-orig/sim/ppc/inline.c	1999-04-16 03:35:10.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/inline.c	2008-09-30 15:11:58.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _INLINE_C_
- #define _INLINE_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "ppc-config.h"
- 
- #include "inline.h"
-diff -urN gdb-6.8-orig/sim/ppc/lf.c gdb-6.8-pl1/sim/ppc/lf.c
---- gdb-6.8-orig/sim/ppc/lf.c	2002-05-30 17:07:06.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/lf.c	2008-09-30 15:33:35.000000000 +0200
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- 
-diff -urN gdb-6.8-orig/sim/ppc/misc.c gdb-6.8-pl1/sim/ppc/misc.c
---- gdb-6.8-orig/sim/ppc/misc.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/misc.c	2008-09-30 15:11:54.000000000 +0200
-@@ -23,7 +23,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- 
- #ifdef HAVE_STDLIB_H
-diff -urN gdb-6.8-orig/sim/ppc/misc.h gdb-6.8-pl1/sim/ppc/misc.h
---- gdb-6.8-orig/sim/ppc/misc.h	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/misc.h	2008-09-30 15:11:49.000000000 +0200
-@@ -21,7 +21,9 @@
- 
- /* Frustrating header junk */
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #include <stdio.h>
- #include <ctype.h>
-diff -urN gdb-6.8-orig/sim/ppc/sim-endian.c gdb-6.8-pl1/sim/ppc/sim-endian.c
---- gdb-6.8-orig/sim/ppc/sim-endian.c	1999-04-16 03:35:11.000000000 +0200
-+++ gdb-6.8-pl1/sim/ppc/sim-endian.c	2008-09-30 15:11:44.000000000 +0200
-@@ -22,7 +22,9 @@
- #ifndef _SIM_ENDIAN_C_
- #define _SIM_ENDIAN_C_
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "basics.h"
- 
- 
-diff -urN gdb-6.8-orig/sim/ppc/table.c gdb-6.8-pl1/sim/ppc/table.c
---- gdb-6.8-orig/sim/ppc/table.c	2002-01-12 11:21:12.000000000 +0100
-+++ gdb-6.8-pl1/sim/ppc/table.c	2008-09-30 15:11:38.000000000 +0200
-@@ -25,7 +25,9 @@
- #include <fcntl.h>
- #include <ctype.h>
- 
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- #include "misc.h"
- #include "lf.h"
- #include "table.h"
diff --git a/patches/gdb/7.10.1/100-musl_fix.patch b/patches/gdb/7.10.1/100-musl_fix.patch
deleted file mode 100644
index c0c1e0a..0000000
--- a/patches/gdb/7.10.1/100-musl_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -17,6 +17,7 @@
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
-+#include "stopcode.h"
- #include "defs.h"
- #include "inferior.h"
- #include "infrun.h"
-@@ -73,6 +74,10 @@
- #define SPUFS_MAGIC 0x23c9b64e
- #endif
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
---- /dev/null
-+++ b/gdb/stopcode.h
-@@ -0,0 +1,4 @@
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
diff --git a/patches/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch b/patches/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
deleted file mode 100644
index 1182a45..0000000
--- a/patches/gdb/7.10.1/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7f8c0d8984bf5754807d3bb543cbc3ffc634e9e4 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 30 May 2015 13:00:32 +0300
-Subject: [PATCH] xtensa: initialize call_abi in xtensa_tdep
-
-Use XSHAL_ABI value provided by xtensa-config.h to correctly initialize
-xtensa_tdep.call_abi
-This fixes calls to functions from GDB that otherwise fail with the
-following assertion in call0 configuration:
-
-  gdb/regcache.c:602: internal-error: regcache_raw_read: Assertion
-  `regnum >= 0 && regnum < regcache->descr->nr_raw_registers' failed.
-
-gdb/
-	* xtensa-tdep.h (XTENSA_GDBARCH_TDEP_INSTANTIATE): Initialize
-	call_abi using XSHAL_ABI macro.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
-index adacaf8..3b6ea66 100644
---- a/gdb/xtensa-tdep.h
-+++ b/gdb/xtensa-tdep.h
-@@ -246,7 +246,8 @@ struct gdbarch_tdep
- 	  .spill_location = -1,					\
- 	  .spill_size = (spillsz),				\
- 	  .unused = 0,						\
--	  .call_abi = 0,					\
-+	  .call_abi = (XSHAL_ABI == XTHAL_ABI_CALL0) ?		\
-+		CallAbiCall0Only : CallAbiDefault,		\
- 	  .debug_interrupt_level = XCHAL_DEBUGLEVEL,		\
- 	  .icache_line_bytes = XCHAL_ICACHE_LINESIZE,		\
- 	  .dcache_line_bytes = XCHAL_DCACHE_LINESIZE,		\
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/patches/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
deleted file mode 100644
index 982bd7f..0000000
--- a/patches/gdb/7.10.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 208ea73d38c9c16cf983b6419f58050dbadcb6a9 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 22:43:49 +0300
-Subject: [PATCH 2/2] xtensa: make sure ar_base is initialized
-
-ar_base is uninitialized for cores w/o windowed registers as their
-regmap doesn't have register 0x0100.
-Check that ar_base is initialized and if not initialize it with a0_base.
-
-gdb/
-	* xtensa-tdep.c (xtensa_derive_tdep): Make sure ar_base is
-	initialized.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
- 	tdep->num_regs = n;
-     }
- 
-+  if (tdep->ar_base == -1)
-+    tdep->ar_base = tdep->a0_base;
-+
-   /* Number of pseudo registers.  */
-   tdep->num_pseudo_regs = n - tdep->num_regs;
- 
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch b/patches/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
deleted file mode 100644
index 506a57c..0000000
--- a/patches/gdb/7.10.1/112-WIP-end-of-prologue-detection-hack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7f8eacbb468575fb67db7fd1155a3aedaa91911b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 23:15:39 +0300
-Subject: [PATCH] WIP: *end of prologue* detection hack
-
-see
-  http://www.esp8266.com/viewtopic.php?p=18461#p18461
-  http://www.esp8266.com/viewtopic.php?p=19026#p19026
-  http://www.esp8266.com/viewtopic.php?p=19683#p19683
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
-   /* Find out, if we have an information about the prologue from DWARF.  */
-   prologue_sal = find_pc_line (start, 0);
-   if (prologue_sal.line != 0) /* Found debug info.  */
--    body_pc = prologue_sal.end;
-+    body_pc = prologue_sal.end + 40;
- 
-   /* If we are going to analyze the prologue in general without knowing about
-      the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.10/10-setns-handling.patch b/patches/gdb/7.10/10-setns-handling.patch
deleted file mode 100644
index e2647ad..0000000
--- a/patches/gdb/7.10/10-setns-handling.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 99fe86f7999afd2743b08c550b10f083ae4bd9bd Mon Sep 17 00:00:00 2001
-From: Peter Bergner <bergner@vnet.ibm.com>
-Date: Tue, 14 Jul 2015 10:46:16 -0500
-Subject: [PATCH] Fix build issue with nat/linux-namespaces.c.
-
-    * nat/linux-namespaces.c (setns): Rename from this ...
-    (do_setns): ... to this.  Support calling setns if it exists.
-    (mnsh_handle_setns): Call do_setns.
----
- gdb/ChangeLog              |  6 ++++++
- gdb/nat/linux-namespaces.c | 12 ++++++------
- 2 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/gdb/nat/linux-namespaces.c b/gdb/nat/linux-namespaces.c
-index a7a3e4d..fd0d4b0 100644
---- a/gdb/nat/linux-namespaces.c
-+++ b/gdb/nat/linux-namespaces.c
-@@ -34,18 +34,18 @@ int debug_linux_namespaces;
- 
- /* Handle systems without setns.  */
- 
--#ifndef HAVE_SETNS
--static int
--setns (int fd, int nstype)
-+static inline int
-+do_setns (int fd, int nstype)
- {
--#ifdef __NR_setns
-+#ifdef HAVE_SETNS
-+  return setns (fd, nstype);
-+#elif defined __NR_setns
-   return syscall (__NR_setns, fd, nstype);
- #else
-   errno = ENOSYS;
-   return -1;
- #endif
- }
--#endif
- 
- /* Handle systems without MSG_CMSG_CLOEXEC.  */
- 
-@@ -495,7 +495,7 @@ mnsh_recv_message (int sock, enum mnsh_msg_type *type,
- static ssize_t
- mnsh_handle_setns (int sock, int fd, int nstype)
- {
--  int result = setns (fd, nstype);
-+  int result = do_setns (fd, nstype);
- 
-   return mnsh_return_int (sock, result, errno);
- }
--- 
-1.9.4
diff --git a/patches/gdb/7.10/100-musl_fix.patch b/patches/gdb/7.10/100-musl_fix.patch
deleted file mode 100644
index c0c1e0a..0000000
--- a/patches/gdb/7.10/100-musl_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -17,6 +17,7 @@
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
-+#include "stopcode.h"
- #include "defs.h"
- #include "inferior.h"
- #include "infrun.h"
-@@ -73,6 +74,10 @@
- #define SPUFS_MAGIC 0x23c9b64e
- #endif
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
---- /dev/null
-+++ b/gdb/stopcode.h
-@@ -0,0 +1,4 @@
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
diff --git a/patches/gdb/7.10/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch b/patches/gdb/7.10/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
deleted file mode 100644
index 1182a45..0000000
--- a/patches/gdb/7.10/110-xtensa-initialize-call_abi-in-xtensa_tdep.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7f8c0d8984bf5754807d3bb543cbc3ffc634e9e4 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 30 May 2015 13:00:32 +0300
-Subject: [PATCH] xtensa: initialize call_abi in xtensa_tdep
-
-Use XSHAL_ABI value provided by xtensa-config.h to correctly initialize
-xtensa_tdep.call_abi
-This fixes calls to functions from GDB that otherwise fail with the
-following assertion in call0 configuration:
-
-  gdb/regcache.c:602: internal-error: regcache_raw_read: Assertion
-  `regnum >= 0 && regnum < regcache->descr->nr_raw_registers' failed.
-
-gdb/
-	* xtensa-tdep.h (XTENSA_GDBARCH_TDEP_INSTANTIATE): Initialize
-	call_abi using XSHAL_ABI macro.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
-index adacaf8..3b6ea66 100644
---- a/gdb/xtensa-tdep.h
-+++ b/gdb/xtensa-tdep.h
-@@ -246,7 +246,8 @@ struct gdbarch_tdep
- 	  .spill_location = -1,					\
- 	  .spill_size = (spillsz),				\
- 	  .unused = 0,						\
--	  .call_abi = 0,					\
-+	  .call_abi = (XSHAL_ABI == XTHAL_ABI_CALL0) ?		\
-+		CallAbiCall0Only : CallAbiDefault,		\
- 	  .debug_interrupt_level = XCHAL_DEBUGLEVEL,		\
- 	  .icache_line_bytes = XCHAL_ICACHE_LINESIZE,		\
- 	  .dcache_line_bytes = XCHAL_DCACHE_LINESIZE,		\
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.10/111-xtensa-make-sure-ar_base-is-initialized.patch b/patches/gdb/7.10/111-xtensa-make-sure-ar_base-is-initialized.patch
deleted file mode 100644
index 982bd7f..0000000
--- a/patches/gdb/7.10/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 208ea73d38c9c16cf983b6419f58050dbadcb6a9 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 22:43:49 +0300
-Subject: [PATCH 2/2] xtensa: make sure ar_base is initialized
-
-ar_base is uninitialized for cores w/o windowed registers as their
-regmap doesn't have register 0x0100.
-Check that ar_base is initialized and if not initialize it with a0_base.
-
-gdb/
-	* xtensa-tdep.c (xtensa_derive_tdep): Make sure ar_base is
-	initialized.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
- 	tdep->num_regs = n;
-     }
- 
-+  if (tdep->ar_base == -1)
-+    tdep->ar_base = tdep->a0_base;
-+
-   /* Number of pseudo registers.  */
-   tdep->num_pseudo_regs = n - tdep->num_regs;
- 
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.10/112-WIP-end-of-prologue-detection-hack.patch b/patches/gdb/7.10/112-WIP-end-of-prologue-detection-hack.patch
deleted file mode 100644
index 506a57c..0000000
--- a/patches/gdb/7.10/112-WIP-end-of-prologue-detection-hack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7f8eacbb468575fb67db7fd1155a3aedaa91911b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 23:15:39 +0300
-Subject: [PATCH] WIP: *end of prologue* detection hack
-
-see
-  http://www.esp8266.com/viewtopic.php?p=18461#p18461
-  http://www.esp8266.com/viewtopic.php?p=19026#p19026
-  http://www.esp8266.com/viewtopic.php?p=19683#p19683
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
-   /* Find out, if we have an information about the prologue from DWARF.  */
-   prologue_sal = find_pc_line (start, 0);
-   if (prologue_sal.line != 0) /* Found debug info.  */
--    body_pc = prologue_sal.end;
-+    body_pc = prologue_sal.end + 40;
- 
-   /* If we are going to analyze the prologue in general without knowing about
-      the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.11.1/100-musl_fix.patch b/patches/gdb/7.11.1/100-musl_fix.patch
deleted file mode 100644
index c0c1e0a..0000000
--- a/patches/gdb/7.11.1/100-musl_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -17,6 +17,7 @@
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
-+#include "stopcode.h"
- #include "defs.h"
- #include "inferior.h"
- #include "infrun.h"
-@@ -73,6 +74,10 @@
- #define SPUFS_MAGIC 0x23c9b64e
- #endif
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
---- /dev/null
-+++ b/gdb/stopcode.h
-@@ -0,0 +1,4 @@
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
diff --git a/patches/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch b/patches/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
deleted file mode 100644
index ff59907..0000000
--- a/patches/gdb/7.11.1/101-uclibc-no-gettimeofday-clobber.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Improve gnulib in gdb's guess work, gettimeofday() works in uClibcm promise.
-
-This patch helps building x86_64-unknown-linux-uclibc toolchains, the final
-gdb-native step otherwise fails when linking the libinproctrace.so
-
-Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
-
---- a/gdb/gnulib/configure	2016-02-25 18:17:04.145903807 +0100
-+++ b/gdb/gnulib/configure	2016-02-25 18:17:28.545903821 +0100
-@@ -13520,8 +13520,9 @@
-   if test "$cross_compiling" = yes; then :
-   # When cross-compiling:
-       case "$host_os" in
--                # Guess all is fine on glibc systems.
-+                # Guess all is fine on glibc/uclibc systems.
-         *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-+        *-uclibc*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-       esac
diff --git a/patches/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/patches/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
deleted file mode 100644
index 982bd7f..0000000
--- a/patches/gdb/7.11.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 208ea73d38c9c16cf983b6419f58050dbadcb6a9 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 22:43:49 +0300
-Subject: [PATCH 2/2] xtensa: make sure ar_base is initialized
-
-ar_base is uninitialized for cores w/o windowed registers as their
-regmap doesn't have register 0x0100.
-Check that ar_base is initialized and if not initialize it with a0_base.
-
-gdb/
-	* xtensa-tdep.c (xtensa_derive_tdep): Make sure ar_base is
-	initialized.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
- 	tdep->num_regs = n;
-     }
- 
-+  if (tdep->ar_base == -1)
-+    tdep->ar_base = tdep->a0_base;
-+
-   /* Number of pseudo registers.  */
-   tdep->num_pseudo_regs = n - tdep->num_regs;
- 
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch b/patches/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
deleted file mode 100644
index 506a57c..0000000
--- a/patches/gdb/7.11.1/112-WIP-end-of-prologue-detection-hack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7f8eacbb468575fb67db7fd1155a3aedaa91911b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 23:15:39 +0300
-Subject: [PATCH] WIP: *end of prologue* detection hack
-
-see
-  http://www.esp8266.com/viewtopic.php?p=18461#p18461
-  http://www.esp8266.com/viewtopic.php?p=19026#p19026
-  http://www.esp8266.com/viewtopic.php?p=19683#p19683
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
-   /* Find out, if we have an information about the prologue from DWARF.  */
-   prologue_sal = find_pc_line (start, 0);
-   if (prologue_sal.line != 0) /* Found debug info.  */
--    body_pc = prologue_sal.end;
-+    body_pc = prologue_sal.end + 40;
- 
-   /* If we are going to analyze the prologue in general without knowing about
-      the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.12.1/100-musl_fix.patch b/patches/gdb/7.12.1/100-musl_fix.patch
deleted file mode 100644
index c0c1e0a..0000000
--- a/patches/gdb/7.12.1/100-musl_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -17,6 +17,7 @@
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
-+#include "stopcode.h"
- #include "defs.h"
- #include "inferior.h"
- #include "infrun.h"
-@@ -73,6 +74,10 @@
- #define SPUFS_MAGIC 0x23c9b64e
- #endif
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
---- /dev/null
-+++ b/gdb/stopcode.h
-@@ -0,0 +1,4 @@
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
diff --git a/patches/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch b/patches/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
deleted file mode 100644
index cd7a4c6..0000000
--- a/patches/gdb/7.12.1/101-uclibc-no-gettimeofday-clobber.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Improve gnulib in gdb's guess work, gettimeofday() works in uClibcm promise.
-
-This patch helps building x86_64-unknown-linux-uclibc toolchains, the final
-gdb-native step otherwise fails when linking the libinproctrace.so
-
-Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
-Signed-off-by: Alexey Neyman <stilor@att.net>
-
-diff -urpN gdb-7.12.orig/gdb/gnulib/configure gdb-7.12/gdb/gnulib/configure
---- gdb-7.12.orig/gdb/gnulib/configure	2017-01-13 13:42:11.773027566 -0800
-+++ gdb-7.12/gdb/gnulib/configure	2017-01-13 13:44:32.518082618 -0800
-@@ -13522,6 +13522,7 @@ else
-       case "$host_os" in
-                 # Guess all is fine on glibc systems.
-         *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-+        *-uclibc*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-       esac
-diff -urpN gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4 gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4
---- gdb-7.12.orig/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:42:11.777027595 -0800
-+++ gdb-7.12/gdb/gnulib/import/m4/gettimeofday.m4	2017-01-13 13:43:55.781797640 -0800
-@@ -111,6 +111,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER],
-       case "$host_os" in
-                 # Guess all is fine on glibc systems.
-         *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-+        *-uclibc*) gl_cv_func_gettimeofday_clobber="guessing no" ;;
-                 # If we don't know, assume the worst.
-         *)      gl_cv_func_gettimeofday_clobber="guessing yes" ;;
-       esac
diff --git a/patches/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch b/patches/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
deleted file mode 100644
index 982bd7f..0000000
--- a/patches/gdb/7.12.1/111-xtensa-make-sure-ar_base-is-initialized.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 208ea73d38c9c16cf983b6419f58050dbadcb6a9 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 22:43:49 +0300
-Subject: [PATCH 2/2] xtensa: make sure ar_base is initialized
-
-ar_base is uninitialized for cores w/o windowed registers as their
-regmap doesn't have register 0x0100.
-Check that ar_base is initialized and if not initialize it with a0_base.
-
-gdb/
-	* xtensa-tdep.c (xtensa_derive_tdep): Make sure ar_base is
-	initialized.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 55e7d98..41f5ec1 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -3175,6 +3175,9 @@ xtensa_derive_tdep (struct gdbarch_tdep *tdep)
- 	tdep->num_regs = n;
-     }
- 
-+  if (tdep->ar_base == -1)
-+    tdep->ar_base = tdep->a0_base;
-+
-   /* Number of pseudo registers.  */
-   tdep->num_pseudo_regs = n - tdep->num_regs;
- 
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch b/patches/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
deleted file mode 100644
index 506a57c..0000000
--- a/patches/gdb/7.12.1/112-WIP-end-of-prologue-detection-hack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7f8eacbb468575fb67db7fd1155a3aedaa91911b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 7 Jun 2015 23:15:39 +0300
-Subject: [PATCH] WIP: *end of prologue* detection hack
-
-see
-  http://www.esp8266.com/viewtopic.php?p=18461#p18461
-  http://www.esp8266.com/viewtopic.php?p=19026#p19026
-  http://www.esp8266.com/viewtopic.php?p=19683#p19683
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gdb/xtensa-tdep.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
-index 41f5ec1..6a7dba7 100644
---- a/gdb/xtensa-tdep.c
-+++ b/gdb/xtensa-tdep.c
-@@ -2410,7 +2410,7 @@ call0_analyze_prologue (struct gdbarch *gdbarch,
-   /* Find out, if we have an information about the prologue from DWARF.  */
-   prologue_sal = find_pc_line (start, 0);
-   if (prologue_sal.line != 0) /* Found debug info.  */
--    body_pc = prologue_sal.end;
-+    body_pc = prologue_sal.end + 40;
- 
-   /* If we are going to analyze the prologue in general without knowing about
-      the current PC, make the best assumtion for the end of the prologue.  */
--- 
-1.8.1.4
-
diff --git a/patches/gdb/7.2a/100-sim-ppc-lz-fix.patch b/patches/gdb/7.2a/100-sim-ppc-lz-fix.patch
deleted file mode 100644
index 6f08ef8..0000000
--- a/patches/gdb/7.2a/100-sim-ppc-lz-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix for psim build failure due to -lz
-
-See http://sourceware.org/bugzilla/show_bug.cgi?id=12202
-
---- gdb-7.2.orig/sim/ppc/Makefile.in
-+++ gdb-7.2/sim/ppc/Makefile.in
-@@ -551,7 +551,7 @@
- PACKAGE_OBJ = @sim_pk_obj@
-
-
--psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBS) $(LIBINTL_DEP)
-+psim: $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP)
- 	$(CC) $(CFLAGS) $(SIM_CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS)
-
- run: psim
diff --git a/patches/gdb/7.4.1/00_all_ptrace_setsiginfo.patch b/patches/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
deleted file mode 100644
index 81a92db..0000000
--- a/patches/gdb/7.4.1/00_all_ptrace_setsiginfo.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-fix from upstream for building with newer kernel headers
-
-From a7f9ca9cb797d653dc7919538e1dfa0c26010331 Mon Sep 17 00:00:00 2001
-From: tschwinge <tschwinge>
-Date: Wed, 21 Mar 2012 13:43:50 +0000
-Subject: [PATCH] struct siginfo vs. siginfo_t
-
-gdb/
-	* amd64-linux-nat.c (amd64_linux_siginfo_fixup): Use siginfo_t instead
-	of struct siginfo.
-	* arm-linux-nat.c (arm_linux_stopped_data_address): Likewise.
-	* ia64-linux-nat.c (ia64_linux_stopped_data_address): Likewise.
-	* linux-nat.c (linux_nat_siginfo_fixup, siginfo_fixup)
-	(linux_xfer_siginfo, linux_nat_set_siginfo_fixup)
-	(linux_nat_get_siginfo): Likewise.
-	* linux-nat.h (struct lwp_info, linux_nat_set_siginfo_fixup)
-	(linux_nat_get_siginfo): Likewise.
-	* linux-tdep.c (linux_get_siginfo_type): Likewise.
-	* ppc-linux-nat.c (ppc_linux_stopped_data_address): Likewise.
-	* procfs.c (gdb_siginfo_t): Likewise.
-
-gdbserver/
-	* linux-arm-low.c (arm_stopped_by_watchpoint): Use siginfo_t instead of
-	struct siginfo.
-	* linux-low.c (siginfo_fixup, linux_xfer_siginfo): Likewise.
-	* linux-x86-low.c (x86_siginfo_fixup): Likewise.
-	* linux-low.h: Include <signal.h>.
-	(struct siginfo): Remove forward declaration.
-	(struct linux_target_ops) <siginfo_fixup>: Use siginfo_t instead of
-	struct siginfo.
----
- gdb/ChangeLog                 |   15 +++++++++++++++
- gdb/amd64-linux-nat.c         |    4 ++--
- gdb/arm-linux-nat.c           |    2 +-
- gdb/gdbserver/ChangeLog       |   11 +++++++++++
- gdb/gdbserver/linux-arm-low.c |    2 +-
- gdb/gdbserver/linux-low.c     |   10 +++++-----
- gdb/gdbserver/linux-low.h     |    5 ++---
- gdb/gdbserver/linux-x86-low.c |    4 ++--
- gdb/ia64-linux-nat.c          |    2 +-
- gdb/linux-nat.c               |   16 ++++++++--------
- gdb/linux-nat.h               |    6 +++---
- gdb/ppc-linux-nat.c           |    2 +-
- gdb/procfs.c                  |    2 +-
- 13 files changed, 53 insertions(+), 28 deletions(-)
-
-diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
-index f954483..5ebba3a 100644
---- a/gdb/amd64-linux-nat.c
-+++ b/gdb/amd64-linux-nat.c
-@@ -731,13 +731,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
-    INF.  */
- 
- static int
--amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction)
-+amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction)
- {
-   /* Is the inferior 32-bit?  If so, then do fixup the siginfo
-      object.  */
-   if (gdbarch_addr_bit (get_frame_arch (get_current_frame ())) == 32)
-     {
--      gdb_assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t));
-+      gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t));
- 
-       if (direction == 0)
- 	compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
-diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
-index c5ce21c..f9f6ba5 100644
---- a/gdb/arm-linux-nat.c
-+++ b/gdb/arm-linux-nat.c
-@@ -1137,7 +1137,7 @@ arm_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw,
- static int
- arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
- {
--  struct siginfo *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
-+  siginfo_t *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
-   int slot = siginfo_p->si_errno;
- 
-   /* This must be a hardware breakpoint.  */
-diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
-index ff2437d..01208ef 100644
---- a/gdb/gdbserver/linux-arm-low.c
-+++ b/gdb/gdbserver/linux-arm-low.c
-@@ -631,7 +631,7 @@ static int
- arm_stopped_by_watchpoint (void)
- {
-   struct lwp_info *lwp = get_thread_lwp (current_inferior);
--  struct siginfo siginfo;
-+  siginfo_t siginfo;
- 
-   /* We must be able to set hardware watchpoints.  */
-   if (arm_linux_get_hw_watchpoint_count () == 0)
-diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
-index d2d4c1d..4734f15 100644
---- a/gdb/gdbserver/linux-low.c
-+++ b/gdb/gdbserver/linux-low.c
-@@ -4779,7 +4779,7 @@ linux_qxfer_osdata (const char *annex,
-    layout of the inferiors' architecture.  */
- 
- static void
--siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
-+siginfo_fixup (siginfo_t *siginfo, void *inf_siginfo, int direction)
- {
-   int done = 0;
- 
-@@ -4791,9 +4791,9 @@ siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
-   if (!done)
-     {
-       if (direction == 1)
--	memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
-+	memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
-       else
--	memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
-+	memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
-     }
- }
- 
-@@ -4802,8 +4802,8 @@ linux_xfer_siginfo (const char *annex, unsigned char *readbuf,
- 		    unsigned const char *writebuf, CORE_ADDR offset, int len)
- {
-   int pid;
--  struct siginfo siginfo;
--  char inf_siginfo[sizeof (struct siginfo)];
-+  siginfo_t siginfo;
-+  char inf_siginfo[sizeof (siginfo_t)];
- 
-   if (current_inferior == NULL)
-     return -1;
-diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
-index 677d261..3aeae70 100644
---- a/gdb/gdbserver/linux-low.h
-+++ b/gdb/gdbserver/linux-low.h
-@@ -20,6 +20,7 @@
- #ifdef HAVE_THREAD_DB_H
- #include <thread_db.h>
- #endif
-+#include <signal.h>
- 
- #include "gdb_proc_service.h"
- 
-@@ -46,8 +47,6 @@ struct regset_info
- extern struct regset_info target_regsets[];
- #endif
- 
--struct siginfo;
--
- struct process_info_private
- {
-   /* Arch-specific additions.  */
-@@ -109,7 +108,7 @@ struct linux_target_ops
-      Returns true if any conversion was done; false otherwise.
-      If DIRECTION is 1, then copy from INF to NATIVE.
-      If DIRECTION is 0, copy from NATIVE to INF.  */
--  int (*siginfo_fixup) (struct siginfo *native, void *inf, int direction);
-+  int (*siginfo_fixup) (siginfo_t *native, void *inf, int direction);
- 
-   /* Hook to call when a new process is created or attached to.
-      If extra per-process architecture-specific data is needed,
-diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
-index ed1f8a8..b466b5d 100644
---- a/gdb/gdbserver/linux-x86-low.c
-+++ b/gdb/gdbserver/linux-x86-low.c
-@@ -918,13 +918,13 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
-    INF.  */
- 
- static int
--x86_siginfo_fixup (struct siginfo *native, void *inf, int direction)
-+x86_siginfo_fixup (siginfo_t *native, void *inf, int direction)
- {
- #ifdef __x86_64__
-   /* Is the inferior 32-bit?  If so, then fixup the siginfo object.  */
-   if (register_size (0) == 4)
-     {
--      if (sizeof (struct siginfo) != sizeof (compat_siginfo_t))
-+      if (sizeof (siginfo_t) != sizeof (compat_siginfo_t))
- 	fatal ("unexpected difference in siginfo");
- 
-       if (direction == 0)
-diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
-index 8773195..19b827f 100644
---- a/gdb/ia64-linux-nat.c
-+++ b/gdb/ia64-linux-nat.c
-@@ -637,7 +637,7 @@ static int
- ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
- {
-   CORE_ADDR psr;
--  struct siginfo *siginfo_p;
-+  siginfo_t *siginfo_p;
-   struct regcache *regcache = get_current_regcache ();
- 
-   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
-diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
-index f80c0c1..d81d55e 100644
---- a/gdb/linux-nat.c
-+++ b/gdb/linux-nat.c
-@@ -188,7 +188,7 @@ static void (*linux_nat_prepare_to_resume) (struct lwp_info *);
- /* The method to call, if any, when the siginfo object needs to be
-    converted between the layout returned by ptrace, and the layout in
-    the architecture of the inferior.  */
--static int (*linux_nat_siginfo_fixup) (struct siginfo *,
-+static int (*linux_nat_siginfo_fixup) (siginfo_t *,
- 				       gdb_byte *,
- 				       int);
- 
-@@ -4232,7 +4232,7 @@ linux_nat_mourn_inferior (struct target_ops *ops)
-    layout of the inferiors' architecture.  */
- 
- static void
--siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
-+siginfo_fixup (siginfo_t *siginfo, gdb_byte *inf_siginfo, int direction)
- {
-   int done = 0;
- 
-@@ -4244,9 +4244,9 @@ siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
-   if (!done)
-     {
-       if (direction == 1)
--	memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
-+	memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
-       else
--	memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
-+	memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
-     }
- }
- 
-@@ -4256,8 +4256,8 @@ linux_xfer_siginfo (struct target_ops *ops, enum target_object object,
- 		    const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
- {
-   int pid;
--  struct siginfo siginfo;
--  gdb_byte inf_siginfo[sizeof (struct siginfo)];
-+  siginfo_t siginfo;
-+  gdb_byte inf_siginfo[sizeof (siginfo_t)];
- 
-   gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
-   gdb_assert (readbuf || writebuf);
-@@ -5266,7 +5266,7 @@ linux_nat_set_new_thread (struct target_ops *t,
-    inferior.  */
- void
- linux_nat_set_siginfo_fixup (struct target_ops *t,
--			     int (*siginfo_fixup) (struct siginfo *,
-+			     int (*siginfo_fixup) (siginfo_t *,
- 						   gdb_byte *,
- 						   int))
- {
-@@ -5285,7 +5285,7 @@ linux_nat_set_prepare_to_resume (struct target_ops *t,
- }
- 
- /* Return the saved siginfo associated with PTID.  */
--struct siginfo *
-+siginfo_t *
- linux_nat_get_siginfo (ptid_t ptid)
- {
-   struct lwp_info *lp = find_lwp_pid (ptid);
-diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
-index c9878d9..d87f0cf 100644
---- a/gdb/linux-nat.h
-+++ b/gdb/linux-nat.h
-@@ -78,7 +78,7 @@ struct lwp_info
- 
-   /* Non-zero si_signo if this LWP stopped with a trap.  si_addr may
-      be the address of a hardware watchpoint.  */
--  struct siginfo siginfo;
-+  siginfo_t siginfo;
- 
-   /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
-      watchpoint trap.  */
-@@ -184,7 +184,7 @@ void linux_nat_set_new_thread (struct target_ops *, void (*) (struct lwp_info *)
-    that ptrace returns, and the layout in the architecture of the
-    inferior.  */
- void linux_nat_set_siginfo_fixup (struct target_ops *,
--				  int (*) (struct siginfo *,
-+				  int (*) (siginfo_t *,
- 					   gdb_byte *,
- 					   int));
- 
-@@ -198,7 +198,7 @@ void linux_nat_set_prepare_to_resume (struct target_ops *,
- void linux_nat_switch_fork (ptid_t new_ptid);
- 
- /* Return the saved siginfo associated with PTID.  */
--struct siginfo *linux_nat_get_siginfo (ptid_t ptid);
-+siginfo_t *linux_nat_get_siginfo (ptid_t ptid);
- 
- /* Compute and return the processor core of a given thread.  */
- int linux_nat_core_of_thread_1 (ptid_t ptid);
-diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
-index 1bd157b..9bd11fd 100644
---- a/gdb/ppc-linux-nat.c
-+++ b/gdb/ppc-linux-nat.c
-@@ -2218,7 +2218,7 @@ ppc_linux_thread_exit (struct thread_info *tp, int silent)
- static int
- ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
- {
--  struct siginfo *siginfo_p;
-+  siginfo_t *siginfo_p;
- 
-   siginfo_p = linux_nat_get_siginfo (inferior_ptid);
- 
-diff --git a/gdb/procfs.c b/gdb/procfs.c
-index 903621d..cb4bc7c 100644
---- a/gdb/procfs.c
-+++ b/gdb/procfs.c
-@@ -266,7 +266,7 @@ typedef struct sigaction gdb_sigaction_t;
- #ifdef HAVE_PR_SIGINFO64_T
- typedef pr_siginfo64_t gdb_siginfo_t;
- #else
--typedef struct siginfo gdb_siginfo_t;
-+typedef siginfo_t gdb_siginfo_t;
- #endif
- 
- /* On mips-irix, praddset and prdelset are defined in such a way that
--- 
-1.7.9.7
-
diff --git a/patches/gdb/7.4.1/05_all_readline-headers.patch b/patches/gdb/7.4.1/05_all_readline-headers.patch
deleted file mode 100644
index e65adf6..0000000
--- a/patches/gdb/7.4.1/05_all_readline-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/readline/complete.c
-+++ b/readline/complete.c
-@@ -25,6 +25,11 @@
- #  include <config.h>
- #endif
- 
-+#ifdef HAVE_WCHAR_H /* wcwidth() */
-+# define _GNU_SOURCE
-+# include <wchar.h>
-+#endif
-+
- #include <sys/types.h>
- #include <fcntl.h>
- #if defined (HAVE_SYS_FILE_H)
---- a/readline/display.c
-+++ b/readline/display.c
-@@ -25,6 +25,11 @@
- #  include <config.h>
- #endif
- 
-+#ifdef HAVE_WCHAR_H /* wcwidth() */
-+# define _GNU_SOURCE
-+# include <wchar.h>
-+#endif
-+
- #include <sys/types.h>
- 
- #if defined (HAVE_UNISTD_H)
---- a/readline/mbutil.c
-+++ b/readline/mbutil.c
-@@ -25,6 +25,11 @@
- #  include <config.h>
- #endif
- 
-+#ifdef HAVE_WCHAR_H /* wcwidth() */
-+# define _GNU_SOURCE
-+# include <wchar.h>
-+#endif
-+
- #include <sys/types.h>
- #include <fcntl.h>
- #include "posixjmp.h"
diff --git a/patches/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch b/patches/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch
deleted file mode 100644
index dacdfb1..0000000
--- a/patches/gettext/0.19.7/110-Fix-linker-error-redefinition-of-vasprintf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Wed, 29 Feb 2012 10:44:43 +0100
-Subject: [PATCH] Fix linker error: redefinition of vasprintf
-
-This might not be the best patch, but it works for us
-The link error was:
-.libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf'
-.libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here
----
- gettext-runtime/libasprintf/autosprintf.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc
-index ca318f7..2526210 100644
---- a/gettext-runtime/libasprintf/autosprintf.cc
-+++ b/gettext-runtime/libasprintf/autosprintf.cc
-@@ -19,8 +19,10 @@
-    This must come before <config.h> because <config.h> may include
-    <features.h>, and once <features.h> has been included, it's too late.  */
- #ifndef _GNU_SOURCE
-+#ifndef _WIN32
- # define _GNU_SOURCE    1
- #endif
-+#endif
- 
- /* Specification.  */
- #include "autosprintf.h"
--- 
-1.8.4
-
diff --git a/patches/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/patches/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
deleted file mode 100644
index 4624cb5..0000000
--- a/patches/gettext/0.19.7/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-From d4ecf6f15ad7a428786df2efdc88b03be0a4fdbb Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Thu, 17 Jan 2013 18:33:40 +0900
-Subject: [PATCH] Fix Woe32 link errors when compiling with -O0.
-
----
- gettext-tools/src/Makefile.am                  | 24 ++++++++++++++++++++++--
- gettext-tools/src/color.c                      |  1 +
- gettext-tools/woe32dll/c++color.cc             |  1 +
- gettext-tools/woe32dll/c++file-ostream.cc      |  2 ++
- gettext-tools/woe32dll/c++html-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++styled-ostream.cc    |  1 +
- gettext-tools/woe32dll/c++term-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++write-catalog.cc     |  1 +
- gettext-tools/woe32dll/c++write-po.cc          |  1 +
- gettext-tools/woe32dll/c++write-properties.cc  |  1 +
- gettext-tools/woe32dll/c++write-stringtable.cc |  1 +
- gnulib-local/modules/file-ostream              |  4 ++++
- gnulib-local/modules/html-ostream              |  4 ++++
- gnulib-local/modules/ostream                   |  4 ++++
- gnulib-local/modules/styled-ostream            |  4 ++++
- gnulib-local/modules/term-ostream              |  4 ++++
- 16 files changed, 53 insertions(+), 2 deletions(-)
- create mode 100644 gettext-tools/woe32dll/c++color.cc
- create mode 100644 gettext-tools/woe32dll/c++file-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++html-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++styled-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++term-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++write-catalog.cc
- create mode 100644 gettext-tools/woe32dll/c++write-po.cc
- create mode 100644 gettext-tools/woe32dll/c++write-properties.cc
- create mode 100644 gettext-tools/woe32dll/c++write-stringtable.cc
-
-Additional fix (COLOR_SOURCE) by Ray Donnelly <mingw.android@gmail.com>
-
-diff -urN a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
---- a/gettext-tools/src/Makefile.am	2015-09-11 01:54:21.000000000 +0100
-+++ b/gettext-tools/src/Makefile.am	2015-10-22 00:41:49.601786700 +0100
-@@ -145,10 +145,26 @@
-   format-lua.c \
-   format-javascript.c
- 
-+if !WOE32DLL
-+COLOR_SOURCE = color.c
-+OUTPUT_SOURCE = \
-+  write-catalog.c \
-+  write-properties.c \
-+  write-stringtable.c \
-+  write-po.c
-+else
-+COLOR_SOURCE = ../woe32dll/c++color.cc
-+OUTPUT_SOURCE = \
-+  ../woe32dll/c++write-catalog.cc \
-+  ../woe32dll/c++write-properties.cc \
-+  ../woe32dll/c++write-stringtable.cc \
-+  ../woe32dll/c++write-po.cc
-+endif
-+
- # libgettextsrc contains all code that is needed by at least two programs.
- libgettextsrc_la_SOURCES = \
- $(COMMON_SOURCE) read-catalog.c \
--color.c write-catalog.c write-properties.c write-stringtable.c write-po.c \
-+$(COLOR_SOURCE) $(OUTPUT_SOURCE) \
- msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \
- msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \
- plural-table.c quote.h sentence.h sentence.c \
-diff -urN a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
---- a/gettext-tools/src/Makefile.in	2015-09-11 04:05:11.000000000 +0100
-+++ b/gettext-tools/src/Makefile.in	2015-10-22 00:42:26.253852000 +0100
-@@ -387,19 +387,22 @@
- am__libgettextsrc_la_SOURCES_DIST = message.c po-error.c po-xerror.c \
- 	read-catalog-abstract.c po-lex.c po-gram-gen.y po-charset.c \
- 	read-po.c read-properties.c read-stringtable.c open-catalog.c \
--	dir-list.c str-list.c read-catalog.c color.c write-catalog.c \
--	write-properties.c write-stringtable.c write-po.c msgl-ascii.c \
--	msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c \
--	msgl-english.c msgl-check.c file-list.c msgl-charset.c \
--	po-time.c plural-exp.c plural-eval.c plural-table.c quote.h \
--	sentence.h sentence.c format.c format-invalid.h format-c.c \
--	format-c-parse.h format-sh.c format-python.c \
--	format-python-brace.c format-lisp.c format-elisp.c \
--	format-librep.c format-scheme.c format-java.c format-csharp.c \
--	format-awk.c format-pascal.c format-ycp.c format-tcl.c \
--	format-perl.c format-perl-brace.c format-php.c \
--	format-gcc-internal.c format-gfc-internal.c format-qt.c \
--	format-qt-plural.c format-kde.c format-kde-kuit.c \
-+	dir-list.c str-list.c read-catalog.c color.c \
-+	../woe32dll/c++color.cc write-catalog.c write-properties.c \
-+	write-stringtable.c write-po.c ../woe32dll/c++write-catalog.cc \
-+	../woe32dll/c++write-properties.cc \
-+	../woe32dll/c++write-stringtable.cc ../woe32dll/c++write-po.cc \
-+	msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c \
-+	msgl-header.c msgl-english.c msgl-check.c file-list.c \
-+	msgl-charset.c po-time.c plural-exp.c plural-eval.c \
-+	plural-table.c quote.h sentence.h sentence.c \
-+	format.c format-invalid.h format-c.c format-c-parse.h \
-+	format-sh.c format-python.c format-python-brace.c \
-+	format-lisp.c format-elisp.c format-librep.c format-scheme.c \
-+	format-java.c format-csharp.c format-awk.c format-pascal.c \
-+	format-ycp.c format-tcl.c format-perl.c format-perl-brace.c \
-+	format-php.c format-gcc-internal.c format-gfc-internal.c \
-+	format-qt.c format-qt-plural.c format-kde.c format-kde-kuit.c \
- 	format-boost.c format-lua.c format-javascript.c \
- 	../woe32dll/c++format.cc read-desktop.c locating-rule.c its.c \
- 	../woe32dll/gettextsrc-exports.c
-@@ -413,7 +416,18 @@
- 	libgettextsrc_la-open-catalog.lo libgettextsrc_la-dir-list.lo \
- 	libgettextsrc_la-str-list.lo
- am__dirstamp = $(am__leading_dot)dirstamp
--@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-format.lo \
-+@WOE32DLL_FALSE@am__objects_2 = libgettextsrc_la-color.lo
-+@WOE32DLL_TRUE@am__objects_2 =  \
-+@WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++color.lo
-+@WOE32DLL_FALSE@am__objects_3 = libgettextsrc_la-write-catalog.lo \
-+@WOE32DLL_FALSE@	libgettextsrc_la-write-properties.lo \
-+@WOE32DLL_FALSE@	libgettextsrc_la-write-stringtable.lo \
-+@WOE32DLL_FALSE@	libgettextsrc_la-write-po.lo
-+@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-c++write-catalog.lo \
-+@WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++write-properties.lo \
-+@WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++write-stringtable.lo \
-+@WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++write-po.lo
-+@WOE32DLL_FALSE@am__objects_4 = libgettextsrc_la-format.lo \
- @WOE32DLL_FALSE@	libgettextsrc_la-format-c.lo \
- @WOE32DLL_FALSE@	libgettextsrc_la-format-sh.lo \
- @WOE32DLL_FALSE@	libgettextsrc_la-format-python.lo \
-@@ -440,7 +454,7 @@
- @WOE32DLL_FALSE@	libgettextsrc_la-format-boost.lo \
- @WOE32DLL_FALSE@	libgettextsrc_la-format-lua.lo \
- @WOE32DLL_FALSE@	libgettextsrc_la-format-javascript.lo
--@WOE32DLL_TRUE@am__objects_2 =  \
-+@WOE32DLL_TRUE@am__objects_4 =  \
- @WOE32DLL_TRUE@	../woe32dll/libgettextsrc_la-c++format.lo \
- @WOE32DLL_TRUE@	libgettextsrc_la-format-c.lo \
- @WOE32DLL_TRUE@	libgettextsrc_la-format-sh.lo \
-@@ -468,13 +482,10 @@
- @WOE32DLL_TRUE@	libgettextsrc_la-format-boost.lo \
- @WOE32DLL_TRUE@	libgettextsrc_la-format-lua.lo \
- @WOE32DLL_TRUE@	libgettextsrc_la-format-javascript.lo
--@WOE32DLL_TRUE@am__objects_3 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo
-+@WOE32DLL_TRUE@am__objects_5 = ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo
- am_libgettextsrc_la_OBJECTS = $(am__objects_1) \
--	libgettextsrc_la-read-catalog.lo libgettextsrc_la-color.lo \
--	libgettextsrc_la-write-catalog.lo \
--	libgettextsrc_la-write-properties.lo \
--	libgettextsrc_la-write-stringtable.lo \
--	libgettextsrc_la-write-po.lo libgettextsrc_la-msgl-ascii.lo \
-+	libgettextsrc_la-read-catalog.lo $(am__objects_2) \
-+	$(am__objects_3) libgettextsrc_la-msgl-ascii.lo \
- 	libgettextsrc_la-msgl-iconv.lo libgettextsrc_la-msgl-equal.lo \
- 	libgettextsrc_la-msgl-cat.lo libgettextsrc_la-msgl-header.lo \
- 	libgettextsrc_la-msgl-english.lo \
-@@ -482,9 +493,9 @@
- 	libgettextsrc_la-msgl-charset.lo libgettextsrc_la-po-time.lo \
- 	libgettextsrc_la-plural-exp.lo libgettextsrc_la-plural-eval.lo \
- 	libgettextsrc_la-plural-table.lo libgettextsrc_la-sentence.lo \
--	$(am__objects_2) libgettextsrc_la-read-desktop.lo \
-+	$(am__objects_4) libgettextsrc_la-read-desktop.lo \
-	libgettextsrc_la-locating-rule.lo libgettextsrc_la-its.lo \
--	$(am__objects_3)
-+	$(am__objects_5)
- libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS)
- PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
- am_cldr_plurals_OBJECTS = cldr_plurals-cldr-plural.$(OBJEXT) \
-@@ -1975,15 +1986,28 @@
- @WOE32DLL_TRUE@	format-qt.c format-qt-plural.c format-kde.c \
- @WOE32DLL_TRUE@	format-kde-kuit.c format-boost.c format-lua.c \
- @WOE32DLL_TRUE@	format-javascript.c
-+@WOE32DLL_FALSE@COLOR_SOURCE = color.c
-+@WOE32DLL_TRUE@COLOR_SOURCE = ../woe32dll/c++color.cc
-+@WOE32DLL_FALSE@OUTPUT_SOURCE = \
-+@WOE32DLL_FALSE@  write-catalog.c \
-+@WOE32DLL_FALSE@  write-properties.c \
-+@WOE32DLL_FALSE@  write-stringtable.c \
-+@WOE32DLL_FALSE@  write-po.c
-+
-+@WOE32DLL_TRUE@OUTPUT_SOURCE = \
-+@WOE32DLL_TRUE@  ../woe32dll/c++write-catalog.cc \
-+@WOE32DLL_TRUE@  ../woe32dll/c++write-properties.cc \
-+@WOE32DLL_TRUE@  ../woe32dll/c++write-stringtable.cc \
-+@WOE32DLL_TRUE@  ../woe32dll/c++write-po.cc
-+
- 
- # libgettextsrc contains all code that is needed by at least two programs.
--libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c color.c \
--	write-catalog.c write-properties.c write-stringtable.c \
--	write-po.c msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c \
--	msgl-header.c msgl-english.c msgl-check.c file-list.c \
--	msgl-charset.c po-time.c plural-exp.c plural-eval.c \
--	plural-table.c quote.h sentence.h sentence.c $(FORMAT_SOURCE) \
--	read-desktop.c locating-rule.c its.c $(am__append_1)
-+libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c \
-+	$(COLOR_SOURCE) $(OUTPUT_SOURCE) msgl-ascii.c msgl-iconv.c \
-+	msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \
-+	msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c \
-+	plural-eval.c plural-table.c quote.h sentence.h sentence.c \
-+	$(FORMAT_SOURCE) read-desktop.c locating-rule.c its.c $(am__append_1)
- 
- # msggrep needs pattern matching.
- LIBGREP = ../libgrep/libgrep.a
-@@ -2345,6 +2370,15 @@
- ../woe32dll/$(am__dirstamp):
- 	@$(MKDIR_P) ../woe32dll
- 	@: > ../woe32dll/$(am__dirstamp)
-+../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/$(am__dirstamp)
-+../woe32dll/libgettextsrc_la-c++write-catalog.lo:  \
-+	../woe32dll/$(am__dirstamp)
-+../woe32dll/libgettextsrc_la-c++write-properties.lo:  \
-+	../woe32dll/$(am__dirstamp)
-+../woe32dll/libgettextsrc_la-c++write-stringtable.lo:  \
-+	../woe32dll/$(am__dirstamp)
-+../woe32dll/libgettextsrc_la-c++write-po.lo:  \
-+	../woe32dll/$(am__dirstamp)
- ../woe32dll/libgettextsrc_la-c++format.lo:  \
- 	../woe32dll/$(am__dirstamp)
- ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo:  \
-@@ -3156,6 +3190,21 @@
- .cc.lo:
- 	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
- 
-+../woe32dll/libgettextsrc_la-c++color.lo: ../woe32dll/c++color.cc
-+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++color.lo `test -f '../woe32dll/c++color.cc' || echo '$(srcdir)/'`../woe32dll/c++color.cc
-+
-+../woe32dll/libgettextsrc_la-c++write-catalog.lo: ../woe32dll/c++write-catalog.cc
-+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++write-catalog.lo `test -f '../woe32dll/c++write-catalog.cc' || echo '$(srcdir)/'`../woe32dll/c++write-catalog.cc
-+
-+../woe32dll/libgettextsrc_la-c++write-properties.lo: ../woe32dll/c++write-properties.cc
-+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++write-properties.lo `test -f '../woe32dll/c++write-properties.cc' || echo '$(srcdir)/'`../woe32dll/c++write-properties.cc
-+
-+../woe32dll/libgettextsrc_la-c++write-stringtable.lo: ../woe32dll/c++write-stringtable.cc
-+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++write-stringtable.lo `test -f '../woe32dll/c++write-stringtable.cc' || echo '$(srcdir)/'`../woe32dll/c++write-stringtable.cc
-+
-+../woe32dll/libgettextsrc_la-c++write-po.lo: ../woe32dll/c++write-po.cc
-+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++write-po.lo `test -f '../woe32dll/c++write-po.cc' || echo '$(srcdir)/'`../woe32dll/c++write-po.cc
-+
- ../woe32dll/libgettextsrc_la-c++format.lo: ../woe32dll/c++format.cc
- 	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ../woe32dll/libgettextsrc_la-c++format.lo `test -f '../woe32dll/c++format.cc' || echo '$(srcdir)/'`../woe32dll/c++format.cc
- 
-diff -urN a/gettext-tools/src/color.c b/gettext-tools/src/color.c
---- a/gettext-tools/src/color.c	2015-08-21 08:18:27.000000000 +0100
-+++ b/gettext-tools/src/color.c	2015-10-22 00:31:33.326659600 +0100
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#include "ostream.h"
- #include "term-ostream.h"
- #include "xalloc.h"
- #include "relocatable.h"
-diff -urN a/gettext-tools/woe32dll/c++color.cc b/gettext-tools/woe32dll/c++color.cc
---- a/gettext-tools/woe32dll/c++color.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++color.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../src/color.c"
-diff -urN a/gettext-tools/woe32dll/c++file-ostream.cc b/gettext-tools/woe32dll/c++file-ostream.cc
---- a/gettext-tools/woe32dll/c++file-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++file-ostream.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1,2 @@
-+#include "../gnulib-lib/file-ostream.c"
-+
-diff -urN a/gettext-tools/woe32dll/c++html-ostream.cc b/gettext-tools/woe32dll/c++html-ostream.cc
---- a/gettext-tools/woe32dll/c++html-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++html-ostream.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../gnulib-lib/html-ostream.c"
-diff -urN a/gettext-tools/woe32dll/c++styled-ostream.cc b/gettext-tools/woe32dll/c++styled-ostream.cc
---- a/gettext-tools/woe32dll/c++styled-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++styled-ostream.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../gnulib-lib/styled-ostream.c"
-diff -urN a/gettext-tools/woe32dll/c++term-ostream.cc b/gettext-tools/woe32dll/c++term-ostream.cc
---- a/gettext-tools/woe32dll/c++term-ostream.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++term-ostream.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../gnulib-lib/term-ostream.c"
-diff -urN a/gettext-tools/woe32dll/c++write-catalog.cc b/gettext-tools/woe32dll/c++write-catalog.cc
---- a/gettext-tools/woe32dll/c++write-catalog.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-catalog.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../src/write-catalog.c"
-diff -urN a/gettext-tools/woe32dll/c++write-po.cc b/gettext-tools/woe32dll/c++write-po.cc
---- a/gettext-tools/woe32dll/c++write-po.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-po.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../src/write-po.c"
-diff -urN a/gettext-tools/woe32dll/c++write-properties.cc b/gettext-tools/woe32dll/c++write-properties.cc
---- a/gettext-tools/woe32dll/c++write-properties.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-properties.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../src/write-properties.c"
-diff -urN a/gettext-tools/woe32dll/c++write-stringtable.cc b/gettext-tools/woe32dll/c++write-stringtable.cc
---- a/gettext-tools/woe32dll/c++write-stringtable.cc	1970-01-01 01:00:00.000000000 +0100
-+++ b/gettext-tools/woe32dll/c++write-stringtable.cc	2015-10-22 00:31:33.326659600 +0100
-@@ -0,0 +1 @@
-+#include "../src/write-stringtable.c"
-diff -urN a/gnulib-local/modules/file-ostream b/gnulib-local/modules/file-ostream
---- a/gnulib-local/modules/file-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/file-ostream	2015-10-22 00:31:33.326659600 +0100
-@@ -12,7 +12,11 @@
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += file-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++file-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h
-diff -urN a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream
---- a/gnulib-local/modules/html-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/html-ostream	2015-10-22 00:31:33.326659600 +0100
-@@ -15,7 +15,11 @@
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += html-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++html-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
-diff -urN a/gnulib-local/modules/ostream b/gnulib-local/modules/ostream
---- a/gnulib-local/modules/ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/ostream	2015-10-22 00:31:33.342259600 +0100
-@@ -11,7 +11,11 @@
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c
-diff -urN a/gnulib-local/modules/styled-ostream b/gnulib-local/modules/styled-ostream
---- a/gnulib-local/modules/styled-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/styled-ostream	2015-10-22 00:31:33.342259600 +0100
-@@ -11,7 +11,11 @@
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += styled-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++styled-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h
-diff -urN a/gnulib-local/modules/term-ostream b/gnulib-local/modules/term-ostream
---- a/gnulib-local/modules/term-ostream	2015-08-21 06:48:27.000000000 +0100
-+++ b/gnulib-local/modules/term-ostream	2015-10-22 00:31:33.342259600 +0100
-@@ -22,7 +22,11 @@
- gl_TERM_OSTREAM
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += term-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++term-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h
diff --git a/patches/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/patches/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
deleted file mode 100644
index 3487302..0000000
--- a/patches/gettext/0.19.7/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c gettext-0.19.6/gettext-tools/gnulib-lib/execute.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:54:39.310372500 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:55:35.261954100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c	2015-09-11 04:03:56.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c	2015-10-24 16:56:00.885918100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c	2015-09-11 04:03:58.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c	2015-10-24 16:56:51.519198900 +0100
-@@ -26,7 +26,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- int
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff gettext-0.19.6/gnulib-local/lib/execute.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/execute.c.diff	2015-10-24 16:58:17.182285000 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff	2015-10-24 16:58:11.741447300 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff gettext-0.19.6/gnulib-local/tests/test-environ.c.diff
---- gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/tests/test-environ.c.diff	2015-10-24 16:58:35.915765100 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  int
diff --git a/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch b/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch
deleted file mode 100644
index 7f980ac..0000000
--- a/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch
+++ /dev/null
@@ -1,44 +0,0 @@
->From cfbc1c62a1ea5c5809d11b957ad29cd820db15b8 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <address@hidden>
-Date: Mon, 21 Mar 2016 00:49:17 -0700
-Subject: [PATCH] sys_select: port to new Cygwin
-
-Problem reported by Ken Brown in:
-https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00054.html
-* lib/sys_select.in.h [__CYGWIN__]: Avoid "unknown type name"
-diagnostics.
----
- ChangeLog           |  8 ++++++++
- lib/sys_select.in.h | 10 ++++++----
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/gettext-tools/gnulib-lib/sys_select.in.h b/gettext-tools/gnulib-lib/sys_select.in.h
-index d6d3f9f..7281144 100644
---- a/gettext-tools/gnulib-lib/sys_select.in.h
-+++ b/gettext-tools/gnulib-lib/sys_select.in.h
-@@ -81,8 +81,9 @@
-    of 'struct timeval', and no definition of this type.
-    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
-    in <sys/time.h>.
--   But avoid namespace pollution on glibc systems.  */
--# ifndef __GLIBC__
-+   But avoid namespace pollution on glibc systems and "unknown type
-+   name" problems on Cygwin.  */
-+# if !(defined __GLIBC__ || defined __CYGWIN__)
- #  include <sys/time.h>
- # endif
- 
-@@ -100,10 +101,11 @@
- #endif
- 
- /* Get definition of 'sigset_t'.
--   But avoid namespace pollution on glibc systems.
-+   But avoid namespace pollution on glibc systems and "unknown type
-+   name" problems on Cygwin.
-    Do this after the include_next (for the sake of OpenBSD 5.0) but before
-    the split double-inclusion guard (for the sake of Solaris).  */
--#if !(defined __GLIBC__ && !defined __UCLIBC__)
-+#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__)
- # include <signal.h>
- #endif
- 
diff --git a/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch b/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch
deleted file mode 100644
index caaf0a0..0000000
--- a/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/gettext-tools/gnulib-lib/sys_select.in.h
-+++ b/gettext-tools/gnulib-lib/sys_select.in.h
-@@ -82,8 +82,8 @@
-    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
-    in <sys/time.h>.
-    But avoid namespace pollution on glibc systems and "unknown type
--   name" problems on Cygwin.  */
--# if !(defined __GLIBC__ || defined __CYGWIN__)
-+   name" problems on newlib systems.  */
-+# if !(defined __GLIBC__ || defined __NEWLIB__)
- #  include <sys/time.h>
- # endif
- 
-@@ -102,10 +102,10 @@
- 
- /* Get definition of 'sigset_t'.
-    But avoid namespace pollution on glibc systems and "unknown type
--   name" problems on Cygwin.
-+   name" problems on newlib systems..
-    Do this after the include_next (for the sake of OpenBSD 5.0) but before
-    the split double-inclusion guard (for the sake of Solaris).  */
--#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__)
-+#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__)
- # include <signal.h>
- #endif
- 
diff --git a/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch b/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch
deleted file mode 100644
index dacdfb1..0000000
--- a/patches/gettext/0.19.8.1/110-Fix-linker-error-redefinition-of-vasprintf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001
-From: Andoni Morales Alastruey <ylatuya@gmail.com>
-Date: Wed, 29 Feb 2012 10:44:43 +0100
-Subject: [PATCH] Fix linker error: redefinition of vasprintf
-
-This might not be the best patch, but it works for us
-The link error was:
-.libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf'
-.libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here
----
- gettext-runtime/libasprintf/autosprintf.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc
-index ca318f7..2526210 100644
---- a/gettext-runtime/libasprintf/autosprintf.cc
-+++ b/gettext-runtime/libasprintf/autosprintf.cc
-@@ -19,8 +19,10 @@
-    This must come before <config.h> because <config.h> may include
-    <features.h>, and once <features.h> has been included, it's too late.  */
- #ifndef _GNU_SOURCE
-+#ifndef _WIN32
- # define _GNU_SOURCE    1
- #endif
-+#endif
- 
- /* Specification.  */
- #include "autosprintf.h"
--- 
-1.8.4
-
diff --git a/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch b/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
deleted file mode 100644
index 8c6b94f..0000000
--- a/patches/gettext/0.19.8.1/120-Fix-Woe32-link-errors-when-compiling-with-O0.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From d4ecf6f15ad7a428786df2efdc88b03be0a4fdbb Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Thu, 17 Jan 2013 18:33:40 +0900
-Subject: [PATCH] Fix Woe32 link errors when compiling with -O0.
-
----
- gettext-tools/src/Makefile.am                  | 24 ++++++++++++++++++++++--
- gettext-tools/src/color.c                      |  1 +
- gettext-tools/woe32dll/c++color.cc             |  1 +
- gettext-tools/woe32dll/c++file-ostream.cc      |  2 ++
- gettext-tools/woe32dll/c++html-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++styled-ostream.cc    |  1 +
- gettext-tools/woe32dll/c++term-ostream.cc      |  1 +
- gettext-tools/woe32dll/c++write-catalog.cc     |  1 +
- gettext-tools/woe32dll/c++write-po.cc          |  1 +
- gettext-tools/woe32dll/c++write-properties.cc  |  1 +
- gettext-tools/woe32dll/c++write-stringtable.cc |  1 +
- gnulib-local/modules/file-ostream              |  4 ++++
- gnulib-local/modules/html-ostream              |  4 ++++
- gnulib-local/modules/ostream                   |  4 ++++
- gnulib-local/modules/styled-ostream            |  4 ++++
- gnulib-local/modules/term-ostream              |  4 ++++
- 16 files changed, 53 insertions(+), 2 deletions(-)
- create mode 100644 gettext-tools/woe32dll/c++color.cc
- create mode 100644 gettext-tools/woe32dll/c++file-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++html-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++styled-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++term-ostream.cc
- create mode 100644 gettext-tools/woe32dll/c++write-catalog.cc
- create mode 100644 gettext-tools/woe32dll/c++write-po.cc
- create mode 100644 gettext-tools/woe32dll/c++write-properties.cc
- create mode 100644 gettext-tools/woe32dll/c++write-stringtable.cc
-
-Additional fix (COLOR_SOURCE) by Ray Donnelly <mingw.android@gmail.com>
-Regenerated for 0.19.8.1 by Alexey Neyman <stilor@att.net>
-
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/src/color.c gettext-0.19.8.1/gettext-tools/src/color.c
---- gettext-0.19.8.1.orig/gettext-tools/src/color.c	2017-01-23 15:13:25.448209511 -0800
-+++ gettext-0.19.8.1/gettext-tools/src/color.c	2017-01-23 15:13:53.168490941 -0800
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#include "ostream.h"
- #include "term-ostream.h"
- #include "xalloc.h"
- #include "relocatable.h"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am gettext-0.19.8.1/gettext-tools/src/Makefile.am
---- gettext-0.19.8.1.orig/gettext-tools/src/Makefile.am	2017-01-23 15:13:25.452209551 -0800
-+++ gettext-0.19.8.1/gettext-tools/src/Makefile.am	2017-01-23 15:13:53.168490941 -0800
-@@ -145,10 +145,26 @@ FORMAT_SOURCE += \
-   format-lua.c \
-   format-javascript.c
- 
-+if !WOE32DLL
-+COLOR_SOURCE = color.c
-+OUTPUT_SOURCE = \
-+  write-catalog.c \
-+  write-properties.c \
-+  write-stringtable.c \
-+  write-po.c
-+else
-+COLOR_SOURCE = ../woe32dll/c++color.cc
-+OUTPUT_SOURCE = \
-+  ../woe32dll/c++write-catalog.cc \
-+  ../woe32dll/c++write-properties.cc \
-+  ../woe32dll/c++write-stringtable.cc \
-+  ../woe32dll/c++write-po.cc
-+endif
-+
- # libgettextsrc contains all code that is needed by at least two programs.
- libgettextsrc_la_SOURCES = \
- $(COMMON_SOURCE) read-catalog.c \
--color.c write-catalog.c write-properties.c write-stringtable.c write-po.c \
-+$(COLOR_SOURCE) $(OUTPUT_SOURCE) \
- msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \
- msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \
- plural-table.c quote.h sentence.h sentence.c \
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++color.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++color.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../src/color.c"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++file-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++file-ostream.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1,2 @@
-+#include "../gnulib-lib/file-ostream.c"
-+
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++html-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++html-ostream.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../gnulib-lib/html-ostream.c"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++styled-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++styled-ostream.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../gnulib-lib/styled-ostream.c"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++term-ostream.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++term-ostream.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../gnulib-lib/term-ostream.c"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-catalog.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-catalog.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../src/write-catalog.c"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-po.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-po.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../src/write-po.c"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-properties.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-properties.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../src/write-properties.c"
-diff -urpN gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc
---- gettext-0.19.8.1.orig/gettext-tools/woe32dll/c++write-stringtable.cc	1969-12-31 16:00:00.000000000 -0800
-+++ gettext-0.19.8.1/gettext-tools/woe32dll/c++write-stringtable.cc	2017-01-23 15:13:53.168490941 -0800
-@@ -0,0 +1 @@
-+#include "../src/write-stringtable.c"
-diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream gettext-0.19.8.1/gnulib-local/modules/file-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/file-ostream	2017-01-23 15:13:25.060205571 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/file-ostream	2017-01-23 15:13:53.168490941 -0800
-@@ -12,7 +12,11 @@ xalloc
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += file-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++file-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- file-ostream.h : $(top_srcdir)/build-aux/moopp file-ostream.oo.h file-ostream.oo.c ostream.oo.h
-diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream gettext-0.19.8.1/gnulib-local/modules/html-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/html-ostream	2017-01-23 15:13:25.060205571 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/html-ostream	2017-01-23 15:13:53.168490941 -0800
-@@ -15,7 +15,11 @@ xalloc
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += html-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++html-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- html-ostream.h : $(top_srcdir)/build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
-diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/ostream gettext-0.19.8.1/gnulib-local/modules/ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/ostream	2017-01-23 15:13:25.060205571 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/ostream	2017-01-23 15:13:53.168490941 -0800
-@@ -11,7 +11,11 @@ moo
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- ostream.h : $(top_srcdir)/build-aux/moopp ostream.oo.h ostream.oo.c
-diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream gettext-0.19.8.1/gnulib-local/modules/styled-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/styled-ostream	2017-01-23 15:13:25.060205571 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/styled-ostream	2017-01-23 15:13:53.168490941 -0800
-@@ -11,7 +11,11 @@ ostream
- configure.ac:
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += styled-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++styled-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- styled-ostream.h : $(top_srcdir)/build-aux/moopp styled-ostream.oo.h styled-ostream.oo.c ostream.oo.h
-diff -urpN gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream gettext-0.19.8.1/gnulib-local/modules/term-ostream
---- gettext-0.19.8.1.orig/gnulib-local/modules/term-ostream	2017-01-23 15:13:25.060205571 -0800
-+++ gettext-0.19.8.1/gnulib-local/modules/term-ostream	2017-01-23 15:13:53.172490983 -0800
-@@ -22,7 +22,11 @@ configure.ac:
- gl_TERM_OSTREAM
- 
- Makefile.am:
-+if !WOE32DLL
- lib_SOURCES += term-ostream.c
-+else
-+lib_SOURCES += ../woe32dll/c++term-ostream.cc
-+endif
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- term-ostream.h : $(top_srcdir)/build-aux/moopp term-ostream.oo.h term-ostream.oo.c ostream.oo.h
diff --git a/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch b/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
deleted file mode 100644
index 3487302..0000000
--- a/patches/gettext/0.19.8.1/130-Fix-static-Cygwin-x86_64-build-environ-is-always-dllimport.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c gettext-0.19.6/gettext-tools/gnulib-lib/execute.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:54:39.310372500 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/execute.c	2015-10-24 16:55:35.261954100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-lib/spawn-pipe.c	2015-09-11 04:03:56.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-lib/spawn-pipe.c	2015-10-24 16:56:00.885918100 +0100
-@@ -52,7 +52,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- 
-diff -urN gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c
---- gettext-0.19.6.orig/gettext-tools/gnulib-tests/test-environ.c	2015-09-11 04:03:58.000000000 +0100
-+++ gettext-0.19.6/gettext-tools/gnulib-tests/test-environ.c	2015-10-24 16:56:51.519198900 +0100
-@@ -26,7 +26,7 @@
-    __cygwin_environ variable on cygwin64:
-    <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- #if defined __CYGWIN__ && defined __x86_64__
--extern DLL_VARIABLE char **environ;
-+extern __attribute__((dllimport)) char **environ;
- #endif
- 
- int
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff gettext-0.19.6/gnulib-local/lib/execute.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/execute.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/execute.c.diff	2015-10-24 16:58:17.182285000 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff
---- gettext-0.19.6.orig/gnulib-local/lib/spawn-pipe.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/lib/spawn-pipe.c.diff	2015-10-24 16:58:11.741447300 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  
-diff -urN gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff gettext-0.19.6/gnulib-local/tests/test-environ.c.diff
---- gettext-0.19.6.orig/gnulib-local/tests/test-environ.c.diff	2015-08-21 08:18:28.000000000 +0100
-+++ gettext-0.19.6/gnulib-local/tests/test-environ.c.diff	2015-10-24 16:58:35.915765100 +0100
-@@ -10,7 +10,7 @@
- +   __cygwin_environ variable on cygwin64:
- +   <https://cygwin.com/ml/cygwin/2013-06/msg00228.html>.  */
- +#if defined __CYGWIN__ && defined __x86_64__
--+extern DLL_VARIABLE char **environ;
-++extern __attribute__((dllimport)) char **environ;
- +#endif
- +
-  int
diff --git a/patches/glibc/2.12.1/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.12.1/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.12.1/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.12.1/900-march-i686.patch b/patches/glibc/2.12.1/900-march-i686.patch
deleted file mode 100644
index 7f5b1ce..0000000
--- a/patches/glibc/2.12.1/900-march-i686.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
-
-       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
-       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
-
-diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
- 
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
- 
-diff -urN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
- 
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
- 
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
diff --git a/patches/glibc/2.12.1/910-typedef-caddr.patch b/patches/glibc/2.12.1/910-typedef-caddr.patch
deleted file mode 100644
index e29e810..0000000
--- a/patches/glibc/2.12.1/910-typedef-caddr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
---- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
-@@ -114,7 +114,10 @@
- #ifdef	__USE_BSD
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
---- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
- #endif
- #ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#  define __caddr_t_defined
-+# endif
- # define __daddr_t_defined
- #endif
- 
diff --git a/patches/glibc/2.12.1/920-make-382.patch b/patches/glibc/2.12.1/920-make-382.patch
deleted file mode 100644
index 28be2fe..0000000
--- a/patches/glibc/2.12.1/920-make-382.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=blob_plain;f=source/base/glibc/make-3.82-fix.patch;hb=8217c32ecc2e14962847ba3d8a272eb64a3dba4f
-
---- glibc-2.10.1.OLD/manual/Makefile
-+++ glibc-2.10.1.NEW/manual/Makefile
-@@ -232,7 +232,9 @@
- .PHONY: stubs
- stubs: $(objpfx)stubs
- endif
--$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
-+$(objpfx)stubs ../po/manual.pot:
-+	touch $@
-+$(objpfx)stamp%:
- 	$(make-target-directory)
- 	touch $@
- 
diff --git a/patches/glibc/2.12.1/999-new-tools.patch b/patches/glibc/2.12.1/999-new-tools.patch
deleted file mode 100644
index d600b58..0000000
--- a/patches/glibc/2.12.1/999-new-tools.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urpN glibc-2.12.1.orig/configure glibc-2.12.1/configure
---- glibc-2.12.1.orig/configure	2010-07-27 04:34:39.000000000 -0700
-+++ glibc-2.12.1/configure	2017-02-08 00:37:58.117495908 -0800
-@@ -5079,7 +5079,7 @@ $as_echo_n "checking version of $CC... "
-   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.4* | 4.[0-9]* )
-+    3.4* | [4-9].* )
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5142,7 +5142,7 @@ $as_echo_n "checking version of $MAKE...
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5269,7 +5269,7 @@ $as_echo_n "checking version of $MAKEINF
-   ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    4.*)
-+    [4-9].*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5329,7 +5329,7 @@ else
-   # Found it, now check the version.
-   { $as_echo "$as_me:$LINENO: checking version of $SED" >&5
- $as_echo_n "checking version of $SED... " >&6; }
--  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-     3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.12.1.orig/configure.in glibc-2.12.1/configure.in
---- glibc-2.12.1.orig/configure.in	2010-07-27 04:34:39.000000000 -0700
-+++ glibc-2.12.1/configure.in	2017-02-08 00:28:47.131374866 -0800
-@@ -960,11 +960,11 @@ fi
- # These programs are version sensitive.
- AC_CHECK_TOOL_PREFIX
- AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
--  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -972,10 +972,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
-   MSGFMT=: aux_missing="$aux_missing msgfmt")
- AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
-   [GNU texinfo.* \([0-9][0-9.]*\)],
--  [4.*],
-+  [[4-9].*],
-   MAKEINFO=: aux_missing="$aux_missing makeinfo")
- AC_CHECK_PROG_VER(SED, sed, --version,
--  [GNU sed version \([0-9]*\.[0-9.]*\)],
-+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
-   [3.0[2-9]*|3.[1-9]*|[4-9]*],
-   SED=: aux_missing="$aux_missing sed")
- 
diff --git a/patches/glibc/2.12.2/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.12.2/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.12.2/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.12.2/900-march-i686.patch b/patches/glibc/2.12.2/900-march-i686.patch
deleted file mode 100644
index 6030de9..0000000
--- a/patches/glibc/2.12.2/900-march-i686.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
-
-       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
-       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
-
-diff -urN glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
- 
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
- 
-diff -urN glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
- 
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
- 
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
diff --git a/patches/glibc/2.12.2/910-typedef-caddr.patch b/patches/glibc/2.12.2/910-typedef-caddr.patch
deleted file mode 100644
index 4bc75cb..0000000
--- a/patches/glibc/2.12.2/910-typedef-caddr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN glibc-2.12.2-orig/posix/sys/types.h glibc-2.12.2/posix/sys/types.h
---- glibc-2.12.2-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.2/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
-@@ -114,7 +114,10 @@
- #ifdef	__USE_BSD
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-diff -urN glibc-2.12.2-orig/sunrpc/rpc/types.h glibc-2.12.2/sunrpc/rpc/types.h
---- glibc-2.12.2-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.2/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
- #endif
- #ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#  define __caddr_t_defined
-+# endif
- # define __daddr_t_defined
- #endif
- 
diff --git a/patches/glibc/2.12.2/999-new-tools.patch b/patches/glibc/2.12.2/999-new-tools.patch
deleted file mode 100644
index e2f7b1d..0000000
--- a/patches/glibc/2.12.2/999-new-tools.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
---- glibc-2.12.2.orig/configure	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure	2017-02-08 00:38:10.249617723 -0800
-@@ -5189,7 +5189,7 @@ $as_echo_n "checking version of $CC... "
-   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.4* | 4.[0-9]* )
-+    3.4* | [4-9].* )
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5252,7 +5252,7 @@ $as_echo_n "checking version of $MAKE...
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5379,7 +5379,7 @@ $as_echo_n "checking version of $MAKEINF
-   ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    4.*)
-+    [4-9].*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5439,7 +5439,7 @@ else
-   # Found it, now check the version.
-   { $as_echo "$as_me:$LINENO: checking version of $SED" >&5
- $as_echo_n "checking version of $SED... " >&6; }
--  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-     3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.12.2.orig/configure.in glibc-2.12.2/configure.in
---- glibc-2.12.2.orig/configure.in	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure.in	2017-02-08 00:29:52.484183611 -0800
-@@ -1026,11 +1026,11 @@ fi
- # These programs are version sensitive.
- AC_CHECK_TOOL_PREFIX
- AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
--  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
-   MSGFMT=: aux_missing="$aux_missing msgfmt")
- AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
-   [GNU texinfo.* \([0-9][0-9.]*\)],
--  [4.*],
-+  [[4-9].*],
-   MAKEINFO=: aux_missing="$aux_missing makeinfo")
- AC_CHECK_PROG_VER(SED, sed, --version,
--  [GNU sed version \([0-9]*\.[0-9.]*\)],
-+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
-   [3.0[2-9]*|3.[1-9]*|[4-9]*],
-   SED=: aux_missing="$aux_missing sed")
- 
diff --git a/patches/glibc/2.13/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.13/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.13/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.13/900-march-i686.patch b/patches/glibc/2.13/900-march-i686.patch
deleted file mode 100644
index 7f5b1ce..0000000
--- a/patches/glibc/2.13/900-march-i686.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
-
-       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
-       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
-
-diff -urN glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.12.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
- 
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
- 
-diff -urN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
- 
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
- 
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
diff --git a/patches/glibc/2.13/910-typedef-caddr.patch b/patches/glibc/2.13/910-typedef-caddr.patch
deleted file mode 100644
index e29e810..0000000
--- a/patches/glibc/2.13/910-typedef-caddr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
---- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
-@@ -114,7 +114,10 @@
- #ifdef	__USE_BSD
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
---- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
- #endif
- #ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#  define __caddr_t_defined
-+# endif
- # define __daddr_t_defined
- #endif
- 
diff --git a/patches/glibc/2.13/950-initfini-ppc64.patch b/patches/glibc/2.13/950-initfini-ppc64.patch
deleted file mode 100644
index 87f8d23..0000000
--- a/patches/glibc/2.13/950-initfini-ppc64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Prevent erroneous inline optimization of initfini.s on PowerPC64.
-
-The problem and the fix was reported there:
-http://sourceware.org/ml/libc-alpha/2012-01/msg00195.html
-Git commit:
-commit 1fe05ea95e1460e5e1cf1568a8ce3982f0f02de6
-Author: Ryan S. Arnold <rsa@us.ibm.com>
-Date: Tue May 3 17:26:17 2011 -0500
-
---- glibc.orig/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:06.713568781 -0800
-+++ glibc/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:50.318605517 -0800
-@@ -31,7 +31,7 @@
- ifneq ($(elf),no)
- # The initfini generation code doesn't work in the presence of -fPIC, so
- # we use -fpic instead which is much better.
--CFLAGS-initfini.s += -fpic -O1
-+CFLAGS-initfini.s += -fpic -O1 -fno-inline
- endif
- endif
- 
diff --git a/patches/glibc/2.13/999-new-tools.patch b/patches/glibc/2.13/999-new-tools.patch
deleted file mode 100644
index d2d498a..0000000
--- a/patches/glibc/2.13/999-new-tools.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urpN glibc-2.13.orig/configure glibc-2.13/configure
---- glibc-2.13.orig/configure	2011-01-17 20:34:07.000000000 -0800
-+++ glibc-2.13/configure	2017-02-08 00:38:22.017735530 -0800
-@@ -5041,7 +5041,7 @@ $as_echo_n "checking version of $CC... "
-   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.4* | 4.[0-9]* )
-+    3.4* | [4-9].* )
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5104,7 +5104,7 @@ $as_echo_n "checking version of $MAKE...
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5231,7 +5231,7 @@ $as_echo_n "checking version of $MAKEINF
-   ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    4.*)
-+    [4-9].*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5291,7 +5291,7 @@ else
-   # Found it, now check the version.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
- $as_echo_n "checking version of $SED... " >&6; }
--  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-     3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.13.orig/configure.in glibc-2.13/configure.in
---- glibc-2.13.orig/configure.in	2011-01-17 20:34:07.000000000 -0800
-+++ glibc-2.13/configure.in	2017-02-08 00:30:01.720295526 -0800
-@@ -1026,11 +1026,11 @@ fi
- # These programs are version sensitive.
- AC_CHECK_TOOL_PREFIX
- AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
--  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
-   MSGFMT=: aux_missing="$aux_missing msgfmt")
- AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
-   [GNU texinfo.* \([0-9][0-9.]*\)],
--  [4.*],
-+  [[4-9].*],
-   MAKEINFO=: aux_missing="$aux_missing makeinfo")
- AC_CHECK_PROG_VER(SED, sed, --version,
--  [GNU sed version \([0-9]*\.[0-9.]*\)],
-+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
-   [3.0[2-9]*|3.[1-9]*|[4-9]*],
-   SED=: aux_missing="$aux_missing sed")
- 
diff --git a/patches/glibc/2.14.1/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.14.1/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.14.1/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.14.1/900-cpuid-include.patch b/patches/glibc/2.14.1/900-cpuid-include.patch
deleted file mode 100644
index 0b8db71..0000000
--- a/patches/glibc/2.14.1/900-cpuid-include.patch
+++ /dev/null
@@ -1,628 +0,0 @@
-This patch fixes another configure test issue when bootstrapping.
-sysdeps/i386/configure.in uses the obsolete AC_HEADER_CHECK macro to
-test for cpuid.h, and that macro tries to include various other
-standard headers (which come from the library, unlike cpuid.h which
-comes from the compiler, so aren't available when bootstrapping) in
-the test code it compiles.  This patch changes the code to use
-AC_CHECK_HEADER, with the fourth argument used to prevent any default
-includes being used in the test.
-
-Tested x86_64 (native).
-
-2012-03-07  Joseph Myers  <joseph@codesourcery.com>
-
-	* sysdeps/i386/configure.in (cpuid.h): Use AC_CHECK_HEADER with no
-	default includes instead of AC_HEADER_CHECK.
-	* sysdeps/i386/configure: Regenerated.
-
-Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
-
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
---- glibc-2.14.1.orig/sysdeps/i386/configure	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure	2012-07-25 01:23:11.799118927 +1000
-@@ -16,23 +16,6 @@
-   as_fn_set_status $1
-   exit $1
- } # as_fn_exit
--# as_fn_arith ARG...
--# ------------------
--# Perform arithmetic evaluation on the ARGs, and store the result in the
--# global $as_val. Take advantage of shells that can avoid forks. The arguments
--# must be portable across $(()) and expr.
--if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
--  eval 'as_fn_arith ()
--  {
--    as_val=$(( $* ))
--  }'
--else
--  as_fn_arith ()
--  {
--    as_val=`expr "$@" || test $? -eq 1`
--  }
--fi # as_fn_arith
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -89,6 +72,10 @@
-   chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- 
-+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-+  # already done that, so ensure we don't try to do so again and fall
-+  # in an infinite loop.  This has already happened in practice.
-+  _as_can_reexec=no; export _as_can_reexec
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-   # original and so on.  Autoconf is especially sensitive to this).
-@@ -97,42 +84,6 @@
-   exit
- }
- 
--# Factoring default headers for most tests.
--ac_includes_default="\
--#include <stdio.h>
--#ifdef HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
--#ifdef HAVE_SYS_STAT_H
--# include <sys/stat.h>
--#endif
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--# include <stddef.h>
--#else
--# ifdef HAVE_STDLIB_H
--#  include <stdlib.h>
--# endif
--#endif
--#ifdef HAVE_STRING_H
--# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
--#  include <memory.h>
--# endif
--# include <string.h>
--#endif
--#ifdef HAVE_STRINGS_H
--# include <strings.h>
--#endif
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_UNISTD_H
--# include <unistd.h>
--#endif"
--
- 
- # ac_fn_c_try_compile LINENO
- # --------------------------
-@@ -167,177 +118,11 @@
- 
- 	ac_retval=1
- fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_compile
- 
--# ac_fn_c_try_cpp LINENO
--# ----------------------
--# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
--ac_fn_c_try_cpp ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_cpp conftest.$ac_ext"
--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_cpp conftest.$ac_ext") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    grep -v '^ *+' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--    mv -f conftest.er1 conftest.err
--  fi
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--    ac_retval=1
--fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_cpp
--
--# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
--# -------------------------------------------------------
--# Tests whether HEADER exists, giving a warning if it cannot be compiled using
--# the include files in INCLUDES and setting the cache variable VAR
--# accordingly.
--ac_fn_c_check_header_mongrel ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if eval "test \"\${$3+set}\"" = set; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
--  $as_echo_n "(cached) " >&6
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
--$as_echo_n "checking $2 usability... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$4
--#include <$2>
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_header_compiler=yes
--else
--  ac_header_compiler=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
--$as_echo_n "checking $2 presence... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <$2>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  ac_header_preproc=yes
--else
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
--  yes:no: )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  eval "$3=\$ac_header_compiler"
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--
--} # ac_fn_c_check_header_mongrel
--
--# ac_fn_c_try_run LINENO
--# ----------------------
--# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
--# that executables *can* be run.
--ac_fn_c_try_run ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_link"
--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_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
--  { { 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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--       $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--       ac_retval=$ac_status
--fi
--  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_run
--
- # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
- # -------------------------------------------------------
- # Tests whether HEADER exists and can be compiled using the include files in
-@@ -347,7 +132,7 @@
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -365,275 +150,16 @@
- eval ac_res=\$$3
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_header_compile
- # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
-  # Local configure fragment for sysdeps/i386.
- 
- 
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
--$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -z "$GREP"; then
--  ac_path_GREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_prog in grep ggrep; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
--# Check for GNU ac_path_GREP and select it if it is found.
--  # Check for GNU $ac_path_GREP
--case `"$ac_path_GREP" --version 2>&1` in
--*GNU*)
--  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'GREP' >> "conftest.nl"
--    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_GREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_GREP="$ac_path_GREP"
--      ac_path_GREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_GREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_GREP"; then
--    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_GREP=$GREP
--fi
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
--$as_echo "$ac_cv_path_GREP" >&6; }
-- GREP="$ac_cv_path_GREP"
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
--$as_echo_n "checking for egrep... " >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
--   then ac_cv_path_EGREP="$GREP -E"
--   else
--     if test -z "$EGREP"; then
--  ac_path_EGREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_prog in egrep; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
--# Check for GNU ac_path_EGREP and select it if it is found.
--  # Check for GNU $ac_path_EGREP
--case `"$ac_path_EGREP" --version 2>&1` in
--*GNU*)
--  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'EGREP' >> "conftest.nl"
--    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_EGREP="$ac_path_EGREP"
--      ac_path_EGREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_EGREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_EGREP=$EGREP
--fi
--
--   fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-- EGREP="$ac_cv_path_EGREP"
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_header_stdc=yes
--else
--  ac_cv_header_stdc=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <string.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then :
--  :
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ctype.h>
--#include <stdlib.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
--		   (('a' <= (c) && (c) <= 'i') \
--		     || ('j' <= (c) && (c) <= 'r') \
--		     || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
--
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
--  int i;
--  for (i = 0; i < 256; i++)
--    if (XOR (islower (i), ISLOWER (i))
--	|| toupper (i) != TOUPPER (i))
--      return 2;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--else
--  ac_cv_header_stdc=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
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "/* No default includes.  */
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
--if test "x$ac_cv_header_cpuid_h" = x""yes; then :
-+if test "x$ac_cv_header_cpuid_h" = xyes; then :
- 
- else
-   as_fn_error $? "gcc must provide the <cpuid.h> header" "$LINENO" 5
-@@ -643,7 +169,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
- $as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
--if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then :
-+if ${libc_cv_cpp_asm_debuginfo+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat > conftest.S <<EOF
-@@ -693,7 +219,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
- $as_echo_n "checking for SSE4 support... " >&6; }
--if test "${libc_cv_cc_sse4+set}" = set; then :
-+if ${libc_cv_cc_sse4+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'
-@@ -716,7 +242,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler -mtune=i686 support" >&5
- $as_echo_n "checking for assembler -mtune=i686 support... " >&6; }
--if test "${libc_cv_as_i686+set}" = set; then :
-+if ${libc_cv_as_i686+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null'
-@@ -735,7 +261,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX support" >&5
- $as_echo_n "checking for AVX support... " >&6; }
--if test "${libc_cv_cc_avx+set}" = set; then :
-+if ${libc_cv_cc_avx+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -mavx -xc /dev/null -S -o /dev/null'
-@@ -758,7 +284,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -mno-vzeroupper support" >&5
- $as_echo_n "checking for -mno-vzeroupper support... " >&6; }
--if test "${libc_cv_cc_novzeroupper+set}" = set; then :
-+if ${libc_cv_cc_novzeroupper+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
---- glibc-2.14.1.orig/sysdeps/i386/configure.in	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure.in	2012-07-25 01:00:49.345025022 +1000
-@@ -1,8 +1,9 @@
- GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
- # Local configure fragment for sysdeps/i386.
- 
--AC_HEADER_CHECK([cpuid.h], ,
--  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
-+AC_CHECK_HEADER([cpuid.h], ,
-+  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
-+  [/* No default includes.  */])
- 
- AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
- 	       libc_cv_cpp_asm_debuginfo, [dnl
-
diff --git a/patches/glibc/2.14.1/910-asm-i686.patch b/patches/glibc/2.14.1/910-asm-i686.patch
deleted file mode 100644
index b049887..0000000
--- a/patches/glibc/2.14.1/910-asm-i686.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2010-04-18
-Initial Package Version: 2.11.1
-Upstream Status:         Not Submitted
-Origin:                  http://www.eglibc.org/archives/patches/msg00073.html
-Description:             Fixes the following build problem with GCC-4.5.0:
-
-/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os
-./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
-./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive
-./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
-make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
-
-diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-04-17 11:34:06.882681001 +0000
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
- 
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
- 
-diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-04-17 11:34:06.882681001 +0000
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
- 
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
- 
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
-
diff --git a/patches/glibc/2.14.1/950-initfini-ppc64.patch b/patches/glibc/2.14.1/950-initfini-ppc64.patch
deleted file mode 100644
index 87f8d23..0000000
--- a/patches/glibc/2.14.1/950-initfini-ppc64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Prevent erroneous inline optimization of initfini.s on PowerPC64.
-
-The problem and the fix was reported there:
-http://sourceware.org/ml/libc-alpha/2012-01/msg00195.html
-Git commit:
-commit 1fe05ea95e1460e5e1cf1568a8ce3982f0f02de6
-Author: Ryan S. Arnold <rsa@us.ibm.com>
-Date: Tue May 3 17:26:17 2011 -0500
-
---- glibc.orig/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:06.713568781 -0800
-+++ glibc/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:50.318605517 -0800
-@@ -31,7 +31,7 @@
- ifneq ($(elf),no)
- # The initfini generation code doesn't work in the presence of -fPIC, so
- # we use -fpic instead which is much better.
--CFLAGS-initfini.s += -fpic -O1
-+CFLAGS-initfini.s += -fpic -O1 -fno-inline
- endif
- endif
- 
diff --git a/patches/glibc/2.14.1/999-new-tools.patch b/patches/glibc/2.14.1/999-new-tools.patch
deleted file mode 100644
index f335a54..0000000
--- a/patches/glibc/2.14.1/999-new-tools.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
---- glibc-2.14.1.orig/configure	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure	2017-02-08 00:38:43.765952352 -0800
-@@ -4939,7 +4939,7 @@ $as_echo_n "checking version of $CC... "
-   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.4* | 4.[0-9]* )
-+    3.4* | [4-9].* )
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5002,7 +5002,7 @@ $as_echo_n "checking version of $MAKE...
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5129,7 +5129,7 @@ $as_echo_n "checking version of $MAKEINF
-   ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    4.*)
-+    [4-9].*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5189,7 +5189,7 @@ else
-   # Found it, now check the version.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
- $as_echo_n "checking version of $SED... " >&6; }
--  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-     3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
---- glibc-2.14.1.orig/configure.in	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure.in	2017-02-08 00:30:13.660439376 -0800
-@@ -1026,11 +1026,11 @@ fi
- # These programs are version sensitive.
- AC_CHECK_TOOL_PREFIX
- AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
--  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
-   MSGFMT=: aux_missing="$aux_missing msgfmt")
- AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
-   [GNU texinfo.* \([0-9][0-9.]*\)],
--  [4.*],
-+  [[4-9].*],
-   MAKEINFO=: aux_missing="$aux_missing makeinfo")
- AC_CHECK_PROG_VER(SED, sed, --version,
--  [GNU sed version \([0-9]*\.[0-9.]*\)],
-+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
-   [3.0[2-9]*|3.[1-9]*|[4-9]*],
-   SED=: aux_missing="$aux_missing sed")
- 
diff --git a/patches/glibc/2.14/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.14/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.14/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.14/900-cpuid-include.patch b/patches/glibc/2.14/900-cpuid-include.patch
deleted file mode 100644
index 0b8db71..0000000
--- a/patches/glibc/2.14/900-cpuid-include.patch
+++ /dev/null
@@ -1,628 +0,0 @@
-This patch fixes another configure test issue when bootstrapping.
-sysdeps/i386/configure.in uses the obsolete AC_HEADER_CHECK macro to
-test for cpuid.h, and that macro tries to include various other
-standard headers (which come from the library, unlike cpuid.h which
-comes from the compiler, so aren't available when bootstrapping) in
-the test code it compiles.  This patch changes the code to use
-AC_CHECK_HEADER, with the fourth argument used to prevent any default
-includes being used in the test.
-
-Tested x86_64 (native).
-
-2012-03-07  Joseph Myers  <joseph@codesourcery.com>
-
-	* sysdeps/i386/configure.in (cpuid.h): Use AC_CHECK_HEADER with no
-	default includes instead of AC_HEADER_CHECK.
-	* sysdeps/i386/configure: Regenerated.
-
-Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
-
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
---- glibc-2.14.1.orig/sysdeps/i386/configure	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure	2012-07-25 01:23:11.799118927 +1000
-@@ -16,23 +16,6 @@
-   as_fn_set_status $1
-   exit $1
- } # as_fn_exit
--# as_fn_arith ARG...
--# ------------------
--# Perform arithmetic evaluation on the ARGs, and store the result in the
--# global $as_val. Take advantage of shells that can avoid forks. The arguments
--# must be portable across $(()) and expr.
--if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
--  eval 'as_fn_arith ()
--  {
--    as_val=$(( $* ))
--  }'
--else
--  as_fn_arith ()
--  {
--    as_val=`expr "$@" || test $? -eq 1`
--  }
--fi # as_fn_arith
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -89,6 +72,10 @@
-   chmod +x "$as_me.lineno" ||
-     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- 
-+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-+  # already done that, so ensure we don't try to do so again and fall
-+  # in an infinite loop.  This has already happened in practice.
-+  _as_can_reexec=no; export _as_can_reexec
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-   # original and so on.  Autoconf is especially sensitive to this).
-@@ -97,42 +84,6 @@
-   exit
- }
- 
--# Factoring default headers for most tests.
--ac_includes_default="\
--#include <stdio.h>
--#ifdef HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
--#ifdef HAVE_SYS_STAT_H
--# include <sys/stat.h>
--#endif
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--# include <stddef.h>
--#else
--# ifdef HAVE_STDLIB_H
--#  include <stdlib.h>
--# endif
--#endif
--#ifdef HAVE_STRING_H
--# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
--#  include <memory.h>
--# endif
--# include <string.h>
--#endif
--#ifdef HAVE_STRINGS_H
--# include <strings.h>
--#endif
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_UNISTD_H
--# include <unistd.h>
--#endif"
--
- 
- # ac_fn_c_try_compile LINENO
- # --------------------------
-@@ -167,177 +118,11 @@
- 
- 	ac_retval=1
- fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_compile
- 
--# ac_fn_c_try_cpp LINENO
--# ----------------------
--# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
--ac_fn_c_try_cpp ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_cpp conftest.$ac_ext"
--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_cpp conftest.$ac_ext") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    grep -v '^ *+' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--    mv -f conftest.er1 conftest.err
--  fi
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--    ac_retval=1
--fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_cpp
--
--# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
--# -------------------------------------------------------
--# Tests whether HEADER exists, giving a warning if it cannot be compiled using
--# the include files in INCLUDES and setting the cache variable VAR
--# accordingly.
--ac_fn_c_check_header_mongrel ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if eval "test \"\${$3+set}\"" = set; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
--  $as_echo_n "(cached) " >&6
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
--$as_echo_n "checking $2 usability... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$4
--#include <$2>
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_header_compiler=yes
--else
--  ac_header_compiler=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
--$as_echo_n "checking $2 presence... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <$2>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  ac_header_preproc=yes
--else
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
--  yes:no: )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  eval "$3=\$ac_header_compiler"
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--fi
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--
--} # ac_fn_c_check_header_mongrel
--
--# ac_fn_c_try_run LINENO
--# ----------------------
--# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
--# that executables *can* be run.
--ac_fn_c_try_run ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_link"
--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_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
--  { { 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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--       $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--       ac_retval=$ac_status
--fi
--  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_run
--
- # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
- # -------------------------------------------------------
- # Tests whether HEADER exists and can be compiled using the include files in
-@@ -347,7 +132,7 @@
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -365,275 +150,16 @@
- eval ac_res=\$$3
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- 
- } # ac_fn_c_check_header_compile
- # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
-  # Local configure fragment for sysdeps/i386.
- 
- 
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
--$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -z "$GREP"; then
--  ac_path_GREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_prog in grep ggrep; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
--# Check for GNU ac_path_GREP and select it if it is found.
--  # Check for GNU $ac_path_GREP
--case `"$ac_path_GREP" --version 2>&1` in
--*GNU*)
--  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'GREP' >> "conftest.nl"
--    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_GREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_GREP="$ac_path_GREP"
--      ac_path_GREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_GREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_GREP"; then
--    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_GREP=$GREP
--fi
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
--$as_echo "$ac_cv_path_GREP" >&6; }
-- GREP="$ac_cv_path_GREP"
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
--$as_echo_n "checking for egrep... " >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
--   then ac_cv_path_EGREP="$GREP -E"
--   else
--     if test -z "$EGREP"; then
--  ac_path_EGREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_prog in egrep; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
--# Check for GNU ac_path_EGREP and select it if it is found.
--  # Check for GNU $ac_path_EGREP
--case `"$ac_path_EGREP" --version 2>&1` in
--*GNU*)
--  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'EGREP' >> "conftest.nl"
--    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_EGREP="$ac_path_EGREP"
--      ac_path_EGREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_EGREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_EGREP=$EGREP
--fi
--
--   fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-- EGREP="$ac_cv_path_EGREP"
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_header_stdc=yes
--else
--  ac_cv_header_stdc=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <string.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then :
--  :
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ctype.h>
--#include <stdlib.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
--		   (('a' <= (c) && (c) <= 'i') \
--		     || ('j' <= (c) && (c) <= 'r') \
--		     || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
--
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
--  int i;
--  for (i = 0; i < 256; i++)
--    if (XOR (islower (i), ISLOWER (i))
--	|| toupper (i) != TOUPPER (i))
--      return 2;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--else
--  ac_cv_header_stdc=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
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "/* No default includes.  */
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
--if test "x$ac_cv_header_cpuid_h" = x""yes; then :
-+if test "x$ac_cv_header_cpuid_h" = xyes; then :
- 
- else
-   as_fn_error $? "gcc must provide the <cpuid.h> header" "$LINENO" 5
-@@ -643,7 +169,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
- $as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
--if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then :
-+if ${libc_cv_cpp_asm_debuginfo+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat > conftest.S <<EOF
-@@ -693,7 +219,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
- $as_echo_n "checking for SSE4 support... " >&6; }
--if test "${libc_cv_cc_sse4+set}" = set; then :
-+if ${libc_cv_cc_sse4+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'
-@@ -716,7 +242,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler -mtune=i686 support" >&5
- $as_echo_n "checking for assembler -mtune=i686 support... " >&6; }
--if test "${libc_cv_as_i686+set}" = set; then :
-+if ${libc_cv_as_i686+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null'
-@@ -735,7 +261,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX support" >&5
- $as_echo_n "checking for AVX support... " >&6; }
--if test "${libc_cv_cc_avx+set}" = set; then :
-+if ${libc_cv_cc_avx+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -mavx -xc /dev/null -S -o /dev/null'
-@@ -758,7 +284,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -mno-vzeroupper support" >&5
- $as_echo_n "checking for -mno-vzeroupper support... " >&6; }
--if test "${libc_cv_cc_novzeroupper+set}" = set; then :
-+if ${libc_cv_cc_novzeroupper+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
---- glibc-2.14.1.orig/sysdeps/i386/configure.in	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure.in	2012-07-25 01:00:49.345025022 +1000
-@@ -1,8 +1,9 @@
- GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
- # Local configure fragment for sysdeps/i386.
- 
--AC_HEADER_CHECK([cpuid.h], ,
--  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
-+AC_CHECK_HEADER([cpuid.h], ,
-+  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
-+  [/* No default includes.  */])
- 
- AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
- 	       libc_cv_cpp_asm_debuginfo, [dnl
-
diff --git a/patches/glibc/2.14/950-initfini-ppc64.patch b/patches/glibc/2.14/950-initfini-ppc64.patch
deleted file mode 100644
index 87f8d23..0000000
--- a/patches/glibc/2.14/950-initfini-ppc64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Prevent erroneous inline optimization of initfini.s on PowerPC64.
-
-The problem and the fix was reported there:
-http://sourceware.org/ml/libc-alpha/2012-01/msg00195.html
-Git commit:
-commit 1fe05ea95e1460e5e1cf1568a8ce3982f0f02de6
-Author: Ryan S. Arnold <rsa@us.ibm.com>
-Date: Tue May 3 17:26:17 2011 -0500
-
---- glibc.orig/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:06.713568781 -0800
-+++ glibc/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:50.318605517 -0800
-@@ -31,7 +31,7 @@
- ifneq ($(elf),no)
- # The initfini generation code doesn't work in the presence of -fPIC, so
- # we use -fpic instead which is much better.
--CFLAGS-initfini.s += -fpic -O1
-+CFLAGS-initfini.s += -fpic -O1 -fno-inline
- endif
- endif
- 
diff --git a/patches/glibc/2.14/999-new-tools.patch b/patches/glibc/2.14/999-new-tools.patch
deleted file mode 100644
index 7d115fd..0000000
--- a/patches/glibc/2.14/999-new-tools.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urpN glibc-2.14.orig/configure glibc-2.14/configure
---- glibc-2.14.orig/configure	2011-05-30 21:12:33.000000000 -0700
-+++ glibc-2.14/configure	2017-02-08 00:38:34.469859812 -0800
-@@ -4939,7 +4939,7 @@ $as_echo_n "checking version of $CC... "
-   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.4* | 4.[0-9]* )
-+    3.4* | [4-9].* )
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5002,7 +5002,7 @@ $as_echo_n "checking version of $MAKE...
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5129,7 +5129,7 @@ $as_echo_n "checking version of $MAKEINF
-   ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    4.*)
-+    [4-9].*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5189,7 +5189,7 @@ else
-   # Found it, now check the version.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
- $as_echo_n "checking version of $SED... " >&6; }
--  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-     3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.14.orig/configure.in glibc-2.14/configure.in
---- glibc-2.14.orig/configure.in	2011-05-30 21:12:33.000000000 -0700
-+++ glibc-2.14/configure.in	2017-02-08 00:30:32.232661325 -0800
-@@ -1026,11 +1026,11 @@ fi
- # These programs are version sensitive.
- AC_CHECK_TOOL_PREFIX
- AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
--  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
-   MSGFMT=: aux_missing="$aux_missing msgfmt")
- AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
-   [GNU texinfo.* \([0-9][0-9.]*\)],
--  [4.*],
-+  [[4-9].*],
-   MAKEINFO=: aux_missing="$aux_missing makeinfo")
- AC_CHECK_PROG_VER(SED, sed, --version,
--  [GNU sed version \([0-9]*\.[0-9.]*\)],
-+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
-   [3.0[2-9]*|3.[1-9]*|[4-9]*],
-   SED=: aux_missing="$aux_missing sed")
- 
diff --git a/patches/glibc/2.15/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.15/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.15/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.15/900-cpuid-include.patch b/patches/glibc/2.15/900-cpuid-include.patch
deleted file mode 100644
index 29edf7b..0000000
--- a/patches/glibc/2.15/900-cpuid-include.patch
+++ /dev/null
@@ -1,548 +0,0 @@
-[As applied to 2.15]
-
-This patch fixes another configure test issue when bootstrapping.
-sysdeps/i386/configure.in uses the obsolete AC_HEADER_CHECK macro to
-test for cpuid.h, and that macro tries to include various other
-standard headers (which come from the library, unlike cpuid.h which
-comes from the compiler, so aren't available when bootstrapping) in
-the test code it compiles.  This patch changes the code to use
-AC_CHECK_HEADER, with the fourth argument used to prevent any default
-includes being used in the test.
-
-Tested x86_64 (native).
-
-2012-03-07  Joseph Myers  <joseph@codesourcery.com>
-
-	* sysdeps/i386/configure.in (cpuid.h): Use AC_CHECK_HEADER with no
-	default includes instead of AC_HEADER_CHECK.
-	* sysdeps/i386/configure: Regenerated.
-
-Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
-
-diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure glibc-2.15/sysdeps/i386/configure
---- glibc-2.15.orig/sysdeps/i386/configure	2017-02-08 14:28:19.947516097 -0800
-+++ glibc-2.15/sysdeps/i386/configure	2017-02-08 17:25:19.756462280 -0800
-@@ -16,23 +16,6 @@ as_fn_exit ()
-   as_fn_set_status $1
-   exit $1
- } # as_fn_exit
--# as_fn_arith ARG...
--# ------------------
--# Perform arithmetic evaluation on the ARGs, and store the result in the
--# global $as_val. Take advantage of shells that can avoid forks. The arguments
--# must be portable across $(()) and expr.
--if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
--  eval 'as_fn_arith ()
--  {
--    as_val=$(( $* ))
--  }'
--else
--  as_fn_arith ()
--  {
--    as_val=`expr "$@" || test $? -eq 1`
--  }
--fi # as_fn_arith
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -97,42 +80,6 @@ $as_echo X/"$0" |
-   exit
- }
- 
--# Factoring default headers for most tests.
--ac_includes_default="\
--#include <stdio.h>
--#ifdef HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
--#ifdef HAVE_SYS_STAT_H
--# include <sys/stat.h>
--#endif
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--# include <stddef.h>
--#else
--# ifdef HAVE_STDLIB_H
--#  include <stdlib.h>
--# endif
--#endif
--#ifdef HAVE_STRING_H
--# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
--#  include <memory.h>
--# endif
--# include <string.h>
--#endif
--#ifdef HAVE_STRINGS_H
--# include <strings.h>
--#endif
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_UNISTD_H
--# include <unistd.h>
--#endif"
--
- 
- # ac_fn_c_try_compile LINENO
- # --------------------------
-@@ -172,172 +119,6 @@ fi
- 
- } # ac_fn_c_try_compile
- 
--# ac_fn_c_try_cpp LINENO
--# ----------------------
--# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
--ac_fn_c_try_cpp ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_cpp conftest.$ac_ext"
--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_cpp conftest.$ac_ext") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    grep -v '^ *+' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--    mv -f conftest.er1 conftest.err
--  fi
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } > conftest.i && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--    ac_retval=1
--fi
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_cpp
--
--# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
--# -------------------------------------------------------
--# Tests whether HEADER exists, giving a warning if it cannot be compiled using
--# the include files in INCLUDES and setting the cache variable VAR
--# accordingly.
--ac_fn_c_check_header_mongrel ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if eval \${$3+:} false; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval \${$3+:} false; then :
--  $as_echo_n "(cached) " >&6
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
--$as_echo_n "checking $2 usability... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$4
--#include <$2>
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_header_compiler=yes
--else
--  ac_header_compiler=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
--$as_echo_n "checking $2 presence... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <$2>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  ac_header_preproc=yes
--else
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
--  yes:no: )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval \${$3+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  eval "$3=\$ac_header_compiler"
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--fi
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--
--} # ac_fn_c_check_header_mongrel
--
--# ac_fn_c_try_run LINENO
--# ----------------------
--# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
--# that executables *can* be run.
--ac_fn_c_try_run ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_link"
--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_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
--  { { 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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--       $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--       ac_retval=$ac_status
--fi
--  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_run
--
- # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
- # -------------------------------------------------------
- # Tests whether HEADER exists and can be compiled using the include files in
-@@ -372,267 +153,8 @@ $as_echo "$ac_res" >&6; }
-  # Local configure fragment for sysdeps/i386.
- 
- 
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
--$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if ${ac_cv_path_GREP+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -z "$GREP"; then
--  ac_path_GREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_prog in grep ggrep; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
--# Check for GNU ac_path_GREP and select it if it is found.
--  # Check for GNU $ac_path_GREP
--case `"$ac_path_GREP" --version 2>&1` in
--*GNU*)
--  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'GREP' >> "conftest.nl"
--    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_GREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_GREP="$ac_path_GREP"
--      ac_path_GREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_GREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_GREP"; then
--    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_GREP=$GREP
--fi
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
--$as_echo "$ac_cv_path_GREP" >&6; }
-- GREP="$ac_cv_path_GREP"
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
--$as_echo_n "checking for egrep... " >&6; }
--if ${ac_cv_path_EGREP+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
--   then ac_cv_path_EGREP="$GREP -E"
--   else
--     if test -z "$EGREP"; then
--  ac_path_EGREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_prog in egrep; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
--      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
--# Check for GNU ac_path_EGREP and select it if it is found.
--  # Check for GNU $ac_path_EGREP
--case `"$ac_path_EGREP" --version 2>&1` in
--*GNU*)
--  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'EGREP' >> "conftest.nl"
--    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_EGREP="$ac_path_EGREP"
--      ac_path_EGREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_EGREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_EGREP=$EGREP
--fi
--
--   fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-- EGREP="$ac_cv_path_EGREP"
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
--if ${ac_cv_header_stdc+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_header_stdc=yes
--else
--  ac_cv_header_stdc=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <string.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then :
--  :
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ctype.h>
--#include <stdlib.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
--		   (('a' <= (c) && (c) <= 'i') \
--		     || ('j' <= (c) && (c) <= 'r') \
--		     || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
--
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
--  int i;
--  for (i = 0; i < 256; i++)
--    if (XOR (islower (i), ISLOWER (i))
--	|| toupper (i) != TOUPPER (i))
--      return 2;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--else
--  ac_cv_header_stdc=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
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "/* No default includes.  */
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
- if test "x$ac_cv_header_cpuid_h" = xyes; then :
- 
- else
-diff -urpN '--exclude=autom4te.cache' glibc-2.15.orig/sysdeps/i386/configure.in glibc-2.15/sysdeps/i386/configure.in
---- glibc-2.15.orig/sysdeps/i386/configure.in	2017-02-08 14:28:19.951516034 -0800
-+++ glibc-2.15/sysdeps/i386/configure.in	2017-02-08 17:24:29.995973278 -0800
-@@ -1,8 +1,9 @@
- GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
- # Local configure fragment for sysdeps/i386.
- 
--AC_HEADER_CHECK([cpuid.h], ,
--  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
-+AC_CHECK_HEADER([cpuid.h], ,
-+  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
-+  [/* No default includes.  */])
- 
- AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
- 	       libc_cv_cpp_asm_debuginfo, [dnl
diff --git a/patches/glibc/2.15/910-asm-i686.patch b/patches/glibc/2.15/910-asm-i686.patch
deleted file mode 100644
index b049887..0000000
--- a/patches/glibc/2.15/910-asm-i686.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2010-04-18
-Initial Package Version: 2.11.1
-Upstream Status:         Not Submitted
-Origin:                  http://www.eglibc.org/archives/patches/msg00073.html
-Description:             Fixes the following build problem with GCC-4.5.0:
-
-/mnt/lfs/sources/libc-build/math/s_frexp.os.dt -MT /mnt/lfs/sources/libc-build/math/s_frexp.os
-./sysdeps/i386/fpu/s_frexp.S: Assembler messages:
-./sysdeps/i386/fpu/s_frexp.S:66: Error: invalid identifier for ".ifdef"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `.'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk at end of line, first unrecognized character is `1'
-./sysdeps/i386/fpu/s_frexp.S:66: Error: expected comma after name `' in .size directive
-./sysdeps/i386/fpu/s_frexp.S:66: Error: ".endif" without ".if"
-./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
-make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
-
-diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-04-17 11:34:06.882681001 +0000
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
- 
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
- 
-diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-04-17 11:34:06.882681001 +0000
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
- 
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
- 
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
-
diff --git a/patches/glibc/2.15/990-try-link-static.patch b/patches/glibc/2.15/990-try-link-static.patch
deleted file mode 100644
index a0ffadd..0000000
--- a/patches/glibc/2.15/990-try-link-static.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-[Patch modified to apply to 2.15]
-
-commit 07037eeb43ca1e0ac2802e3a1492cecf869c63c6
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Thu Mar 8 00:17:27 2012 +0000
-
-    Fix .ctors/.dtors header configure test for bootstrapping.
-
-diff -urpN glibc-2.15.orig/aclocal.m4 glibc-2.15/aclocal.m4
---- glibc-2.15.orig/aclocal.m4	2017-02-08 11:27:28.445657746 -0800
-+++ glibc-2.15/aclocal.m4	2017-02-08 11:37:25.818463475 -0800
-@@ -114,3 +114,17 @@ AC_CACHE_CHECK(whether $LD is GNU ld, li
- [LIBC_PROG_FOO_GNU($LD, libc_cv_prog_ld_gnu=yes, libc_cv_prog_ld_gnu=no)])
- gnu_ld=$libc_cv_prog_ld_gnu
- ])
-+
-+dnl Run a static link test with -nostdlib -nostartfiles.
-+dnl LIBC_TRY_LINK_STATIC([code], [action-if-true], [action-if-false])
-+AC_DEFUN([LIBC_TRY_LINK_STATIC],
-+[cat > conftest.c <<EOF
-+int _start (void) { return 0; }
-+int __start (void) { return 0; }
-+$1
-+EOF
-+AS_IF([AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest
-+		       conftest.c -static -nostartfiles -nostdlib
-+		       1>&AS_MESSAGE_LOG_FD])],
-+      [$2], [$3])
-+rm -f conftest*])
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2017-02-08 11:27:28.453657802 -0800
-+++ glibc-2.15/configure	2017-02-08 11:47:36.184360147 -0800
-@@ -6147,29 +6147,32 @@ $as_echo_n "checking for .preinit_array/
- if ${libc_cv_initfini_array+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--    cat > conftest.c <<EOF
-+  cat > conftest.c <<EOF
- int _start (void) { return 0; }
- int __start (void) { return 0; }
-+
- int foo (void) { return 1; }
- int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;
-+
- EOF
--  if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c
--		     -static -nostartfiles -nostdlib 1>&5'
-+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest
-+		       conftest.c -static -nostartfiles -nostdlib
-+		       1>&5'
-   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }
--  then
--    if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
--      libc_cv_initfini_array=yes
--    else
--      libc_cv_initfini_array=no
--    fi
-+  test $ac_status = 0; }; }; then :
-+  if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
-+    libc_cv_initfini_array=yes
-   else
-     libc_cv_initfini_array=no
-   fi
--  rm -f conftest*
-+else
-+  libc_cv_initfini_array=no
-+fi
-+rm -f conftest*
-+
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_initfini_array" >&5
- $as_echo "$libc_cv_initfini_array" >&6; }
-@@ -6183,21 +6186,22 @@ if ${libc_cv_ctors_header+:} false; then
-   $as_echo_n "(cached) " >&6
- else
-       libc_cv_ctors_header=yes
--    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
-+    cat > conftest.c <<EOF
-+int _start (void) { return 0; }
-+int __start (void) { return 0; }
-+
-+__attribute__ ((constructor)) void ctor (void) { asm (""); }
-+__attribute__ ((destructor))  void dtor (void) { asm (""); }
- 
--int
--main ()
--{
--
--__attribute__ ((constructor)) void ctor (void) { puts("ctor"); }
--__attribute__ ((destructor))  void dtor (void) { puts("dtor"); }
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-+EOF
-+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest
-+		       conftest.c -static -nostartfiles -nostdlib
-+		       1>&5'
-+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then :
-         if $READELF -WS conftest$ac_exeext | $AWK '
- 	{ gsub(/\[ */, "[") }
- 	$2 == ".ctors" || $2 == ".dtors" {
-@@ -6219,8 +6223,7 @@ else
-         as_fn_error $? "missing __attribute__ ((constructor)) support??" "$LINENO" 5
- 
- fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
-+rm -f conftest*
- 
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ctors_header" >&5
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2017-02-08 11:27:28.433657663 -0800
-+++ glibc-2.15/configure.in	2017-02-08 11:46:58.994915812 -0800
-@@ -1439,24 +1439,17 @@ EOF
- 
-   AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support,
- 		 libc_cv_initfini_array, [dnl
--  cat > conftest.c <<EOF
--int _start (void) { return 0; }
--int __start (void) { return 0; }
-+LIBC_TRY_LINK_STATIC([
- int foo (void) { return 1; }
- int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;
--EOF
--  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c
--		     -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD])
--  then
--    if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
--      libc_cv_initfini_array=yes
--    else
--      libc_cv_initfini_array=no
--    fi
-+],
-+  [if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
-+    libc_cv_initfini_array=yes
-   else
-     libc_cv_initfini_array=no
--  fi
--  rm -f conftest*])
-+  fi],
-+  [libc_cv_initfini_array=no])
-+])
-   if test $libc_cv_initfini_array != yes; then
-     AC_MSG_ERROR([Need linker with .init_array/.fini_array support.])
-   fi
-@@ -1464,9 +1457,9 @@ EOF
-   AC_CACHE_CHECK(whether to use .ctors/.dtors header and trailer,
- 		 libc_cv_ctors_header, [dnl
-     libc_cv_ctors_header=yes
--    AC_TRY_LINK([], [
--__attribute__ ((constructor)) void ctor (void) { puts("ctor"); }
--__attribute__ ((destructor))  void dtor (void) { puts("dtor"); }
-+    LIBC_TRY_LINK_STATIC([
-+__attribute__ ((constructor)) void ctor (void) { asm (""); }
-+__attribute__ ((destructor))  void dtor (void) { asm (""); }
- ],
- 		[dnl
-       AS_IF([$READELF -WS conftest$ac_exeext | $AWK '
diff --git a/patches/glibc/2.15/991-builtin_expect.patch b/patches/glibc/2.15/991-builtin_expect.patch
deleted file mode 100644
index 8a327fa..0000000
--- a/patches/glibc/2.15/991-builtin_expect.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-[As applied to 2.15]
-
-commit 3857022a761ea7251f8e5c0e45d382ebc3e34cf9
-Author: Ulrich Drepper <drepper@gmail.com>
-Date:   Sun Jan 8 09:21:09 2012 -0500
-
-     No need for test for __builtin_expect
-
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2017-02-08 12:47:52.580858002 -0800
-+++ glibc-2.15/configure	2017-02-08 13:01:40.682870318 -0800
-@@ -7185,38 +7185,6 @@ if test "$libc_cv_c_asmcr0_bug" != 'no';
- fi
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
--$as_echo_n "checking for __builtin_expect... " >&6; }
--if ${libc_cv_gcc_builtin_expect+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat > conftest.c <<EOF
--#line $LINENO "configure"
--int foo (int a)
--{
--  a = __builtin_expect (a, 10);
--  return a == 10 ? 0 : 1;
--}
--EOF
--if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles
--			    -o conftest conftest.c -lgcc >&5'
--  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then
--  libc_cv_gcc_builtin_expect=yes
--else
--  libc_cv_gcc_builtin_expect=no
--fi
--rm -f conftest*
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gcc_builtin_expect" >&5
--$as_echo "$libc_cv_gcc_builtin_expect" >&6; }
--if test "$libc_cv_gcc_builtin_expect" = no; then
--  as_fn_error $? "support for __builtin_expect needed" "$LINENO" 5
--fi
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_memset" >&5
- $as_echo_n "checking for __builtin_memset... " >&6; }
- if ${libc_cv_gcc_builtin_memset+:} false; then :
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2017-02-08 12:47:52.580858002 -0800
-+++ glibc-2.15/configure.in	2017-02-08 13:01:17.638580410 -0800
-@@ -2098,28 +2098,6 @@ if test "$libc_cv_c_asmcr0_bug" != 'no';
- fi
- fi
- 
--dnl Check whether compiler understands __builtin_expect.
--AC_CACHE_CHECK(for __builtin_expect, libc_cv_gcc_builtin_expect,
--[cat > conftest.c <<EOF
--#line $LINENO "configure"
--int foo (int a)
--{
--  a = __builtin_expect (a, 10);
--  return a == 10 ? 0 : 1;
--}
--EOF
--dnl No \ in command here because it ends up inside ''.
--if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles
--			    -o conftest conftest.c -lgcc >&AS_MESSAGE_LOG_FD]); then
--  libc_cv_gcc_builtin_expect=yes
--else
--  libc_cv_gcc_builtin_expect=no
--fi
--rm -f conftest*])
--if test "$libc_cv_gcc_builtin_expect" = no; then
--  AC_MSG_ERROR([support for __builtin_expect needed])
--fi
--
- AC_CACHE_CHECK(for __builtin_memset, libc_cv_gcc_builtin_memset, [dnl
- cat > conftest.c <<\EOF
- void zero (void *x)
diff --git a/patches/glibc/2.15/992-gcc_s-suffix.patch b/patches/glibc/2.15/992-gcc_s-suffix.patch
deleted file mode 100644
index 6dbc70f..0000000
--- a/patches/glibc/2.15/992-gcc_s-suffix.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-[As applied to 2.15]
-commit 3a533ca370725b68b516e6b74adf4727d17ed28a
-Author: Joseph Myers <joseph@codesourcery.com>
-Date:   Tue Apr 24 10:22:45 2012 +0000
-
-    Don't handle libgcc_s suffixes.
-
-diff -urpN glibc-2.15.orig/config.make.in glibc-2.15/config.make.in
---- glibc-2.15.orig/config.make.in	2017-02-08 13:24:23.338055977 -0800
-+++ glibc-2.15/config.make.in	2017-02-08 13:25:21.810625337 -0800
-@@ -50,7 +50,6 @@ have-z-execstack = @libc_cv_z_execstack@
- have-initfini = @libc_cv_have_initfini@
- have-Bgroup = @libc_cv_Bgroup@
- have-as-needed = @libc_cv_as_needed@
--libgcc_s_suffix = @libc_cv_libgcc_s_suffix@
- need-nopic-initfini = @nopic_initfini@
- with-fp = @with_fp@
- old-glibc-headers = @old_glibc_headers@
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2017-02-08 13:24:23.346056054 -0800
-+++ glibc-2.15/configure	2017-02-08 13:27:07.327670602 -0800
-@@ -654,7 +654,6 @@ libc_cv_z_execstack
- libc_cv_z_combreloc
- ASFLAGS_config
- libc_cv_as_needed
--libc_cv_libgcc_s_suffix
- libc_cv_Bgroup
- libc_cv_cc_with_libunwind
- VERSIONING
-@@ -6465,24 +6464,6 @@ fi
- $as_echo "$libc_cv_Bgroup" >&6; }
- 
- 
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcc_s suffix" >&5
--$as_echo_n "checking for libgcc_s suffix... " >&6; }
--if ${libc_cv_libgcc_s_suffix+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--    cat > conftest.c <<EOF
--int main (void) { return 0; }
--EOF
--  libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
--			   -fPIC -shared -shared-libgcc -o conftest.so \
--			   conftest.c -v 2>&1 >/dev/null \
--			   | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
--  rm -f conftest*
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_libgcc_s_suffix" >&5
--$as_echo "$libc_cv_libgcc_s_suffix" >&6; }
--
--
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed option" >&5
- $as_echo_n "checking for --as-needed option... " >&6; }
- if ${libc_cv_as_needed+:} false; then :
-@@ -6493,7 +6474,7 @@ int main (void) { return 0; }
- EOF
-   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- 			      -fPIC -shared -o conftest.so conftest.c
--			      -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
-+			      -lgcc_s -Wl,--as-needed
- 			      -nostdlib 1>&5'
-   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-   (eval $ac_try) 2>&5
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2017-02-08 13:24:23.346056054 -0800
-+++ glibc-2.15/configure.in	2017-02-08 13:26:44.383441535 -0800
-@@ -1639,20 +1639,6 @@ EOF
-   rm -f conftest*])
-   AC_SUBST(libc_cv_Bgroup)
- 
--  AC_CACHE_CHECK(for libgcc_s suffix,
--		 libc_cv_libgcc_s_suffix, [dnl
--  cat > conftest.c <<EOF
--int main (void) { return 0; }
--EOF
--changequote(,)dnl
--  libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
--			   -fPIC -shared -shared-libgcc -o conftest.so \
--			   conftest.c -v 2>&1 >/dev/null \
--			   | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
--changequote([,])dnl
--  rm -f conftest*])
--  AC_SUBST(libc_cv_libgcc_s_suffix)
--
-   AC_CACHE_CHECK(for --as-needed option,
- 		 libc_cv_as_needed, [dnl
-   cat > conftest.c <<EOF
-@@ -1660,7 +1646,7 @@ int main (void) { return 0; }
- EOF
-   if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
- 			      -fPIC -shared -o conftest.so conftest.c
--			      -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
-+			      -lgcc_s -Wl,--as-needed
- 			      -nostdlib 1>&AS_MESSAGE_LOG_FD])
-   then
-     libc_cv_as_needed=yes
-diff -urpN glibc-2.15.orig/Makeconfig glibc-2.15/Makeconfig
---- glibc-2.15.orig/Makeconfig	2017-02-08 13:24:23.338055977 -0800
-+++ glibc-2.15/Makeconfig	2017-02-08 13:24:31.262132679 -0800
-@@ -565,7 +565,7 @@ endif
- ifneq ($(have-as-needed),yes)
-  libgcc_eh := -lgcc_eh $(libunwind)
- else
-- libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
-+ libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
- endif
- gnulib := -lgcc $(libgcc_eh)
- static-gnulib := -lgcc -lgcc_eh $(libunwind)
diff --git a/patches/glibc/2.15/999-new-tools.patch b/patches/glibc/2.15/999-new-tools.patch
deleted file mode 100644
index e0632a3..0000000
--- a/patches/glibc/2.15/999-new-tools.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urpN glibc-2.15.orig/configure glibc-2.15/configure
---- glibc-2.15.orig/configure	2012-03-19 07:56:58.000000000 -0700
-+++ glibc-2.15/configure	2017-02-08 00:38:53.578049806 -0800
-@@ -4922,7 +4922,7 @@ $as_echo_n "checking version of $CC... "
-   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.4* | 4.[0-9]* )
-+    3.4* | [4-9].* )
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -4985,7 +4985,7 @@ $as_echo_n "checking version of $MAKE...
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5112,7 +5112,7 @@ $as_echo_n "checking version of $MAKEINF
-   ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    4.*)
-+    [4-9].*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5172,7 +5172,7 @@ else
-   # Found it, now check the version.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
- $as_echo_n "checking version of $SED... " >&6; }
--  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-     3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.15.orig/configure.in glibc-2.15/configure.in
---- glibc-2.15.orig/configure.in	2012-01-01 04:16:32.000000000 -0800
-+++ glibc-2.15/configure.in	2017-02-08 00:30:47.440841480 -0800
-@@ -1000,11 +1000,11 @@ fi
- # These programs are version sensitive.
- AC_CHECK_TOOL_PREFIX
- AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
--  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | 4.[0-9]* ],
-+  [version \([egcygnustpi-]*[0-9.]*\)], [3.4* | [4-9].* ],
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1012,10 +1012,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
-   MSGFMT=: aux_missing="$aux_missing msgfmt")
- AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
-   [GNU texinfo.* \([0-9][0-9.]*\)],
--  [4.*],
-+  [[4-9].*],
-   MAKEINFO=: aux_missing="$aux_missing makeinfo")
- AC_CHECK_PROG_VER(SED, sed, --version,
--  [GNU sed version \([0-9]*\.[0-9.]*\)],
-+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
-   [3.0[2-9]*|3.[1-9]*|[4-9]*],
-   SED=: aux_missing="$aux_missing sed")
- 
diff --git a/patches/glibc/2.16.0/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.16.0/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.16.0/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch b/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
deleted file mode 100644
index 803ac6f..0000000
--- a/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 536ae0651b015b1f6140ec01775d4deaacf12c0c Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Mon, 21 Jan 2013 17:41:28 +0100
-Subject: [PATCH] Fix parsing of numeric hosts in gethostbyname_r
-
-Ported from master, fixes CVE-2015-0235.
----
- nss/Makefile           |    2 -
- nss/digits_dots.c      |   73 +++++++++++++------------------------------------
- nss/getXXbyYY_r.c      |    3 ++
- nss/test-digits-dots.c |   38 +++++++++++++++++++++++++
- 4 files changed, 62 insertions(+), 54 deletions(-)
- create mode 100644 nss/test-digits-dots.c
-
---- a/nss/Makefile
-+++ b/nss/Makefile
-@@ -38,7 +38,7 @@ install-bin             := getent makedb
- makedb-modules = xmalloc hash-string
- extra-objs		+= $(makedb-modules:=.o)
- 
--tests			= test-netdb tst-nss-test1
-+tests			= test-netdb tst-nss-test1 test-digits-dots
- xtests			= bug-erange
- 
- include ../Makeconfig
---- a/nss/digits_dots.c
-+++ b/nss/digits_dots.c
-@@ -46,7 +46,10 @@ __nss_hostname_digits_dots (const char *
-     {
-       if (h_errnop)
- 	*h_errnop = NETDB_INTERNAL;
--      *result = NULL;
-+      if (buffer_size == NULL)
-+	*status = NSS_STATUS_TRYAGAIN;
-+      else
-+	*result = NULL;
-       return -1;
-     }
- 
-@@ -83,14 +86,16 @@ __nss_hostname_digits_dots (const char *
- 	}
- 
-       size_needed = (sizeof (*host_addr)
--		     + sizeof (*h_addr_ptrs) + strlen (name) + 1);
-+		     + sizeof (*h_addr_ptrs)
-+		     + sizeof (*h_alias_ptr) + strlen (name) + 1);
- 
-       if (buffer_size == NULL)
-         {
- 	  if (buflen < size_needed)
- 	    {
-+	      *status = NSS_STATUS_TRYAGAIN;
- 	      if (h_errnop != NULL)
--		*h_errnop = TRY_AGAIN;
-+		*h_errnop = NETDB_INTERNAL;
- 	      __set_errno (ERANGE);
- 	      goto done;
- 	    }
-@@ -109,7 +114,7 @@ __nss_hostname_digits_dots (const char *
- 	      *buffer_size = 0;
- 	      __set_errno (save);
- 	      if (h_errnop != NULL)
--		*h_errnop = TRY_AGAIN;
-+		*h_errnop = NETDB_INTERNAL;
- 	      *result = NULL;
- 	      goto done;
- 	    }
-@@ -149,7 +154,9 @@ __nss_hostname_digits_dots (const char *
- 		  if (! ok)
- 		    {
- 		      *h_errnop = HOST_NOT_FOUND;
--		      if (buffer_size)
-+		      if (buffer_size == NULL)
-+			*status = NSS_STATUS_NOTFOUND;
-+		      else
- 			*result = NULL;
- 		      goto done;
- 		    }
-@@ -190,7 +197,7 @@ __nss_hostname_digits_dots (const char *
- 		  if (buffer_size == NULL)
- 		    *status = NSS_STATUS_SUCCESS;
- 		  else
--		   *result = resbuf;
-+		    *result = resbuf;
- 		  goto done;
- 		}
- 
-@@ -201,15 +208,6 @@ __nss_hostname_digits_dots (const char *
- 
-       if ((isxdigit (name[0]) && strchr (name, ':') != NULL) || name[0] == ':')
- 	{
--	  const char *cp;
--	  char *hostname;
--	  typedef unsigned char host_addr_t[16];
--	  host_addr_t *host_addr;
--	  typedef char *host_addr_list_t[2];
--	  host_addr_list_t *h_addr_ptrs;
--	  size_t size_needed;
--	  int addr_size;
--
- 	  switch (af)
- 	    {
- 	    default:
-@@ -225,7 +223,10 @@ __nss_hostname_digits_dots (const char *
- 	      /* This is not possible.  We cannot represent an IPv6 address
- 		 in an `struct in_addr' variable.  */
- 	      *h_errnop = HOST_NOT_FOUND;
--	      *result = NULL;
-+	      if (buffer_size == NULL)
-+		*status = NSS_STATUS_NOTFOUND;
-+	      else
-+		*result = NULL;
- 	      goto done;
- 
- 	    case AF_INET6:
-@@ -233,42 +234,6 @@ __nss_hostname_digits_dots (const char *
- 	      break;
- 	    }
- 
--	  size_needed = (sizeof (*host_addr)
--			 + sizeof (*h_addr_ptrs) + strlen (name) + 1);
--
--	  if (buffer_size == NULL && buflen < size_needed)
--	    {
--	      if (h_errnop != NULL)
--		*h_errnop = TRY_AGAIN;
--	      __set_errno (ERANGE);
--	      goto done;
--	    }
--	  else if (buffer_size != NULL && *buffer_size < size_needed)
--	    {
--	      char *new_buf;
--	      *buffer_size = size_needed;
--	      new_buf = realloc (*buffer, *buffer_size);
--
--	      if (new_buf == NULL)
--		{
--		  save = errno;
--		  free (*buffer);
--		  __set_errno (save);
--		  *buffer = NULL;
--		  *buffer_size = 0;
--		  *result = NULL;
--		  goto done;
--		}
--	      *buffer = new_buf;
--	    }
--
--	  memset (*buffer, '\0', size_needed);
--
--	  host_addr = (host_addr_t *) *buffer;
--	  h_addr_ptrs = (host_addr_list_t *)
--	    ((char *) host_addr + sizeof (*host_addr));
--	  hostname = (char *) h_addr_ptrs + sizeof (*h_addr_ptrs);
--
- 	  for (cp = name;; ++cp)
- 	    {
- 	      if (!*cp)
-@@ -281,7 +246,9 @@ __nss_hostname_digits_dots (const char *
- 		  if (inet_pton (AF_INET6, name, host_addr) <= 0)
- 		    {
- 		      *h_errnop = HOST_NOT_FOUND;
--		      if (buffer_size)
-+		      if (buffer_size == NULL)
-+			*status = NSS_STATUS_NOTFOUND;
-+		      else
- 			*result = NULL;
- 		      goto done;
- 		    }
---- /dev/null
-+++ b/nss/test-digits-dots.c
-@@ -0,0 +1,38 @@
-+/* Copyright (C) 2013 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* Testcase for BZ #15014 */
-+
-+#include <stdlib.h>
-+#include <netdb.h>
-+#include <errno.h>
-+
-+static int
-+do_test (void)
-+{
-+  char buf[32];
-+  struct hostent *result = NULL;
-+  struct hostent ret;
-+  int h_err = 0;
-+  int err;
-+
-+  err = gethostbyname_r ("1.2.3.4", &ret, buf, sizeof (buf), &result, &h_err);
-+  return err == ERANGE && h_err == NETDB_INTERNAL ? EXIT_SUCCESS : EXIT_FAILURE;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
---- a/nss/getXXbyYY_r.c
-+++ b/nss/getXXbyYY_r.c
-@@ -179,6 +179,9 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, L
-     case -1:
-       return errno;
-     case 1:
-+#ifdef NEED_H_ERRNO
-+      any_service = true;
-+#endif
-       goto done;
-     }
- #endif
diff --git a/patches/glibc/2.16.0/999-new-tools.patch b/patches/glibc/2.16.0/999-new-tools.patch
deleted file mode 100644
index e753365..0000000
--- a/patches/glibc/2.16.0/999-new-tools.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urpN glibc-2.16.0.orig/configure glibc-2.16.0/configure
---- glibc-2.16.0.orig/configure	2012-06-30 12:12:34.000000000 -0700
-+++ glibc-2.16.0/configure	2017-02-08 00:39:03.778150878 -0800
-@@ -4845,7 +4845,7 @@ $as_echo_n "checking version of $MAKE...
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -5032,7 +5032,7 @@ else
-   # Found it, now check the version.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
- $as_echo_n "checking version of $SED... " >&6; }
--  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-     3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.16.0.orig/configure.in glibc-2.16.0/configure.in
---- glibc-2.16.0.orig/configure.in	2012-06-30 12:12:34.000000000 -0700
-+++ glibc-2.16.0/configure.in	2017-02-08 00:14:07.996446792 -0800
-@@ -940,7 +940,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}g
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
diff --git a/patches/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch b/patches/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch
deleted file mode 100644
index 59f95aa..0000000
--- a/patches/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Tue, 20 May 2014 21:27:13 +0000
-Subject: [PATCH] Fix ARM build with GCC trunk.
-
-sysdeps/unix/sysv/linux/arm/unwind-resume.c and
-sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static
-variables that are written in C code but only read from toplevel asms.
-Current GCC trunk now optimizes away such apparently write-only static
-variables, so causing a build failure.  This patch marks those
-variables with __attribute_used__ to avoid that optimization.
-
-Tested that this fixes the build for ARM.
-
-	* sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-	(libgcc_s_resume): Use __attribute_used__.
-	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
-	Likewise.
----
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-index 6ccd9b4..660d148 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-@@ -22,7 +22,8 @@
- #include <pthreadP.h>
- 
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-@@ -20,7 +20,8 @@
- #include <stdio.h>
- #include <unwind.h>
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- 
--- 
-1.9.4
-
diff --git a/patches/glibc/2.17/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.17/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.17/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.17/120-support-make4.patch b/patches/glibc/2.17/120-support-make4.patch
deleted file mode 100644
index ca2bae0..0000000
--- a/patches/glibc/2.17/120-support-make4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Original patch modified: Removed ChangeLog and NEWS sections, ajdust for configure.in
-KS
-
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Thu, 31 Oct 2013 02:37:50 +0000 (+1000)
-Subject: Accept make versions 4.0 and greater
-X-Git-Tag: glibc-2.19~556
-X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=28d708c44bc47b56f6551ff285f78edcf61c208a;hp=a56ee40b176d0a3f47f2a7eb75208f2e3763c9fd
-
-Accept make versions 4.0 and greater
----
-
-diff --git a/configure b/configure
-index f382138..5e61abd 100755
---- a/configure
-+++ b/configure
-@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-diff --git a/configure.in b/configure.in
-index 49b70fd..6da8efd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
diff --git a/patches/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch b/patches/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
deleted file mode 100644
index 40e3632..0000000
--- a/patches/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 4f2bcda964d4fff56855e0c66198c9bcb682ea1e
-Author: Will Newton <will.newton@linaro.org>
-Date:   Thu Aug 29 20:10:26 2013 +0100
-
-    ARM: Fix clone code when built for Thumb.
-    
-    The mov lr, pc instruction will lose the Thumb bit from the return address
-    so use blx lr instead.
-    
-    ports/ChangeLog.arm:
-    
-    2013-08-30  Will Newton  <will.newton@linaro.org>
-    
-    	[BZ #15909]
-    	* sysdeps/unix/sysv/linux/arm/clone.S (__clone): Use blx
-    	instead of mov lr, pc.
-    
-    (cherry picked from commit 6b06ac56cdfc9293908724e51e827534e97819aa)
-
-diff --git a/NEWS b/NEWS
-index b023c30..f64fb82 100644
---- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,12 @@ See the end for copying conditions.
- Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
- using `glibc' in the "product" field.
- 
-+Version 2.18.1
-+
-+* The following bugs are resolved with this release:
-+
-+  15909.
-+
- Version 2.18
- 
- * The following bugs are resolved with this release:
-diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
-index 1e7a35c..54debd7 100644
---- a/ports/ChangeLog.arm
-+++ b/ports/ChangeLog.arm
-@@ -1,3 +1,9 @@
-+2013-08-30  Will Newton  <will.newton@linaro.org>
-+
-+	[BZ #15909]
-+	* sysdeps/unix/sysv/linux/arm/clone.S (__clone): Use blx
-+	instead of mov lr, pc.
-+
- 2013-07-03  Joseph Myers  <joseph@codesourcery.com>
- 
- 	* sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
-diff --git a/ports/sysdeps/unix/sysv/linux/arm/clone.S b/ports/sysdeps/unix/sysv/linux/arm/clone.S
-index ce9c2a5..6e74fa7 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/clone.S
-+++ b/ports/sysdeps/unix/sysv/linux/arm/clone.S
-@@ -93,8 +93,8 @@ PSEUDO_END (__clone)
- 	mov	lr, pc
- 	bx      ip
- #else
--	mov	lr, pc
--	ldr 	pc, [sp], #8
-+	ldr 	lr, [sp], #8
-+	blx	lr
- #endif
- 
- 	@ and we are done, passing the return value through r0
diff --git a/patches/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch b/patches/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
deleted file mode 100644
index 7ad9fdf..0000000
--- a/patches/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-commit 2770d15e7e880821fc586619c59eb45180628e16
-Author: Siddhesh Poyarekar <siddhesh@redhat.com>
-Date:   Thu Oct 3 08:26:21 2013 +0530
-
-    Fix PI mutex check in pthread_cond_broadcast and pthread_cond_signal
-    
-    Fixes BZ #15996.
-    
-    The check had a typo - it checked for PTHREAD_MUTEX_ROBUST_NP instead
-    of PTHREAD_MUTEX_ROBUST_NORMAL_NP.  It has now been replaced by the
-    already existing convenience macro USE_REQUEUE_PI.
-
-diff --git a/NEWS b/NEWS
-index f64fb82..fb6069d 100644
---- a/NEWS
-+++ b/NEWS
-@@ -9,7 +9,7 @@ Version 2.18.1
- 
- * The following bugs are resolved with this release:
- 
--  15909.
-+  15909, 15996.
- 
- Version 2.18
- 
-diff --git a/nptl/ChangeLog b/nptl/ChangeLog
-index eae5079..2d78490 100644
---- a/nptl/ChangeLog
-+++ b/nptl/ChangeLog
-@@ -1,3 +1,12 @@
-+2013-10-03  Siddhesh Poyarekar  <siddhesh@redhat.com>
-+
-+	[BZ #15996]
-+	* pthread_cond_broadcast.c (__pthread_cond_broadcast)
-+	[lll_futex_cmp_requeue_pi && __ASSUME_REQUEUE_PI]: Use
-+	USE_REQUEUE_PI.
-+	* pthread_cond_signal.c (__pthread_cond_signal)
-+	[lll_futex_cmd_requeue_pi && __ASSUME_REQUEUE_PI]: Likewise.
-+
- 2013-07-23  David S. Miller  <davem@davemloft.net>
- 
- 	* tst-cancel4.c (WRITE_BUFFER_SIZE): Adjust comment.
-diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
-index 0702ec0..7ba9efa 100644
---- a/nptl/pthread_cond_broadcast.c
-+++ b/nptl/pthread_cond_broadcast.c
-@@ -63,10 +63,7 @@ __pthread_cond_broadcast (cond)
- 
- #if (defined lll_futex_cmp_requeue_pi \
-      && defined __ASSUME_REQUEUE_PI)
--      int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
--      pi_flag &= mut->__data.__kind;
--
--      if (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP)
-+      if (USE_REQUEUE_PI (mut))
- 	{
- 	  if (lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, INT_MAX,
- 					&mut->__data.__lock, futex_val,
-diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
-index 102d0b3..ffc35dc 100644
---- a/nptl/pthread_cond_signal.c
-+++ b/nptl/pthread_cond_signal.c
-@@ -49,14 +49,9 @@ __pthread_cond_signal (cond)
- 
- #if (defined lll_futex_cmp_requeue_pi \
-      && defined __ASSUME_REQUEUE_PI)
--      int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
-       pthread_mutex_t *mut = cond->__data.__mutex;
- 
--      /* Do not use requeue for pshared condvars.  */
--      if (mut != (void *) ~0l)
--	pi_flag &= mut->__data.__kind;
--
--      if (__builtin_expect (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP, 0)
-+      if (USE_REQUEUE_PI (mut)
- 	/* This can only really fail with a ENOSYS, since nobody can modify
- 	   futex while we have the cond_lock.  */
- 	  && lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, 0,
diff --git a/patches/glibc/2.18/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.18/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.18/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.18/120-support-make4.patch b/patches/glibc/2.18/120-support-make4.patch
deleted file mode 100644
index ca2bae0..0000000
--- a/patches/glibc/2.18/120-support-make4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Original patch modified: Removed ChangeLog and NEWS sections, ajdust for configure.in
-KS
-
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Thu, 31 Oct 2013 02:37:50 +0000 (+1000)
-Subject: Accept make versions 4.0 and greater
-X-Git-Tag: glibc-2.19~556
-X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=28d708c44bc47b56f6551ff285f78edcf61c208a;hp=a56ee40b176d0a3f47f2a7eb75208f2e3763c9fd
-
-Accept make versions 4.0 and greater
----
-
-diff --git a/configure b/configure
-index f382138..5e61abd 100755
---- a/configure
-+++ b/configure
-@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
-   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    3.79* | 3.[89]*)
-+    3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-diff --git a/configure.in b/configure.in
-index 49b70fd..6da8efd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | [4-9].* | [1-9][0-9]*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
diff --git a/patches/glibc/2.18/130-arm-unwind.patch b/patches/glibc/2.18/130-arm-unwind.patch
deleted file mode 100644
index 69cc07a..0000000
--- a/patches/glibc/2.18/130-arm-unwind.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c
---- glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c	2016-09-15 02:30:09.199939478 +0300
-@@ -24,7 +24,7 @@
- #include <gnu/lib-names.h>
- 
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2016-09-15 02:29:07.096945862 +0300
-@@ -22,7 +22,7 @@
- #include <pthreadP.h>
- 
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2016-09-15 02:29:37.352917115 +0300
-@@ -20,7 +20,7 @@
- #include <stdio.h>
- #include <unwind.h>
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- 
-diff -urN glibc-2.18.orig/sysdeps/gnu/unwind-resume.c glibc-2.18/sysdeps/gnu/unwind-resume.c
---- glibc-2.18.orig/sysdeps/gnu/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/sysdeps/gnu/unwind-resume.c	2016-09-15 02:29:53.376431503 +0300
-@@ -21,7 +21,7 @@
- #include <unwind.h>
- #include <gnu/lib-names.h>
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
diff --git a/patches/glibc/2.19/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.19/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.19/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.19/130-arm-unwind.patch b/patches/glibc/2.19/130-arm-unwind.patch
deleted file mode 100644
index 69cc07a..0000000
--- a/patches/glibc/2.19/130-arm-unwind.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c
---- glibc-2.18.orig/nptl/sysdeps/pthread/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/nptl/sysdeps/pthread/unwind-forcedunwind.c	2016-09-15 02:30:09.199939478 +0300
-@@ -24,7 +24,7 @@
- #include <gnu/lib-names.h>
- 
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c	2016-09-15 02:29:07.096945862 +0300
-@@ -22,7 +22,7 @@
- #include <pthreadP.h>
- 
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff -urN glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
---- glibc-2.18.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c	2016-09-15 02:29:37.352917115 +0300
-@@ -20,7 +20,7 @@
- #include <stdio.h>
- #include <unwind.h>
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- 
-diff -urN glibc-2.18.orig/sysdeps/gnu/unwind-resume.c glibc-2.18/sysdeps/gnu/unwind-resume.c
---- glibc-2.18.orig/sysdeps/gnu/unwind-resume.c	2013-08-11 02:52:55.000000000 +0400
-+++ glibc-2.18/sysdeps/gnu/unwind-resume.c	2016-09-15 02:29:53.376431503 +0300
-@@ -21,7 +21,7 @@
- #include <unwind.h>
- #include <gnu/lib-names.h>
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
diff --git a/patches/glibc/2.19/910-typedef-caddr.patch b/patches/glibc/2.19/910-typedef-caddr.patch
deleted file mode 100644
index e29e810..0000000
--- a/patches/glibc/2.19/910-typedef-caddr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
---- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
-@@ -114,7 +114,10 @@
- #ifdef	__USE_BSD
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
---- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
- #endif
- #ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#  define __caddr_t_defined
-+# endif
- # define __daddr_t_defined
- #endif
- 
diff --git a/patches/glibc/2.20/100-sparc-nptl.patch b/patches/glibc/2.20/100-sparc-nptl.patch
deleted file mode 100644
index 21f0337..0000000
--- a/patches/glibc/2.20/100-sparc-nptl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/sysdeps/sparc/sparc32/sem_trywait.c b/sysdeps/sparc/sparc32/sem_trywait.c
-index 7d0fc55..ad9b4ad 100644
---- a/sysdeps/sparc/sparc32/sem_trywait.c
-+++ b/sysdeps/sparc/sparc32/sem_trywait.c
-@@ -22,6 +22,7 @@
- #include <lowlevellock.h>
- #include <internaltypes.h>
- #include <semaphore.h>
-+#include <sparc-nptl.h>
- 
- #include <shlib-compat.h>
- 
- 
-
diff --git a/patches/glibc/2.20/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.20/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.20/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.20/910-typedef-caddr.patch b/patches/glibc/2.20/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b..0000000
--- a/patches/glibc/2.20/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/patches/glibc/2.21/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.21/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.21/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.21/910-typedef-caddr.patch b/patches/glibc/2.21/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b..0000000
--- a/patches/glibc/2.21/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/patches/glibc/2.22/100-sparc32-sem_open-missing-include.patch b/patches/glibc/2.22/100-sparc32-sem_open-missing-include.patch
deleted file mode 100644
index b481046..0000000
--- a/patches/glibc/2.22/100-sparc32-sem_open-missing-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 3f512ca79fda7854da188df0585e71467119206e
-Author: Brett Neumeier <brett@neumeier.us>
-Date:   Mon Aug 31 15:27:21 2015 -0700
-
-    Fix non-v9 32-bit sparc build.
-    
-    	[BZ #18870]
-    	* sysdeps/sparc/sparc32/sem_open.c: Add missing #include
-
-diff --git a/sysdeps/sparc/sparc32/sem_open.c b/sysdeps/sparc/sparc32/sem_open.c
-index 16cb9ad..59df2d7 100644
---- a/sysdeps/sparc/sparc32/sem_open.c
-+++ b/sysdeps/sparc/sparc32/sem_open.c
-@@ -29,6 +29,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include "semaphoreP.h"
-+#include <futex-internal.h>
- #include <shm-directory.h>
- 
- 
diff --git a/patches/glibc/2.22/110-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.22/110-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.22/110-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch b/patches/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch
deleted file mode 100644
index 257c5f2..0000000
--- a/patches/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-diff -ruN glibc-2.22.orig/resolv/nss_dns/dns-host.c glibc-2.22/resolv/nss_dns/dns-host.c
---- glibc-2.22.orig/resolv/nss_dns/dns-host.c	2015-08-04 23:42:21.000000000 -0700
-+++ glibc-2.22/resolv/nss_dns/dns-host.c	2016-02-16 13:38:38.000000000 -0800
-@@ -1031,7 +1031,10 @@
-   int h_namelen = 0;
- 
-   if (ancount == 0)
--    return NSS_STATUS_NOTFOUND;
-+    {
-+      *h_errnop = HOST_NOT_FOUND;
-+      return NSS_STATUS_NOTFOUND;
-+    }
- 
-   while (ancount-- > 0 && cp < end_of_message && had_error == 0)
-     {
-@@ -1208,7 +1211,14 @@
-   /* Special case here: if the resolver sent a result but it only
-      contains a CNAME while we are looking for a T_A or T_AAAA record,
-      we fail with NOTFOUND instead of TRYAGAIN.  */
--  return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
-+  if (canon != NULL)
-+    {
-+      *h_errnop = HOST_NOT_FOUND;
-+      return NSS_STATUS_NOTFOUND;
-+    }
-+
-+  *h_errnop = NETDB_INTERNAL;
-+  return NSS_STATUS_TRYAGAIN;
- }
- 
- 
-@@ -1222,11 +1232,101 @@
- 
-   enum nss_status status = NSS_STATUS_NOTFOUND;
- 
-+  /* Combining the NSS status of two distinct queries requires some
-+     compromise and attention to symmetry (A or AAAA queries can be
-+     returned in any order).  What follows is a breakdown of how this
-+     code is expected to work and why. We discuss only SUCCESS,
-+     TRYAGAIN, NOTFOUND and UNAVAIL, since they are the only returns
-+     that apply (though RETURN and MERGE exist).  We make a distinction
-+     between TRYAGAIN (recoverable) and TRYAGAIN' (not-recoverable).
-+     A recoverable TRYAGAIN is almost always due to buffer size issues
-+     and returns ERANGE in errno and the caller is expected to retry
-+     with a larger buffer.
-+
-+     Lastly, you may be tempted to make significant changes to the
-+     conditions in this code to bring about symmetry between responses.
-+     Please don't change anything without due consideration for
-+     expected application behaviour.  Some of the synthesized responses
-+     aren't very well thought out and sometimes appear to imply that
-+     IPv4 responses are always answer 1, and IPv6 responses are always
-+     answer 2, but that's not true (see the implemetnation of send_dg
-+     and send_vc to see response can arrive in any order, particlarly
-+     for UDP). However, we expect it holds roughly enough of the time
-+     that this code works, but certainly needs to be fixed to make this
-+     a more robust implementation.
-+
-+     ----------------------------------------------
-+     | Answer 1 Status /   | Synthesized | Reason |
-+     | Answer 2 Status     | Status      |        |
-+     |--------------------------------------------|
-+     | SUCCESS/SUCCESS     | SUCCESS     | [1]    |
-+     | SUCCESS/TRYAGAIN    | TRYAGAIN    | [5]    |
-+     | SUCCESS/TRYAGAIN'   | SUCCESS     | [1]    |
-+     | SUCCESS/NOTFOUND    | SUCCESS     | [1]    |
-+     | SUCCESS/UNAVAIL     | SUCCESS     | [1]    |
-+     | TRYAGAIN/SUCCESS    | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/TRYAGAIN   | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/TRYAGAIN'  | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/NOTFOUND   | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/UNAVAIL    | TRYAGAIN    | [2]    |
-+     | TRYAGAIN'/SUCCESS   | SUCCESS     | [3]    |
-+     | TRYAGAIN'/TRYAGAIN  | TRYAGAIN    | [3]    |
-+     | TRYAGAIN'/TRYAGAIN' | TRYAGAIN'   | [3]    |
-+     | TRYAGAIN'/NOTFOUND  | TRYAGAIN'   | [3]    |
-+     | TRYAGAIN'/UNAVAIL   | UNAVAIL     | [3]    |
-+     | NOTFOUND/SUCCESS    | SUCCESS     | [3]    |
-+     | NOTFOUND/TRYAGAIN   | TRYAGAIN    | [3]    |
-+     | NOTFOUND/TRYAGAIN'  | TRYAGAIN'   | [3]    |
-+     | NOTFOUND/NOTFOUND   | NOTFOUND    | [3]    |
-+     | NOTFOUND/UNAVAIL    | UNAVAIL     | [3]    |
-+     | UNAVAIL/SUCCESS     | UNAVAIL     | [4]    |
-+     | UNAVAIL/TRYAGAIN    | UNAVAIL     | [4]    |
-+     | UNAVAIL/TRYAGAIN'   | UNAVAIL     | [4]    |
-+     | UNAVAIL/NOTFOUND    | UNAVAIL     | [4]    |
-+     | UNAVAIL/UNAVAIL     | UNAVAIL     | [4]    |
-+     ----------------------------------------------
-+
-+     [1] If the first response is a success we return success.
-+         This ignores the state of the second answer and in fact
-+         incorrectly sets errno and h_errno to that of the second
-+	 answer.  However because the response is a success we ignore
-+	 *errnop and *h_errnop (though that means you touched errno on
-+         success).  We are being conservative here and returning the
-+         likely IPv4 response in the first answer as a success.
-+
-+     [2] If the first response is a recoverable TRYAGAIN we return
-+	 that instead of looking at the second response.  The
-+	 expectation here is that we have failed to get an IPv4 response
-+	 and should retry both queries.
-+
-+     [3] If the first response was not a SUCCESS and the second
-+	 response is not NOTFOUND (had a SUCCESS, need to TRYAGAIN,
-+	 or failed entirely e.g. TRYAGAIN' and UNAVAIL) then use the
-+	 result from the second response, otherwise the first responses
-+	 status is used.  Again we have some odd side-effects when the
-+	 second response is NOTFOUND because we overwrite *errnop and
-+	 *h_errnop that means that a first answer of NOTFOUND might see
-+	 its *errnop and *h_errnop values altered.  Whether it matters
-+	 in practice that a first response NOTFOUND has the wrong
-+	 *errnop and *h_errnop is undecided.
-+
-+     [4] If the first response is UNAVAIL we return that instead of
-+	 looking at the second response.  The expectation here is that
-+	 it will have failed similarly e.g. configuration failure.
-+
-+     [5] Testing this code is complicated by the fact that truncated
-+	 second response buffers might be returned as SUCCESS if the
-+	 first answer is a SUCCESS.  To fix this we add symmetry to
-+	 TRYAGAIN with the second response.  If the second response
-+	 is a recoverable error we now return TRYAGIN even if the first
-+	 response was SUCCESS.  */
-+
-   if (anslen1 > 0)
-     status = gaih_getanswer_slice(answer1, anslen1, qname,
- 				  &pat, &buffer, &buflen,
- 				  errnop, h_errnop, ttlp,
- 				  &first);
-+
-   if ((status == NSS_STATUS_SUCCESS || status == NSS_STATUS_NOTFOUND
-        || (status == NSS_STATUS_TRYAGAIN
- 	   /* We want to look at the second answer in case of an
-@@ -1242,8 +1342,15 @@
- 						     &pat, &buffer, &buflen,
- 						     errnop, h_errnop, ttlp,
- 						     &first);
-+      /* Use the second response status in some cases.  */
-       if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND)
- 	status = status2;
-+      /* Do not return a truncated second response (unless it was
-+         unavoidable e.g. unrecoverable TRYAGAIN).  */
-+      if (status == NSS_STATUS_SUCCESS
-+	  && (status2 == NSS_STATUS_TRYAGAIN
-+	      && *errnop == ERANGE && *h_errnop != NO_RECOVERY))
-+	status = NSS_STATUS_TRYAGAIN;
-     }
- 
-   return status;
-diff -ruN glibc-2.22.orig/resolv/res_query.c glibc-2.22/resolv/res_query.c
---- glibc-2.22.orig/resolv/res_query.c	2015-08-04 23:42:21.000000000 -0700
-+++ glibc-2.22/resolv/res_query.c	2016-02-16 13:38:38.000000000 -0800
-@@ -396,6 +396,7 @@
- 		  {
- 		    free (*answerp2);
- 		    *answerp2 = NULL;
-+		    *nanswerp2 = 0;
- 		    *answerp2_malloced = 0;
- 		  }
- 	}
-@@ -447,6 +448,7 @@
- 			  {
- 			    free (*answerp2);
- 			    *answerp2 = NULL;
-+			    *nanswerp2 = 0;
- 			    *answerp2_malloced = 0;
- 			  }
- 
-@@ -521,6 +523,7 @@
- 	  {
- 	    free (*answerp2);
- 	    *answerp2 = NULL;
-+	    *nanswerp2 = 0;
- 	    *answerp2_malloced = 0;
- 	  }
- 	if (saved_herrno != -1)
-diff -ruN glibc-2.22.orig/resolv/res_send.c glibc-2.22/resolv/res_send.c
---- glibc-2.22.orig/resolv/res_send.c	2015-08-04 23:42:21.000000000 -0700
-+++ glibc-2.22/resolv/res_send.c	2016-02-16 13:43:59.000000000 -0800
-@@ -1,3 +1,20 @@
-+/* Copyright (C) 2016 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
- /*
-  * Copyright (c) 1985, 1989, 1993
-  *    The Regents of the University of California.  All rights reserved.
-@@ -363,6 +380,8 @@
- #ifdef USE_HOOKS
- 	if (__glibc_unlikely (statp->qhook || statp->rhook))       {
- 		if (anssiz < MAXPACKET && ansp) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *buf = malloc (MAXPACKET);
- 			if (buf == NULL)
- 				return (-1);
-@@ -638,6 +657,77 @@
-     return (struct sockaddr *) (void *) &statp->nsaddr_list[n];
- }
- 
-+/* The send_vc function is responsible for sending a DNS query over TCP
-+   to the nameserver numbered NS from the res_state STATP i.e.
-+   EXT(statp).nssocks[ns].  The function supports sending both IPv4 and
-+   IPv6 queries at the same serially on the same socket.
-+
-+   Please note that for TCP there is no way to disable sending both
-+   queries, unlike UDP, which honours RES_SNGLKUP and RES_SNGLKUPREOP
-+   and sends the queries serially and waits for the result after each
-+   sent query.  This implemetnation should be corrected to honour these
-+   options.
-+
-+   Please also note that for TCP we send both queries over the same
-+   socket one after another.  This technically violates best practice
-+   since the server is allowed to read the first query, respond, and
-+   then close the socket (to service another client).  If the server
-+   does this, then the remaining second query in the socket data buffer
-+   will cause the server to send the client an RST which will arrive
-+   asynchronously and the client's OS will likely tear down the socket
-+   receive buffer resulting in a potentially short read and lost
-+   response data.  This will force the client to retry the query again,
-+   and this process may repeat until all servers and connection resets
-+   are exhausted and then the query will fail.  It's not known if this
-+   happens with any frequency in real DNS server implementations.  This
-+   implementation should be corrected to use two sockets by default for
-+   parallel queries.
-+
-+   The query stored in BUF of BUFLEN length is sent first followed by
-+   the query stored in BUF2 of BUFLEN2 length.  Queries are sent
-+   serially on the same socket.
-+
-+   Answers to the query are stored firstly in *ANSP up to a max of
-+   *ANSSIZP bytes.  If more than *ANSSIZP bytes are needed and ANSCP
-+   is non-NULL (to indicate that modifying the answer buffer is allowed)
-+   then malloc is used to allocate a new response buffer and ANSCP and
-+   ANSP will both point to the new buffer.  If more than *ANSSIZP bytes
-+   are needed but ANSCP is NULL, then as much of the response as
-+   possible is read into the buffer, but the results will be truncated.
-+   When truncation happens because of a small answer buffer the DNS
-+   packets header feild TC will bet set to 1, indicating a truncated
-+   message and the rest of the socket data will be read and discarded.
-+
-+   Answers to the query are stored secondly in *ANSP2 up to a max of
-+   *ANSSIZP2 bytes, with the actual response length stored in
-+   *RESPLEN2.  If more than *ANSSIZP bytes are needed and ANSP2
-+   is non-NULL (required for a second query) then malloc is used to
-+   allocate a new response buffer, *ANSSIZP2 is set to the new buffer
-+   size and *ANSP2_MALLOCED is set to 1.
-+
-+   The ANSP2_MALLOCED argument will eventually be removed as the
-+   change in buffer pointer can be used to detect the buffer has
-+   changed and that the caller should use free on the new buffer.
-+
-+   Note that the answers may arrive in any order from the server and
-+   therefore the first and second answer buffers may not correspond to
-+   the first and second queries.
-+
-+   It is not supported to call this function with a non-NULL ANSP2
-+   but a NULL ANSCP.  Put another way, you can call send_vc with a
-+   single unmodifiable buffer or two modifiable buffers, but no other
-+   combination is supported.
-+
-+   It is the caller's responsibility to free the malloc allocated
-+   buffers by detecting that the pointers have changed from their
-+   original values i.e. *ANSCP or *ANSP2 has changed.
-+
-+   If errors are encountered then *TERRNO is set to an appropriate
-+   errno value and a zero result is returned for a recoverable error,
-+   and a less-than zero result is returned for a non-recoverable error.
-+
-+   If no errors are encountered then *TERRNO is left unmodified and
-+   a the length of the first response in bytes is returned.  */
- static int
- send_vc(res_state statp,
- 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
-@@ -647,11 +737,7 @@
- {
- 	const HEADER *hp = (HEADER *) buf;
- 	const HEADER *hp2 = (HEADER *) buf2;
--	u_char *ans = *ansp;
--	int orig_anssizp = *anssizp;
--	// XXX REMOVE
--	// int anssiz = *anssizp;
--	HEADER *anhp = (HEADER *) ans;
-+	HEADER *anhp = (HEADER *) *ansp;
- 	struct sockaddr *nsap = get_nsaddr (statp, ns);
- 	int truncating, connreset, n;
- 	/* On some architectures compiler might emit a warning indicating
-@@ -743,6 +829,8 @@
- 	 * Receive length & response
- 	 */
- 	int recvresp1 = 0;
-+	/* Skip the second response if there is no second query.
-+           To do that we mark the second response as received.  */
- 	int recvresp2 = buf2 == NULL;
- 	uint16_t rlen16;
-  read_len:
-@@ -779,40 +867,14 @@
- 	u_char **thisansp;
- 	int *thisresplenp;
- 	if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
-+		/* We have not received any responses
-+		   yet or we only have one response to
-+		   receive.  */
- 		thisanssizp = anssizp;
- 		thisansp = anscp ?: ansp;
- 		assert (anscp != NULL || ansp2 == NULL);
- 		thisresplenp = &resplen;
- 	} else {
--		if (*anssizp != MAXPACKET) {
--			/* No buffer allocated for the first
--			   reply.  We can try to use the rest
--			   of the user-provided buffer.  */
--#if __GNUC_PREREQ (4, 7)
--			DIAG_PUSH_NEEDS_COMMENT;
--			DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
--#endif
--#if _STRING_ARCH_unaligned
--			*anssizp2 = orig_anssizp - resplen;
--			*ansp2 = *ansp + resplen;
--#else
--			int aligned_resplen
--			  = ((resplen + __alignof__ (HEADER) - 1)
--			     & ~(__alignof__ (HEADER) - 1));
--			*anssizp2 = orig_anssizp - aligned_resplen;
--			*ansp2 = *ansp + aligned_resplen;
--#endif
--#if __GNUC_PREREQ (4, 7)
--			DIAG_POP_NEEDS_COMMENT;
--#endif
--		} else {
--			/* The first reply did not fit into the
--			   user-provided buffer.  Maybe the second
--			   answer will.  */
--			*anssizp2 = orig_anssizp;
--			*ansp2 = *ansp;
--		}
--
- 		thisanssizp = anssizp2;
- 		thisansp = ansp2;
- 		thisresplenp = resplen2;
-@@ -820,10 +882,14 @@
- 	anhp = (HEADER *) *thisansp;
- 
- 	*thisresplenp = rlen;
--	if (rlen > *thisanssizp) {
--		/* Yes, we test ANSCP here.  If we have two buffers
--		   both will be allocatable.  */
--		if (__glibc_likely (anscp != NULL))       {
-+	/* Is the answer buffer too small?  */
-+	if (*thisanssizp < rlen) {
-+		/* If the current buffer is not the the static
-+		   user-supplied buffer then we can reallocate
-+		   it.  */
-+		if (thisansp != NULL && thisansp != ansp) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *newp = malloc (MAXPACKET);
- 			if (newp == NULL) {
- 				*terrno = ENOMEM;
-@@ -835,6 +901,9 @@
- 			if (thisansp == ansp2)
- 			  *ansp2_malloced = 1;
- 			anhp = (HEADER *) newp;
-+			/* A uint16_t can't be larger than MAXPACKET
-+			   thus it's safe to allocate MAXPACKET but
-+			   read RLEN bytes instead.  */
- 			len = rlen;
- 		} else {
- 			Dprint(statp->options & RES_DEBUG,
-@@ -997,6 +1066,66 @@
- 	return 1;
- }
- 
-+/* The send_dg function is responsible for sending a DNS query over UDP
-+   to the nameserver numbered NS from the res_state STATP i.e.
-+   EXT(statp).nssocks[ns].  The function supports IPv4 and IPv6 queries
-+   along with the ability to send the query in parallel for both stacks
-+   (default) or serially (RES_SINGLKUP).  It also supports serial lookup
-+   with a close and reopen of the socket used to talk to the server
-+   (RES_SNGLKUPREOP) to work around broken name servers.
-+
-+   The query stored in BUF of BUFLEN length is sent first followed by
-+   the query stored in BUF2 of BUFLEN2 length.  Queries are sent
-+   in parallel (default) or serially (RES_SINGLKUP or RES_SNGLKUPREOP).
-+
-+   Answers to the query are stored firstly in *ANSP up to a max of
-+   *ANSSIZP bytes.  If more than *ANSSIZP bytes are needed and ANSCP
-+   is non-NULL (to indicate that modifying the answer buffer is allowed)
-+   then malloc is used to allocate a new response buffer and ANSCP and
-+   ANSP will both point to the new buffer.  If more than *ANSSIZP bytes
-+   are needed but ANSCP is NULL, then as much of the response as
-+   possible is read into the buffer, but the results will be truncated.
-+   When truncation happens because of a small answer buffer the DNS
-+   packets header feild TC will bet set to 1, indicating a truncated
-+   message, while the rest of the UDP packet is discarded.
-+
-+   Answers to the query are stored secondly in *ANSP2 up to a max of
-+   *ANSSIZP2 bytes, with the actual response length stored in
-+   *RESPLEN2.  If more than *ANSSIZP bytes are needed and ANSP2
-+   is non-NULL (required for a second query) then malloc is used to
-+   allocate a new response buffer, *ANSSIZP2 is set to the new buffer
-+   size and *ANSP2_MALLOCED is set to 1.
-+
-+   The ANSP2_MALLOCED argument will eventually be removed as the
-+   change in buffer pointer can be used to detect the buffer has
-+   changed and that the caller should use free on the new buffer.
-+
-+   Note that the answers may arrive in any order from the server and
-+   therefore the first and second answer buffers may not correspond to
-+   the first and second queries.
-+
-+   It is not supported to call this function with a non-NULL ANSP2
-+   but a NULL ANSCP.  Put another way, you can call send_vc with a
-+   single unmodifiable buffer or two modifiable buffers, but no other
-+   combination is supported.
-+
-+   It is the caller's responsibility to free the malloc allocated
-+   buffers by detecting that the pointers have changed from their
-+   original values i.e. *ANSCP or *ANSP2 has changed.
-+
-+   If an answer is truncated because of UDP datagram DNS limits then
-+   *V_CIRCUIT is set to 1 and the return value non-zero to indicate to
-+   the caller to retry with TCP.  The value *GOTSOMEWHERE is set to 1
-+   if any progress was made reading a response from the nameserver and
-+   is used by the caller to distinguish between ECONNREFUSED and
-+   ETIMEDOUT (the latter if *GOTSOMEWHERE is 1).
-+
-+   If errors are encountered then *TERRNO is set to an appropriate
-+   errno value and a zero result is returned for a recoverable error,
-+   and a less-than zero result is returned for a non-recoverable error.
-+
-+   If no errors are encountered then *TERRNO is left unmodified and
-+   a the length of the first response in bytes is returned.  */
- static int
- send_dg(res_state statp,
- 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
-@@ -1006,8 +1135,6 @@
- {
- 	const HEADER *hp = (HEADER *) buf;
- 	const HEADER *hp2 = (HEADER *) buf2;
--	u_char *ans = *ansp;
--	int orig_anssizp = *anssizp;
- 	struct timespec now, timeout, finish;
- 	struct pollfd pfd[1];
- 	int ptimeout;
-@@ -1040,6 +1167,8 @@
- 	int need_recompute = 0;
- 	int nwritten = 0;
- 	int recvresp1 = 0;
-+	/* Skip the second response if there is no second query.
-+           To do that we mark the second response as received.  */
- 	int recvresp2 = buf2 == NULL;
- 	pfd[0].fd = EXT(statp).nssocks[ns];
- 	pfd[0].events = POLLOUT;
-@@ -1203,55 +1332,56 @@
- 		int *thisresplenp;
- 
- 		if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
-+			/* We have not received any responses
-+			   yet or we only have one response to
-+			   receive.  */
- 			thisanssizp = anssizp;
- 			thisansp = anscp ?: ansp;
- 			assert (anscp != NULL || ansp2 == NULL);
- 			thisresplenp = &resplen;
- 		} else {
--			if (*anssizp != MAXPACKET) {
--				/* No buffer allocated for the first
--				   reply.  We can try to use the rest
--				   of the user-provided buffer.  */
--#if _STRING_ARCH_unaligned
--				*anssizp2 = orig_anssizp - resplen;
--				*ansp2 = *ansp + resplen;
--#else
--				int aligned_resplen
--				  = ((resplen + __alignof__ (HEADER) - 1)
--				     & ~(__alignof__ (HEADER) - 1));
--				*anssizp2 = orig_anssizp - aligned_resplen;
--				*ansp2 = *ansp + aligned_resplen;
--#endif
--			} else {
--				/* The first reply did not fit into the
--				   user-provided buffer.  Maybe the second
--				   answer will.  */
--				*anssizp2 = orig_anssizp;
--				*ansp2 = *ansp;
--			}
--
- 			thisanssizp = anssizp2;
- 			thisansp = ansp2;
- 			thisresplenp = resplen2;
- 		}
- 
- 		if (*thisanssizp < MAXPACKET
--		    /* Yes, we test ANSCP here.  If we have two buffers
--		       both will be allocatable.  */
--		    && anscp
-+		    /* If the current buffer is not the the static
-+		       user-supplied buffer then we can reallocate
-+		       it.  */
-+		    && (thisansp != NULL && thisansp != ansp)
- #ifdef FIONREAD
-+		    /* Is the size too small?  */
- 		    && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
- 			|| *thisanssizp < *thisresplenp)
- #endif
-                     ) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *newp = malloc (MAXPACKET);
- 			if (newp != NULL) {
--				*anssizp = MAXPACKET;
--				*thisansp = ans = newp;
-+				*thisanssizp = MAXPACKET;
-+				*thisansp = newp;
- 				if (thisansp == ansp2)
- 				  *ansp2_malloced = 1;
- 			}
- 		}
-+		/* We could end up with truncation if anscp was NULL
-+		   (not allowed to change caller's buffer) and the
-+		   response buffer size is too small.  This isn't a
-+		   reliable way to detect truncation because the ioctl
-+		   may be an inaccurate report of the UDP message size.
-+		   Therefore we use this only to issue debug output.
-+		   To do truncation accurately with UDP we need
-+		   MSG_TRUNC which is only available on Linux.  We
-+		   can abstract out the Linux-specific feature in the
-+		   future to detect truncation.  */
-+		if (__glibc_unlikely (*thisanssizp < *thisresplenp)) {
-+			Dprint(statp->options & RES_DEBUG,
-+			       (stdout, ";; response may be truncated (UDP)\n")
-+			);
-+		}
-+
- 		HEADER *anhp = (HEADER *) *thisansp;
- 		socklen_t fromlen = sizeof(struct sockaddr_in6);
- 		assert (sizeof(from) <= fromlen);
diff --git a/patches/glibc/2.22/910-typedef-caddr.patch b/patches/glibc/2.22/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b..0000000
--- a/patches/glibc/2.22/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/patches/glibc/2.23/100-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.23/100-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.23/100-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/patches/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
deleted file mode 100644
index 6fd663a..0000000
--- a/patches/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
- -Wparentheses
-
----
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-2.7.4
-
diff --git a/patches/glibc/2.23/120-Fix-build-with-enable-static-nss.patch b/patches/glibc/2.23/120-Fix-build-with-enable-static-nss.patch
deleted file mode 100644
index 59ab087..0000000
--- a/patches/glibc/2.23/120-Fix-build-with-enable-static-nss.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3a36c1eea4fa3b6f3b3b43f7eb91152383ae4ad8 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Tue, 24 Jan 2017 10:31:40 -0800
-Subject: [PATCH] Fix build with --enable-static-nss
-
-* nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions
-  match those around use, to avoid "defined but not used" error.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ChangeLog      | 5 +++++
- nss/nsswitch.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/nss/nsswitch.c b/nss/nsswitch.c
-index 0a65f6a..8f31658 100644
---- a/nss/nsswitch.c
-+++ b/nss/nsswitch.c
-@@ -94,7 +94,7 @@ static name_database *service_table;
- static name_database_entry *defconfig_entries;
- 
- 
--#ifdef USE_NSCD
-+#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
- /* Nonzero if this is the nscd process.  */
- static bool is_nscd;
- /* The callback passed to the init functions when nscd is used.  */
--- 
-2.9.3
-
diff --git a/patches/glibc/2.23/910-typedef-caddr.patch b/patches/glibc/2.23/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b..0000000
--- a/patches/glibc/2.23/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/patches/glibc/2.24/100-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.24/100-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.24/100-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.24/110-sh-fix-gcc6.patch b/patches/glibc/2.24/110-sh-fix-gcc6.patch
deleted file mode 100644
index cacf390..0000000
--- a/patches/glibc/2.24/110-sh-fix-gcc6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 279acf7a059f2d2296f690d7f2d886bd0e404f30 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 25 Jan 2017 21:46:53 -0800
-Subject: [PATCH] sh: conditional is false in dl-conflict.c
-
-... ifdef it out, so that it doesn't create a call to abort().
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- sysdeps/sh/dl-machine.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
-index 449deea..2b468af 100644
---- a/sysdeps/sh/dl-machine.h
-+++ b/sysdeps/sh/dl-machine.h
-@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
- 	  break;
- 	case R_SH_DIR32:
- 	  {
--#ifndef RTLD_BOOTSTRAP
-+#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
- 	   /* This is defined in rtld.c, but nowhere in the static
- 	      libc.a; make the reference weak so static programs can
- 	      still link.  This declaration cannot be done when
--- 
-2.9.3
-
diff --git a/patches/glibc/2.24/120-Fix-build-with-enable-static-nss.patch b/patches/glibc/2.24/120-Fix-build-with-enable-static-nss.patch
deleted file mode 100644
index 59ab087..0000000
--- a/patches/glibc/2.24/120-Fix-build-with-enable-static-nss.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3a36c1eea4fa3b6f3b3b43f7eb91152383ae4ad8 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Tue, 24 Jan 2017 10:31:40 -0800
-Subject: [PATCH] Fix build with --enable-static-nss
-
-* nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions
-  match those around use, to avoid "defined but not used" error.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ChangeLog      | 5 +++++
- nss/nsswitch.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/nss/nsswitch.c b/nss/nsswitch.c
-index 0a65f6a..8f31658 100644
---- a/nss/nsswitch.c
-+++ b/nss/nsswitch.c
-@@ -94,7 +94,7 @@ static name_database *service_table;
- static name_database_entry *defconfig_entries;
- 
- 
--#ifdef USE_NSCD
-+#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
- /* Nonzero if this is the nscd process.  */
- static bool is_nscd;
- /* The callback passed to the init functions when nscd is used.  */
--- 
-2.9.3
-
diff --git a/patches/glibc/2.24/910-typedef-caddr.patch b/patches/glibc/2.24/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b..0000000
--- a/patches/glibc/2.24/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch
deleted file mode 100644
index 9097628..0000000
--- a/patches/glibc/2.25/100-Cygwin-doesnt-have-stat64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.22/sunrpc/rpc_main.c.orig	2015-08-05 07:42:21.000000000 +0100
-+++ glibc-2.22/sunrpc/rpc_main.c	2015-10-21 23:37:31.071268800 +0100
-@@ -51,6 +51,10 @@
- #include "rpc_scan.h"
- #include "proto.h"
- 
-+#if defined(__CYGWIN__)
-+#define stat64 stat
-+#endif
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
- 
diff --git a/patches/glibc/2.25/110-sh-fix-gcc6.patch b/patches/glibc/2.25/110-sh-fix-gcc6.patch
deleted file mode 100644
index cacf390..0000000
--- a/patches/glibc/2.25/110-sh-fix-gcc6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 279acf7a059f2d2296f690d7f2d886bd0e404f30 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 25 Jan 2017 21:46:53 -0800
-Subject: [PATCH] sh: conditional is false in dl-conflict.c
-
-... ifdef it out, so that it doesn't create a call to abort().
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- sysdeps/sh/dl-machine.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
-index 449deea..2b468af 100644
---- a/sysdeps/sh/dl-machine.h
-+++ b/sysdeps/sh/dl-machine.h
-@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
- 	  break;
- 	case R_SH_DIR32:
- 	  {
--#ifndef RTLD_BOOTSTRAP
-+#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
- 	   /* This is defined in rtld.c, but nowhere in the static
- 	      libc.a; make the reference weak so static programs can
- 	      still link.  This declaration cannot be done when
--- 
-2.9.3
-
diff --git a/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch b/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
deleted file mode 100644
index 59ab087..0000000
--- a/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3a36c1eea4fa3b6f3b3b43f7eb91152383ae4ad8 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Tue, 24 Jan 2017 10:31:40 -0800
-Subject: [PATCH] Fix build with --enable-static-nss
-
-* nss/nsswitch.c (nscd_init_cb, is_nscd): make the #if around definitions
-  match those around use, to avoid "defined but not used" error.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ChangeLog      | 5 +++++
- nss/nsswitch.c | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/nss/nsswitch.c b/nss/nsswitch.c
-index 0a65f6a..8f31658 100644
---- a/nss/nsswitch.c
-+++ b/nss/nsswitch.c
-@@ -94,7 +94,7 @@ static name_database *service_table;
- static name_database_entry *defconfig_entries;
- 
- 
--#ifdef USE_NSCD
-+#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
- /* Nonzero if this is the nscd process.  */
- static bool is_nscd;
- /* The callback passed to the init functions when nscd is used.  */
--- 
-2.9.3
-
diff --git a/patches/glibc/2.25/910-typedef-caddr.patch b/patches/glibc/2.25/910-typedef-caddr.patch
deleted file mode 100644
index fc7979b..0000000
--- a/patches/glibc/2.25/910-typedef-caddr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN glibc-2.23-orig/posix/sys/types.h glibc-2.23/posix/sys/types.h
---- glibc-2.23-orig/posix/sys/types.h   2016-02-18 12:54:00.000000000 -0500
-+++ glibc-2.23/posix/sys/types.h        2017-01-06 11:40:05.842147165 -0500
-@@ -113,7 +113,10 @@
- #ifdef __USE_MISC
- # ifndef __daddr_t_defined
- typedef __daddr_t daddr_t;
-+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
- typedef __caddr_t caddr_t;
-+#   define __caddr_t_defined
-+#  endif
- #  define __daddr_t_defined
- # endif
- #endif
-
diff --git a/patches/glibc/linaro-2.20-2014.11/100-sparc-nptl.patch b/patches/glibc/linaro-2.20-2014.11/100-sparc-nptl.patch
deleted file mode 100644
index 21f0337..0000000
--- a/patches/glibc/linaro-2.20-2014.11/100-sparc-nptl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/sysdeps/sparc/sparc32/sem_trywait.c b/sysdeps/sparc/sparc32/sem_trywait.c
-index 7d0fc55..ad9b4ad 100644
---- a/sysdeps/sparc/sparc32/sem_trywait.c
-+++ b/sysdeps/sparc/sparc32/sem_trywait.c
-@@ -22,6 +22,7 @@
- #include <lowlevellock.h>
- #include <internaltypes.h>
- #include <semaphore.h>
-+#include <sparc-nptl.h>
- 
- #include <shlib-compat.h>
- 
- 
-
diff --git a/patches/glibc/ports-2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch b/patches/glibc/ports-2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
deleted file mode 100644
index 1a632fe..0000000
--- a/patches/glibc/ports-2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Tue, 20 May 2014 21:27:13 +0000
-Subject: [PATCH] Fix ARM build with GCC trunk.
-
-sysdeps/unix/sysv/linux/arm/unwind-resume.c and
-sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static
-variables that are written in C code but only read from toplevel asms.
-Current GCC trunk now optimizes away such apparently write-only static
-variables, so causing a build failure.  This patch marks those
-variables with __attribute_used__ to avoid that optimization.
-
-Tested that this fixes the build for ARM.
-
-	* sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-	(libgcc_s_resume): Use __attribute_used__.
-	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
-	Likewise.
----
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
diff --git a/patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch b/patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch
deleted file mode 100644
index ed022be..0000000
--- a/patches/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Respect environment CPPFLAGS when we run ./configure so we can inject
-random -D things without having to set CFLAGS/ASFLAGS
-
-diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
---- glibc-2.12.1.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.12.1/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
-+CPPFLAGS += $(CPPFLAGS-config)
- override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
- 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
-diff -durN glibc-2.12.1.orig/config.make.in glibc-2.12.1/config.make.in
---- glibc-2.12.1.orig/config.make.in	2009-05-09 17:59:38.000000000 +0200
-+++ glibc-2.12.1/config.make.in	2009-11-13 00:49:41.000000000 +0100
-@@ -107,6 +107,7 @@
- CXX = @CXX@
- BUILD_CC = @BUILD_CC@
- CFLAGS = @CFLAGS@
-+CPPFLAGS-config = @CPPFLAGS@
- ASFLAGS-config = @ASFLAGS_config@
- AR = @AR@
- RANLIB = @RANLIB@
diff --git a/patches/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.patch b/patches/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.patch
deleted file mode 100644
index 95f5ace..0000000
--- a/patches/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-revert cfi additions to clone on i386/x86_64 to workaround problems in
-gcc's unwinder code.  this is not a bug in glibc, it triggers problems
-elsewhere.  this cfi code does not gain us a whole lot anyways.
-
-http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
-
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.12.1/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.12.1/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/patches/glibc/ports-2.12.1/140-disable-ldconfig.patch b/patches/glibc/ports-2.12.1/140-disable-ldconfig.patch
deleted file mode 100644
index 43330b8..0000000
--- a/patches/glibc/ports-2.12.1/140-disable-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
-file outside of the chroot.  doesnt matter anyways as we wont use the cache
-results (portage will rebuild cache), so running ldconfig is simply a waste
-of time.
-
-diff -durN glibc-2.12.1.orig/Makefile glibc-2.12.1/Makefile
---- glibc-2.12.1.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.12.1/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
- 	rm -f $(symbolic-link-list)
- 
- install:
-+dont-bother-with-destdir:
- 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
- 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
- 				       $(slibdir) $(libdir)
diff --git a/patches/glibc/ports-2.12.1/150-queue-header-updates.patch b/patches/glibc/ports-2.12.1/150-queue-header-updates.patch
deleted file mode 100644
index fe625e1..0000000
--- a/patches/glibc/ports-2.12.1/150-queue-header-updates.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-grab some updates from FreeBSD
-
-http://bugs.gentoo.org/201979
-
-diff -durN glibc-2.12.1.orig/misc/sys/queue.h glibc-2.12.1/misc/sys/queue.h
-
-diff -durN glibc-2.12.1.orig/misc/sys/queue.h glibc-2.12.1/misc/sys/queue.h
---- glibc-2.12.1.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.12.1/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
-@@ -136,6 +136,11 @@
- 		(var);							\
- 		(var) = ((var)->field.le_next))
- 
-+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = LIST_FIRST((head));				\
-+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
- /*
-  * List access methods.
-  */
-@@ -197,6 +202,16 @@
- #define	SLIST_FOREACH(var, head, field)					\
- 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
- 
-+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = SLIST_FIRST((head));				\
-+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-+	for ((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != NULL;					\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
- /*
-  * Singly-linked List access methods.
-  */
-@@ -242,6 +257,12 @@
- 	(head)->stqh_last = &(elm)->field.stqe_next;			\
- } while (/*CONSTCOND*/0)
- 
-+#define	STAILQ_LAST(head, type, field)					\
-+	(STAILQ_EMPTY((head)) ?						\
-+		NULL :							\
-+	        ((struct type *)(void *)				\
-+		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+
- #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
- 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
- 		(head)->stqh_last = &(elm)->field.stqe_next;		\
-@@ -271,6 +292,11 @@
- 		(var);							\
- 		(var) = ((var)->field.stqe_next))
- 
-+#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = STAILQ_FIRST((head));				\
-+		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	STAILQ_CONCAT(head1, head2) do {				\
- 	if (!STAILQ_EMPTY((head2))) {					\
- 		*(head1)->stqh_last = (head2)->stqh_first;		\
-@@ -437,11 +463,21 @@
- 		(var);							\
- 		(var) = ((var)->field.tqe_next))
- 
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
- 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
- 		(var);							\
- 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
- 
-+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_CONCAT(head1, head2, field) do {				\
- 	if (!TAILQ_EMPTY(head2)) {					\
- 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/patches/glibc/ports-2.12.1/160-manual-no-perl.patch b/patches/glibc/ports-2.12.1/160-manual-no-perl.patch
deleted file mode 100644
index 2eb5414..0000000
--- a/patches/glibc/ports-2.12.1/160-manual-no-perl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-If we're using a cvs snapshot which updates the source files, and
-perl isn't installed yet, then we can't regen the docs.  Not a big
-deal, so just whine a little and continue on our merry way.
-
-http://bugs.gentoo.org/60132
-
-diff -durN glibc-2.12.1.orig/manual/Makefile glibc-2.12.1/manual/Makefile
---- glibc-2.12.1.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.12.1/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
- libm-err.texi: stamp-libm-err
- stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
- 						     $(dir)/libm-test-ulps))
-+ifneq ($(PERL),no)
- 	pwd=`pwd`; \
- 	$(PERL) $< $$pwd/.. > libm-err-tmp
- 	$(move-if-change) libm-err-tmp libm-err.texi
-+else
-+	echo "Unable to rebuild math docs, no perl installed"
-+	touch libm-err.texi
-+endif
- 	touch $@
- 
- # Generate Texinfo files from the C source for the example programs.
diff --git a/patches/glibc/ports-2.12.1/170-localedef-fix-trampoline.patch b/patches/glibc/ports-2.12.1/170-localedef-fix-trampoline.patch
deleted file mode 100644
index 0e05844..0000000
--- a/patches/glibc/ports-2.12.1/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
-if [ $# -ne 2 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
-diff -durN glibc-2.12.1.orig/locale/programs/3level.h glibc-2.12.1/locale/programs/3level.h
---- glibc-2.12.1.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.12.1/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
diff --git a/patches/glibc/ports-2.12.1/180-resolv-dynamic.patch b/patches/glibc/ports-2.12.1/180-resolv-dynamic.patch
deleted file mode 100644
index 8f74a53..0000000
--- a/patches/glibc/ports-2.12.1/180-resolv-dynamic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
-diff -durN glibc-2.12.1.orig/resolv/res_libc.c glibc-2.12.1/resolv/res_libc.c
---- glibc-2.12.1.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.12.1/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -95,6 +96,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
diff --git a/patches/glibc/ports-2.12.1/190-localedef-mmap.patch b/patches/glibc/ports-2.12.1/190-localedef-mmap.patch
deleted file mode 100644
index b24ed80..0000000
--- a/patches/glibc/ports-2.12.1/190-localedef-mmap.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-sniped from Debian
-http://bugs.gentoo.org/289615
-
-2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
-	used later with MMAP_FIXED | MMAP_SHARED to cope with different
-	alignment restrictions.
-
-diff -durN glibc-2.12.1.orig/locale/programs/locarchive.c glibc-2.12.1/locale/programs/locarchive.c
---- glibc-2.12.1.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.12.1/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
-@@ -134,7 +134,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -396,7 +396,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -614,7 +614,7 @@
-   int xflags = 0;
-   void *p;
-   if (st.st_size < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
diff --git a/patches/glibc/ports-2.12.1/200-fadvise64_64.patch b/patches/glibc/ports-2.12.1/200-fadvise64_64.patch
deleted file mode 100644
index a9f10cd..0000000
--- a/patches/glibc/ports-2.12.1/200-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.12.1/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
diff --git a/patches/glibc/ports-2.12.1/220-section-comments.patch b/patches/glibc/ports-2.12.1/220-section-comments.patch
deleted file mode 100644
index 4d35535..0000000
--- a/patches/glibc/ports-2.12.1/220-section-comments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
-
-fixes building on some architectures (like m68k/arm/cris/etc...) because
-it does the right thing
-
-diff -durN glibc-2.12.1.orig/include/libc-symbols.h glibc-2.12.1/include/libc-symbols.h
---- glibc-2.12.1.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.12.1/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
- #  define __make_section_unallocated(section_string)
- # endif
- 
--/* Tacking on "\n\t#" to the section name makes gcc put it's bogus
-+/* Tacking on "\n#APP\n\t#" to the section name makes gcc put it's bogus
-    section attributes on what looks like a comment to the assembler.  */
- # ifdef HAVE_SECTION_QUOTES
--#  define __sec_comment "\"\n\t#\""
-+#  define __sec_comment "\"\n#APP\n\t#\""
- # else
--#  define __sec_comment "\n\t#"
-+#  define __sec_comment "\n#APP\n\t#"
- # endif
- # define link_warning(symbol, msg) \
-   __make_section_unallocated (".gnu.warning." #symbol) \
diff --git a/patches/glibc/ports-2.12.1/230-no-inline-gmon.patch b/patches/glibc/ports-2.12.1/230-no-inline-gmon.patch
deleted file mode 100644
index 594fb79..0000000
--- a/patches/glibc/ports-2.12.1/230-no-inline-gmon.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://bugs.gentoo.org/196245
-http://sourceware.org/ml/libc-alpha/2006-05/msg00017.html
-
-Attached is a patch to add __attribute__ ((noinline)) to
-call_gmon_start.
-
-Without this patch, the sec script that processed initfini.s removes a
-part of inlined call_gmon_start, causing undefined label errors.
-
-This patch solves the problem by forcing gcc not to inline
-call_gmon_start with __attribute__ ((noinline)).
-
-Tested by building for arm-none-lixux-gnueabi.  OK to apply?
-
-Kazu Hirata
-
-2006-05-07  Kazu Hirata  &lt;kazu@codesourcery.com&gt;
-
-	* sysdeps/generic/initfini.c (call_gmon_start): Add
-	__attribute__ ((noinline)).
-
-Index: sysdeps/generic/initfini.c
-===================================================================
-
-diff -durN glibc-2.12.1.orig/sysdeps/generic/initfini.c glibc-2.12.1/sysdeps/generic/initfini.c
---- glibc-2.12.1.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.12.1/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
-@@ -70,7 +70,7 @@
- /* The beginning of _init:  */
- asm ("\n/*@_init_PROLOG_BEGINS*/");
- 
--static void
-+static void __attribute__ ((noinline))
- call_gmon_start(void)
- {
-   extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
diff --git a/patches/glibc/ports-2.12.1/240-check_native-headers.patch b/patches/glibc/ports-2.12.1/240-check_native-headers.patch
deleted file mode 100644
index de0cb5b..0000000
--- a/patches/glibc/ports-2.12.1/240-check_native-headers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-many ports hit this warning:
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-
-snipped from suse
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/check_native.c glibc-2.12.1/sysdeps/unix/sysv/linux/check_native.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/check_native.c	2007-11-24 04:12:17.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/check_native.c	2009-11-13 00:50:11.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <time.h>
- #include <unistd.h>
- #include <net/if.h>
diff --git a/patches/glibc/ports-2.12.1/250-fix-pr631.patch b/patches/glibc/ports-2.12.1/250-fix-pr631.patch
deleted file mode 100644
index af5b347..0000000
--- a/patches/glibc/ports-2.12.1/250-fix-pr631.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From dank@kegel.com
-Wed Jun 15 09:12:43 PDT 2005
-
-Fixes
-
-build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
-build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
-... 53 lines deleted ...
-build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
-collect2: ld returned 1 exit status
-make[2]: *** [/build/gcc-3.4.3-glibc-2.3.5-hdrs-2.6.11.2/i686-unknown-linux-gnu/build-glibc/elf/ldconfig] Error 1
-
-when building glibc with --enable-static-nss.
-
-See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
-
-diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
---- glibc-2.12.1.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-+++ glibc-2.12.1/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-@@ -531,7 +531,7 @@
- 
- # The static libraries.
- ifeq (yes,$(build-static))
--link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
-+link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
- else
- ifeq (yes,$(build-shared))
- # We can try to link the programs with lib*_pic.a...
-diff -durN glibc-2.12.1.orig/elf/Makefile glibc-2.12.1/elf/Makefile
---- glibc-2.12.1.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100
-+++ glibc-2.12.1/elf/Makefile	2009-11-13 00:50:13.000000000 +0100
-@@ -146,6 +146,13 @@
- install-bin-script = ldd
- endif
- 
-+ifeq (yes,$(build-static-nss))
-+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
-+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
-+otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
-+	     $(resolvobjdir)/libresolv.a
-+endif
-+
- others		= sprof sln
- install-bin	= sprof
- others-static   = sln
diff --git a/patches/glibc/ports-2.12.1/260-assume-pipe2.patch b/patches/glibc/ports-2.12.1/260-assume-pipe2.patch
deleted file mode 100644
index b84f882..0000000
--- a/patches/glibc/ports-2.12.1/260-assume-pipe2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/250342
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
-
-we cant assume sock_cloexec and pipe2 are bound together as the former defines
-are found in glibc only while the latter are a combo of kernel headers and
-glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
-inside of glibc, we hit a problem.  for example:
-
-#include <grp.h>
-#include <stdio.h>
-main()
-{
-	getgrnam("portage");
-	if (!popen("ls", "r"))
-		perror("popen()");
-}
-
-getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
-__have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
-older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
-stub for it.  so popen() will always fail as glibc assumes pipe2() works.
-
-diff -durN glibc-2.12.1.orig/socket/have_sock_cloexec.c glibc-2.12.1/socket/have_sock_cloexec.c
---- glibc-2.12.1.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.12.1/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
-@@ -16,9 +16,14 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#include <fcntl.h>
- #include <sys/socket.h>
- #include <kernel-features.h>
- 
- #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
- int __have_sock_cloexec;
- #endif
-+
-+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
-+int __have_pipe2;
-+#endif
diff --git a/patches/glibc/ports-2.12.1/270-china.patch b/patches/glibc/ports-2.12.1/270-china.patch
deleted file mode 100644
index 4cde1cf..0000000
--- a/patches/glibc/ports-2.12.1/270-china.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.12.1.orig/localedata/locales/zh_TW glibc-2.12.1/localedata/locales/zh_TW
---- glibc-2.12.1.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.12.1/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
-@@ -1,7 +1,7 @@
- comment_char %
- escape_char /
- %
--% Chinese language locale for Taiwan R.O.C.
-+% Chinese language locale for Taiwan
- % charmap: BIG5-CP950
- %
- % Original Author:
-@@ -17,7 +17,7 @@
- % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
- 
- LC_IDENTIFICATION
--title      "Chinese locale for Taiwan R.O.C."
-+title      "Chinese locale for Taiwan"
- source     ""
- address    ""
- contact    ""
-@@ -25,7 +25,7 @@
- tel        ""
- fax        ""
- language   "Chinese"
--territory  "Taiwan R.O.C."
-+territory  "Taiwan"
- revision   "0.2"
- date       "2000-08-02"
- %
diff --git a/patches/glibc/ports-2.12.1/280-new-valencian-locale.patch b/patches/glibc/ports-2.12.1/280-new-valencian-locale.patch
deleted file mode 100644
index 6b46b44..0000000
--- a/patches/glibc/ports-2.12.1/280-new-valencian-locale.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=131815
-http://sourceware.org/bugzilla/show_bug.cgi?id=2522
-
-diff -durN glibc-2.12.1.orig/localedata/SUPPORTED glibc-2.12.1/localedata/SUPPORTED
---- glibc-2.12.1.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.12.1/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
- ca_ES.UTF-8/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8@valencia/UTF-8 \
-+ca_ES@valencia/ISO-8859-15 \
- ca_FR.UTF-8/UTF-8 \
- ca_FR/ISO-8859-15 \
- ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.12.1.orig/localedata/locales/ca_ES@valencia glibc-2.12.1/localedata/locales/ca_ES@valencia
---- glibc-2.12.1.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.12.1/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
-@@ -0,0 +1,96 @@
-+comment_char %
-+escape_char  /
-+%
-+% Valencian (southern Catalan) locale for Spain with Euro
-+%
-+% Note that this locale is almost the same as ca_ES@euro.  The point of having
-+% a separate locale is only for PO translations, which have a lot of social
-+% support and are very appreciated by the Valencian-speaking community.
-+%
-+% Contact: Jordi Mallach
-+% Email: jordi@gnu.org
-+% Tel:
-+% Fax:
-+% Language: ca
-+% Territory: ES
-+% Option: euro
-+% Revision: 1.0
-+% Date: 2006-04-06
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: ISO-8859-15
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Valencian (southern Catalan) locale for Spain with Euro"
-+source     ""
-+address    ""
-+contact    "Jordi Mallach"
-+email      "jordi@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Catalan"
-+territory  "Spain"
-+revision   "1.0"
-+date       "2006-04-06"
-+%
-+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
-+category  "ca_ES@valencia:2006";LC_CTYPE
-+category  "ca_ES@valencia:2006";LC_COLLATE
-+category  "ca_ES@valencia:2006";LC_MONETARY
-+category  "ca_ES@valencia:2006";LC_NUMERIC
-+category  "ca_ES@valencia:2006";LC_TIME
-+category  "ca_ES@valencia:2006";LC_MESSAGES
-+category  "ca_ES@valencia:2006";LC_PAPER
-+category  "ca_ES@valencia:2006";LC_NAME
-+category  "ca_ES@valencia:2006";LC_ADDRESS
-+category  "ca_ES@valencia:2006";LC_TELEPHONE
-+category  "ca_ES@valencia:2006";LC_MEASUREMENT
-+
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "ca_ES"
-+END LC_COLLATE
-+
-+LC_MONETARY
-+copy "ca_ES"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "ca_ES"
-+END LC_NUMERIC
-+
-+LC_TIME
-+copy "ca_ES"
-+END LC_TIME
-+
-+LC_MESSAGES
-+copy "ca_ES"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+copy "ca_ES"
-+END LC_PAPER
-+
-+LC_NAME
-+copy "ca_ES"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "ca_ES"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "ca_ES"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "ca_ES"
-+END LC_MEASUREMENT
diff --git a/patches/glibc/ports-2.12.1/300-nscd-one-fork.patch b/patches/glibc/ports-2.12.1/300-nscd-one-fork.patch
deleted file mode 100644
index 27eae51..0000000
--- a/patches/glibc/ports-2.12.1/300-nscd-one-fork.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-only fork one to assist in stop-start-daemon assumptions about daemon behavior
-
-http://bugs.gentoo.org/190785
-
-diff -durN glibc-2.12.1.orig/nscd/nscd.c glibc-2.12.1/nscd/nscd.c
---- glibc-2.12.1.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.12.1/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
-@@ -182,6 +182,9 @@
-       if (pid != 0)
- 	exit (0);
- 
-+       if (write_pid (_PATH_NSCDPID) < 0)
-+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
-+
-       int nullfd = open (_PATH_DEVNULL, O_RDWR);
-       if (nullfd != -1)
- 	{
-@@ -231,12 +234,6 @@
- 	for (i = min_close_fd; i < getdtablesize (); i++)
- 	  close (i);
- 
--      pid = fork ();
--      if (pid == -1)
--	error (EXIT_FAILURE, errno, _("cannot fork"));
--      if (pid != 0)
--	exit (0);
--
-       setsid ();
- 
-       if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
- 
-       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
- 
--      if (write_pid (_PATH_NSCDPID) < 0)
--	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
--
-       if (!init_logfile ())
- 	dbg_log (_("Could not create log file"));
- 
diff --git a/patches/glibc/ports-2.12.1/310-hppa-nptl-carlos.patch b/patches/glibc/ports-2.12.1/310-hppa-nptl-carlos.patch
deleted file mode 100644
index 947bb58..0000000
--- a/patches/glibc/ports-2.12.1/310-hppa-nptl-carlos.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-diff -durN glibc-2.12.1.orig/elf/rtld.c glibc-2.12.1/elf/rtld.c
---- glibc-2.12.1.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.12.1/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -390,14 +390,14 @@
-      know it is available.  We do not have to clear the memory if we
-      do not have to use the temporary bootstrap_map.  Global variables
-      are initialized to zero by default.  */
--#ifndef DONT_USE_BOOTSTRAP_MAP
-+#if !defined DONT_USE_BOOTSTRAP_MAP
- # ifdef HAVE_BUILTIN_MEMSET
-   __builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
- # else
--  for (size_t cnt = 0;
--       cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
--       ++cnt)
--    bootstrap_map.l_info[cnt] = 0;
-+  /* Clear the whole bootstrap_map structure */
-+  for (char *cnt = (char *)&(bootstrap_map);
-+       cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
-+       *cnt++ = '\0');
- # endif
- # if USE___THREAD
-   bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.12.1.orig/include/atomic.h glibc-2.12.1/include/atomic.h
---- glibc-2.12.1.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.12.1/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
-@@ -185,7 +185,7 @@
-      __typeof (*(mem)) __atg5_value = (newvalue);			      \
- 									      \
-      do									      \
--       __atg5_oldval = *__atg5_memp;					      \
-+       __atg5_oldval = *(volatile __typeof (mem))__atg5_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
- 						   __atg5_oldval), 0));	      \
-@@ -206,7 +206,7 @@
-      __typeof (*(mem)) __atg6_value = (value);				      \
- 									      \
-      do									      \
--       __atg6_oldval = *__atg6_memp;					      \
-+       __atg6_oldval = *(volatile __typeof (mem))__atg6_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg6_memp,		      \
- 						   __atg6_oldval	      \
-@@ -224,7 +224,7 @@
-      __typeof (*(mem)) __atg7_value = (value);				      \
- 									      \
-      do									      \
--       __atg7_oldv = *__atg7_memp;					      \
-+       __atg7_oldv = *(volatile __typeof (mem))__atg7_memp;		      \
-      while (__builtin_expect						      \
- 	    (catomic_compare_and_exchange_bool_acq (__atg7_memp,	      \
- 						    __atg7_oldv		      \
-@@ -242,7 +242,7 @@
-     __typeof (mem) __atg8_memp = (mem);					      \
-     __typeof (*(mem)) __atg8_value = (value);				      \
-     do {								      \
--      __atg8_oldval = *__atg8_memp;					      \
-+      __atg8_oldval = *(volatile __typeof (mem))__atg8_memp;		      \
-       if (__atg8_oldval >= __atg8_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -259,7 +259,7 @@
-     __typeof (mem) __atg9_memp = (mem);					      \
-     __typeof (*(mem)) __atg9_value = (value);				      \
-     do {								      \
--      __atg9_oldv = *__atg9_memp;					      \
-+      __atg9_oldv = *(volatile __typeof (mem))__atg9_memp;		      \
-       if (__atg9_oldv >= __atg9_value)					      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -277,7 +277,7 @@
-     __typeof (mem) __atg10_memp = (mem);				      \
-     __typeof (*(mem)) __atg10_value = (value);				      \
-     do {								      \
--      __atg10_oldval = *__atg10_memp;					      \
-+      __atg10_oldval = *(volatile __typeof (mem))__atg10_memp;		      \
-       if (__atg10_oldval <= __atg10_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -361,7 +361,7 @@
- 									      \
-      do									      \
-        {								      \
--	 __atg11_oldval = *__atg11_memp;				      \
-+	 __atg11_oldval = *(volatile __typeof (mem))__atg11_memp;	      \
- 	 if (__builtin_expect (__atg11_oldval <= 0, 0))			      \
- 	   break;							      \
-        }								      \
-@@ -400,7 +400,7 @@
-      __typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit));	      \
- 									      \
-      do									      \
--       __atg14_old = (*__atg14_memp);					      \
-+       __atg14_old = (*(volatile __typeof (mem))__atg14_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg14_memp,	      \
- 						   __atg14_old | __atg14_mask,\
-@@ -418,7 +418,7 @@
-     __typeof (*(mem)) __atg15_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg15_old = (*__atg15_memp);					      \
-+      __atg15_old = (*(volatile __typeof (mem))__atg15_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg15_memp,		      \
- 						  __atg15_old & __atg15_mask, \
-@@ -450,7 +450,7 @@
-      __typeof (*(mem)) __atg16_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg16_old = (*__atg16_memp);					      \
-+       __atg16_old = (*(volatile __typeof (mem))__atg16_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg16_memp,	      \
- 						   __atg16_old & __atg16_mask,\
-@@ -468,7 +468,7 @@
-     __typeof (*(mem)) __atg17_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg17_old = (*__atg17_memp);					      \
-+      __atg17_old = (*(volatile __typeof (mem))__atg17_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg17_memp,		      \
- 						  __atg17_old | __atg17_mask, \
-@@ -484,7 +484,7 @@
-     __typeof (*(mem)) __atg18_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg18_old = (*__atg18_memp);					      \
-+      __atg18_old = (*(volatile __typeof (mem))__atg18_memp);		      \
-     while (__builtin_expect						      \
- 	   (catomic_compare_and_exchange_bool_acq (__atg18_memp,	      \
- 						   __atg18_old | __atg18_mask,\
-@@ -500,7 +500,7 @@
-      __typeof (*(mem)) __atg19_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg19_old = (*__atg19_memp);					      \
-+       __atg19_old = (*(volatile __typeof (mem))__atg19_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
- 						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.12.1.orig/nptl/Makefile glibc-2.12.1/nptl/Makefile
---- glibc-2.12.1.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.12.1/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -264,9 +264,9 @@
- # Files which must not be linked with libpthread.
- tests-nolibpthread = tst-unload
- 
--# This sets the stack resource limit to 1023kb, which is not a multiple
--# of the page size since every architecture's page size is > 1k.
--tst-oddstacklimit-ENV = ; ulimit -s 1023;
-+# This sets the stack resource limit to 8193kb, which is not a multiple
-+# of the page size since every architecture's page size is 4096 bytes.
-+tst-oddstacklimit-ENV = ; ulimit -s 8193;
- 
- distribute = eintr.c tst-cleanup4aux.c
- 
-@@ -425,6 +425,35 @@
- CFLAGS-tst-cleanupx4.c += -fexceptions
- CFLAGS-tst-oncex3.c += -fexceptions
- CFLAGS-tst-oncex4.c += -fexceptions
-+
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
-+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
-+
- CFLAGS-tst-align.c += $(stack-align-test-flags)
- CFLAGS-tst-align3.c += $(stack-align-test-flags)
- CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.12.1.orig/nptl/pthread_barrier_wait.c glibc-2.12.1/nptl/pthread_barrier_wait.c
---- glibc-2.12.1.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.12.1/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
-@@ -64,7 +64,7 @@
-       do
- 	lll_futex_wait (&ibarrier->curr_event, event,
- 			ibarrier->private ^ FUTEX_PRIVATE_FLAG);
--      while (event == ibarrier->curr_event);
-+      while (event == *(volatile unsigned int *)&ibarrier->curr_event);
-     }
- 
-   /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.12.1.orig/nptl/sysdeps/pthread/Makefile glibc-2.12.1/nptl/sysdeps/pthread/Makefile
---- glibc-2.12.1.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.12.1/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -33,7 +33,9 @@
- 
- ifeq ($(have-forced-unwind),yes)
- tests += tst-mqueue8x
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
- CFLAGS-tst-mqueue8x.c += -fexceptions
-+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s) 
- endif
- endif
- 
-diff -durN glibc-2.12.1.orig/stdio-common/Makefile glibc-2.12.1/stdio-common/Makefile
---- glibc-2.12.1.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.12.1/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -82,7 +82,7 @@
- 	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
- endif
- 
--CFLAGS-vfprintf.c = -Wno-uninitialized
-+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
- CFLAGS-vfwprintf.c = -Wno-uninitialized
- CFLAGS-tst-printf.c = -Wno-format
- CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.12.1.orig/sunrpc/clnt_udp.c glibc-2.12.1/sunrpc/clnt_udp.c
---- glibc-2.12.1.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.12.1/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
-       while (inlen < 0 && errno == EINTR);
-       if (inlen < 0)
- 	{
--	  if (errno == EWOULDBLOCK)
-+	  if (errno == EWOULDBLOCK || errno == EAGAIN)
- 	    continue;
- 	  cu->cu_error.re_errno = errno;
- 	  return (cu->cu_error.re_status = RPC_CANTRECV);
diff --git a/patches/glibc/ports-2.12.1/330-m68k-sys-user.patch b/patches/glibc/ports-2.12.1/330-m68k-sys-user.patch
deleted file mode 100644
index b441691..0000000
--- a/patches/glibc/ports-2.12.1/330-m68k-sys-user.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-copied from kernel as it is sanitized now
-
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
-@@ -1,3 +1,90 @@
-+#ifndef _SYS_USER_H
-+#define _SYS_USER_H
-+
-+/* Core file format: The core file is written in such a way that gdb
-+   can understand it and provide useful information to the user (under
-+   linux we use the 'trad-core' bfd).  There are quite a number of
-+   obstacles to being able to view the contents of the floating point
-+   registers, and until these are solved you will not be able to view the
-+   contents of them.  Actually, you can read in the core file and look at
-+   the contents of the user struct to find out what the floating point
-+   registers contain.
-+   The actual file contents are as follows:
-+   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-+   in the file.  Directly after this is a copy of the task_struct, which
-+   is currently not used by gdb, but it may come in useful at some point.
-+   All of the registers are stored as part of the upage.  The upage should
-+   always be only one page.
-+   DATA: The data area is stored.  We use current->end_text to
-+   current->brk to pick up all of the user variables, plus any memory
-+   that may have been malloced.  No attempt is made to determine if a page
-+   is demand-zero or if a page is totally unused, we just cover the entire
-+   range.  All of the addresses are rounded in such a way that an integral
-+   number of pages is written.
-+   STACK: We need the stack information in order to get a meaningful
-+   backtrace.  We need to write the data from (esp) to
-+   current->start_stack, so we round each of these off in order to be able
-+   to write an integer number of pages.
-+   The minimum core file size is 3 pages, or 12288 bytes.
-+*/
-+
-+struct user_m68kfp_struct {
-+	unsigned long  fpregs[8*3];	/* fp0-fp7 registers */
-+	unsigned long  fpcntl[3];	/* fp control regs */
-+};
-+
-+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
-+   is still the layout used by user (the new pt_regs doesn't have
-+   all registers). */
-+struct user_regs_struct {
-+	long d1,d2,d3,d4,d5,d6,d7;
-+	long a0,a1,a2,a3,a4,a5,a6;
-+	long d0;
-+	long usp;
-+	long orig_d0;
-+	short stkadj;
-+	short sr;
-+	long pc;
-+	short fmtvec;
-+	short __fill;
-+};
-+
-+
-+/* When the kernel dumps core, it starts by dumping the user struct -
-+   this will be used by gdb to figure out where the data and stack segments
-+   are within the file, and what virtual addresses to use. */
-+struct user{
-+/* We start with the registers, to mimic the way that "memory" is returned
-+   from the ptrace(3,...) function.  */
-+  struct user_regs_struct regs;	/* Where the registers are actually stored */
-+/* ptrace does not yet supply these.  Someday.... */
-+  int u_fpvalid;		/* True if math co-processor being used. */
-+                                /* for this mess. Not yet used. */
-+  struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
-+/* The rest of this junk is to help gdb figure out what goes where */
-+  unsigned long int u_tsize;	/* Text segment size (pages). */
-+  unsigned long int u_dsize;	/* Data segment size (pages). */
-+  unsigned long int u_ssize;	/* Stack segment size (pages). */
-+  unsigned long start_code;     /* Starting virtual address of text. */
-+  unsigned long start_stack;	/* Starting virtual address of stack area.
-+				   This is actually the bottom of the stack,
-+				   the top of the stack is always found in the
-+				   esp register.  */
-+  long int signal;		/* Signal that caused the core dump. */
-+  int reserved;			/* No longer used */
-+  struct user_regs_struct *u_ar0;
-+				/* Used by gdb to help find the values for */
-+				/* the registers. */
-+  struct user_m68kfp_struct* u_fpstate;	/* Math Co-processor pointer. */
-+  unsigned long magic;		/* To uniquely identify a core file */
-+  char u_comm[32];		/* User command that was responsible */
-+};
-+#define NBPG 4096
-+#define UPAGES 1
-+#define HOST_TEXT_START_ADDR (u.start_code)
-+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-+
-+#endif
- /* Copyright (C) 2008 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.12.1/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/patches/glibc/ports-2.12.1/340-dl_execstack-PaX-support.patch b/patches/glibc/ports-2.12.1/340-dl_execstack-PaX-support.patch
deleted file mode 100644
index afdb39c..0000000
--- a/patches/glibc/ports-2.12.1/340-dl_execstack-PaX-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-	With latest versions of glibc, a lot of apps failed on a PaX enabled
-	system with:
-		 cannot enable executable stack as shared object requires: Permission denied
-	
-	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	to make the stack executable due to some libraries not containing the
-	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-
-	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
-
-diff -durN glibc-2.12.1.orig/nptl/allocatestack.c glibc-2.12.1/nptl/allocatestack.c
---- glibc-2.12.1.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.12.1/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
- # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
- #endif
-   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
--    return errno;
-+    if (errno != EACCES) /* PAX is enabled */
-+    	return errno;
- 
-   return 0;
- }
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.12.1/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -63,7 +63,10 @@
-       else
- # endif
- 	{
--	  result = errno;
-+	  if (errno == EACCES)  /* PAX is enabled */
-+	    result = 0;
-+	  else
-+	    result = errno;
- 	  goto out;
- 	}
-     }
-@@ -89,7 +92,12 @@
- 	page -= size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
-@@ -115,7 +123,12 @@
- 	page += size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
diff --git a/patches/glibc/ports-2.12.1/350-pre20040117-pt_pax.patch b/patches/glibc/ports-2.12.1/350-pre20040117-pt_pax.patch
deleted file mode 100644
index 3f03169..0000000
--- a/patches/glibc/ports-2.12.1/350-pre20040117-pt_pax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.12.1.orig/elf/elf.h glibc-2.12.1/elf/elf.h
---- glibc-2.12.1.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.12.1/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/patches/glibc/ports-2.12.1/360-tests-sandbox-libdl-paths.patch b/patches/glibc/ports-2.12.1/360-tests-sandbox-libdl-paths.patch
deleted file mode 100644
index a847cdb..0000000
--- a/patches/glibc/ports-2.12.1/360-tests-sandbox-libdl-paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-when glibc runs its tests, it does so by invoking the local library loader.
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against
-libdl (so that it can load libraries and pull out symbols).  the trouble
-is that when you upgrade from an older glibc to the new one, often times
-internal symbols change name or abi.  this is normally OK as you cannot use
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
-we always say "keep all of the glibc libraries from the same build".  but
-when glibc runs its tests, it uses dynamic paths to point to its new local
-copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
-its path, and when sandbox triggers the loading of libdl, glibc does so
-from the host system system.  this gets us into the case of all libraries
-are from the locally compiled version of glibc except for libdl.so.
-
-Fix by Wormo
-
-http://bugs.gentoo.org/56898
-
-diff -durN glibc-2.12.1.orig/grp/tst_fgetgrent.sh glibc-2.12.1/grp/tst_fgetgrent.sh
---- glibc-2.12.1.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.12.1/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,7 +24,8 @@
- rtld_installed_name=$1; shift
- 
- testout=${common_objpfx}/grp/tst_fgetgrent.out
--library_path=${common_objpfx}
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
- 
- result=0
- 
-diff -durN glibc-2.12.1.orig/iconvdata/run-iconv-test.sh glibc-2.12.1/iconvdata/run-iconv-test.sh
---- glibc-2.12.1.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.12.1/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -34,7 +34,7 @@
- export GCONV_PATH
- 
- # We have to have some directories in the library path.
--LIBPATH=$codir:$codir/iconvdata
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
- 
- # How the start the iconv(1) program.
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.12.1.orig/iconvdata/tst-table.sh glibc-2.12.1/iconvdata/tst-table.sh
---- glibc-2.12.1.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.12.1/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -59,8 +59,11 @@
-   irreversible=${charset}.irreversible
- fi
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # iconv in one direction.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-table-from ${charset} \
-   > ${objpfx}tst-${charset}.table
- 
-diff -durN glibc-2.12.1.orig/intl/tst-codeset.sh glibc-2.12.1/intl/tst-codeset.sh
---- glibc-2.12.1.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.12.1/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -37,6 +37,9 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- ${common_objpfx}elf/ld.so --library-path $common_objpfx \
- ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
- 
-diff -durN glibc-2.12.1.orig/intl/tst-gettext.sh glibc-2.12.1/intl/tst-gettext.sh
---- glibc-2.12.1.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.12.1/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -51,9 +51,12 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
- MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.12.1.orig/intl/tst-gettext2.sh glibc-2.12.1/intl/tst-gettext2.sh
---- glibc-2.12.1.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.12.1/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -65,8 +65,11 @@
- LOCPATH=${objpfx}domaindir
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
- cmp ${objpfx}tst-gettext2.out - <<EOF
- String1 - Lang1: 1st string
-diff -durN glibc-2.12.1.orig/intl/tst-translit.sh glibc-2.12.1/intl/tst-translit.sh
---- glibc-2.12.1.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.12.1/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -36,7 +36,10 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.12.1.orig/malloc/tst-mtrace.sh glibc-2.12.1/malloc/tst-mtrace.sh
---- glibc-2.12.1.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.12.1/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,9 +24,12 @@
- status=0
- trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
- LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
-   ${common_objpfx}malloc/tst-mtrace || status=1
- 
- if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.12.1.orig/nptl/tst-tls6.sh glibc-2.12.1/nptl/tst-tls6.sh
---- glibc-2.12.1.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.12.1/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -5,8 +5,8 @@
- rtld_installed_name=$1; shift
- logfile=$common_objpfx/nptl/tst-tls6.out
- 
--# We have to find libc and nptl
--library_path=${common_objpfx}:${common_objpfx}nptl
-+# We have to find libc and nptl (also libdl in case sandbox is in use)
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
- tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- 	  ${common_objpfx}/nptl/tst-tls5"
- 
-diff -durN glibc-2.12.1.orig/posix/globtest.sh glibc-2.12.1/posix/globtest.sh
---- glibc-2.12.1.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.12.1/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -18,7 +18,7 @@
- esac
- 
- # We have to find the libc and the NSS modules.
--library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
-+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
- 
- # Since we use `sort' we must make sure to use the same locale everywhere.
- LC_ALL=C
-diff -durN glibc-2.12.1.orig/posix/tst-getconf.sh glibc-2.12.1/posix/tst-getconf.sh
---- glibc-2.12.1.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.12.1/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -10,7 +10,10 @@
- else
-   rtld_installed_name=$1; shift
-   runit() {
--    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
-+    
-+  # make sure libdl is also in path in case sandbox is in use
-+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
-   }
- fi
- 
-diff -durN glibc-2.12.1.orig/posix/wordexp-tst.sh glibc-2.12.1/posix/wordexp-tst.sh
---- glibc-2.12.1.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.12.1/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -19,8 +19,11 @@
- "
- export IFS
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- failed=0
--${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
- cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
- wordexp returned 0
diff --git a/patches/glibc/ports-2.12.1/370-fnmatch.patch b/patches/glibc/ports-2.12.1/370-fnmatch.patch
deleted file mode 100644
index f345b35..0000000
--- a/patches/glibc/ports-2.12.1/370-fnmatch.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-http://sourceware.org/ml/libc-hacker/2002-11/msg00071.html
-
-When fnmatch detects an invalid multibyte character it should fall back to
-single byte matching, so that "*" has a chance to match such a string.
-
-Andreas.
-
-2005-04-12  Andreas Schwab  <schwab@suse.de>
-
-	* posix/fnmatch.c (fnmatch): If conversion to wide character
-	fails fall back to single byte matching.
-
-Index: posix/fnmatch.c
-===================================================================
-
-diff -durN glibc-2.12.1.orig/posix/fnmatch.c glibc-2.12.1/posix/fnmatch.c
---- glibc-2.12.1.orig/posix/fnmatch.c	2007-07-28 22:35:00.000000000 +0200
-+++ glibc-2.12.1/posix/fnmatch.c	2009-11-13 00:50:39.000000000 +0100
-@@ -327,6 +327,7 @@
- # if HANDLE_MULTIBYTE
-   if (__builtin_expect (MB_CUR_MAX, 1) != 1)
-     {
-+      const char *orig_pattern = pattern;
-       mbstate_t ps;
-       size_t n;
-       const char *p;
-@@ -382,10 +383,8 @@
- 	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
- 	  n = mbsrtowcs (wstring, &p, n + 1, &ps);
- 	  if (__builtin_expect (n == (size_t) -1, 0))
--	    /* Something wrong.
--	       XXX Do we have to set `errno' to something which mbsrtows hasn't
--	       already done?  */
--	    return -1;
-+	    /* Something wrong.  Fall back to single byte matching.  */
-+	    goto try_singlebyte;
- 	  if (p)
- 	    {
- 	      memset (&ps, '\0', sizeof (ps));
-@@ -397,10 +396,8 @@
- 	prepare_wstring:
- 	  n = mbsrtowcs (NULL, &string, 0, &ps);
- 	  if (__builtin_expect (n == (size_t) -1, 0))
--	    /* Something wrong.
--	       XXX Do we have to set `errno' to something which mbsrtows hasn't
--	       already done?  */
--	    return -1;
-+	    /* Something wrong.  Fall back to single byte matching.  */
-+	    goto try_singlebyte;
- 	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
- 	  assert (mbsinit (&ps));
- 	  (void) mbsrtowcs (wstring, &string, n + 1, &ps);
-@@ -408,6 +405,9 @@
- 
-       return internal_fnwmatch (wpattern, wstring, wstring + n,
- 				flags & FNM_PERIOD, flags, NULL);
-+
-+    try_singlebyte:
-+      pattern = orig_pattern;
-     }
- # endif  /* mbstate_t and mbsrtowcs or _LIBC.  */
- 
diff --git a/patches/glibc/ports-2.12.1/380-dont-build-timezone.patch b/patches/glibc/ports-2.12.1/380-dont-build-timezone.patch
deleted file mode 100644
index 0a30436..0000000
--- a/patches/glibc/ports-2.12.1/380-dont-build-timezone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
-diff -durN glibc-2.12.1.orig/Makeconfig glibc-2.12.1/Makeconfig
---- glibc-2.12.1.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.12.1/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/patches/glibc/ports-2.12.1/400-alpha-xstat.patch b/patches/glibc/ports-2.12.1/400-alpha-xstat.patch
deleted file mode 100644
index 97bea98..0000000
--- a/patches/glibc/ports-2.12.1/400-alpha-xstat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-@@ -386,6 +386,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE	1
- #endif
- 
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL	1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
-    after exec is always rounded up to the next page.  */
- #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/patches/glibc/ports-2.12.1/430-alpha-creat.patch b/patches/glibc/ports-2.12.1/430-alpha-creat.patch
deleted file mode 100644
index bfb72d0..0000000
--- a/patches/glibc/ports-2.12.1/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.12.1/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/patches/glibc/ports-2.12.1/440-alpha-cache-shape.patch b/patches/glibc/ports-2.12.1/440-alpha-cache-shape.patch
deleted file mode 100644
index ea85e99..0000000
--- a/patches/glibc/ports-2.12.1/440-alpha-cache-shape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-older verisons of glibc would build dl-sysdep as shared-only and dl-support as
-static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
-glibc build dl-sysdep as both shared and static which means we now have symbol
-duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
-is both shared/static, there is no point in hooking dl-support anymore, so we
-can punt it.
-
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
--#include "dl-auxv.h"
- #include <elf/dl-support.c>
diff --git a/patches/glibc/ports-2.12.1/460-alpha-fix-gcc-4.1-warnings.patch b/patches/glibc/ports-2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
deleted file mode 100644
index 6438267..0000000
--- a/patches/glibc/ports-2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-2006-05-30  Falk Hueffner <falk@debian.org>
-
-	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
-	  to ev6 in assembly code.
-
-{standard input}: Assembler messages:
-{standard input}:341: Error: macro requires $at register while noat in effect
-{standard input}:374: Error: macro requires $at register while noat in effect
-{standard input}:438: Error: macro requires $at register while noat in effect
-{standard input}:471: Error: macro requires $at register while noat in effect
-make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
-
-Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
-I cannot really think of anything better than
-
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
- static inline void
- stb_mb(unsigned char val, unsigned long addr)
- {
--  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
-+  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
- }
- 
- static inline void
- stw_mb(unsigned short val, unsigned long addr)
- {
--  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
- }
- 
- static inline void
-@@ -356,7 +356,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned char r;
- 
--  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-+  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-   return r;
- }
- 
-@@ -366,7 +366,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned short r;
- 
--  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-+  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-   return r;
- }
- 
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/patches/glibc/ports-2.12.1/490-alpha_alpha-add-fdatasync-support.patch b/patches/glibc/ports-2.12.1/490-alpha_alpha-add-fdatasync-support.patch
deleted file mode 100644
index 9d35ebd..0000000
--- a/patches/glibc/ports-2.12.1/490-alpha_alpha-add-fdatasync-support.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/kernel-features.h: define 
-	__ASSUME_FDATASYNC. 
-	* sysdeps/unix/sysv/linux/fdatasync.c: New file.
-	* sysdeps/unix/sysv/linux/Makefile: compile fdatasync.c with
-	-fexceptions.
-	* sysdeps/unix/sysv/linux/syscalls.list: Remove fdatasync.
-
- sysdeps/unix/sysv/linux/Makefile          |    1 
- sysdeps/unix/sysv/linux/fdatasync.c       |   69 ++++++++++++++++++++++++++++++
- sysdeps/unix/sysv/linux/kernel-features.h |    6 ++
- sysdeps/unix/sysv/linux/syscalls.list     |    1 
- 4 files changed, 76 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.12.1/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -20,6 +20,7 @@
- 		   setfsuid setfsgid makedev epoll_pwait signalfd \
- 		   eventfd eventfd_read eventfd_write
- 
-+CFLAGS-fdatasync.c = -fexceptions
- CFLAGS-gethostid.c = -fexceptions
- 
- sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.12.1/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* fdatasync -- synchronize at least the data part of a file with 
-+   the underlying media. Linux version. 
-+
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+#include <bp-checks.h>
-+
-+#include <kernel-features.h>
-+
-+#if defined __NR_fdatasync && !defined __ASSUME_FDATASYNC
-+static int __have_no_fdatasync;
-+#endif
-+
-+static int
-+do_fdatasync (int fd)
-+{
-+#ifdef __ASSUME_FDATASYNC
-+  return INLINE_SYSCALL (fdatasync, 1, fd);
-+#elif defined __NR_fdatasync
-+  if (!__builtin_expect (__have_no_fdatasync, 0))
-+    {
-+      int result = INLINE_SYSCALL (fdatasync, 1, fd);
-+      if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
-+	return result;
-+
-+      __have_no_fdatasync = 1;
-+    }
-+#endif
-+  return INLINE_SYSCALL (fsync, 1, fd);
-+}
-+
-+int
-+__fdatasync (int fd)
-+{
-+  if (SINGLE_THREAD_P)
-+    return do_fdatasync (fd);
-+
-+  int oldtype = LIBC_CANCEL_ASYNC ();
-+
-+  int result = do_fdatasync (fd);
-+
-+  LIBC_CANCEL_RESET (oldtype);
-+
-+  return result;
-+}
-+
-+weak_alias (__fdatasync, fdatasync)
-+
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
-@@ -459,6 +459,12 @@
- # define __ASSUME_FUTEX_LOCK_PI	1
- #endif
- 
-+/* Support for fsyncdata syscall was added in 2.6.22 on alpha, but it
-+   was already present in 2.0 kernels on other architectures.  */
-+#if (!defined __alpha || __LINUX_KERNEL_VERSION >= 0x020616)
-+# define __ASSUME_FDATASYNC	1
-+#endif
-+
- /* Support for utimensat syscall was added in 2.6.22, on SH
-    only after 2.6.22-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.12.1.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.12.1/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.12.1.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
- epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
- epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
- epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
--fdatasync	-	fdatasync	Ci:i	fdatasync
- flock		-	flock		i:ii	__flock		flock
- fork		-	fork		i:	__libc_fork	__fork fork
- get_kernel_syms	EXTRA	get_kernel_syms	i:p	get_kernel_syms
diff --git a/patches/glibc/ports-2.12.1/530-alpha-fix-rtld-fPIC.patch b/patches/glibc/ports-2.12.1/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index 621a6f3..0000000
--- a/patches/glibc/ports-2.12.1/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile glibc-2.12.1/glibc-ports-2.12.1/sysdeps/alpha/Makefile
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.12.1.orig/ports/sysdeps/alpha/Makefile glibc-2.12.1/ports/sysdeps/alpha/Makefile
diff --git a/patches/glibc/ports-2.12.1/560-ppc-atomic.patch b/patches/glibc/ports-2.12.1/560-ppc-atomic.patch
deleted file mode 100644
index 679ef18..0000000
--- a/patches/glibc/ports-2.12.1/560-ppc-atomic.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-sniped from suse
-
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
-
-diff -durN glibc-2.12.1.orig/sysdeps/powerpc/bits/atomic.h glibc-2.12.1/sysdeps/powerpc/bits/atomic.h
---- glibc-2.12.1.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.12.1/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -85,14 +85,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-diff -durN glibc-2.12.1.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.12.1/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.12.1.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.12.1/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-diff -durN glibc-2.12.1.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.12.1/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.12.1.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.12.1/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
diff --git a/patches/glibc/ports-2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/patches/glibc/ports-2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
deleted file mode 100644
index fc42a92..0000000
--- a/patches/glibc/ports-2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-http://yann.poupet.free.fr/ep93xx/
-Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
-
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
-@@ -12,7 +12,7 @@
- /* FPA floating point units are always big-endian, irrespective of the
-    CPU endianness.  VFP floating point units use the same endianness
-    as the rest of the system.  */
--#ifdef __VFP_FP__
-+#if defined __VFP_FP__ || defined __MAVERICK__
- #define __FLOAT_WORD_ORDER __BYTE_ORDER
- #else
- #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -30,7 +30,33 @@
- 	movs	r0, r1		/* get the return value in place */
- 	moveq	r0, #1		/* can't let setjmp() return zero! */
- 
-+#ifdef __MAVERICK__
-+	cfldrd	mvd4,  [ip], #8
-+	nop
-+	cfldrd	mvd5,  [ip], #8
-+	nop
-+	cfldrd	mvd6,  [ip], #8
-+	nop
-+	cfldrd	mvd7,  [ip], #8
-+	nop
-+	cfldrd	mvd8,  [ip], #8
-+	nop
-+	cfldrd	mvd9,  [ip], #8
-+	nop
-+	cfldrd	mvd10, [ip], #8
-+	nop
-+	cfldrd	mvd11, [ip], #8
-+	nop
-+	cfldrd	mvd12, [ip], #8
-+	nop
-+	cfldrd	mvd13, [ip], #8
-+	nop
-+	cfldrd	mvd14, [ip], #8
-+	nop
-+	cfldrd	mvd15, [ip], #8
-+#else
- 	lfmfd	f4, 4, [ip] !	/* load the floating point regs */
-+#endif
- 
- 	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
- END (__longjmp)
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
-@@ -20,6 +20,45 @@
- # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
- #endif
- 
-+#if defined(__MAVERICK__)
-+
-+/* Define bits representing exceptions in the FPU status word.  */
-+enum
-+  {
-+    FE_INVALID = 1,
-+#define FE_INVALID FE_INVALID
-+    FE_OVERFLOW = 4,
-+#define FE_OVERFLOW FE_OVERFLOW
-+    FE_UNDERFLOW = 8,
-+#define FE_UNDERFLOW FE_UNDERFLOW
-+    FE_INEXACT = 16,
-+#define FE_INEXACT FE_INEXACT
-+  };
-+
-+/* Amount to shift by to convert an exception to a mask bit.  */
-+#define FE_EXCEPT_SHIFT	5
-+
-+/* All supported exceptions.  */
-+#define FE_ALL_EXCEPT	\
-+	(FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
-+
-+/* IEEE rounding modes.  */
-+enum
-+  {
-+    FE_TONEAREST = 0,
-+#define FE_TONEAREST    FE_TONEAREST
-+    FE_TOWARDZERO = 0x400,
-+#define FE_TOWARDZERO   FE_TOWARDZERO
-+    FE_DOWNWARD = 0x800,
-+#define FE_DOWNWARD     FE_DOWNWARD
-+    FE_UPWARD = 0xc00,
-+#define FE_UPWARD       FE_UPWARD
-+  };
-+
-+#define FE_ROUND_MASK (FE_UPWARD)
-+
-+#else /* FPA */
-+
- /* Define bits representing exceptions in the FPU status word.  */
- enum
-   {
-@@ -44,6 +83,8 @@
-    modes exist, but you have to encode them in the actual instruction.  */
- #define FE_TONEAREST	0
- 
-+#endif
-+
- /* Type representing exception flags. */
- typedef unsigned long int fexcept_t;
- 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
-@@ -28,7 +28,11 @@
- #ifndef _ASM
- /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
-    saved.  */
-+#ifdef __MAVERICK__
-+typedef int __jmp_buf[34];
-+#else
- typedef int __jmp_buf[22];
- #endif
-+#endif
- 
- #endif
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,9 +18,21 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fegetround (void)
- {
-+#if defined(__MAVERICK__)
-+
-+  unsigned long temp;
-+
-+  _FPU_GETCW (temp);
-+  return temp & FE_ROUND_MASK;
-+
-+#else /* FPA */
-+
-   return FE_TONEAREST;		/* Easy. :-) */
-+
-+#endif
- }
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,12 +18,28 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fesetround (int round)
- {
-+#if defined(__MAVERICK__)
-+  unsigned long temp;
-+
-+  if (round & ~FE_ROUND_MASK)
-+    return 1;
-+
-+  _FPU_GETCW (temp);
-+  temp = (temp & ~FE_ROUND_MASK) | round;
-+  _FPU_SETCW (temp);
-+  return 0;
-+
-+#else /* FPA */
-+
-   /* We only support FE_TONEAREST, so there is no need for any work.  */
-   return (round == FE_TONEAREST)?0:1;
-+
-+#endif
- }
- 
- libm_hidden_def (fesetround)
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
-@@ -1,5 +1,6 @@
- /* FPU control word definitions.  ARM version.
--   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-+   Copyright (C) 1996, 1997, 1998, 2000, 2005
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -20,6 +21,79 @@
- #ifndef _FPU_CONTROL_H
- #define _FPU_CONTROL_H
- 
-+#if defined(__MAVERICK__)
-+
-+/* DSPSC register: (from EP9312 User's Guide)
-+ *
-+ * bits 31..29	- DAID
-+ * bits 28..26	- HVID
-+ * bits 25..24	- RSVD
-+ * bit  23	- ISAT
-+ * bit  22	- UI
-+ * bit  21	- INT
-+ * bit  20	- AEXC
-+ * bits 19..18	- SAT
-+ * bits 17..16	- FCC
-+ * bit  15	- V
-+ * bit  14	- FWDEN
-+ * bit  13	- Invalid
-+ * bit	12	- Denorm
-+ * bits 11..10	- RM
-+ * bits 9..5	- IXE, UFE, OFE, RSVD, IOE
-+ * bits 4..0	- IX, UF, OF, RSVD, IO
-+ */
-+
-+/* masking of interrupts */
-+#define _FPU_MASK_IM	(1 << 5)	/* invalid operation */
-+#define _FPU_MASK_ZM	0		/* divide by zero */
-+#define _FPU_MASK_OM	(1 << 7)	/* overflow */
-+#define _FPU_MASK_UM	(1 << 8)	/* underflow */
-+#define _FPU_MASK_PM	(1 << 9)	/* inexact */
-+#define _FPU_MASK_DM	0		/* denormalized operation */
-+
-+#define _FPU_RESERVED	0xfffff000	/* These bits are reserved.  */
-+
-+#define _FPU_DEFAULT	0x00b00000	/* Default value.  */
-+#define _FPU_IEEE	0x00b003a0	/* Default + exceptions enabled. */
-+
-+/* Type of the control word.  */
-+typedef unsigned int fpu_control_t;
-+
-+/* Macros for accessing the hardware control word.  */
-+#define _FPU_GETCW(cw) ({			\
-+	register int __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv32sc	mvdx0, dspsc\n\t"	\
-+	"cfmvr64l	%0, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (cw), "=r" (__t1), "=r" (__t2)	\
-+	);					\
-+})
-+
-+#define _FPU_SETCW(cw) ({			\
-+	register int __t0, __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %0\n\t"		\
-+	"cfmvsc32	dspsc, mvdx0\n\t"	\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (__t0), "=r" (__t1), "=r" (__t2)	\
-+	: "0" (cw)				\
-+	);					\
-+})
-+
-+/* Default control word set at startup.  */
-+extern fpu_control_t __fpu_control;
-+
-+#else /* FPA */
-+
- /* We have a slight terminology confusion here.  On the ARM, the register
-  * we're interested in is actually the FPU status word - the FPU control
-  * word is something different (which is implementation-defined and only
-@@ -99,4 +173,6 @@
- /* Default control word set at startup.  */
- extern fpu_control_t __fpu_control;
- 
-+#endif
-+
- #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,4 +17,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define __JMP_BUF_SP		32
-+#else
- #define __JMP_BUF_SP		20
-+#endif
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -24,11 +24,41 @@
- 
- ENTRY (__sigsetjmp)
- 	/* Save registers */
-+#ifdef __MAVERICK__
-+	cfstrd	mvd4,  [r0], #8
-+	nop
-+	cfstrd	mvd5,  [r0], #8
-+	nop
-+	cfstrd	mvd6,  [r0], #8
-+	nop
-+	cfstrd	mvd7,  [r0], #8
-+	nop
-+	cfstrd	mvd8,  [r0], #8
-+	nop
-+	cfstrd	mvd9,  [r0], #8
-+	nop
-+	cfstrd	mvd10, [r0], #8
-+	nop
-+	cfstrd	mvd11, [r0], #8
-+	nop
-+	cfstrd	mvd12, [r0], #8
-+	nop
-+	cfstrd	mvd13, [r0], #8
-+	nop
-+	cfstrd	mvd14, [r0], #8
-+	nop
-+	cfstrd	mvd15, [r0], #8
-+#else
- 	sfmea	f4, 4, [r0]!
-+#endif
- 	stmia	r0, {v1-v6, sl, fp, sp, lr}
- 
- 	/* Restore pointer to jmp_buf */
-+#ifdef __MAVERICK__
-+	sub	r0, r0, #96
-+#else
- 	sub	r0, r0, #48
-+#endif
- 
- 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
- 	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gccframe.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,6 +17,10 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define FIRST_PSEUDO_REGISTER 43
-+#else
- #define FIRST_PSEUDO_REGISTER 27
-+#endif
- 
- #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
-@@ -29,7 +29,7 @@
- #if defined(__ARMEB__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 1
--#elif defined(__VFP_FP__)
-+#elif defined(__VFP_FP__) || defined(__MAVERICK__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 0
- #else
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/bits/endian.h glibc-2.12.1/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.12.1/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.12.1/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.12.1/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.12.1/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.12.1/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.12.1/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.12.1/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.12.1/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/gccframe.h glibc-2.12.1/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.12.1/ports/sysdeps/arm/gmp-mparam.h
diff --git a/patches/glibc/ports-2.12.1/580-nptl-lowlevellock.patch b/patches/glibc/ports-2.12.1/580-nptl-lowlevellock.patch
deleted file mode 100644
index c243a76..0000000
--- a/patches/glibc/ports-2.12.1/580-nptl-lowlevellock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix build error on arm like on hppa:
-
-arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
-
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.12.1/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/patches/glibc/ports-2.12.1/610-fpu-cw-mips.patch b/patches/glibc/ports-2.12.1/610-fpu-cw-mips.patch
deleted file mode 100644
index 7d990de..0000000
--- a/patches/glibc/ports-2.12.1/610-fpu-cw-mips.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
-
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
- #define _FPU_RC_UP      0x2
- #define _FPU_RC_DOWN    0x3
- 
--#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
-+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
- 
- 
- /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.12.1.orig/ports/sysdeps/mips/fpu_control.h glibc-2.12.1/ports/sysdeps/mips/fpu_control.h
diff --git a/patches/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch b/patches/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch
deleted file mode 100644
index f6a5eb6..0000000
--- a/patches/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN glibc-2.12.1.orig/elf/dl-lookup.c glibc-2.12.1/elf/dl-lookup.c
---- glibc-2.12.1.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.12.1/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-	    success:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;
diff --git a/patches/glibc/ports-2.12.1/640-alpha-atfcts.patch b/patches/glibc/ports-2.12.1/640-alpha-atfcts.patch
deleted file mode 100644
index 90a9d0d..0000000
--- a/patches/glibc/ports-2.12.1/640-alpha-atfcts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.12.1/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
-@@ -437,7 +437,8 @@
-    the code.  On PPC they were introduced in 2.6.17-rc1,
-    on SH in 2.6.19-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
-+    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
-+    && (!defined __alpha__)
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/patches/glibc/ports-2.12.1/650-syslog.patch b/patches/glibc/ports-2.12.1/650-syslog.patch
deleted file mode 100644
index c20cafc..0000000
--- a/patches/glibc/ports-2.12.1/650-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
-@@ -152,7 +152,7 @@
- #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- 	/* Check for invalid bits. */
- 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
--		syslog(INTERNALLOG,
-+		__syslog(INTERNALLOG,
- 		    "syslog: unknown facility/priority: %x", pri);
- 		pri &= LOG_PRIMASK|LOG_FACMASK;
- 	}
diff --git a/patches/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch b/patches/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a7052..0000000
--- a/patches/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/patches/glibc/ports-2.13/090-Fix-ARM-build-with-GCC-trunk.patch b/patches/glibc/ports-2.13/090-Fix-ARM-build-with-GCC-trunk.patch
deleted file mode 100644
index 1a632fe..0000000
--- a/patches/glibc/ports-2.13/090-Fix-ARM-build-with-GCC-trunk.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Tue, 20 May 2014 21:27:13 +0000
-Subject: [PATCH] Fix ARM build with GCC trunk.
-
-sysdeps/unix/sysv/linux/arm/unwind-resume.c and
-sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static
-variables that are written in C code but only read from toplevel asms.
-Current GCC trunk now optimizes away such apparently write-only static
-variables, so causing a build failure.  This patch marks those
-variables with __attribute_used__ to avoid that optimization.
-
-Tested that this fixes the build for ARM.
-
-	* sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-	(libgcc_s_resume): Use __attribute_used__.
-	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
-	Likewise.
----
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
diff --git a/patches/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch b/patches/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch
deleted file mode 100644
index 3798cb2..0000000
--- a/patches/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Respect environment CPPFLAGS when we run ./configure so we can inject
-random -D things without having to set CFLAGS/ASFLAGS
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
-+CPPFLAGS += $(CPPFLAGS-config)
- override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
- 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
diff --git a/patches/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch b/patches/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch
deleted file mode 100644
index c7f6182..0000000
--- a/patches/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-revert cfi additions to clone on i386/x86_64 to workaround problems in
-gcc's unwinder code.  this is not a bug in glibc, it triggers problems
-elsewhere.  this cfi code does not gain us a whole lot anyways.
-
-http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
-
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/patches/glibc/ports-2.13/140-disable-ldconfig.patch b/patches/glibc/ports-2.13/140-disable-ldconfig.patch
deleted file mode 100644
index 378e1df..0000000
--- a/patches/glibc/ports-2.13/140-disable-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
-file outside of the chroot.  doesnt matter anyways as we wont use the cache
-results (portage will rebuild cache), so running ldconfig is simply a waste
-of time.
-
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
- 	rm -f $(symbolic-link-list)
- 
- install:
-+dont-bother-with-destdir:
- 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
- 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
- 				       $(slibdir) $(libdir)
diff --git a/patches/glibc/ports-2.13/150-queue-header-updates.patch b/patches/glibc/ports-2.13/150-queue-header-updates.patch
deleted file mode 100644
index 7cbe70e..0000000
--- a/patches/glibc/ports-2.13/150-queue-header-updates.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-grab some updates from FreeBSD
-
-http://bugs.gentoo.org/201979
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
-@@ -136,6 +136,11 @@
- 		(var);							\
- 		(var) = ((var)->field.le_next))
- 
-+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = LIST_FIRST((head));				\
-+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
- /*
-  * List access methods.
-  */
-@@ -197,6 +202,16 @@
- #define	SLIST_FOREACH(var, head, field)					\
- 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
- 
-+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = SLIST_FIRST((head));				\
-+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-+	for ((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != NULL;					\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
- /*
-  * Singly-linked List access methods.
-  */
-@@ -242,6 +257,12 @@
- 	(head)->stqh_last = &(elm)->field.stqe_next;			\
- } while (/*CONSTCOND*/0)
- 
-+#define	STAILQ_LAST(head, type, field)					\
-+	(STAILQ_EMPTY((head)) ?						\
-+		NULL :							\
-+	        ((struct type *)(void *)				\
-+		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+
- #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
- 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
- 		(head)->stqh_last = &(elm)->field.stqe_next;		\
-@@ -271,6 +292,11 @@
- 		(var);							\
- 		(var) = ((var)->field.stqe_next))
- 
-+#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = STAILQ_FIRST((head));				\
-+		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	STAILQ_CONCAT(head1, head2) do {				\
- 	if (!STAILQ_EMPTY((head2))) {					\
- 		*(head1)->stqh_last = (head2)->stqh_first;		\
-@@ -437,11 +463,21 @@
- 		(var);							\
- 		(var) = ((var)->field.tqe_next))
- 
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
- 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
- 		(var);							\
- 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
- 
-+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_CONCAT(head1, head2, field) do {				\
- 	if (!TAILQ_EMPTY(head2)) {					\
- 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/patches/glibc/ports-2.13/160-manual-no-perl.patch b/patches/glibc/ports-2.13/160-manual-no-perl.patch
deleted file mode 100644
index 5e2b807..0000000
--- a/patches/glibc/ports-2.13/160-manual-no-perl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-If we're using a cvs snapshot which updates the source files, and
-perl isn't installed yet, then we can't regen the docs.  Not a big
-deal, so just whine a little and continue on our merry way.
-
-http://bugs.gentoo.org/60132
-
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
- libm-err.texi: stamp-libm-err
- stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
- 						     $(dir)/libm-test-ulps))
-+ifneq ($(PERL),no)
- 	pwd=`pwd`; \
- 	$(PERL) $< $$pwd/.. > libm-err-tmp
- 	$(move-if-change) libm-err-tmp libm-err.texi
-+else
-+	echo "Unable to rebuild math docs, no perl installed"
-+	touch libm-err.texi
-+endif
- 	touch $@
- 
- # Generate Texinfo files from the C source for the example programs.
diff --git a/patches/glibc/ports-2.13/170-localedef-fix-trampoline.patch b/patches/glibc/ports-2.13/170-localedef-fix-trampoline.patch
deleted file mode 100644
index 4784a07..0000000
--- a/patches/glibc/ports-2.13/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
-if [ $# -ne 2 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
diff --git a/patches/glibc/ports-2.13/180-resolv-dynamic.patch b/patches/glibc/ports-2.13/180-resolv-dynamic.patch
deleted file mode 100644
index e916bce..0000000
--- a/patches/glibc/ports-2.13/180-resolv-dynamic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -95,6 +96,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
diff --git a/patches/glibc/ports-2.13/190-localedef-mmap.patch b/patches/glibc/ports-2.13/190-localedef-mmap.patch
deleted file mode 100644
index f3914cd..0000000
--- a/patches/glibc/ports-2.13/190-localedef-mmap.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-sniped from Debian
-http://bugs.gentoo.org/289615
-
-2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
-	used later with MMAP_FIXED | MMAP_SHARED to cope with different
-	alignment restrictions.
-
-diff -durN glibc-2.13.orig/locale/programs/locarchive.c glibc-2.13/locale/programs/locarchive.c
---- glibc-2.13.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.13/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
-@@ -134,7 +134,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -396,7 +396,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -614,7 +614,7 @@
-   int xflags = 0;
-   void *p;
-   if (st.st_size < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
diff --git a/patches/glibc/ports-2.13/200-fadvise64_64.patch b/patches/glibc/ports-2.13/200-fadvise64_64.patch
deleted file mode 100644
index 71bca38..0000000
--- a/patches/glibc/ports-2.13/200-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
diff --git a/patches/glibc/ports-2.13/220-section-comments.patch b/patches/glibc/ports-2.13/220-section-comments.patch
deleted file mode 100644
index d717829..0000000
--- a/patches/glibc/ports-2.13/220-section-comments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
-
-fixes building on some architectures (like m68k/arm/cris/etc...) because
-it does the right thing
-
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
- #  define __make_section_unallocated(section_string)
- # endif
- 
--/* Tacking on "\n\t#" to the section name makes gcc put it's bogus
-+/* Tacking on "\n#APP\n\t#" to the section name makes gcc put it's bogus
-    section attributes on what looks like a comment to the assembler.  */
- # ifdef HAVE_SECTION_QUOTES
--#  define __sec_comment "\"\n\t#\""
-+#  define __sec_comment "\"\n#APP\n\t#\""
- # else
--#  define __sec_comment "\n\t#"
-+#  define __sec_comment "\n#APP\n\t#"
- # endif
- # define link_warning(symbol, msg) \
-   __make_section_unallocated (".gnu.warning." #symbol) \
diff --git a/patches/glibc/ports-2.13/230-no-inline-gmon.patch b/patches/glibc/ports-2.13/230-no-inline-gmon.patch
deleted file mode 100644
index fa33c2b..0000000
--- a/patches/glibc/ports-2.13/230-no-inline-gmon.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://bugs.gentoo.org/196245
-http://sourceware.org/ml/libc-alpha/2006-05/msg00017.html
-
-Attached is a patch to add __attribute__ ((noinline)) to
-call_gmon_start.
-
-Without this patch, the sec script that processed initfini.s removes a
-part of inlined call_gmon_start, causing undefined label errors.
-
-This patch solves the problem by forcing gcc not to inline
-call_gmon_start with __attribute__ ((noinline)).
-
-Tested by building for arm-none-lixux-gnueabi.  OK to apply?
-
-Kazu Hirata
-
-2006-05-07  Kazu Hirata  &lt;kazu@codesourcery.com&gt;
-
-	* sysdeps/generic/initfini.c (call_gmon_start): Add
-	__attribute__ ((noinline)).
-
-Index: sysdeps/generic/initfini.c
-===================================================================
-
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
-@@ -70,7 +70,7 @@
- /* The beginning of _init:  */
- asm ("\n/*@_init_PROLOG_BEGINS*/");
- 
--static void
-+static void __attribute__ ((noinline))
- call_gmon_start(void)
- {
-   extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
diff --git a/patches/glibc/ports-2.13/240-check_native-headers.patch b/patches/glibc/ports-2.13/240-check_native-headers.patch
deleted file mode 100644
index c936f71..0000000
--- a/patches/glibc/ports-2.13/240-check_native-headers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-many ports hit this warning:
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-
-snipped from suse
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/check_native.c glibc-2.13/sysdeps/unix/sysv/linux/check_native.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/check_native.c	2007-11-24 04:12:17.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/check_native.c	2009-11-13 00:50:11.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <time.h>
- #include <unistd.h>
- #include <net/if.h>
diff --git a/patches/glibc/ports-2.13/250-fix-pr631.patch b/patches/glibc/ports-2.13/250-fix-pr631.patch
deleted file mode 100644
index a48912e..0000000
--- a/patches/glibc/ports-2.13/250-fix-pr631.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From dank@kegel.com
-Wed Jun 15 09:12:43 PDT 2005
-
-Fixes
-
-build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r'
-build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent'
-... 53 lines deleted ...
-build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r'
-collect2: ld returned 1 exit status
-make[2]: *** [/build/gcc-3.4.3-glibc-2.3.5-hdrs-2.6.11.2/i686-unknown-linux-gnu/build-glibc/elf/ldconfig] Error 1
-
-when building glibc with --enable-static-nss.
-
-See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-@@ -531,7 +531,7 @@
- 
- # The static libraries.
- ifeq (yes,$(build-static))
--link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
-+link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a
- else
- ifeq (yes,$(build-shared))
- # We can try to link the programs with lib*_pic.a...
-diff -durN glibc-2.13.orig/elf/Makefile glibc-2.13/elf/Makefile
---- glibc-2.13.orig/elf/Makefile	2009-01-31 01:20:55.000000000 +0100
-+++ glibc-2.13/elf/Makefile	2009-11-13 00:50:13.000000000 +0100
-@@ -146,6 +146,13 @@
- install-bin-script = ldd
- endif
- 
-+ifeq (yes,$(build-static-nss))
-+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
-+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
-+otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
-+	     $(resolvobjdir)/libresolv.a
-+endif
-+
- others		= sprof sln
- install-bin	= sprof
- others-static   = sln
diff --git a/patches/glibc/ports-2.13/260-assume-pipe2.patch b/patches/glibc/ports-2.13/260-assume-pipe2.patch
deleted file mode 100644
index 42e8f4e..0000000
--- a/patches/glibc/ports-2.13/260-assume-pipe2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/250342
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
-
-we cant assume sock_cloexec and pipe2 are bound together as the former defines
-are found in glibc only while the latter are a combo of kernel headers and
-glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
-inside of glibc, we hit a problem.  for example:
-
-#include <grp.h>
-#include <stdio.h>
-main()
-{
-	getgrnam("portage");
-	if (!popen("ls", "r"))
-		perror("popen()");
-}
-
-getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
-__have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
-older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
-stub for it.  so popen() will always fail as glibc assumes pipe2() works.
-
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
-@@ -16,9 +16,14 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#include <fcntl.h>
- #include <sys/socket.h>
- #include <kernel-features.h>
- 
- #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
- int __have_sock_cloexec;
- #endif
-+
-+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
-+int __have_pipe2;
-+#endif
diff --git a/patches/glibc/ports-2.13/270-china.patch b/patches/glibc/ports-2.13/270-china.patch
deleted file mode 100644
index 41d7759..0000000
--- a/patches/glibc/ports-2.13/270-china.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
-@@ -1,7 +1,7 @@
- comment_char %
- escape_char /
- %
--% Chinese language locale for Taiwan R.O.C.
-+% Chinese language locale for Taiwan
- % charmap: BIG5-CP950
- %
- % Original Author:
-@@ -17,7 +17,7 @@
- % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
- 
- LC_IDENTIFICATION
--title      "Chinese locale for Taiwan R.O.C."
-+title      "Chinese locale for Taiwan"
- source     ""
- address    ""
- contact    ""
-@@ -25,7 +25,7 @@
- tel        ""
- fax        ""
- language   "Chinese"
--territory  "Taiwan R.O.C."
-+territory  "Taiwan"
- revision   "0.2"
- date       "2000-08-02"
- %
diff --git a/patches/glibc/ports-2.13/280-new-valencian-locale.patch b/patches/glibc/ports-2.13/280-new-valencian-locale.patch
deleted file mode 100644
index 4cdd108..0000000
--- a/patches/glibc/ports-2.13/280-new-valencian-locale.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=131815
-http://sourceware.org/bugzilla/show_bug.cgi?id=2522
-
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
- ca_ES.UTF-8/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8@valencia/UTF-8 \
-+ca_ES@valencia/ISO-8859-15 \
- ca_FR.UTF-8/UTF-8 \
- ca_FR/ISO-8859-15 \
- ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
-@@ -0,0 +1,96 @@
-+comment_char %
-+escape_char  /
-+%
-+% Valencian (southern Catalan) locale for Spain with Euro
-+%
-+% Note that this locale is almost the same as ca_ES@euro.  The point of having
-+% a separate locale is only for PO translations, which have a lot of social
-+% support and are very appreciated by the Valencian-speaking community.
-+%
-+% Contact: Jordi Mallach
-+% Email: jordi@gnu.org
-+% Tel:
-+% Fax:
-+% Language: ca
-+% Territory: ES
-+% Option: euro
-+% Revision: 1.0
-+% Date: 2006-04-06
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: ISO-8859-15
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Valencian (southern Catalan) locale for Spain with Euro"
-+source     ""
-+address    ""
-+contact    "Jordi Mallach"
-+email      "jordi@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Catalan"
-+territory  "Spain"
-+revision   "1.0"
-+date       "2006-04-06"
-+%
-+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
-+category  "ca_ES@valencia:2006";LC_CTYPE
-+category  "ca_ES@valencia:2006";LC_COLLATE
-+category  "ca_ES@valencia:2006";LC_MONETARY
-+category  "ca_ES@valencia:2006";LC_NUMERIC
-+category  "ca_ES@valencia:2006";LC_TIME
-+category  "ca_ES@valencia:2006";LC_MESSAGES
-+category  "ca_ES@valencia:2006";LC_PAPER
-+category  "ca_ES@valencia:2006";LC_NAME
-+category  "ca_ES@valencia:2006";LC_ADDRESS
-+category  "ca_ES@valencia:2006";LC_TELEPHONE
-+category  "ca_ES@valencia:2006";LC_MEASUREMENT
-+
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "ca_ES"
-+END LC_COLLATE
-+
-+LC_MONETARY
-+copy "ca_ES"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "ca_ES"
-+END LC_NUMERIC
-+
-+LC_TIME
-+copy "ca_ES"
-+END LC_TIME
-+
-+LC_MESSAGES
-+copy "ca_ES"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+copy "ca_ES"
-+END LC_PAPER
-+
-+LC_NAME
-+copy "ca_ES"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "ca_ES"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "ca_ES"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "ca_ES"
-+END LC_MEASUREMENT
diff --git a/patches/glibc/ports-2.13/300-nscd-one-fork.patch b/patches/glibc/ports-2.13/300-nscd-one-fork.patch
deleted file mode 100644
index adc9b3f..0000000
--- a/patches/glibc/ports-2.13/300-nscd-one-fork.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-only fork one to assist in stop-start-daemon assumptions about daemon behavior
-
-http://bugs.gentoo.org/190785
-
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
-@@ -182,6 +182,9 @@
-       if (pid != 0)
- 	exit (0);
- 
-+       if (write_pid (_PATH_NSCDPID) < 0)
-+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
-+
-       int nullfd = open (_PATH_DEVNULL, O_RDWR);
-       if (nullfd != -1)
- 	{
-@@ -231,12 +234,6 @@
- 	for (i = min_close_fd; i < getdtablesize (); i++)
- 	  close (i);
- 
--      pid = fork ();
--      if (pid == -1)
--	error (EXIT_FAILURE, errno, _("cannot fork"));
--      if (pid != 0)
--	exit (0);
--
-       setsid ();
- 
-       if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
- 
-       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
- 
--      if (write_pid (_PATH_NSCDPID) < 0)
--	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
--
-       if (!init_logfile ())
- 	dbg_log (_("Could not create log file"));
- 
diff --git a/patches/glibc/ports-2.13/310-hppa-nptl-carlos.patch b/patches/glibc/ports-2.13/310-hppa-nptl-carlos.patch
deleted file mode 100644
index 4c028b2..0000000
--- a/patches/glibc/ports-2.13/310-hppa-nptl-carlos.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -392,14 +392,14 @@
-      know it is available.  We do not have to clear the memory if we
-      do not have to use the temporary bootstrap_map.  Global variables
-      are initialized to zero by default.  */
--#ifndef DONT_USE_BOOTSTRAP_MAP
-+#if !defined DONT_USE_BOOTSTRAP_MAP
- # ifdef HAVE_BUILTIN_MEMSET
-   __builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
- # else
--  for (size_t cnt = 0;
--       cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
--       ++cnt)
--    bootstrap_map.l_info[cnt] = 0;
-+  /* Clear the whole bootstrap_map structure */
-+  for (char *cnt = (char *)&(bootstrap_map);
-+       cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
-+       *cnt++ = '\0');
- # endif
- # if USE___THREAD
-   bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
-@@ -185,7 +185,7 @@
-      __typeof (*(mem)) __atg5_value = (newvalue);			      \
- 									      \
-      do									      \
--       __atg5_oldval = *__atg5_memp;					      \
-+       __atg5_oldval = *(volatile __typeof (mem))__atg5_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
- 						   __atg5_oldval), 0));	      \
-@@ -206,7 +206,7 @@
-      __typeof (*(mem)) __atg6_value = (value);				      \
- 									      \
-      do									      \
--       __atg6_oldval = *__atg6_memp;					      \
-+       __atg6_oldval = *(volatile __typeof (mem))__atg6_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg6_memp,		      \
- 						   __atg6_oldval	      \
-@@ -224,7 +224,7 @@
-      __typeof (*(mem)) __atg7_value = (value);				      \
- 									      \
-      do									      \
--       __atg7_oldv = *__atg7_memp;					      \
-+       __atg7_oldv = *(volatile __typeof (mem))__atg7_memp;		      \
-      while (__builtin_expect						      \
- 	    (catomic_compare_and_exchange_bool_acq (__atg7_memp,	      \
- 						    __atg7_oldv		      \
-@@ -242,7 +242,7 @@
-     __typeof (mem) __atg8_memp = (mem);					      \
-     __typeof (*(mem)) __atg8_value = (value);				      \
-     do {								      \
--      __atg8_oldval = *__atg8_memp;					      \
-+      __atg8_oldval = *(volatile __typeof (mem))__atg8_memp;		      \
-       if (__atg8_oldval >= __atg8_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -259,7 +259,7 @@
-     __typeof (mem) __atg9_memp = (mem);					      \
-     __typeof (*(mem)) __atg9_value = (value);				      \
-     do {								      \
--      __atg9_oldv = *__atg9_memp;					      \
-+      __atg9_oldv = *(volatile __typeof (mem))__atg9_memp;		      \
-       if (__atg9_oldv >= __atg9_value)					      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -277,7 +277,7 @@
-     __typeof (mem) __atg10_memp = (mem);				      \
-     __typeof (*(mem)) __atg10_value = (value);				      \
-     do {								      \
--      __atg10_oldval = *__atg10_memp;					      \
-+      __atg10_oldval = *(volatile __typeof (mem))__atg10_memp;		      \
-       if (__atg10_oldval <= __atg10_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -361,7 +361,7 @@
- 									      \
-      do									      \
-        {								      \
--	 __atg11_oldval = *__atg11_memp;				      \
-+	 __atg11_oldval = *(volatile __typeof (mem))__atg11_memp;	      \
- 	 if (__builtin_expect (__atg11_oldval <= 0, 0))			      \
- 	   break;							      \
-        }								      \
-@@ -400,7 +400,7 @@
-      __typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit));	      \
- 									      \
-      do									      \
--       __atg14_old = (*__atg14_memp);					      \
-+       __atg14_old = (*(volatile __typeof (mem))__atg14_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg14_memp,	      \
- 						   __atg14_old | __atg14_mask,\
-@@ -418,7 +418,7 @@
-     __typeof (*(mem)) __atg15_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg15_old = (*__atg15_memp);					      \
-+      __atg15_old = (*(volatile __typeof (mem))__atg15_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg15_memp,		      \
- 						  __atg15_old & __atg15_mask, \
-@@ -450,7 +450,7 @@
-      __typeof (*(mem)) __atg16_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg16_old = (*__atg16_memp);					      \
-+       __atg16_old = (*(volatile __typeof (mem))__atg16_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg16_memp,	      \
- 						   __atg16_old & __atg16_mask,\
-@@ -468,7 +468,7 @@
-     __typeof (*(mem)) __atg17_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg17_old = (*__atg17_memp);					      \
-+      __atg17_old = (*(volatile __typeof (mem))__atg17_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg17_memp,		      \
- 						  __atg17_old | __atg17_mask, \
-@@ -484,7 +484,7 @@
-     __typeof (*(mem)) __atg18_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg18_old = (*__atg18_memp);					      \
-+      __atg18_old = (*(volatile __typeof (mem))__atg18_memp);		      \
-     while (__builtin_expect						      \
- 	   (catomic_compare_and_exchange_bool_acq (__atg18_memp,	      \
- 						   __atg18_old | __atg18_mask,\
-@@ -500,7 +500,7 @@
-      __typeof (*(mem)) __atg19_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg19_old = (*__atg19_memp);					      \
-+       __atg19_old = (*(volatile __typeof (mem))__atg19_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
- 						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -265,9 +265,9 @@
- # Files which must not be linked with libpthread.
- tests-nolibpthread = tst-unload
- 
--# This sets the stack resource limit to 1023kb, which is not a multiple
--# of the page size since every architecture's page size is > 1k.
--tst-oddstacklimit-ENV = ; ulimit -s 1023;
-+# This sets the stack resource limit to 8193kb, which is not a multiple
-+# of the page size since every architecture's page size is 4096 bytes.
-+tst-oddstacklimit-ENV = ; ulimit -s 8193;
- 
- distribute = eintr.c tst-cleanup4aux.c
- 
-@@ -426,6 +426,35 @@
- CFLAGS-tst-cleanupx4.c += -fexceptions
- CFLAGS-tst-oncex3.c += -fexceptions
- CFLAGS-tst-oncex4.c += -fexceptions
-+
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
-+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
-+
- CFLAGS-tst-align.c += $(stack-align-test-flags)
- CFLAGS-tst-align3.c += $(stack-align-test-flags)
- CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
-@@ -64,7 +64,7 @@
-       do
- 	lll_futex_wait (&ibarrier->curr_event, event,
- 			ibarrier->private ^ FUTEX_PRIVATE_FLAG);
--      while (event == ibarrier->curr_event);
-+      while (event == *(volatile unsigned int *)&ibarrier->curr_event);
-     }
- 
-   /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -33,7 +33,9 @@
- 
- ifeq ($(have-forced-unwind),yes)
- tests += tst-mqueue8x
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
- CFLAGS-tst-mqueue8x.c += -fexceptions
-+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s) 
- endif
- endif
- 
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -82,7 +82,7 @@
- 	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
- endif
- 
--CFLAGS-vfprintf.c = -Wno-uninitialized
-+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
- CFLAGS-vfwprintf.c = -Wno-uninitialized
- CFLAGS-tst-printf.c = -Wno-format
- CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
-       while (inlen < 0 && errno == EINTR);
-       if (inlen < 0)
- 	{
--	  if (errno == EWOULDBLOCK)
-+	  if (errno == EWOULDBLOCK || errno == EAGAIN)
- 	    continue;
- 	  cu->cu_error.re_errno = errno;
- 	  return (cu->cu_error.re_status = RPC_CANTRECV);
diff --git a/patches/glibc/ports-2.13/330-m68k-sys-user.patch b/patches/glibc/ports-2.13/330-m68k-sys-user.patch
deleted file mode 100644
index 191e0c6..0000000
--- a/patches/glibc/ports-2.13/330-m68k-sys-user.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-copied from kernel as it is sanitized now
-
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
-@@ -1,3 +1,90 @@
-+#ifndef _SYS_USER_H
-+#define _SYS_USER_H
-+
-+/* Core file format: The core file is written in such a way that gdb
-+   can understand it and provide useful information to the user (under
-+   linux we use the 'trad-core' bfd).  There are quite a number of
-+   obstacles to being able to view the contents of the floating point
-+   registers, and until these are solved you will not be able to view the
-+   contents of them.  Actually, you can read in the core file and look at
-+   the contents of the user struct to find out what the floating point
-+   registers contain.
-+   The actual file contents are as follows:
-+   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-+   in the file.  Directly after this is a copy of the task_struct, which
-+   is currently not used by gdb, but it may come in useful at some point.
-+   All of the registers are stored as part of the upage.  The upage should
-+   always be only one page.
-+   DATA: The data area is stored.  We use current->end_text to
-+   current->brk to pick up all of the user variables, plus any memory
-+   that may have been malloced.  No attempt is made to determine if a page
-+   is demand-zero or if a page is totally unused, we just cover the entire
-+   range.  All of the addresses are rounded in such a way that an integral
-+   number of pages is written.
-+   STACK: We need the stack information in order to get a meaningful
-+   backtrace.  We need to write the data from (esp) to
-+   current->start_stack, so we round each of these off in order to be able
-+   to write an integer number of pages.
-+   The minimum core file size is 3 pages, or 12288 bytes.
-+*/
-+
-+struct user_m68kfp_struct {
-+	unsigned long  fpregs[8*3];	/* fp0-fp7 registers */
-+	unsigned long  fpcntl[3];	/* fp control regs */
-+};
-+
-+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
-+   is still the layout used by user (the new pt_regs doesn't have
-+   all registers). */
-+struct user_regs_struct {
-+	long d1,d2,d3,d4,d5,d6,d7;
-+	long a0,a1,a2,a3,a4,a5,a6;
-+	long d0;
-+	long usp;
-+	long orig_d0;
-+	short stkadj;
-+	short sr;
-+	long pc;
-+	short fmtvec;
-+	short __fill;
-+};
-+
-+
-+/* When the kernel dumps core, it starts by dumping the user struct -
-+   this will be used by gdb to figure out where the data and stack segments
-+   are within the file, and what virtual addresses to use. */
-+struct user{
-+/* We start with the registers, to mimic the way that "memory" is returned
-+   from the ptrace(3,...) function.  */
-+  struct user_regs_struct regs;	/* Where the registers are actually stored */
-+/* ptrace does not yet supply these.  Someday.... */
-+  int u_fpvalid;		/* True if math co-processor being used. */
-+                                /* for this mess. Not yet used. */
-+  struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
-+/* The rest of this junk is to help gdb figure out what goes where */
-+  unsigned long int u_tsize;	/* Text segment size (pages). */
-+  unsigned long int u_dsize;	/* Data segment size (pages). */
-+  unsigned long int u_ssize;	/* Stack segment size (pages). */
-+  unsigned long start_code;     /* Starting virtual address of text. */
-+  unsigned long start_stack;	/* Starting virtual address of stack area.
-+				   This is actually the bottom of the stack,
-+				   the top of the stack is always found in the
-+				   esp register.  */
-+  long int signal;		/* Signal that caused the core dump. */
-+  int reserved;			/* No longer used */
-+  struct user_regs_struct *u_ar0;
-+				/* Used by gdb to help find the values for */
-+				/* the registers. */
-+  struct user_m68kfp_struct* u_fpstate;	/* Math Co-processor pointer. */
-+  unsigned long magic;		/* To uniquely identify a core file */
-+  char u_comm[32];		/* User command that was responsible */
-+};
-+#define NBPG 4096
-+#define UPAGES 1
-+#define HOST_TEXT_START_ADDR (u.start_code)
-+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-+
-+#endif
- /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/patches/glibc/ports-2.13/340-dl_execstack-PaX-support.patch b/patches/glibc/ports-2.13/340-dl_execstack-PaX-support.patch
deleted file mode 100644
index 2402af0..0000000
--- a/patches/glibc/ports-2.13/340-dl_execstack-PaX-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-	With latest versions of glibc, a lot of apps failed on a PaX enabled
-	system with:
-		 cannot enable executable stack as shared object requires: Permission denied
-	
-	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	to make the stack executable due to some libraries not containing the
-	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-
-	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
-
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
- # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
- #endif
-   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
--    return errno;
-+    if (errno != EACCES) /* PAX is enabled */
-+    	return errno;
- 
-   return 0;
- }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -63,7 +63,10 @@
-       else
- # endif
- 	{
--	  result = errno;
-+	  if (errno == EACCES)  /* PAX is enabled */
-+	    result = 0;
-+	  else
-+	    result = errno;
- 	  goto out;
- 	}
-     }
-@@ -89,7 +92,12 @@
- 	page -= size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
-@@ -115,7 +123,12 @@
- 	page += size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
diff --git a/patches/glibc/ports-2.13/350-pre20040117-pt_pax.patch b/patches/glibc/ports-2.13/350-pre20040117-pt_pax.patch
deleted file mode 100644
index f8f6b83..0000000
--- a/patches/glibc/ports-2.13/350-pre20040117-pt_pax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/patches/glibc/ports-2.13/360-tests-sandbox-libdl-paths.patch b/patches/glibc/ports-2.13/360-tests-sandbox-libdl-paths.patch
deleted file mode 100644
index 9f78c52..0000000
--- a/patches/glibc/ports-2.13/360-tests-sandbox-libdl-paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-when glibc runs its tests, it does so by invoking the local library loader.
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against
-libdl (so that it can load libraries and pull out symbols).  the trouble
-is that when you upgrade from an older glibc to the new one, often times
-internal symbols change name or abi.  this is normally OK as you cannot use
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
-we always say "keep all of the glibc libraries from the same build".  but
-when glibc runs its tests, it uses dynamic paths to point to its new local
-copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
-its path, and when sandbox triggers the loading of libdl, glibc does so
-from the host system system.  this gets us into the case of all libraries
-are from the locally compiled version of glibc except for libdl.so.
-
-Fix by Wormo
-
-http://bugs.gentoo.org/56898
-
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,7 +24,8 @@
- rtld_installed_name=$1; shift
- 
- testout=${common_objpfx}/grp/tst_fgetgrent.out
--library_path=${common_objpfx}
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
- 
- result=0
- 
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -34,7 +34,7 @@
- export GCONV_PATH
- 
- # We have to have some directories in the library path.
--LIBPATH=$codir:$codir/iconvdata
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
- 
- # How the start the iconv(1) program.
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -59,8 +59,11 @@
-   irreversible=${charset}.irreversible
- fi
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # iconv in one direction.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-table-from ${charset} \
-   > ${objpfx}tst-${charset}.table
- 
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -37,6 +37,9 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- ${common_objpfx}elf/ld.so --library-path $common_objpfx \
- ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
- 
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -51,9 +51,12 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
- MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -65,8 +65,11 @@
- LOCPATH=${objpfx}domaindir
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
- cmp ${objpfx}tst-gettext2.out - <<EOF
- String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -36,7 +36,10 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,9 +24,12 @@
- status=0
- trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
- LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
-   ${common_objpfx}malloc/tst-mtrace || status=1
- 
- if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -5,8 +5,8 @@
- rtld_installed_name=$1; shift
- logfile=$common_objpfx/nptl/tst-tls6.out
- 
--# We have to find libc and nptl
--library_path=${common_objpfx}:${common_objpfx}nptl
-+# We have to find libc and nptl (also libdl in case sandbox is in use)
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
- tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- 	  ${common_objpfx}/nptl/tst-tls5"
- 
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -18,7 +18,7 @@
- esac
- 
- # We have to find the libc and the NSS modules.
--library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
-+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
- 
- # Since we use `sort' we must make sure to use the same locale everywhere.
- LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -10,7 +10,10 @@
- else
-   rtld_installed_name=$1; shift
-   runit() {
--    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
-+    
-+  # make sure libdl is also in path in case sandbox is in use
-+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
-   }
- fi
- 
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -19,8 +19,11 @@
- "
- export IFS
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- failed=0
--${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
- cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
- wordexp returned 0
diff --git a/patches/glibc/ports-2.13/380-dont-build-timezone.patch b/patches/glibc/ports-2.13/380-dont-build-timezone.patch
deleted file mode 100644
index 11c358e..0000000
--- a/patches/glibc/ports-2.13/380-dont-build-timezone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/patches/glibc/ports-2.13/400-alpha-xstat.patch b/patches/glibc/ports-2.13/400-alpha-xstat.patch
deleted file mode 100644
index 6e4ab8f..0000000
--- a/patches/glibc/ports-2.13/400-alpha-xstat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-@@ -386,6 +386,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE	1
- #endif
- 
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL	1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
-    after exec is always rounded up to the next page.  */
- #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/patches/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch b/patches/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch
deleted file mode 100644
index fd55537..0000000
--- a/patches/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2011-02-28  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_SETPIPE_SZ,
-	F_GETPIPE_SZ): Define.
-
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-index 860e9ac..e5e726b 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-@@ -97,6 +97,8 @@
- # define F_SETLEASE	1024	/* Set a lease.	 */
- # define F_GETLEASE	1025	/* Enquire what lease is active.  */
- # define F_NOTIFY	1026	/* Request notfications on a directory.	 */
-+# define F_SETPIPE_SZ	1031    /* Set pipe page size array.  */
-+# define F_GETPIPE_SZ	1032    /* Set pipe page size array.  */
- #endif
- #ifdef __USE_XOPEN2K8
- # define F_DUPFD_CLOEXEC 1030	/* Duplicate file descriptor with
-
diff --git a/patches/glibc/ports-2.13/420-alpha-statfs.patch b/patches/glibc/ports-2.13/420-alpha-statfs.patch
deleted file mode 100644
index 65c925a..0000000
--- a/patches/glibc/ports-2.13/420-alpha-statfs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-2011-02-28  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/mips/bits/statfs.h (struct statfs,
-	struct statfs64): Add f_flags field.
-
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-index d838e6b..157591d 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-@@ -42,7 +42,8 @@ struct statfs
-     __fsid_t f_fsid;
-     int f_namelen;
-     int f_frsize;
--    int f_spare[5];
-+    int f_flags;
-+    int f_spare[4];
-   };
- 
- #ifdef __USE_LARGEFILE64
-@@ -58,7 +59,8 @@ struct statfs64
-     __fsid_t f_fsid;
-     int f_namelen;
-     int f_frsize;
--    int f_spare[5];
-+    int f_flags;
-+    int f_spare[4];
-   };
- #endif
-
diff --git a/patches/glibc/ports-2.13/430-alpha-creat.patch b/patches/glibc/ports-2.13/430-alpha-creat.patch
deleted file mode 100644
index da6ddda..0000000
--- a/patches/glibc/ports-2.13/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/patches/glibc/ports-2.13/440-alpha-cache-shape.patch b/patches/glibc/ports-2.13/440-alpha-cache-shape.patch
deleted file mode 100644
index 62ade7b..0000000
--- a/patches/glibc/ports-2.13/440-alpha-cache-shape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-older verisons of glibc would build dl-sysdep as shared-only and dl-support as
-static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
-glibc build dl-sysdep as both shared and static which means we now have symbol
-duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
-is both shared/static, there is no point in hooking dl-support anymore, so we
-can punt it.
-
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
--#include "dl-auxv.h"
- #include <elf/dl-support.c>
diff --git a/patches/glibc/ports-2.13/450-alpha-DEFAULT_STACK_PERMS.patch b/patches/glibc/ports-2.13/450-alpha-DEFAULT_STACK_PERMS.patch
deleted file mode 100644
index ac3ea9a..0000000
--- a/patches/glibc/ports-2.13/450-alpha-DEFAULT_STACK_PERMS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-2011-02-28  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X.
-
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
-index 0a281bd..d9dbc35 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
-@@ -22,7 +22,13 @@
- #ifndef _STACKINFO_H
- #define _STACKINFO_H	1
- 
-+#include <elf.h>
-+
- /* On Alpha the stack grows down.  */
- #define _STACK_GROWS_DOWN	1
- 
-+/* Default to an executable stack.  PF_X can be overridden if PT_GNU_STACK is
-+ * present, but it is presumed absent.  */
-+#define DEFAULT_STACK_PERMS (PF_R|PF_W|PF_X)
-+
- #endif	/* stackinfo.h */
-
diff --git a/patches/glibc/ports-2.13/460-alpha-fix-gcc-4.1-warnings.patch b/patches/glibc/ports-2.13/460-alpha-fix-gcc-4.1-warnings.patch
deleted file mode 100644
index 313e0e0..0000000
--- a/patches/glibc/ports-2.13/460-alpha-fix-gcc-4.1-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-2006-05-30  Falk Hueffner <falk@debian.org>
-
-	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
-	  to ev6 in assembly code.
-
-{standard input}: Assembler messages:
-{standard input}:341: Error: macro requires $at register while noat in effect
-{standard input}:374: Error: macro requires $at register while noat in effect
-{standard input}:438: Error: macro requires $at register while noat in effect
-{standard input}:471: Error: macro requires $at register while noat in effect
-make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
-
-Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
-I cannot really think of anything better than
-
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
- static inline void
- stb_mb(unsigned char val, unsigned long addr)
- {
--  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
-+  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
- }
- 
- static inline void
- stw_mb(unsigned short val, unsigned long addr)
- {
--  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
- }
- 
- static inline void
-@@ -356,7 +356,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned char r;
- 
--  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-+  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-   return r;
- }
- 
-@@ -366,7 +366,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned short r;
- 
--  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-+  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-   return r;
- }
- 
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.13/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/patches/glibc/ports-2.13/470-alpha-feupdateenv.patch b/patches/glibc/ports-2.13/470-alpha-feupdateenv.patch
deleted file mode 100644
index 45a7051..0000000
--- a/patches/glibc/ports-2.13/470-alpha-feupdateenv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-2011-03-01  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/fpu/feupdateenv.c (feupdateenv): Add
-	libm_hidden_def.
-	* sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise.
-
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-index c798070..9abbf11 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-@@ -46,4 +46,5 @@ strong_alias (__feupdateenv, __old_feupdateenv)
- compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1);
- #endif
- 
-+libm_hidden_ver (__feupdateenv, feupdateenv)
- versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-index a4b3081..34d8113 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-@@ -30,3 +30,4 @@ fetestexcept (int excepts)
- 
-   return tmp & excepts & SWCR_STATUS_MASK;
- }
-+libm_hidden_def (fetestexcept)
-
diff --git a/patches/glibc/ports-2.13/490-alpha_alpha-add-fdatasync-support.patch b/patches/glibc/ports-2.13/490-alpha_alpha-add-fdatasync-support.patch
deleted file mode 100644
index 372f34c..0000000
--- a/patches/glibc/ports-2.13/490-alpha_alpha-add-fdatasync-support.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/kernel-features.h: define 
-	__ASSUME_FDATASYNC. 
-	* sysdeps/unix/sysv/linux/fdatasync.c: New file.
-	* sysdeps/unix/sysv/linux/Makefile: compile fdatasync.c with
-	-fexceptions.
-	* sysdeps/unix/sysv/linux/syscalls.list: Remove fdatasync.
-
- sysdeps/unix/sysv/linux/Makefile          |    1 
- sysdeps/unix/sysv/linux/fdatasync.c       |   69 ++++++++++++++++++++++++++++++
- sysdeps/unix/sysv/linux/kernel-features.h |    6 ++
- sysdeps/unix/sysv/linux/syscalls.list     |    1 
- 4 files changed, 76 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -20,6 +20,7 @@
- 		   setfsuid setfsgid makedev epoll_pwait signalfd \
- 		   eventfd eventfd_read eventfd_write prlimit
- 
-+CFLAGS-fdatasync.c = -fexceptions
- CFLAGS-gethostid.c = -fexceptions
- 
- sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* fdatasync -- synchronize at least the data part of a file with 
-+   the underlying media. Linux version. 
-+
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+#include <bp-checks.h>
-+
-+#include <kernel-features.h>
-+
-+#if defined __NR_fdatasync && !defined __ASSUME_FDATASYNC
-+static int __have_no_fdatasync;
-+#endif
-+
-+static int
-+do_fdatasync (int fd)
-+{
-+#ifdef __ASSUME_FDATASYNC
-+  return INLINE_SYSCALL (fdatasync, 1, fd);
-+#elif defined __NR_fdatasync
-+  if (!__builtin_expect (__have_no_fdatasync, 0))
-+    {
-+      int result = INLINE_SYSCALL (fdatasync, 1, fd);
-+      if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
-+	return result;
-+
-+      __have_no_fdatasync = 1;
-+    }
-+#endif
-+  return INLINE_SYSCALL (fsync, 1, fd);
-+}
-+
-+int
-+__fdatasync (int fd)
-+{
-+  if (SINGLE_THREAD_P)
-+    return do_fdatasync (fd);
-+
-+  int oldtype = LIBC_CANCEL_ASYNC ();
-+
-+  int result = do_fdatasync (fd);
-+
-+  LIBC_CANCEL_RESET (oldtype);
-+
-+  return result;
-+}
-+
-+weak_alias (__fdatasync, fdatasync)
-+
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
-@@ -459,6 +459,12 @@
- # define __ASSUME_FUTEX_LOCK_PI	1
- #endif
- 
-+/* Support for fsyncdata syscall was added in 2.6.22 on alpha, but it
-+   was already present in 2.0 kernels on other architectures.  */
-+#if (!defined __alpha || __LINUX_KERNEL_VERSION >= 0x020616)
-+# define __ASSUME_FDATASYNC	1
-+#endif
-+
- /* Support for utimensat syscall was added in 2.6.22, on SH
-    only after 2.6.22-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
- epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
- epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
- epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
--fdatasync	-	fdatasync	Ci:i	fdatasync
- flock		-	flock		i:ii	__flock		flock
- fork		-	fork		i:	__libc_fork	__fork fork
- get_kernel_syms	EXTRA	get_kernel_syms	i:p	get_kernel_syms
diff --git a/patches/glibc/ports-2.13/530-alpha-fix-rtld-fPIC.patch b/patches/glibc/ports-2.13/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index b2ae9b5..0000000
--- a/patches/glibc/ports-2.13/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile glibc-2.13/glibc-ports-2.13/sysdeps/alpha/Makefile
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.13.orig/ports/sysdeps/alpha/Makefile glibc-2.13/ports/sysdeps/alpha/Makefile
diff --git a/patches/glibc/ports-2.13/560-ppc-atomic.patch b/patches/glibc/ports-2.13/560-ppc-atomic.patch
deleted file mode 100644
index ee1cb90..0000000
--- a/patches/glibc/ports-2.13/560-ppc-atomic.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-sniped from suse
-
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
-
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -85,14 +85,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
diff --git a/patches/glibc/ports-2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/patches/glibc/ports-2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
deleted file mode 100644
index 4f4dbec..0000000
--- a/patches/glibc/ports-2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-http://yann.poupet.free.fr/ep93xx/
-Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
-
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/bits/endian.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
-@@ -12,7 +12,7 @@
- /* FPA floating point units are always big-endian, irrespective of the
-    CPU endianness.  VFP floating point units use the same endianness
-    as the rest of the system.  */
--#ifdef __VFP_FP__
-+#if defined __VFP_FP__ || defined __MAVERICK__
- #define __FLOAT_WORD_ORDER __BYTE_ORDER
- #else
- #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -30,7 +30,33 @@
- 	movs	r0, r1		/* get the return value in place */
- 	moveq	r0, #1		/* can't let setjmp() return zero! */
- 
-+#ifdef __MAVERICK__
-+	cfldrd	mvd4,  [ip], #8
-+	nop
-+	cfldrd	mvd5,  [ip], #8
-+	nop
-+	cfldrd	mvd6,  [ip], #8
-+	nop
-+	cfldrd	mvd7,  [ip], #8
-+	nop
-+	cfldrd	mvd8,  [ip], #8
-+	nop
-+	cfldrd	mvd9,  [ip], #8
-+	nop
-+	cfldrd	mvd10, [ip], #8
-+	nop
-+	cfldrd	mvd11, [ip], #8
-+	nop
-+	cfldrd	mvd12, [ip], #8
-+	nop
-+	cfldrd	mvd13, [ip], #8
-+	nop
-+	cfldrd	mvd14, [ip], #8
-+	nop
-+	cfldrd	mvd15, [ip], #8
-+#else
- 	lfmfd	f4, 4, [ip] !	/* load the floating point regs */
-+#endif
- 
- 	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
- END (__longjmp)
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
-@@ -20,6 +20,45 @@
- # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
- #endif
- 
-+#if defined(__MAVERICK__)
-+
-+/* Define bits representing exceptions in the FPU status word.  */
-+enum
-+  {
-+    FE_INVALID = 1,
-+#define FE_INVALID FE_INVALID
-+    FE_OVERFLOW = 4,
-+#define FE_OVERFLOW FE_OVERFLOW
-+    FE_UNDERFLOW = 8,
-+#define FE_UNDERFLOW FE_UNDERFLOW
-+    FE_INEXACT = 16,
-+#define FE_INEXACT FE_INEXACT
-+  };
-+
-+/* Amount to shift by to convert an exception to a mask bit.  */
-+#define FE_EXCEPT_SHIFT	5
-+
-+/* All supported exceptions.  */
-+#define FE_ALL_EXCEPT	\
-+	(FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
-+
-+/* IEEE rounding modes.  */
-+enum
-+  {
-+    FE_TONEAREST = 0,
-+#define FE_TONEAREST    FE_TONEAREST
-+    FE_TOWARDZERO = 0x400,
-+#define FE_TOWARDZERO   FE_TOWARDZERO
-+    FE_DOWNWARD = 0x800,
-+#define FE_DOWNWARD     FE_DOWNWARD
-+    FE_UPWARD = 0xc00,
-+#define FE_UPWARD       FE_UPWARD
-+  };
-+
-+#define FE_ROUND_MASK (FE_UPWARD)
-+
-+#else /* FPA */
-+
- /* Define bits representing exceptions in the FPU status word.  */
- enum
-   {
-@@ -44,6 +83,8 @@
-    modes exist, but you have to encode them in the actual instruction.  */
- #define FE_TONEAREST	0
- 
-+#endif
-+
- /* Type representing exception flags. */
- typedef unsigned long int fexcept_t;
- 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
-@@ -28,7 +28,11 @@
- #ifndef _ASM
- /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
-    saved.  */
-+#ifdef __MAVERICK__
-+typedef int __jmp_buf[34];
-+#else
- typedef int __jmp_buf[22];
- #endif
-+#endif
- 
- #endif
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,9 +18,21 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fegetround (void)
- {
-+#if defined(__MAVERICK__)
-+
-+  unsigned long temp;
-+
-+  _FPU_GETCW (temp);
-+  return temp & FE_ROUND_MASK;
-+
-+#else /* FPA */
-+
-   return FE_TONEAREST;		/* Easy. :-) */
-+
-+#endif
- }
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,12 +18,28 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fesetround (int round)
- {
-+#if defined(__MAVERICK__)
-+  unsigned long temp;
-+
-+  if (round & ~FE_ROUND_MASK)
-+    return 1;
-+
-+  _FPU_GETCW (temp);
-+  temp = (temp & ~FE_ROUND_MASK) | round;
-+  _FPU_SETCW (temp);
-+  return 0;
-+
-+#else /* FPA */
-+
-   /* We only support FE_TONEAREST, so there is no need for any work.  */
-   return (round == FE_TONEAREST)?0:1;
-+
-+#endif
- }
- 
- libm_hidden_def (fesetround)
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
-@@ -1,5 +1,6 @@
- /* FPU control word definitions.  ARM version.
--   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-+   Copyright (C) 1996, 1997, 1998, 2000, 2005
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -20,6 +21,79 @@
- #ifndef _FPU_CONTROL_H
- #define _FPU_CONTROL_H
- 
-+#if defined(__MAVERICK__)
-+
-+/* DSPSC register: (from EP9312 User's Guide)
-+ *
-+ * bits 31..29	- DAID
-+ * bits 28..26	- HVID
-+ * bits 25..24	- RSVD
-+ * bit  23	- ISAT
-+ * bit  22	- UI
-+ * bit  21	- INT
-+ * bit  20	- AEXC
-+ * bits 19..18	- SAT
-+ * bits 17..16	- FCC
-+ * bit  15	- V
-+ * bit  14	- FWDEN
-+ * bit  13	- Invalid
-+ * bit	12	- Denorm
-+ * bits 11..10	- RM
-+ * bits 9..5	- IXE, UFE, OFE, RSVD, IOE
-+ * bits 4..0	- IX, UF, OF, RSVD, IO
-+ */
-+
-+/* masking of interrupts */
-+#define _FPU_MASK_IM	(1 << 5)	/* invalid operation */
-+#define _FPU_MASK_ZM	0		/* divide by zero */
-+#define _FPU_MASK_OM	(1 << 7)	/* overflow */
-+#define _FPU_MASK_UM	(1 << 8)	/* underflow */
-+#define _FPU_MASK_PM	(1 << 9)	/* inexact */
-+#define _FPU_MASK_DM	0		/* denormalized operation */
-+
-+#define _FPU_RESERVED	0xfffff000	/* These bits are reserved.  */
-+
-+#define _FPU_DEFAULT	0x00b00000	/* Default value.  */
-+#define _FPU_IEEE	0x00b003a0	/* Default + exceptions enabled. */
-+
-+/* Type of the control word.  */
-+typedef unsigned int fpu_control_t;
-+
-+/* Macros for accessing the hardware control word.  */
-+#define _FPU_GETCW(cw) ({			\
-+	register int __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv32sc	mvdx0, dspsc\n\t"	\
-+	"cfmvr64l	%0, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (cw), "=r" (__t1), "=r" (__t2)	\
-+	);					\
-+})
-+
-+#define _FPU_SETCW(cw) ({			\
-+	register int __t0, __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %0\n\t"		\
-+	"cfmvsc32	dspsc, mvdx0\n\t"	\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (__t0), "=r" (__t1), "=r" (__t2)	\
-+	: "0" (cw)				\
-+	);					\
-+})
-+
-+/* Default control word set at startup.  */
-+extern fpu_control_t __fpu_control;
-+
-+#else /* FPA */
-+
- /* We have a slight terminology confusion here.  On the ARM, the register
-  * we're interested in is actually the FPU status word - the FPU control
-  * word is something different (which is implementation-defined and only
-@@ -99,4 +173,6 @@
- /* Default control word set at startup.  */
- extern fpu_control_t __fpu_control;
- 
-+#endif
-+
- #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,4 +17,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define __JMP_BUF_SP		32
-+#else
- #define __JMP_BUF_SP		20
-+#endif
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -24,11 +24,41 @@
- 
- ENTRY (__sigsetjmp)
- 	/* Save registers */
-+#ifdef __MAVERICK__
-+	cfstrd	mvd4,  [r0], #8
-+	nop
-+	cfstrd	mvd5,  [r0], #8
-+	nop
-+	cfstrd	mvd6,  [r0], #8
-+	nop
-+	cfstrd	mvd7,  [r0], #8
-+	nop
-+	cfstrd	mvd8,  [r0], #8
-+	nop
-+	cfstrd	mvd9,  [r0], #8
-+	nop
-+	cfstrd	mvd10, [r0], #8
-+	nop
-+	cfstrd	mvd11, [r0], #8
-+	nop
-+	cfstrd	mvd12, [r0], #8
-+	nop
-+	cfstrd	mvd13, [r0], #8
-+	nop
-+	cfstrd	mvd14, [r0], #8
-+	nop
-+	cfstrd	mvd15, [r0], #8
-+#else
- 	sfmea	f4, 4, [r0]!
-+#endif
- 	stmia	r0, {v1-v6, sl, fp, sp, lr}
- 
- 	/* Restore pointer to jmp_buf */
-+#ifdef __MAVERICK__
-+	sub	r0, r0, #96
-+#else
- 	sub	r0, r0, #48
-+#endif
- 
- 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
- 	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/gccframe.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,6 +17,10 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define FIRST_PSEUDO_REGISTER 43
-+#else
- #define FIRST_PSEUDO_REGISTER 27
-+#endif
- 
- #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
-@@ -29,7 +29,7 @@
- #if defined(__ARMEB__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 1
--#elif defined(__VFP_FP__)
-+#elif defined(__VFP_FP__) || defined(__MAVERICK__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 0
- #else
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/bits/endian.h glibc-2.13/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.13/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.13/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.13/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.13/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.13/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.13/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.13/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.13/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/gccframe.h glibc-2.13/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.13/ports/sysdeps/arm/gmp-mparam.h
diff --git a/patches/glibc/ports-2.13/580-nptl-lowlevellock.patch b/patches/glibc/ports-2.13/580-nptl-lowlevellock.patch
deleted file mode 100644
index 08518e9..0000000
--- a/patches/glibc/ports-2.13/580-nptl-lowlevellock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix build error on arm like on hppa:
-
-arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
-
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.13/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/patches/glibc/ports-2.13/610-fpu-cw-mips.patch b/patches/glibc/ports-2.13/610-fpu-cw-mips.patch
deleted file mode 100644
index cd2b4d9..0000000
--- a/patches/glibc/ports-2.13/610-fpu-cw-mips.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
-
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h glibc-2.13/glibc-ports-2.13/sysdeps/mips/fpu_control.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
- #define _FPU_RC_UP      0x2
- #define _FPU_RC_DOWN    0x3
- 
--#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
-+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
- 
- 
- /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.13.orig/ports/sysdeps/mips/fpu_control.h glibc-2.13/ports/sysdeps/mips/fpu_control.h
diff --git a/patches/glibc/ports-2.13/630-mips_shn_undef-hack.patch b/patches/glibc/ports-2.13/630-mips_shn_undef-hack.patch
deleted file mode 100644
index 791d76c..0000000
--- a/patches/glibc/ports-2.13/630-mips_shn_undef-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-	    success:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;
diff --git a/patches/glibc/ports-2.13/640-alpha-atfcts.patch b/patches/glibc/ports-2.13/640-alpha-atfcts.patch
deleted file mode 100644
index 7a8a94a..0000000
--- a/patches/glibc/ports-2.13/640-alpha-atfcts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
-@@ -437,7 +437,8 @@
-    the code.  On PPC they were introduced in 2.6.17-rc1,
-    on SH in 2.6.19-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
-+    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
-+    && (!defined __alpha__)
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/patches/glibc/ports-2.13/650-syslog.patch b/patches/glibc/ports-2.13/650-syslog.patch
deleted file mode 100644
index c20cafc..0000000
--- a/patches/glibc/ports-2.13/650-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
-@@ -152,7 +152,7 @@
- #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- 	/* Check for invalid bits. */
- 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
--		syslog(INTERNALLOG,
-+		__syslog(INTERNALLOG,
- 		    "syslog: unknown facility/priority: %x", pri);
- 		pri &= LOG_PRIMASK|LOG_FACMASK;
- 	}
diff --git a/patches/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch b/patches/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a7052..0000000
--- a/patches/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/patches/glibc/ports-2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch b/patches/glibc/ports-2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
deleted file mode 100644
index 1a632fe..0000000
--- a/patches/glibc/ports-2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Tue, 20 May 2014 21:27:13 +0000
-Subject: [PATCH] Fix ARM build with GCC trunk.
-
-sysdeps/unix/sysv/linux/arm/unwind-resume.c and
-sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static
-variables that are written in C code but only read from toplevel asms.
-Current GCC trunk now optimizes away such apparently write-only static
-variables, so causing a build failure.  This patch marks those
-variables with __attribute_used__ to avoid that optimization.
-
-Tested that this fixes the build for ARM.
-
-	* sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-	(libgcc_s_resume): Use __attribute_used__.
-	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
-	Likewise.
----
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
diff --git a/patches/glibc/ports-2.14.1/100-respect-env-CPPFLAGS.patch b/patches/glibc/ports-2.14.1/100-respect-env-CPPFLAGS.patch
deleted file mode 100644
index 3798cb2..0000000
--- a/patches/glibc/ports-2.14.1/100-respect-env-CPPFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Respect environment CPPFLAGS when we run ./configure so we can inject
-random -D things without having to set CFLAGS/ASFLAGS
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
-+CPPFLAGS += $(CPPFLAGS-config)
- override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
- 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
diff --git a/patches/glibc/ports-2.14.1/120-i386-x86_64-revert-clone-cfi.patch b/patches/glibc/ports-2.14.1/120-i386-x86_64-revert-clone-cfi.patch
deleted file mode 100644
index c7f6182..0000000
--- a/patches/glibc/ports-2.14.1/120-i386-x86_64-revert-clone-cfi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-revert cfi additions to clone on i386/x86_64 to workaround problems in
-gcc's unwinder code.  this is not a bug in glibc, it triggers problems
-elsewhere.  this cfi code does not gain us a whole lot anyways.
-
-http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
-
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/patches/glibc/ports-2.14.1/140-disable-ldconfig.patch b/patches/glibc/ports-2.14.1/140-disable-ldconfig.patch
deleted file mode 100644
index 378e1df..0000000
--- a/patches/glibc/ports-2.14.1/140-disable-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
-file outside of the chroot.  doesnt matter anyways as we wont use the cache
-results (portage will rebuild cache), so running ldconfig is simply a waste
-of time.
-
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
- 	rm -f $(symbolic-link-list)
- 
- install:
-+dont-bother-with-destdir:
- 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
- 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
- 				       $(slibdir) $(libdir)
diff --git a/patches/glibc/ports-2.14.1/150-queue-header-updates.patch b/patches/glibc/ports-2.14.1/150-queue-header-updates.patch
deleted file mode 100644
index 7cbe70e..0000000
--- a/patches/glibc/ports-2.14.1/150-queue-header-updates.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-grab some updates from FreeBSD
-
-http://bugs.gentoo.org/201979
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
-@@ -136,6 +136,11 @@
- 		(var);							\
- 		(var) = ((var)->field.le_next))
- 
-+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = LIST_FIRST((head));				\
-+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
- /*
-  * List access methods.
-  */
-@@ -197,6 +202,16 @@
- #define	SLIST_FOREACH(var, head, field)					\
- 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
- 
-+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = SLIST_FIRST((head));				\
-+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-+	for ((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != NULL;					\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
- /*
-  * Singly-linked List access methods.
-  */
-@@ -242,6 +257,12 @@
- 	(head)->stqh_last = &(elm)->field.stqe_next;			\
- } while (/*CONSTCOND*/0)
- 
-+#define	STAILQ_LAST(head, type, field)					\
-+	(STAILQ_EMPTY((head)) ?						\
-+		NULL :							\
-+	        ((struct type *)(void *)				\
-+		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+
- #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
- 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
- 		(head)->stqh_last = &(elm)->field.stqe_next;		\
-@@ -271,6 +292,11 @@
- 		(var);							\
- 		(var) = ((var)->field.stqe_next))
- 
-+#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = STAILQ_FIRST((head));				\
-+		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	STAILQ_CONCAT(head1, head2) do {				\
- 	if (!STAILQ_EMPTY((head2))) {					\
- 		*(head1)->stqh_last = (head2)->stqh_first;		\
-@@ -437,11 +463,21 @@
- 		(var);							\
- 		(var) = ((var)->field.tqe_next))
- 
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
- 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
- 		(var);							\
- 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
- 
-+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_CONCAT(head1, head2, field) do {				\
- 	if (!TAILQ_EMPTY(head2)) {					\
- 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/patches/glibc/ports-2.14.1/160-manual-no-perl.patch b/patches/glibc/ports-2.14.1/160-manual-no-perl.patch
deleted file mode 100644
index 5e2b807..0000000
--- a/patches/glibc/ports-2.14.1/160-manual-no-perl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-If we're using a cvs snapshot which updates the source files, and
-perl isn't installed yet, then we can't regen the docs.  Not a big
-deal, so just whine a little and continue on our merry way.
-
-http://bugs.gentoo.org/60132
-
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
- libm-err.texi: stamp-libm-err
- stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
- 						     $(dir)/libm-test-ulps))
-+ifneq ($(PERL),no)
- 	pwd=`pwd`; \
- 	$(PERL) $< $$pwd/.. > libm-err-tmp
- 	$(move-if-change) libm-err-tmp libm-err.texi
-+else
-+	echo "Unable to rebuild math docs, no perl installed"
-+	touch libm-err.texi
-+endif
- 	touch $@
- 
- # Generate Texinfo files from the C source for the example programs.
diff --git a/patches/glibc/ports-2.14.1/170-localedef-fix-trampoline.patch b/patches/glibc/ports-2.14.1/170-localedef-fix-trampoline.patch
deleted file mode 100644
index 4784a07..0000000
--- a/patches/glibc/ports-2.14.1/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
-if [ $# -ne 2 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
diff --git a/patches/glibc/ports-2.14.1/180-resolv-dynamic.patch b/patches/glibc/ports-2.14.1/180-resolv-dynamic.patch
deleted file mode 100644
index e916bce..0000000
--- a/patches/glibc/ports-2.14.1/180-resolv-dynamic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -95,6 +96,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
diff --git a/patches/glibc/ports-2.14.1/190-localedef-mmap.patch b/patches/glibc/ports-2.14.1/190-localedef-mmap.patch
deleted file mode 100644
index f3914cd..0000000
--- a/patches/glibc/ports-2.14.1/190-localedef-mmap.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-sniped from Debian
-http://bugs.gentoo.org/289615
-
-2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
-	used later with MMAP_FIXED | MMAP_SHARED to cope with different
-	alignment restrictions.
-
-diff -durN glibc-2.13.orig/locale/programs/locarchive.c glibc-2.13/locale/programs/locarchive.c
---- glibc-2.13.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.13/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
-@@ -134,7 +134,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -396,7 +396,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -614,7 +614,7 @@
-   int xflags = 0;
-   void *p;
-   if (st.st_size < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
diff --git a/patches/glibc/ports-2.14.1/200-fadvise64_64.patch b/patches/glibc/ports-2.14.1/200-fadvise64_64.patch
deleted file mode 100644
index 71bca38..0000000
--- a/patches/glibc/ports-2.14.1/200-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
diff --git a/patches/glibc/ports-2.14.1/220-section-comments.patch b/patches/glibc/ports-2.14.1/220-section-comments.patch
deleted file mode 100644
index d717829..0000000
--- a/patches/glibc/ports-2.14.1/220-section-comments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
-
-fixes building on some architectures (like m68k/arm/cris/etc...) because
-it does the right thing
-
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
- #  define __make_section_unallocated(section_string)
- # endif
- 
--/* Tacking on "\n\t#" to the section name makes gcc put it's bogus
-+/* Tacking on "\n#APP\n\t#" to the section name makes gcc put it's bogus
-    section attributes on what looks like a comment to the assembler.  */
- # ifdef HAVE_SECTION_QUOTES
--#  define __sec_comment "\"\n\t#\""
-+#  define __sec_comment "\"\n#APP\n\t#\""
- # else
--#  define __sec_comment "\n\t#"
-+#  define __sec_comment "\n#APP\n\t#"
- # endif
- # define link_warning(symbol, msg) \
-   __make_section_unallocated (".gnu.warning." #symbol) \
diff --git a/patches/glibc/ports-2.14.1/230-no-inline-gmon.patch b/patches/glibc/ports-2.14.1/230-no-inline-gmon.patch
deleted file mode 100644
index fa33c2b..0000000
--- a/patches/glibc/ports-2.14.1/230-no-inline-gmon.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://bugs.gentoo.org/196245
-http://sourceware.org/ml/libc-alpha/2006-05/msg00017.html
-
-Attached is a patch to add __attribute__ ((noinline)) to
-call_gmon_start.
-
-Without this patch, the sec script that processed initfini.s removes a
-part of inlined call_gmon_start, causing undefined label errors.
-
-This patch solves the problem by forcing gcc not to inline
-call_gmon_start with __attribute__ ((noinline)).
-
-Tested by building for arm-none-lixux-gnueabi.  OK to apply?
-
-Kazu Hirata
-
-2006-05-07  Kazu Hirata  &lt;kazu@codesourcery.com&gt;
-
-	* sysdeps/generic/initfini.c (call_gmon_start): Add
-	__attribute__ ((noinline)).
-
-Index: sysdeps/generic/initfini.c
-===================================================================
-
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
-@@ -70,7 +70,7 @@
- /* The beginning of _init:  */
- asm ("\n/*@_init_PROLOG_BEGINS*/");
- 
--static void
-+static void __attribute__ ((noinline))
- call_gmon_start(void)
- {
-   extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
diff --git a/patches/glibc/ports-2.14.1/260-assume-pipe2.patch b/patches/glibc/ports-2.14.1/260-assume-pipe2.patch
deleted file mode 100644
index 42e8f4e..0000000
--- a/patches/glibc/ports-2.14.1/260-assume-pipe2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/250342
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
-
-we cant assume sock_cloexec and pipe2 are bound together as the former defines
-are found in glibc only while the latter are a combo of kernel headers and
-glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
-inside of glibc, we hit a problem.  for example:
-
-#include <grp.h>
-#include <stdio.h>
-main()
-{
-	getgrnam("portage");
-	if (!popen("ls", "r"))
-		perror("popen()");
-}
-
-getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
-__have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
-older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
-stub for it.  so popen() will always fail as glibc assumes pipe2() works.
-
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
-@@ -16,9 +16,14 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#include <fcntl.h>
- #include <sys/socket.h>
- #include <kernel-features.h>
- 
- #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
- int __have_sock_cloexec;
- #endif
-+
-+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
-+int __have_pipe2;
-+#endif
diff --git a/patches/glibc/ports-2.14.1/270-china.patch b/patches/glibc/ports-2.14.1/270-china.patch
deleted file mode 100644
index 41d7759..0000000
--- a/patches/glibc/ports-2.14.1/270-china.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
-@@ -1,7 +1,7 @@
- comment_char %
- escape_char /
- %
--% Chinese language locale for Taiwan R.O.C.
-+% Chinese language locale for Taiwan
- % charmap: BIG5-CP950
- %
- % Original Author:
-@@ -17,7 +17,7 @@
- % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
- 
- LC_IDENTIFICATION
--title      "Chinese locale for Taiwan R.O.C."
-+title      "Chinese locale for Taiwan"
- source     ""
- address    ""
- contact    ""
-@@ -25,7 +25,7 @@
- tel        ""
- fax        ""
- language   "Chinese"
--territory  "Taiwan R.O.C."
-+territory  "Taiwan"
- revision   "0.2"
- date       "2000-08-02"
- %
diff --git a/patches/glibc/ports-2.14.1/280-new-valencian-locale.patch b/patches/glibc/ports-2.14.1/280-new-valencian-locale.patch
deleted file mode 100644
index 4cdd108..0000000
--- a/patches/glibc/ports-2.14.1/280-new-valencian-locale.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=131815
-http://sourceware.org/bugzilla/show_bug.cgi?id=2522
-
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
- ca_ES.UTF-8/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8@valencia/UTF-8 \
-+ca_ES@valencia/ISO-8859-15 \
- ca_FR.UTF-8/UTF-8 \
- ca_FR/ISO-8859-15 \
- ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
-@@ -0,0 +1,96 @@
-+comment_char %
-+escape_char  /
-+%
-+% Valencian (southern Catalan) locale for Spain with Euro
-+%
-+% Note that this locale is almost the same as ca_ES@euro.  The point of having
-+% a separate locale is only for PO translations, which have a lot of social
-+% support and are very appreciated by the Valencian-speaking community.
-+%
-+% Contact: Jordi Mallach
-+% Email: jordi@gnu.org
-+% Tel:
-+% Fax:
-+% Language: ca
-+% Territory: ES
-+% Option: euro
-+% Revision: 1.0
-+% Date: 2006-04-06
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: ISO-8859-15
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Valencian (southern Catalan) locale for Spain with Euro"
-+source     ""
-+address    ""
-+contact    "Jordi Mallach"
-+email      "jordi@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Catalan"
-+territory  "Spain"
-+revision   "1.0"
-+date       "2006-04-06"
-+%
-+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
-+category  "ca_ES@valencia:2006";LC_CTYPE
-+category  "ca_ES@valencia:2006";LC_COLLATE
-+category  "ca_ES@valencia:2006";LC_MONETARY
-+category  "ca_ES@valencia:2006";LC_NUMERIC
-+category  "ca_ES@valencia:2006";LC_TIME
-+category  "ca_ES@valencia:2006";LC_MESSAGES
-+category  "ca_ES@valencia:2006";LC_PAPER
-+category  "ca_ES@valencia:2006";LC_NAME
-+category  "ca_ES@valencia:2006";LC_ADDRESS
-+category  "ca_ES@valencia:2006";LC_TELEPHONE
-+category  "ca_ES@valencia:2006";LC_MEASUREMENT
-+
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "ca_ES"
-+END LC_COLLATE
-+
-+LC_MONETARY
-+copy "ca_ES"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "ca_ES"
-+END LC_NUMERIC
-+
-+LC_TIME
-+copy "ca_ES"
-+END LC_TIME
-+
-+LC_MESSAGES
-+copy "ca_ES"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+copy "ca_ES"
-+END LC_PAPER
-+
-+LC_NAME
-+copy "ca_ES"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "ca_ES"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "ca_ES"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "ca_ES"
-+END LC_MEASUREMENT
diff --git a/patches/glibc/ports-2.14.1/300-nscd-one-fork.patch b/patches/glibc/ports-2.14.1/300-nscd-one-fork.patch
deleted file mode 100644
index adc9b3f..0000000
--- a/patches/glibc/ports-2.14.1/300-nscd-one-fork.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-only fork one to assist in stop-start-daemon assumptions about daemon behavior
-
-http://bugs.gentoo.org/190785
-
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
-@@ -182,6 +182,9 @@
-       if (pid != 0)
- 	exit (0);
- 
-+       if (write_pid (_PATH_NSCDPID) < 0)
-+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
-+
-       int nullfd = open (_PATH_DEVNULL, O_RDWR);
-       if (nullfd != -1)
- 	{
-@@ -231,12 +234,6 @@
- 	for (i = min_close_fd; i < getdtablesize (); i++)
- 	  close (i);
- 
--      pid = fork ();
--      if (pid == -1)
--	error (EXIT_FAILURE, errno, _("cannot fork"));
--      if (pid != 0)
--	exit (0);
--
-       setsid ();
- 
-       if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
- 
-       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
- 
--      if (write_pid (_PATH_NSCDPID) < 0)
--	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
--
-       if (!init_logfile ())
- 	dbg_log (_("Could not create log file"));
- 
diff --git a/patches/glibc/ports-2.14.1/310-hppa-nptl-carlos.patch b/patches/glibc/ports-2.14.1/310-hppa-nptl-carlos.patch
deleted file mode 100644
index 4c028b2..0000000
--- a/patches/glibc/ports-2.14.1/310-hppa-nptl-carlos.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -392,14 +392,14 @@
-      know it is available.  We do not have to clear the memory if we
-      do not have to use the temporary bootstrap_map.  Global variables
-      are initialized to zero by default.  */
--#ifndef DONT_USE_BOOTSTRAP_MAP
-+#if !defined DONT_USE_BOOTSTRAP_MAP
- # ifdef HAVE_BUILTIN_MEMSET
-   __builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
- # else
--  for (size_t cnt = 0;
--       cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
--       ++cnt)
--    bootstrap_map.l_info[cnt] = 0;
-+  /* Clear the whole bootstrap_map structure */
-+  for (char *cnt = (char *)&(bootstrap_map);
-+       cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
-+       *cnt++ = '\0');
- # endif
- # if USE___THREAD
-   bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
-@@ -185,7 +185,7 @@
-      __typeof (*(mem)) __atg5_value = (newvalue);			      \
- 									      \
-      do									      \
--       __atg5_oldval = *__atg5_memp;					      \
-+       __atg5_oldval = *(volatile __typeof (mem))__atg5_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
- 						   __atg5_oldval), 0));	      \
-@@ -206,7 +206,7 @@
-      __typeof (*(mem)) __atg6_value = (value);				      \
- 									      \
-      do									      \
--       __atg6_oldval = *__atg6_memp;					      \
-+       __atg6_oldval = *(volatile __typeof (mem))__atg6_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg6_memp,		      \
- 						   __atg6_oldval	      \
-@@ -224,7 +224,7 @@
-      __typeof (*(mem)) __atg7_value = (value);				      \
- 									      \
-      do									      \
--       __atg7_oldv = *__atg7_memp;					      \
-+       __atg7_oldv = *(volatile __typeof (mem))__atg7_memp;		      \
-      while (__builtin_expect						      \
- 	    (catomic_compare_and_exchange_bool_acq (__atg7_memp,	      \
- 						    __atg7_oldv		      \
-@@ -242,7 +242,7 @@
-     __typeof (mem) __atg8_memp = (mem);					      \
-     __typeof (*(mem)) __atg8_value = (value);				      \
-     do {								      \
--      __atg8_oldval = *__atg8_memp;					      \
-+      __atg8_oldval = *(volatile __typeof (mem))__atg8_memp;		      \
-       if (__atg8_oldval >= __atg8_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -259,7 +259,7 @@
-     __typeof (mem) __atg9_memp = (mem);					      \
-     __typeof (*(mem)) __atg9_value = (value);				      \
-     do {								      \
--      __atg9_oldv = *__atg9_memp;					      \
-+      __atg9_oldv = *(volatile __typeof (mem))__atg9_memp;		      \
-       if (__atg9_oldv >= __atg9_value)					      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -277,7 +277,7 @@
-     __typeof (mem) __atg10_memp = (mem);				      \
-     __typeof (*(mem)) __atg10_value = (value);				      \
-     do {								      \
--      __atg10_oldval = *__atg10_memp;					      \
-+      __atg10_oldval = *(volatile __typeof (mem))__atg10_memp;		      \
-       if (__atg10_oldval <= __atg10_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -361,7 +361,7 @@
- 									      \
-      do									      \
-        {								      \
--	 __atg11_oldval = *__atg11_memp;				      \
-+	 __atg11_oldval = *(volatile __typeof (mem))__atg11_memp;	      \
- 	 if (__builtin_expect (__atg11_oldval <= 0, 0))			      \
- 	   break;							      \
-        }								      \
-@@ -400,7 +400,7 @@
-      __typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit));	      \
- 									      \
-      do									      \
--       __atg14_old = (*__atg14_memp);					      \
-+       __atg14_old = (*(volatile __typeof (mem))__atg14_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg14_memp,	      \
- 						   __atg14_old | __atg14_mask,\
-@@ -418,7 +418,7 @@
-     __typeof (*(mem)) __atg15_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg15_old = (*__atg15_memp);					      \
-+      __atg15_old = (*(volatile __typeof (mem))__atg15_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg15_memp,		      \
- 						  __atg15_old & __atg15_mask, \
-@@ -450,7 +450,7 @@
-      __typeof (*(mem)) __atg16_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg16_old = (*__atg16_memp);					      \
-+       __atg16_old = (*(volatile __typeof (mem))__atg16_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg16_memp,	      \
- 						   __atg16_old & __atg16_mask,\
-@@ -468,7 +468,7 @@
-     __typeof (*(mem)) __atg17_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg17_old = (*__atg17_memp);					      \
-+      __atg17_old = (*(volatile __typeof (mem))__atg17_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg17_memp,		      \
- 						  __atg17_old | __atg17_mask, \
-@@ -484,7 +484,7 @@
-     __typeof (*(mem)) __atg18_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg18_old = (*__atg18_memp);					      \
-+      __atg18_old = (*(volatile __typeof (mem))__atg18_memp);		      \
-     while (__builtin_expect						      \
- 	   (catomic_compare_and_exchange_bool_acq (__atg18_memp,	      \
- 						   __atg18_old | __atg18_mask,\
-@@ -500,7 +500,7 @@
-      __typeof (*(mem)) __atg19_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg19_old = (*__atg19_memp);					      \
-+       __atg19_old = (*(volatile __typeof (mem))__atg19_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
- 						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -265,9 +265,9 @@
- # Files which must not be linked with libpthread.
- tests-nolibpthread = tst-unload
- 
--# This sets the stack resource limit to 1023kb, which is not a multiple
--# of the page size since every architecture's page size is > 1k.
--tst-oddstacklimit-ENV = ; ulimit -s 1023;
-+# This sets the stack resource limit to 8193kb, which is not a multiple
-+# of the page size since every architecture's page size is 4096 bytes.
-+tst-oddstacklimit-ENV = ; ulimit -s 8193;
- 
- distribute = eintr.c tst-cleanup4aux.c
- 
-@@ -426,6 +426,35 @@
- CFLAGS-tst-cleanupx4.c += -fexceptions
- CFLAGS-tst-oncex3.c += -fexceptions
- CFLAGS-tst-oncex4.c += -fexceptions
-+
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
-+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
-+
- CFLAGS-tst-align.c += $(stack-align-test-flags)
- CFLAGS-tst-align3.c += $(stack-align-test-flags)
- CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
-@@ -64,7 +64,7 @@
-       do
- 	lll_futex_wait (&ibarrier->curr_event, event,
- 			ibarrier->private ^ FUTEX_PRIVATE_FLAG);
--      while (event == ibarrier->curr_event);
-+      while (event == *(volatile unsigned int *)&ibarrier->curr_event);
-     }
- 
-   /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -33,7 +33,9 @@
- 
- ifeq ($(have-forced-unwind),yes)
- tests += tst-mqueue8x
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
- CFLAGS-tst-mqueue8x.c += -fexceptions
-+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s) 
- endif
- endif
- 
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -82,7 +82,7 @@
- 	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
- endif
- 
--CFLAGS-vfprintf.c = -Wno-uninitialized
-+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
- CFLAGS-vfwprintf.c = -Wno-uninitialized
- CFLAGS-tst-printf.c = -Wno-format
- CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
-       while (inlen < 0 && errno == EINTR);
-       if (inlen < 0)
- 	{
--	  if (errno == EWOULDBLOCK)
-+	  if (errno == EWOULDBLOCK || errno == EAGAIN)
- 	    continue;
- 	  cu->cu_error.re_errno = errno;
- 	  return (cu->cu_error.re_status = RPC_CANTRECV);
diff --git a/patches/glibc/ports-2.14.1/330-m68k-sys-user.patch b/patches/glibc/ports-2.14.1/330-m68k-sys-user.patch
deleted file mode 100644
index 8fbe2e5..0000000
--- a/patches/glibc/ports-2.14.1/330-m68k-sys-user.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-copied from kernel as it is sanitized now
-
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
-@@ -1,3 +1,90 @@
-+#ifndef _SYS_USER_H
-+#define _SYS_USER_H
-+
-+/* Core file format: The core file is written in such a way that gdb
-+   can understand it and provide useful information to the user (under
-+   linux we use the 'trad-core' bfd).  There are quite a number of
-+   obstacles to being able to view the contents of the floating point
-+   registers, and until these are solved you will not be able to view the
-+   contents of them.  Actually, you can read in the core file and look at
-+   the contents of the user struct to find out what the floating point
-+   registers contain.
-+   The actual file contents are as follows:
-+   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-+   in the file.  Directly after this is a copy of the task_struct, which
-+   is currently not used by gdb, but it may come in useful at some point.
-+   All of the registers are stored as part of the upage.  The upage should
-+   always be only one page.
-+   DATA: The data area is stored.  We use current->end_text to
-+   current->brk to pick up all of the user variables, plus any memory
-+   that may have been malloced.  No attempt is made to determine if a page
-+   is demand-zero or if a page is totally unused, we just cover the entire
-+   range.  All of the addresses are rounded in such a way that an integral
-+   number of pages is written.
-+   STACK: We need the stack information in order to get a meaningful
-+   backtrace.  We need to write the data from (esp) to
-+   current->start_stack, so we round each of these off in order to be able
-+   to write an integer number of pages.
-+   The minimum core file size is 3 pages, or 12288 bytes.
-+*/
-+
-+struct user_m68kfp_struct {
-+	unsigned long  fpregs[8*3];	/* fp0-fp7 registers */
-+	unsigned long  fpcntl[3];	/* fp control regs */
-+};
-+
-+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
-+   is still the layout used by user (the new pt_regs doesn't have
-+   all registers). */
-+struct user_regs_struct {
-+	long d1,d2,d3,d4,d5,d6,d7;
-+	long a0,a1,a2,a3,a4,a5,a6;
-+	long d0;
-+	long usp;
-+	long orig_d0;
-+	short stkadj;
-+	short sr;
-+	long pc;
-+	short fmtvec;
-+	short __fill;
-+};
-+
-+
-+/* When the kernel dumps core, it starts by dumping the user struct -
-+   this will be used by gdb to figure out where the data and stack segments
-+   are within the file, and what virtual addresses to use. */
-+struct user{
-+/* We start with the registers, to mimic the way that "memory" is returned
-+   from the ptrace(3,...) function.  */
-+  struct user_regs_struct regs;	/* Where the registers are actually stored */
-+/* ptrace does not yet supply these.  Someday.... */
-+  int u_fpvalid;		/* True if math co-processor being used. */
-+                                /* for this mess. Not yet used. */
-+  struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
-+/* The rest of this junk is to help gdb figure out what goes where */
-+  unsigned long int u_tsize;	/* Text segment size (pages). */
-+  unsigned long int u_dsize;	/* Data segment size (pages). */
-+  unsigned long int u_ssize;	/* Stack segment size (pages). */
-+  unsigned long start_code;     /* Starting virtual address of text. */
-+  unsigned long start_stack;	/* Starting virtual address of stack area.
-+				   This is actually the bottom of the stack,
-+				   the top of the stack is always found in the
-+				   esp register.  */
-+  long int signal;		/* Signal that caused the core dump. */
-+  int reserved;			/* No longer used */
-+  struct user_regs_struct *u_ar0;
-+				/* Used by gdb to help find the values for */
-+				/* the registers. */
-+  struct user_m68kfp_struct* u_fpstate;	/* Math Co-processor pointer. */
-+  unsigned long magic;		/* To uniquely identify a core file */
-+  char u_comm[32];		/* User command that was responsible */
-+};
-+#define NBPG 4096
-+#define UPAGES 1
-+#define HOST_TEXT_START_ADDR (u.start_code)
-+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-+
-+#endif
- /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14.1/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/patches/glibc/ports-2.14.1/340-dl_execstack-PaX-support.patch b/patches/glibc/ports-2.14.1/340-dl_execstack-PaX-support.patch
deleted file mode 100644
index 2402af0..0000000
--- a/patches/glibc/ports-2.14.1/340-dl_execstack-PaX-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-	With latest versions of glibc, a lot of apps failed on a PaX enabled
-	system with:
-		 cannot enable executable stack as shared object requires: Permission denied
-	
-	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	to make the stack executable due to some libraries not containing the
-	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-
-	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
-
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
- # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
- #endif
-   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
--    return errno;
-+    if (errno != EACCES) /* PAX is enabled */
-+    	return errno;
- 
-   return 0;
- }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -63,7 +63,10 @@
-       else
- # endif
- 	{
--	  result = errno;
-+	  if (errno == EACCES)  /* PAX is enabled */
-+	    result = 0;
-+	  else
-+	    result = errno;
- 	  goto out;
- 	}
-     }
-@@ -89,7 +92,12 @@
- 	page -= size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
-@@ -115,7 +123,12 @@
- 	page += size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
diff --git a/patches/glibc/ports-2.14.1/350-pre20040117-pt_pax.patch b/patches/glibc/ports-2.14.1/350-pre20040117-pt_pax.patch
deleted file mode 100644
index f8f6b83..0000000
--- a/patches/glibc/ports-2.14.1/350-pre20040117-pt_pax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/patches/glibc/ports-2.14.1/360-tests-sandbox-libdl-paths.patch b/patches/glibc/ports-2.14.1/360-tests-sandbox-libdl-paths.patch
deleted file mode 100644
index 9f78c52..0000000
--- a/patches/glibc/ports-2.14.1/360-tests-sandbox-libdl-paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-when glibc runs its tests, it does so by invoking the local library loader.
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against
-libdl (so that it can load libraries and pull out symbols).  the trouble
-is that when you upgrade from an older glibc to the new one, often times
-internal symbols change name or abi.  this is normally OK as you cannot use
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
-we always say "keep all of the glibc libraries from the same build".  but
-when glibc runs its tests, it uses dynamic paths to point to its new local
-copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
-its path, and when sandbox triggers the loading of libdl, glibc does so
-from the host system system.  this gets us into the case of all libraries
-are from the locally compiled version of glibc except for libdl.so.
-
-Fix by Wormo
-
-http://bugs.gentoo.org/56898
-
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,7 +24,8 @@
- rtld_installed_name=$1; shift
- 
- testout=${common_objpfx}/grp/tst_fgetgrent.out
--library_path=${common_objpfx}
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
- 
- result=0
- 
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -34,7 +34,7 @@
- export GCONV_PATH
- 
- # We have to have some directories in the library path.
--LIBPATH=$codir:$codir/iconvdata
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
- 
- # How the start the iconv(1) program.
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -59,8 +59,11 @@
-   irreversible=${charset}.irreversible
- fi
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # iconv in one direction.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-table-from ${charset} \
-   > ${objpfx}tst-${charset}.table
- 
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -37,6 +37,9 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- ${common_objpfx}elf/ld.so --library-path $common_objpfx \
- ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
- 
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -51,9 +51,12 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
- MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -65,8 +65,11 @@
- LOCPATH=${objpfx}domaindir
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
- cmp ${objpfx}tst-gettext2.out - <<EOF
- String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -36,7 +36,10 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,9 +24,12 @@
- status=0
- trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
- LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
-   ${common_objpfx}malloc/tst-mtrace || status=1
- 
- if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -5,8 +5,8 @@
- rtld_installed_name=$1; shift
- logfile=$common_objpfx/nptl/tst-tls6.out
- 
--# We have to find libc and nptl
--library_path=${common_objpfx}:${common_objpfx}nptl
-+# We have to find libc and nptl (also libdl in case sandbox is in use)
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
- tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- 	  ${common_objpfx}/nptl/tst-tls5"
- 
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -18,7 +18,7 @@
- esac
- 
- # We have to find the libc and the NSS modules.
--library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
-+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
- 
- # Since we use `sort' we must make sure to use the same locale everywhere.
- LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -10,7 +10,10 @@
- else
-   rtld_installed_name=$1; shift
-   runit() {
--    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
-+    
-+  # make sure libdl is also in path in case sandbox is in use
-+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
-   }
- fi
- 
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -19,8 +19,11 @@
- "
- export IFS
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- failed=0
--${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
- cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
- wordexp returned 0
diff --git a/patches/glibc/ports-2.14.1/380-dont-build-timezone.patch b/patches/glibc/ports-2.14.1/380-dont-build-timezone.patch
deleted file mode 100644
index 11c358e..0000000
--- a/patches/glibc/ports-2.14.1/380-dont-build-timezone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/patches/glibc/ports-2.14.1/400-alpha-xstat.patch b/patches/glibc/ports-2.14.1/400-alpha-xstat.patch
deleted file mode 100644
index 6e4ab8f..0000000
--- a/patches/glibc/ports-2.14.1/400-alpha-xstat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-@@ -386,6 +386,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE	1
- #endif
- 
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL	1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
-    after exec is always rounded up to the next page.  */
- #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/patches/glibc/ports-2.14.1/430-alpha-creat.patch b/patches/glibc/ports-2.14.1/430-alpha-creat.patch
deleted file mode 100644
index da6ddda..0000000
--- a/patches/glibc/ports-2.14.1/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/patches/glibc/ports-2.14.1/440-alpha-cache-shape.patch b/patches/glibc/ports-2.14.1/440-alpha-cache-shape.patch
deleted file mode 100644
index 8ca0bd6..0000000
--- a/patches/glibc/ports-2.14.1/440-alpha-cache-shape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-older verisons of glibc would build dl-sysdep as shared-only and dl-support as
-static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
-glibc build dl-sysdep as both shared and static which means we now have symbol
-duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
-is both shared/static, there is no point in hooking dl-support anymore, so we
-can punt it.
-
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
--#include "dl-auxv.h"
- #include <elf/dl-support.c>
diff --git a/patches/glibc/ports-2.14.1/460-alpha-fix-gcc-4.1-warnings.patch b/patches/glibc/ports-2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
deleted file mode 100644
index c3e59f4..0000000
--- a/patches/glibc/ports-2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-2006-05-30  Falk Hueffner <falk@debian.org>
-
-	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
-	  to ev6 in assembly code.
-
-{standard input}: Assembler messages:
-{standard input}:341: Error: macro requires $at register while noat in effect
-{standard input}:374: Error: macro requires $at register while noat in effect
-{standard input}:438: Error: macro requires $at register while noat in effect
-{standard input}:471: Error: macro requires $at register while noat in effect
-make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
-
-Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
-I cannot really think of anything better than
-
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
- static inline void
- stb_mb(unsigned char val, unsigned long addr)
- {
--  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
-+  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
- }
- 
- static inline void
- stw_mb(unsigned short val, unsigned long addr)
- {
--  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
- }
- 
- static inline void
-@@ -356,7 +356,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned char r;
- 
--  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-+  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-   return r;
- }
- 
-@@ -366,7 +366,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned short r;
- 
--  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-+  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-   return r;
- }
- 
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14.1/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/patches/glibc/ports-2.14.1/490-alpha_alpha-add-fdatasync-support.patch b/patches/glibc/ports-2.14.1/490-alpha_alpha-add-fdatasync-support.patch
deleted file mode 100644
index 372f34c..0000000
--- a/patches/glibc/ports-2.14.1/490-alpha_alpha-add-fdatasync-support.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/kernel-features.h: define 
-	__ASSUME_FDATASYNC. 
-	* sysdeps/unix/sysv/linux/fdatasync.c: New file.
-	* sysdeps/unix/sysv/linux/Makefile: compile fdatasync.c with
-	-fexceptions.
-	* sysdeps/unix/sysv/linux/syscalls.list: Remove fdatasync.
-
- sysdeps/unix/sysv/linux/Makefile          |    1 
- sysdeps/unix/sysv/linux/fdatasync.c       |   69 ++++++++++++++++++++++++++++++
- sysdeps/unix/sysv/linux/kernel-features.h |    6 ++
- sysdeps/unix/sysv/linux/syscalls.list     |    1 
- 4 files changed, 76 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -20,6 +20,7 @@
- 		   setfsuid setfsgid makedev epoll_pwait signalfd \
- 		   eventfd eventfd_read eventfd_write prlimit
- 
-+CFLAGS-fdatasync.c = -fexceptions
- CFLAGS-gethostid.c = -fexceptions
- 
- sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* fdatasync -- synchronize at least the data part of a file with 
-+   the underlying media. Linux version. 
-+
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+#include <bp-checks.h>
-+
-+#include <kernel-features.h>
-+
-+#if defined __NR_fdatasync && !defined __ASSUME_FDATASYNC
-+static int __have_no_fdatasync;
-+#endif
-+
-+static int
-+do_fdatasync (int fd)
-+{
-+#ifdef __ASSUME_FDATASYNC
-+  return INLINE_SYSCALL (fdatasync, 1, fd);
-+#elif defined __NR_fdatasync
-+  if (!__builtin_expect (__have_no_fdatasync, 0))
-+    {
-+      int result = INLINE_SYSCALL (fdatasync, 1, fd);
-+      if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
-+	return result;
-+
-+      __have_no_fdatasync = 1;
-+    }
-+#endif
-+  return INLINE_SYSCALL (fsync, 1, fd);
-+}
-+
-+int
-+__fdatasync (int fd)
-+{
-+  if (SINGLE_THREAD_P)
-+    return do_fdatasync (fd);
-+
-+  int oldtype = LIBC_CANCEL_ASYNC ();
-+
-+  int result = do_fdatasync (fd);
-+
-+  LIBC_CANCEL_RESET (oldtype);
-+
-+  return result;
-+}
-+
-+weak_alias (__fdatasync, fdatasync)
-+
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
-@@ -459,6 +459,12 @@
- # define __ASSUME_FUTEX_LOCK_PI	1
- #endif
- 
-+/* Support for fsyncdata syscall was added in 2.6.22 on alpha, but it
-+   was already present in 2.0 kernels on other architectures.  */
-+#if (!defined __alpha || __LINUX_KERNEL_VERSION >= 0x020616)
-+# define __ASSUME_FDATASYNC	1
-+#endif
-+
- /* Support for utimensat syscall was added in 2.6.22, on SH
-    only after 2.6.22-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
- epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
- epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
- epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
--fdatasync	-	fdatasync	Ci:i	fdatasync
- flock		-	flock		i:ii	__flock		flock
- fork		-	fork		i:	__libc_fork	__fork fork
- get_kernel_syms	EXTRA	get_kernel_syms	i:p	get_kernel_syms
diff --git a/patches/glibc/ports-2.14.1/530-alpha-fix-rtld-fPIC.patch b/patches/glibc/ports-2.14.1/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index 2691a99..0000000
--- a/patches/glibc/ports-2.14.1/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile glibc-2.14.1/glibc-ports-2.14.1/sysdeps/alpha/Makefile
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.14.1.orig/ports/sysdeps/alpha/Makefile glibc-2.14.1/ports/sysdeps/alpha/Makefile
diff --git a/patches/glibc/ports-2.14.1/560-ppc-atomic.patch b/patches/glibc/ports-2.14.1/560-ppc-atomic.patch
deleted file mode 100644
index ee1cb90..0000000
--- a/patches/glibc/ports-2.14.1/560-ppc-atomic.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-sniped from suse
-
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
-
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -85,14 +85,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
diff --git a/patches/glibc/ports-2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/patches/glibc/ports-2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
deleted file mode 100644
index 5e45682..0000000
--- a/patches/glibc/ports-2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-http://yann.poupet.free.fr/ep93xx/
-Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
-
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
-@@ -12,7 +12,7 @@
- /* FPA floating point units are always big-endian, irrespective of the
-    CPU endianness.  VFP floating point units use the same endianness
-    as the rest of the system.  */
--#ifdef __VFP_FP__
-+#if defined __VFP_FP__ || defined __MAVERICK__
- #define __FLOAT_WORD_ORDER __BYTE_ORDER
- #else
- #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -30,7 +30,33 @@
- 	movs	r0, r1		/* get the return value in place */
- 	moveq	r0, #1		/* can't let setjmp() return zero! */
- 
-+#ifdef __MAVERICK__
-+	cfldrd	mvd4,  [ip], #8
-+	nop
-+	cfldrd	mvd5,  [ip], #8
-+	nop
-+	cfldrd	mvd6,  [ip], #8
-+	nop
-+	cfldrd	mvd7,  [ip], #8
-+	nop
-+	cfldrd	mvd8,  [ip], #8
-+	nop
-+	cfldrd	mvd9,  [ip], #8
-+	nop
-+	cfldrd	mvd10, [ip], #8
-+	nop
-+	cfldrd	mvd11, [ip], #8
-+	nop
-+	cfldrd	mvd12, [ip], #8
-+	nop
-+	cfldrd	mvd13, [ip], #8
-+	nop
-+	cfldrd	mvd14, [ip], #8
-+	nop
-+	cfldrd	mvd15, [ip], #8
-+#else
- 	lfmfd	f4, 4, [ip] !	/* load the floating point regs */
-+#endif
- 
- 	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
- END (__longjmp)
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
-@@ -20,6 +20,45 @@
- # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
- #endif
- 
-+#if defined(__MAVERICK__)
-+
-+/* Define bits representing exceptions in the FPU status word.  */
-+enum
-+  {
-+    FE_INVALID = 1,
-+#define FE_INVALID FE_INVALID
-+    FE_OVERFLOW = 4,
-+#define FE_OVERFLOW FE_OVERFLOW
-+    FE_UNDERFLOW = 8,
-+#define FE_UNDERFLOW FE_UNDERFLOW
-+    FE_INEXACT = 16,
-+#define FE_INEXACT FE_INEXACT
-+  };
-+
-+/* Amount to shift by to convert an exception to a mask bit.  */
-+#define FE_EXCEPT_SHIFT	5
-+
-+/* All supported exceptions.  */
-+#define FE_ALL_EXCEPT	\
-+	(FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
-+
-+/* IEEE rounding modes.  */
-+enum
-+  {
-+    FE_TONEAREST = 0,
-+#define FE_TONEAREST    FE_TONEAREST
-+    FE_TOWARDZERO = 0x400,
-+#define FE_TOWARDZERO   FE_TOWARDZERO
-+    FE_DOWNWARD = 0x800,
-+#define FE_DOWNWARD     FE_DOWNWARD
-+    FE_UPWARD = 0xc00,
-+#define FE_UPWARD       FE_UPWARD
-+  };
-+
-+#define FE_ROUND_MASK (FE_UPWARD)
-+
-+#else /* FPA */
-+
- /* Define bits representing exceptions in the FPU status word.  */
- enum
-   {
-@@ -44,6 +83,8 @@
-    modes exist, but you have to encode them in the actual instruction.  */
- #define FE_TONEAREST	0
- 
-+#endif
-+
- /* Type representing exception flags. */
- typedef unsigned long int fexcept_t;
- 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
-@@ -28,7 +28,11 @@
- #ifndef _ASM
- /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
-    saved.  */
-+#ifdef __MAVERICK__
-+typedef int __jmp_buf[34];
-+#else
- typedef int __jmp_buf[22];
- #endif
-+#endif
- 
- #endif
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,9 +18,21 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fegetround (void)
- {
-+#if defined(__MAVERICK__)
-+
-+  unsigned long temp;
-+
-+  _FPU_GETCW (temp);
-+  return temp & FE_ROUND_MASK;
-+
-+#else /* FPA */
-+
-   return FE_TONEAREST;		/* Easy. :-) */
-+
-+#endif
- }
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,12 +18,28 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fesetround (int round)
- {
-+#if defined(__MAVERICK__)
-+  unsigned long temp;
-+
-+  if (round & ~FE_ROUND_MASK)
-+    return 1;
-+
-+  _FPU_GETCW (temp);
-+  temp = (temp & ~FE_ROUND_MASK) | round;
-+  _FPU_SETCW (temp);
-+  return 0;
-+
-+#else /* FPA */
-+
-   /* We only support FE_TONEAREST, so there is no need for any work.  */
-   return (round == FE_TONEAREST)?0:1;
-+
-+#endif
- }
- 
- libm_hidden_def (fesetround)
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
-@@ -1,5 +1,6 @@
- /* FPU control word definitions.  ARM version.
--   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-+   Copyright (C) 1996, 1997, 1998, 2000, 2005
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -20,6 +21,79 @@
- #ifndef _FPU_CONTROL_H
- #define _FPU_CONTROL_H
- 
-+#if defined(__MAVERICK__)
-+
-+/* DSPSC register: (from EP9312 User's Guide)
-+ *
-+ * bits 31..29	- DAID
-+ * bits 28..26	- HVID
-+ * bits 25..24	- RSVD
-+ * bit  23	- ISAT
-+ * bit  22	- UI
-+ * bit  21	- INT
-+ * bit  20	- AEXC
-+ * bits 19..18	- SAT
-+ * bits 17..16	- FCC
-+ * bit  15	- V
-+ * bit  14	- FWDEN
-+ * bit  13	- Invalid
-+ * bit	12	- Denorm
-+ * bits 11..10	- RM
-+ * bits 9..5	- IXE, UFE, OFE, RSVD, IOE
-+ * bits 4..0	- IX, UF, OF, RSVD, IO
-+ */
-+
-+/* masking of interrupts */
-+#define _FPU_MASK_IM	(1 << 5)	/* invalid operation */
-+#define _FPU_MASK_ZM	0		/* divide by zero */
-+#define _FPU_MASK_OM	(1 << 7)	/* overflow */
-+#define _FPU_MASK_UM	(1 << 8)	/* underflow */
-+#define _FPU_MASK_PM	(1 << 9)	/* inexact */
-+#define _FPU_MASK_DM	0		/* denormalized operation */
-+
-+#define _FPU_RESERVED	0xfffff000	/* These bits are reserved.  */
-+
-+#define _FPU_DEFAULT	0x00b00000	/* Default value.  */
-+#define _FPU_IEEE	0x00b003a0	/* Default + exceptions enabled. */
-+
-+/* Type of the control word.  */
-+typedef unsigned int fpu_control_t;
-+
-+/* Macros for accessing the hardware control word.  */
-+#define _FPU_GETCW(cw) ({			\
-+	register int __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv32sc	mvdx0, dspsc\n\t"	\
-+	"cfmvr64l	%0, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (cw), "=r" (__t1), "=r" (__t2)	\
-+	);					\
-+})
-+
-+#define _FPU_SETCW(cw) ({			\
-+	register int __t0, __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %0\n\t"		\
-+	"cfmvsc32	dspsc, mvdx0\n\t"	\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (__t0), "=r" (__t1), "=r" (__t2)	\
-+	: "0" (cw)				\
-+	);					\
-+})
-+
-+/* Default control word set at startup.  */
-+extern fpu_control_t __fpu_control;
-+
-+#else /* FPA */
-+
- /* We have a slight terminology confusion here.  On the ARM, the register
-  * we're interested in is actually the FPU status word - the FPU control
-  * word is something different (which is implementation-defined and only
-@@ -99,4 +173,6 @@
- /* Default control word set at startup.  */
- extern fpu_control_t __fpu_control;
- 
-+#endif
-+
- #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,4 +17,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define __JMP_BUF_SP		32
-+#else
- #define __JMP_BUF_SP		20
-+#endif
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -24,11 +24,41 @@
- 
- ENTRY (__sigsetjmp)
- 	/* Save registers */
-+#ifdef __MAVERICK__
-+	cfstrd	mvd4,  [r0], #8
-+	nop
-+	cfstrd	mvd5,  [r0], #8
-+	nop
-+	cfstrd	mvd6,  [r0], #8
-+	nop
-+	cfstrd	mvd7,  [r0], #8
-+	nop
-+	cfstrd	mvd8,  [r0], #8
-+	nop
-+	cfstrd	mvd9,  [r0], #8
-+	nop
-+	cfstrd	mvd10, [r0], #8
-+	nop
-+	cfstrd	mvd11, [r0], #8
-+	nop
-+	cfstrd	mvd12, [r0], #8
-+	nop
-+	cfstrd	mvd13, [r0], #8
-+	nop
-+	cfstrd	mvd14, [r0], #8
-+	nop
-+	cfstrd	mvd15, [r0], #8
-+#else
- 	sfmea	f4, 4, [r0]!
-+#endif
- 	stmia	r0, {v1-v6, sl, fp, sp, lr}
- 
- 	/* Restore pointer to jmp_buf */
-+#ifdef __MAVERICK__
-+	sub	r0, r0, #96
-+#else
- 	sub	r0, r0, #48
-+#endif
- 
- 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
- 	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gccframe.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,6 +17,10 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define FIRST_PSEUDO_REGISTER 43
-+#else
- #define FIRST_PSEUDO_REGISTER 27
-+#endif
- 
- #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
-@@ -29,7 +29,7 @@
- #if defined(__ARMEB__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 1
--#elif defined(__VFP_FP__)
-+#elif defined(__VFP_FP__) || defined(__MAVERICK__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 0
- #else
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/bits/endian.h glibc-2.14.1/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.14.1/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.14.1/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14.1/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.14.1/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.14.1/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.14.1/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14.1/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.14.1/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/gccframe.h glibc-2.14.1/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.14.1/ports/sysdeps/arm/gmp-mparam.h
diff --git a/patches/glibc/ports-2.14.1/580-nptl-lowlevellock.patch b/patches/glibc/ports-2.14.1/580-nptl-lowlevellock.patch
deleted file mode 100644
index 6bf5250..0000000
--- a/patches/glibc/ports-2.14.1/580-nptl-lowlevellock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix build error on arm like on hppa:
-
-arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
-
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14.1/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/patches/glibc/ports-2.14.1/610-fpu-cw-mips.patch b/patches/glibc/ports-2.14.1/610-fpu-cw-mips.patch
deleted file mode 100644
index e53ac78..0000000
--- a/patches/glibc/ports-2.14.1/610-fpu-cw-mips.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
-
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
- #define _FPU_RC_UP      0x2
- #define _FPU_RC_DOWN    0x3
- 
--#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
-+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
- 
- 
- /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.14.1.orig/ports/sysdeps/mips/fpu_control.h glibc-2.14.1/ports/sysdeps/mips/fpu_control.h
diff --git a/patches/glibc/ports-2.14.1/630-mips_shn_undef-hack.patch b/patches/glibc/ports-2.14.1/630-mips_shn_undef-hack.patch
deleted file mode 100644
index 791d76c..0000000
--- a/patches/glibc/ports-2.14.1/630-mips_shn_undef-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-	    success:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;
diff --git a/patches/glibc/ports-2.14.1/640-alpha-atfcts.patch b/patches/glibc/ports-2.14.1/640-alpha-atfcts.patch
deleted file mode 100644
index 7a8a94a..0000000
--- a/patches/glibc/ports-2.14.1/640-alpha-atfcts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
-@@ -437,7 +437,8 @@
-    the code.  On PPC they were introduced in 2.6.17-rc1,
-    on SH in 2.6.19-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
-+    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
-+    && (!defined __alpha__)
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/patches/glibc/ports-2.14.1/650-syslog.patch b/patches/glibc/ports-2.14.1/650-syslog.patch
deleted file mode 100644
index c20cafc..0000000
--- a/patches/glibc/ports-2.14.1/650-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
-@@ -152,7 +152,7 @@
- #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- 	/* Check for invalid bits. */
- 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
--		syslog(INTERNALLOG,
-+		__syslog(INTERNALLOG,
- 		    "syslog: unknown facility/priority: %x", pri);
- 		pri &= LOG_PRIMASK|LOG_FACMASK;
- 	}
diff --git a/patches/glibc/ports-2.14.1/660-debug-readlink_chk-readklinkat_chk.patch b/patches/glibc/ports-2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a7052..0000000
--- a/patches/glibc/ports-2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/patches/glibc/ports-2.14/090-Fix-ARM-build-with-GCC-trunk.patch b/patches/glibc/ports-2.14/090-Fix-ARM-build-with-GCC-trunk.patch
deleted file mode 100644
index 1a632fe..0000000
--- a/patches/glibc/ports-2.14/090-Fix-ARM-build-with-GCC-trunk.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Tue, 20 May 2014 21:27:13 +0000
-Subject: [PATCH] Fix ARM build with GCC trunk.
-
-sysdeps/unix/sysv/linux/arm/unwind-resume.c and
-sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static
-variables that are written in C code but only read from toplevel asms.
-Current GCC trunk now optimizes away such apparently write-only static
-variables, so causing a build failure.  This patch marks those
-variables with __attribute_used__ to avoid that optimization.
-
-Tested that this fixes the build for ARM.
-
-	* sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-	(libgcc_s_resume): Use __attribute_used__.
-	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
-	Likewise.
----
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
diff --git a/patches/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch b/patches/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch
deleted file mode 100644
index 3798cb2..0000000
--- a/patches/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Respect environment CPPFLAGS when we run ./configure so we can inject
-random -D things without having to set CFLAGS/ASFLAGS
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
-+CPPFLAGS += $(CPPFLAGS-config)
- override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
- 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
diff --git a/patches/glibc/ports-2.14/120-i386-x86_64-revert-clone-cfi.patch b/patches/glibc/ports-2.14/120-i386-x86_64-revert-clone-cfi.patch
deleted file mode 100644
index c7f6182..0000000
--- a/patches/glibc/ports-2.14/120-i386-x86_64-revert-clone-cfi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-revert cfi additions to clone on i386/x86_64 to workaround problems in
-gcc's unwinder code.  this is not a bug in glibc, it triggers problems
-elsewhere.  this cfi code does not gain us a whole lot anyways.
-
-http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
-
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/patches/glibc/ports-2.14/140-disable-ldconfig.patch b/patches/glibc/ports-2.14/140-disable-ldconfig.patch
deleted file mode 100644
index 378e1df..0000000
--- a/patches/glibc/ports-2.14/140-disable-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
-file outside of the chroot.  doesnt matter anyways as we wont use the cache
-results (portage will rebuild cache), so running ldconfig is simply a waste
-of time.
-
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
- 	rm -f $(symbolic-link-list)
- 
- install:
-+dont-bother-with-destdir:
- 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
- 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
- 				       $(slibdir) $(libdir)
diff --git a/patches/glibc/ports-2.14/150-queue-header-updates.patch b/patches/glibc/ports-2.14/150-queue-header-updates.patch
deleted file mode 100644
index 7cbe70e..0000000
--- a/patches/glibc/ports-2.14/150-queue-header-updates.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-grab some updates from FreeBSD
-
-http://bugs.gentoo.org/201979
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
-@@ -136,6 +136,11 @@
- 		(var);							\
- 		(var) = ((var)->field.le_next))
- 
-+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = LIST_FIRST((head));				\
-+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
- /*
-  * List access methods.
-  */
-@@ -197,6 +202,16 @@
- #define	SLIST_FOREACH(var, head, field)					\
- 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
- 
-+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = SLIST_FIRST((head));				\
-+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-+	for ((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != NULL;					\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
- /*
-  * Singly-linked List access methods.
-  */
-@@ -242,6 +257,12 @@
- 	(head)->stqh_last = &(elm)->field.stqe_next;			\
- } while (/*CONSTCOND*/0)
- 
-+#define	STAILQ_LAST(head, type, field)					\
-+	(STAILQ_EMPTY((head)) ?						\
-+		NULL :							\
-+	        ((struct type *)(void *)				\
-+		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+
- #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
- 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
- 		(head)->stqh_last = &(elm)->field.stqe_next;		\
-@@ -271,6 +292,11 @@
- 		(var);							\
- 		(var) = ((var)->field.stqe_next))
- 
-+#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = STAILQ_FIRST((head));				\
-+		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	STAILQ_CONCAT(head1, head2) do {				\
- 	if (!STAILQ_EMPTY((head2))) {					\
- 		*(head1)->stqh_last = (head2)->stqh_first;		\
-@@ -437,11 +463,21 @@
- 		(var);							\
- 		(var) = ((var)->field.tqe_next))
- 
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
- 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
- 		(var);							\
- 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
- 
-+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_CONCAT(head1, head2, field) do {				\
- 	if (!TAILQ_EMPTY(head2)) {					\
- 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/patches/glibc/ports-2.14/160-manual-no-perl.patch b/patches/glibc/ports-2.14/160-manual-no-perl.patch
deleted file mode 100644
index 5e2b807..0000000
--- a/patches/glibc/ports-2.14/160-manual-no-perl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-If we're using a cvs snapshot which updates the source files, and
-perl isn't installed yet, then we can't regen the docs.  Not a big
-deal, so just whine a little and continue on our merry way.
-
-http://bugs.gentoo.org/60132
-
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
- libm-err.texi: stamp-libm-err
- stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
- 						     $(dir)/libm-test-ulps))
-+ifneq ($(PERL),no)
- 	pwd=`pwd`; \
- 	$(PERL) $< $$pwd/.. > libm-err-tmp
- 	$(move-if-change) libm-err-tmp libm-err.texi
-+else
-+	echo "Unable to rebuild math docs, no perl installed"
-+	touch libm-err.texi
-+endif
- 	touch $@
- 
- # Generate Texinfo files from the C source for the example programs.
diff --git a/patches/glibc/ports-2.14/170-localedef-fix-trampoline.patch b/patches/glibc/ports-2.14/170-localedef-fix-trampoline.patch
deleted file mode 100644
index 4784a07..0000000
--- a/patches/glibc/ports-2.14/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
-if [ $# -ne 2 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
diff --git a/patches/glibc/ports-2.14/180-resolv-dynamic.patch b/patches/glibc/ports-2.14/180-resolv-dynamic.patch
deleted file mode 100644
index e916bce..0000000
--- a/patches/glibc/ports-2.14/180-resolv-dynamic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -95,6 +96,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
diff --git a/patches/glibc/ports-2.14/190-localedef-mmap.patch b/patches/glibc/ports-2.14/190-localedef-mmap.patch
deleted file mode 100644
index f3914cd..0000000
--- a/patches/glibc/ports-2.14/190-localedef-mmap.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-sniped from Debian
-http://bugs.gentoo.org/289615
-
-2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
-	used later with MMAP_FIXED | MMAP_SHARED to cope with different
-	alignment restrictions.
-
-diff -durN glibc-2.13.orig/locale/programs/locarchive.c glibc-2.13/locale/programs/locarchive.c
---- glibc-2.13.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.13/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
-@@ -134,7 +134,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -396,7 +396,7 @@
-   size_t reserved = RESERVE_MMAP_SIZE;
-   int xflags = 0;
-   if (total < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
-@@ -614,7 +614,7 @@
-   int xflags = 0;
-   void *p;
-   if (st.st_size < reserved
--      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
-+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
- 		       -1, 0)) != MAP_FAILED))
-     xflags = MAP_FIXED;
-   else
diff --git a/patches/glibc/ports-2.14/200-fadvise64_64.patch b/patches/glibc/ports-2.14/200-fadvise64_64.patch
deleted file mode 100644
index 71bca38..0000000
--- a/patches/glibc/ports-2.14/200-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
diff --git a/patches/glibc/ports-2.14/220-section-comments.patch b/patches/glibc/ports-2.14/220-section-comments.patch
deleted file mode 100644
index d717829..0000000
--- a/patches/glibc/ports-2.14/220-section-comments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
-
-fixes building on some architectures (like m68k/arm/cris/etc...) because
-it does the right thing
-
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
- #  define __make_section_unallocated(section_string)
- # endif
- 
--/* Tacking on "\n\t#" to the section name makes gcc put it's bogus
-+/* Tacking on "\n#APP\n\t#" to the section name makes gcc put it's bogus
-    section attributes on what looks like a comment to the assembler.  */
- # ifdef HAVE_SECTION_QUOTES
--#  define __sec_comment "\"\n\t#\""
-+#  define __sec_comment "\"\n#APP\n\t#\""
- # else
--#  define __sec_comment "\n\t#"
-+#  define __sec_comment "\n#APP\n\t#"
- # endif
- # define link_warning(symbol, msg) \
-   __make_section_unallocated (".gnu.warning." #symbol) \
diff --git a/patches/glibc/ports-2.14/230-no-inline-gmon.patch b/patches/glibc/ports-2.14/230-no-inline-gmon.patch
deleted file mode 100644
index fa33c2b..0000000
--- a/patches/glibc/ports-2.14/230-no-inline-gmon.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://bugs.gentoo.org/196245
-http://sourceware.org/ml/libc-alpha/2006-05/msg00017.html
-
-Attached is a patch to add __attribute__ ((noinline)) to
-call_gmon_start.
-
-Without this patch, the sec script that processed initfini.s removes a
-part of inlined call_gmon_start, causing undefined label errors.
-
-This patch solves the problem by forcing gcc not to inline
-call_gmon_start with __attribute__ ((noinline)).
-
-Tested by building for arm-none-lixux-gnueabi.  OK to apply?
-
-Kazu Hirata
-
-2006-05-07  Kazu Hirata  &lt;kazu@codesourcery.com&gt;
-
-	* sysdeps/generic/initfini.c (call_gmon_start): Add
-	__attribute__ ((noinline)).
-
-Index: sysdeps/generic/initfini.c
-===================================================================
-
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
-@@ -70,7 +70,7 @@
- /* The beginning of _init:  */
- asm ("\n/*@_init_PROLOG_BEGINS*/");
- 
--static void
-+static void __attribute__ ((noinline))
- call_gmon_start(void)
- {
-   extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
diff --git a/patches/glibc/ports-2.14/240-check_native-headers.patch b/patches/glibc/ports-2.14/240-check_native-headers.patch
deleted file mode 100644
index c936f71..0000000
--- a/patches/glibc/ports-2.14/240-check_native-headers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-many ports hit this warning:
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-../sysdeps/unix/sysv/linux/check_native.c:46: warning: implicit declaration of function 'memset'
-
-snipped from suse
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/check_native.c glibc-2.13/sysdeps/unix/sysv/linux/check_native.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/check_native.c	2007-11-24 04:12:17.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/check_native.c	2009-11-13 00:50:11.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <time.h>
- #include <unistd.h>
- #include <net/if.h>
diff --git a/patches/glibc/ports-2.14/260-assume-pipe2.patch b/patches/glibc/ports-2.14/260-assume-pipe2.patch
deleted file mode 100644
index 42e8f4e..0000000
--- a/patches/glibc/ports-2.14/260-assume-pipe2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/250342
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
-
-we cant assume sock_cloexec and pipe2 are bound together as the former defines
-are found in glibc only while the latter are a combo of kernel headers and
-glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
-inside of glibc, we hit a problem.  for example:
-
-#include <grp.h>
-#include <stdio.h>
-main()
-{
-	getgrnam("portage");
-	if (!popen("ls", "r"))
-		perror("popen()");
-}
-
-getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
-__have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
-older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
-stub for it.  so popen() will always fail as glibc assumes pipe2() works.
-
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
-@@ -16,9 +16,14 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#include <fcntl.h>
- #include <sys/socket.h>
- #include <kernel-features.h>
- 
- #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
- int __have_sock_cloexec;
- #endif
-+
-+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
-+int __have_pipe2;
-+#endif
diff --git a/patches/glibc/ports-2.14/270-china.patch b/patches/glibc/ports-2.14/270-china.patch
deleted file mode 100644
index 41d7759..0000000
--- a/patches/glibc/ports-2.14/270-china.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
-@@ -1,7 +1,7 @@
- comment_char %
- escape_char /
- %
--% Chinese language locale for Taiwan R.O.C.
-+% Chinese language locale for Taiwan
- % charmap: BIG5-CP950
- %
- % Original Author:
-@@ -17,7 +17,7 @@
- % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
- 
- LC_IDENTIFICATION
--title      "Chinese locale for Taiwan R.O.C."
-+title      "Chinese locale for Taiwan"
- source     ""
- address    ""
- contact    ""
-@@ -25,7 +25,7 @@
- tel        ""
- fax        ""
- language   "Chinese"
--territory  "Taiwan R.O.C."
-+territory  "Taiwan"
- revision   "0.2"
- date       "2000-08-02"
- %
diff --git a/patches/glibc/ports-2.14/280-new-valencian-locale.patch b/patches/glibc/ports-2.14/280-new-valencian-locale.patch
deleted file mode 100644
index 4cdd108..0000000
--- a/patches/glibc/ports-2.14/280-new-valencian-locale.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=131815
-http://sourceware.org/bugzilla/show_bug.cgi?id=2522
-
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
- ca_ES.UTF-8/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8@valencia/UTF-8 \
-+ca_ES@valencia/ISO-8859-15 \
- ca_FR.UTF-8/UTF-8 \
- ca_FR/ISO-8859-15 \
- ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
-@@ -0,0 +1,96 @@
-+comment_char %
-+escape_char  /
-+%
-+% Valencian (southern Catalan) locale for Spain with Euro
-+%
-+% Note that this locale is almost the same as ca_ES@euro.  The point of having
-+% a separate locale is only for PO translations, which have a lot of social
-+% support and are very appreciated by the Valencian-speaking community.
-+%
-+% Contact: Jordi Mallach
-+% Email: jordi@gnu.org
-+% Tel:
-+% Fax:
-+% Language: ca
-+% Territory: ES
-+% Option: euro
-+% Revision: 1.0
-+% Date: 2006-04-06
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: ISO-8859-15
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Valencian (southern Catalan) locale for Spain with Euro"
-+source     ""
-+address    ""
-+contact    "Jordi Mallach"
-+email      "jordi@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Catalan"
-+territory  "Spain"
-+revision   "1.0"
-+date       "2006-04-06"
-+%
-+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
-+category  "ca_ES@valencia:2006";LC_CTYPE
-+category  "ca_ES@valencia:2006";LC_COLLATE
-+category  "ca_ES@valencia:2006";LC_MONETARY
-+category  "ca_ES@valencia:2006";LC_NUMERIC
-+category  "ca_ES@valencia:2006";LC_TIME
-+category  "ca_ES@valencia:2006";LC_MESSAGES
-+category  "ca_ES@valencia:2006";LC_PAPER
-+category  "ca_ES@valencia:2006";LC_NAME
-+category  "ca_ES@valencia:2006";LC_ADDRESS
-+category  "ca_ES@valencia:2006";LC_TELEPHONE
-+category  "ca_ES@valencia:2006";LC_MEASUREMENT
-+
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "ca_ES"
-+END LC_COLLATE
-+
-+LC_MONETARY
-+copy "ca_ES"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "ca_ES"
-+END LC_NUMERIC
-+
-+LC_TIME
-+copy "ca_ES"
-+END LC_TIME
-+
-+LC_MESSAGES
-+copy "ca_ES"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+copy "ca_ES"
-+END LC_PAPER
-+
-+LC_NAME
-+copy "ca_ES"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "ca_ES"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "ca_ES"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "ca_ES"
-+END LC_MEASUREMENT
diff --git a/patches/glibc/ports-2.14/300-nscd-one-fork.patch b/patches/glibc/ports-2.14/300-nscd-one-fork.patch
deleted file mode 100644
index adc9b3f..0000000
--- a/patches/glibc/ports-2.14/300-nscd-one-fork.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-only fork one to assist in stop-start-daemon assumptions about daemon behavior
-
-http://bugs.gentoo.org/190785
-
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
-@@ -182,6 +182,9 @@
-       if (pid != 0)
- 	exit (0);
- 
-+       if (write_pid (_PATH_NSCDPID) < 0)
-+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
-+
-       int nullfd = open (_PATH_DEVNULL, O_RDWR);
-       if (nullfd != -1)
- 	{
-@@ -231,12 +234,6 @@
- 	for (i = min_close_fd; i < getdtablesize (); i++)
- 	  close (i);
- 
--      pid = fork ();
--      if (pid == -1)
--	error (EXIT_FAILURE, errno, _("cannot fork"));
--      if (pid != 0)
--	exit (0);
--
-       setsid ();
- 
-       if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
- 
-       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
- 
--      if (write_pid (_PATH_NSCDPID) < 0)
--	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
--
-       if (!init_logfile ())
- 	dbg_log (_("Could not create log file"));
- 
diff --git a/patches/glibc/ports-2.14/310-hppa-nptl-carlos.patch b/patches/glibc/ports-2.14/310-hppa-nptl-carlos.patch
deleted file mode 100644
index 4c028b2..0000000
--- a/patches/glibc/ports-2.14/310-hppa-nptl-carlos.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -392,14 +392,14 @@
-      know it is available.  We do not have to clear the memory if we
-      do not have to use the temporary bootstrap_map.  Global variables
-      are initialized to zero by default.  */
--#ifndef DONT_USE_BOOTSTRAP_MAP
-+#if !defined DONT_USE_BOOTSTRAP_MAP
- # ifdef HAVE_BUILTIN_MEMSET
-   __builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
- # else
--  for (size_t cnt = 0;
--       cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
--       ++cnt)
--    bootstrap_map.l_info[cnt] = 0;
-+  /* Clear the whole bootstrap_map structure */
-+  for (char *cnt = (char *)&(bootstrap_map);
-+       cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
-+       *cnt++ = '\0');
- # endif
- # if USE___THREAD
-   bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
-@@ -185,7 +185,7 @@
-      __typeof (*(mem)) __atg5_value = (newvalue);			      \
- 									      \
-      do									      \
--       __atg5_oldval = *__atg5_memp;					      \
-+       __atg5_oldval = *(volatile __typeof (mem))__atg5_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
- 						   __atg5_oldval), 0));	      \
-@@ -206,7 +206,7 @@
-      __typeof (*(mem)) __atg6_value = (value);				      \
- 									      \
-      do									      \
--       __atg6_oldval = *__atg6_memp;					      \
-+       __atg6_oldval = *(volatile __typeof (mem))__atg6_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg6_memp,		      \
- 						   __atg6_oldval	      \
-@@ -224,7 +224,7 @@
-      __typeof (*(mem)) __atg7_value = (value);				      \
- 									      \
-      do									      \
--       __atg7_oldv = *__atg7_memp;					      \
-+       __atg7_oldv = *(volatile __typeof (mem))__atg7_memp;		      \
-      while (__builtin_expect						      \
- 	    (catomic_compare_and_exchange_bool_acq (__atg7_memp,	      \
- 						    __atg7_oldv		      \
-@@ -242,7 +242,7 @@
-     __typeof (mem) __atg8_memp = (mem);					      \
-     __typeof (*(mem)) __atg8_value = (value);				      \
-     do {								      \
--      __atg8_oldval = *__atg8_memp;					      \
-+      __atg8_oldval = *(volatile __typeof (mem))__atg8_memp;		      \
-       if (__atg8_oldval >= __atg8_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -259,7 +259,7 @@
-     __typeof (mem) __atg9_memp = (mem);					      \
-     __typeof (*(mem)) __atg9_value = (value);				      \
-     do {								      \
--      __atg9_oldv = *__atg9_memp;					      \
-+      __atg9_oldv = *(volatile __typeof (mem))__atg9_memp;		      \
-       if (__atg9_oldv >= __atg9_value)					      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -277,7 +277,7 @@
-     __typeof (mem) __atg10_memp = (mem);				      \
-     __typeof (*(mem)) __atg10_value = (value);				      \
-     do {								      \
--      __atg10_oldval = *__atg10_memp;					      \
-+      __atg10_oldval = *(volatile __typeof (mem))__atg10_memp;		      \
-       if (__atg10_oldval <= __atg10_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -361,7 +361,7 @@
- 									      \
-      do									      \
-        {								      \
--	 __atg11_oldval = *__atg11_memp;				      \
-+	 __atg11_oldval = *(volatile __typeof (mem))__atg11_memp;	      \
- 	 if (__builtin_expect (__atg11_oldval <= 0, 0))			      \
- 	   break;							      \
-        }								      \
-@@ -400,7 +400,7 @@
-      __typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit));	      \
- 									      \
-      do									      \
--       __atg14_old = (*__atg14_memp);					      \
-+       __atg14_old = (*(volatile __typeof (mem))__atg14_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg14_memp,	      \
- 						   __atg14_old | __atg14_mask,\
-@@ -418,7 +418,7 @@
-     __typeof (*(mem)) __atg15_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg15_old = (*__atg15_memp);					      \
-+      __atg15_old = (*(volatile __typeof (mem))__atg15_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg15_memp,		      \
- 						  __atg15_old & __atg15_mask, \
-@@ -450,7 +450,7 @@
-      __typeof (*(mem)) __atg16_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg16_old = (*__atg16_memp);					      \
-+       __atg16_old = (*(volatile __typeof (mem))__atg16_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg16_memp,	      \
- 						   __atg16_old & __atg16_mask,\
-@@ -468,7 +468,7 @@
-     __typeof (*(mem)) __atg17_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg17_old = (*__atg17_memp);					      \
-+      __atg17_old = (*(volatile __typeof (mem))__atg17_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg17_memp,		      \
- 						  __atg17_old | __atg17_mask, \
-@@ -484,7 +484,7 @@
-     __typeof (*(mem)) __atg18_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg18_old = (*__atg18_memp);					      \
-+      __atg18_old = (*(volatile __typeof (mem))__atg18_memp);		      \
-     while (__builtin_expect						      \
- 	   (catomic_compare_and_exchange_bool_acq (__atg18_memp,	      \
- 						   __atg18_old | __atg18_mask,\
-@@ -500,7 +500,7 @@
-      __typeof (*(mem)) __atg19_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg19_old = (*__atg19_memp);					      \
-+       __atg19_old = (*(volatile __typeof (mem))__atg19_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
- 						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -265,9 +265,9 @@
- # Files which must not be linked with libpthread.
- tests-nolibpthread = tst-unload
- 
--# This sets the stack resource limit to 1023kb, which is not a multiple
--# of the page size since every architecture's page size is > 1k.
--tst-oddstacklimit-ENV = ; ulimit -s 1023;
-+# This sets the stack resource limit to 8193kb, which is not a multiple
-+# of the page size since every architecture's page size is 4096 bytes.
-+tst-oddstacklimit-ENV = ; ulimit -s 8193;
- 
- distribute = eintr.c tst-cleanup4aux.c
- 
-@@ -426,6 +426,35 @@
- CFLAGS-tst-cleanupx4.c += -fexceptions
- CFLAGS-tst-oncex3.c += -fexceptions
- CFLAGS-tst-oncex4.c += -fexceptions
-+
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
-+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
-+
- CFLAGS-tst-align.c += $(stack-align-test-flags)
- CFLAGS-tst-align3.c += $(stack-align-test-flags)
- CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
-@@ -64,7 +64,7 @@
-       do
- 	lll_futex_wait (&ibarrier->curr_event, event,
- 			ibarrier->private ^ FUTEX_PRIVATE_FLAG);
--      while (event == ibarrier->curr_event);
-+      while (event == *(volatile unsigned int *)&ibarrier->curr_event);
-     }
- 
-   /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -33,7 +33,9 @@
- 
- ifeq ($(have-forced-unwind),yes)
- tests += tst-mqueue8x
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
- CFLAGS-tst-mqueue8x.c += -fexceptions
-+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s) 
- endif
- endif
- 
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -82,7 +82,7 @@
- 	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
- endif
- 
--CFLAGS-vfprintf.c = -Wno-uninitialized
-+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
- CFLAGS-vfwprintf.c = -Wno-uninitialized
- CFLAGS-tst-printf.c = -Wno-format
- CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
-       while (inlen < 0 && errno == EINTR);
-       if (inlen < 0)
- 	{
--	  if (errno == EWOULDBLOCK)
-+	  if (errno == EWOULDBLOCK || errno == EAGAIN)
- 	    continue;
- 	  cu->cu_error.re_errno = errno;
- 	  return (cu->cu_error.re_status = RPC_CANTRECV);
diff --git a/patches/glibc/ports-2.14/330-m68k-sys-user.patch b/patches/glibc/ports-2.14/330-m68k-sys-user.patch
deleted file mode 100644
index 28bcb11..0000000
--- a/patches/glibc/ports-2.14/330-m68k-sys-user.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-copied from kernel as it is sanitized now
-
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
-@@ -1,3 +1,90 @@
-+#ifndef _SYS_USER_H
-+#define _SYS_USER_H
-+
-+/* Core file format: The core file is written in such a way that gdb
-+   can understand it and provide useful information to the user (under
-+   linux we use the 'trad-core' bfd).  There are quite a number of
-+   obstacles to being able to view the contents of the floating point
-+   registers, and until these are solved you will not be able to view the
-+   contents of them.  Actually, you can read in the core file and look at
-+   the contents of the user struct to find out what the floating point
-+   registers contain.
-+   The actual file contents are as follows:
-+   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-+   in the file.  Directly after this is a copy of the task_struct, which
-+   is currently not used by gdb, but it may come in useful at some point.
-+   All of the registers are stored as part of the upage.  The upage should
-+   always be only one page.
-+   DATA: The data area is stored.  We use current->end_text to
-+   current->brk to pick up all of the user variables, plus any memory
-+   that may have been malloced.  No attempt is made to determine if a page
-+   is demand-zero or if a page is totally unused, we just cover the entire
-+   range.  All of the addresses are rounded in such a way that an integral
-+   number of pages is written.
-+   STACK: We need the stack information in order to get a meaningful
-+   backtrace.  We need to write the data from (esp) to
-+   current->start_stack, so we round each of these off in order to be able
-+   to write an integer number of pages.
-+   The minimum core file size is 3 pages, or 12288 bytes.
-+*/
-+
-+struct user_m68kfp_struct {
-+	unsigned long  fpregs[8*3];	/* fp0-fp7 registers */
-+	unsigned long  fpcntl[3];	/* fp control regs */
-+};
-+
-+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
-+   is still the layout used by user (the new pt_regs doesn't have
-+   all registers). */
-+struct user_regs_struct {
-+	long d1,d2,d3,d4,d5,d6,d7;
-+	long a0,a1,a2,a3,a4,a5,a6;
-+	long d0;
-+	long usp;
-+	long orig_d0;
-+	short stkadj;
-+	short sr;
-+	long pc;
-+	short fmtvec;
-+	short __fill;
-+};
-+
-+
-+/* When the kernel dumps core, it starts by dumping the user struct -
-+   this will be used by gdb to figure out where the data and stack segments
-+   are within the file, and what virtual addresses to use. */
-+struct user{
-+/* We start with the registers, to mimic the way that "memory" is returned
-+   from the ptrace(3,...) function.  */
-+  struct user_regs_struct regs;	/* Where the registers are actually stored */
-+/* ptrace does not yet supply these.  Someday.... */
-+  int u_fpvalid;		/* True if math co-processor being used. */
-+                                /* for this mess. Not yet used. */
-+  struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
-+/* The rest of this junk is to help gdb figure out what goes where */
-+  unsigned long int u_tsize;	/* Text segment size (pages). */
-+  unsigned long int u_dsize;	/* Data segment size (pages). */
-+  unsigned long int u_ssize;	/* Stack segment size (pages). */
-+  unsigned long start_code;     /* Starting virtual address of text. */
-+  unsigned long start_stack;	/* Starting virtual address of stack area.
-+				   This is actually the bottom of the stack,
-+				   the top of the stack is always found in the
-+				   esp register.  */
-+  long int signal;		/* Signal that caused the core dump. */
-+  int reserved;			/* No longer used */
-+  struct user_regs_struct *u_ar0;
-+				/* Used by gdb to help find the values for */
-+				/* the registers. */
-+  struct user_m68kfp_struct* u_fpstate;	/* Math Co-processor pointer. */
-+  unsigned long magic;		/* To uniquely identify a core file */
-+  char u_comm[32];		/* User command that was responsible */
-+};
-+#define NBPG 4096
-+#define UPAGES 1
-+#define HOST_TEXT_START_ADDR (u.start_code)
-+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-+
-+#endif
- /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/patches/glibc/ports-2.14/340-dl_execstack-PaX-support.patch b/patches/glibc/ports-2.14/340-dl_execstack-PaX-support.patch
deleted file mode 100644
index 2402af0..0000000
--- a/patches/glibc/ports-2.14/340-dl_execstack-PaX-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-	With latest versions of glibc, a lot of apps failed on a PaX enabled
-	system with:
-		 cannot enable executable stack as shared object requires: Permission denied
-	
-	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	to make the stack executable due to some libraries not containing the
-	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-
-	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
-
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
- # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
- #endif
-   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
--    return errno;
-+    if (errno != EACCES) /* PAX is enabled */
-+    	return errno;
- 
-   return 0;
- }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -63,7 +63,10 @@
-       else
- # endif
- 	{
--	  result = errno;
-+	  if (errno == EACCES)  /* PAX is enabled */
-+	    result = 0;
-+	  else
-+	    result = errno;
- 	  goto out;
- 	}
-     }
-@@ -89,7 +92,12 @@
- 	page -= size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
-@@ -115,7 +123,12 @@
- 	page += size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
diff --git a/patches/glibc/ports-2.14/350-pre20040117-pt_pax.patch b/patches/glibc/ports-2.14/350-pre20040117-pt_pax.patch
deleted file mode 100644
index f8f6b83..0000000
--- a/patches/glibc/ports-2.14/350-pre20040117-pt_pax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/patches/glibc/ports-2.14/360-tests-sandbox-libdl-paths.patch b/patches/glibc/ports-2.14/360-tests-sandbox-libdl-paths.patch
deleted file mode 100644
index 9f78c52..0000000
--- a/patches/glibc/ports-2.14/360-tests-sandbox-libdl-paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-when glibc runs its tests, it does so by invoking the local library loader.
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against
-libdl (so that it can load libraries and pull out symbols).  the trouble
-is that when you upgrade from an older glibc to the new one, often times
-internal symbols change name or abi.  this is normally OK as you cannot use
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
-we always say "keep all of the glibc libraries from the same build".  but
-when glibc runs its tests, it uses dynamic paths to point to its new local
-copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
-its path, and when sandbox triggers the loading of libdl, glibc does so
-from the host system system.  this gets us into the case of all libraries
-are from the locally compiled version of glibc except for libdl.so.
-
-Fix by Wormo
-
-http://bugs.gentoo.org/56898
-
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,7 +24,8 @@
- rtld_installed_name=$1; shift
- 
- testout=${common_objpfx}/grp/tst_fgetgrent.out
--library_path=${common_objpfx}
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
- 
- result=0
- 
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -34,7 +34,7 @@
- export GCONV_PATH
- 
- # We have to have some directories in the library path.
--LIBPATH=$codir:$codir/iconvdata
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
- 
- # How the start the iconv(1) program.
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -59,8 +59,11 @@
-   irreversible=${charset}.irreversible
- fi
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # iconv in one direction.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-table-from ${charset} \
-   > ${objpfx}tst-${charset}.table
- 
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -37,6 +37,9 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- ${common_objpfx}elf/ld.so --library-path $common_objpfx \
- ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
- 
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -51,9 +51,12 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
- MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -65,8 +65,11 @@
- LOCPATH=${objpfx}domaindir
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
- cmp ${objpfx}tst-gettext2.out - <<EOF
- String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -36,7 +36,10 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,9 +24,12 @@
- status=0
- trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
- LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
-   ${common_objpfx}malloc/tst-mtrace || status=1
- 
- if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -5,8 +5,8 @@
- rtld_installed_name=$1; shift
- logfile=$common_objpfx/nptl/tst-tls6.out
- 
--# We have to find libc and nptl
--library_path=${common_objpfx}:${common_objpfx}nptl
-+# We have to find libc and nptl (also libdl in case sandbox is in use)
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
- tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- 	  ${common_objpfx}/nptl/tst-tls5"
- 
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -18,7 +18,7 @@
- esac
- 
- # We have to find the libc and the NSS modules.
--library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
-+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
- 
- # Since we use `sort' we must make sure to use the same locale everywhere.
- LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -10,7 +10,10 @@
- else
-   rtld_installed_name=$1; shift
-   runit() {
--    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
-+    
-+  # make sure libdl is also in path in case sandbox is in use
-+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
-   }
- fi
- 
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -19,8 +19,11 @@
- "
- export IFS
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- failed=0
--${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
- cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
- wordexp returned 0
diff --git a/patches/glibc/ports-2.14/380-dont-build-timezone.patch b/patches/glibc/ports-2.14/380-dont-build-timezone.patch
deleted file mode 100644
index 11c358e..0000000
--- a/patches/glibc/ports-2.14/380-dont-build-timezone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/patches/glibc/ports-2.14/400-alpha-xstat.patch b/patches/glibc/ports-2.14/400-alpha-xstat.patch
deleted file mode 100644
index 6e4ab8f..0000000
--- a/patches/glibc/ports-2.14/400-alpha-xstat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-@@ -386,6 +386,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE	1
- #endif
- 
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL	1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
-    after exec is always rounded up to the next page.  */
- #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/patches/glibc/ports-2.14/430-alpha-creat.patch b/patches/glibc/ports-2.14/430-alpha-creat.patch
deleted file mode 100644
index da6ddda..0000000
--- a/patches/glibc/ports-2.14/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/patches/glibc/ports-2.14/440-alpha-cache-shape.patch b/patches/glibc/ports-2.14/440-alpha-cache-shape.patch
deleted file mode 100644
index def0181..0000000
--- a/patches/glibc/ports-2.14/440-alpha-cache-shape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-older verisons of glibc would build dl-sysdep as shared-only and dl-support as
-static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
-glibc build dl-sysdep as both shared and static which means we now have symbol
-duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
-is both shared/static, there is no point in hooking dl-support anymore, so we
-can punt it.
-
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
--#include "dl-auxv.h"
- #include <elf/dl-support.c>
diff --git a/patches/glibc/ports-2.14/460-alpha-fix-gcc-4.1-warnings.patch b/patches/glibc/ports-2.14/460-alpha-fix-gcc-4.1-warnings.patch
deleted file mode 100644
index 1569ce4..0000000
--- a/patches/glibc/ports-2.14/460-alpha-fix-gcc-4.1-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-2006-05-30  Falk Hueffner <falk@debian.org>
-
-	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
-	  to ev6 in assembly code.
-
-{standard input}: Assembler messages:
-{standard input}:341: Error: macro requires $at register while noat in effect
-{standard input}:374: Error: macro requires $at register while noat in effect
-{standard input}:438: Error: macro requires $at register while noat in effect
-{standard input}:471: Error: macro requires $at register while noat in effect
-make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
-
-Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
-I cannot really think of anything better than
-
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
- static inline void
- stb_mb(unsigned char val, unsigned long addr)
- {
--  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
-+  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
- }
- 
- static inline void
- stw_mb(unsigned short val, unsigned long addr)
- {
--  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
- }
- 
- static inline void
-@@ -356,7 +356,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned char r;
- 
--  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-+  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-   return r;
- }
- 
-@@ -366,7 +366,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned short r;
- 
--  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-+  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-   return r;
- }
- 
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/patches/glibc/ports-2.14/490-alpha_alpha-add-fdatasync-support.patch b/patches/glibc/ports-2.14/490-alpha_alpha-add-fdatasync-support.patch
deleted file mode 100644
index 372f34c..0000000
--- a/patches/glibc/ports-2.14/490-alpha_alpha-add-fdatasync-support.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/kernel-features.h: define 
-	__ASSUME_FDATASYNC. 
-	* sysdeps/unix/sysv/linux/fdatasync.c: New file.
-	* sysdeps/unix/sysv/linux/Makefile: compile fdatasync.c with
-	-fexceptions.
-	* sysdeps/unix/sysv/linux/syscalls.list: Remove fdatasync.
-
- sysdeps/unix/sysv/linux/Makefile          |    1 
- sysdeps/unix/sysv/linux/fdatasync.c       |   69 ++++++++++++++++++++++++++++++
- sysdeps/unix/sysv/linux/kernel-features.h |    6 ++
- sysdeps/unix/sysv/linux/syscalls.list     |    1 
- 4 files changed, 76 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -20,6 +20,7 @@
- 		   setfsuid setfsgid makedev epoll_pwait signalfd \
- 		   eventfd eventfd_read eventfd_write prlimit
- 
-+CFLAGS-fdatasync.c = -fexceptions
- CFLAGS-gethostid.c = -fexceptions
- 
- sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* fdatasync -- synchronize at least the data part of a file with 
-+   the underlying media. Linux version. 
-+
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+#include <bp-checks.h>
-+
-+#include <kernel-features.h>
-+
-+#if defined __NR_fdatasync && !defined __ASSUME_FDATASYNC
-+static int __have_no_fdatasync;
-+#endif
-+
-+static int
-+do_fdatasync (int fd)
-+{
-+#ifdef __ASSUME_FDATASYNC
-+  return INLINE_SYSCALL (fdatasync, 1, fd);
-+#elif defined __NR_fdatasync
-+  if (!__builtin_expect (__have_no_fdatasync, 0))
-+    {
-+      int result = INLINE_SYSCALL (fdatasync, 1, fd);
-+      if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
-+	return result;
-+
-+      __have_no_fdatasync = 1;
-+    }
-+#endif
-+  return INLINE_SYSCALL (fsync, 1, fd);
-+}
-+
-+int
-+__fdatasync (int fd)
-+{
-+  if (SINGLE_THREAD_P)
-+    return do_fdatasync (fd);
-+
-+  int oldtype = LIBC_CANCEL_ASYNC ();
-+
-+  int result = do_fdatasync (fd);
-+
-+  LIBC_CANCEL_RESET (oldtype);
-+
-+  return result;
-+}
-+
-+weak_alias (__fdatasync, fdatasync)
-+
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
-@@ -459,6 +459,12 @@
- # define __ASSUME_FUTEX_LOCK_PI	1
- #endif
- 
-+/* Support for fsyncdata syscall was added in 2.6.22 on alpha, but it
-+   was already present in 2.0 kernels on other architectures.  */
-+#if (!defined __alpha || __LINUX_KERNEL_VERSION >= 0x020616)
-+# define __ASSUME_FDATASYNC	1
-+#endif
-+
- /* Support for utimensat syscall was added in 2.6.22, on SH
-    only after 2.6.22-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
- epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
- epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
- epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
--fdatasync	-	fdatasync	Ci:i	fdatasync
- flock		-	flock		i:ii	__flock		flock
- fork		-	fork		i:	__libc_fork	__fork fork
- get_kernel_syms	EXTRA	get_kernel_syms	i:p	get_kernel_syms
diff --git a/patches/glibc/ports-2.14/530-alpha-fix-rtld-fPIC.patch b/patches/glibc/ports-2.14/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index 3560e2a..0000000
--- a/patches/glibc/ports-2.14/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile glibc-2.14/glibc-ports-2.14/sysdeps/alpha/Makefile
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.14.orig/ports/sysdeps/alpha/Makefile glibc-2.14/ports/sysdeps/alpha/Makefile
diff --git a/patches/glibc/ports-2.14/560-ppc-atomic.patch b/patches/glibc/ports-2.14/560-ppc-atomic.patch
deleted file mode 100644
index ee1cb90..0000000
--- a/patches/glibc/ports-2.14/560-ppc-atomic.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-sniped from suse
-
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
-
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -85,14 +85,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
diff --git a/patches/glibc/ports-2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/patches/glibc/ports-2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
deleted file mode 100644
index b297ff0..0000000
--- a/patches/glibc/ports-2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-http://yann.poupet.free.fr/ep93xx/
-Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
-
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/bits/endian.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
-@@ -12,7 +12,7 @@
- /* FPA floating point units are always big-endian, irrespective of the
-    CPU endianness.  VFP floating point units use the same endianness
-    as the rest of the system.  */
--#ifdef __VFP_FP__
-+#if defined __VFP_FP__ || defined __MAVERICK__
- #define __FLOAT_WORD_ORDER __BYTE_ORDER
- #else
- #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -30,7 +30,33 @@
- 	movs	r0, r1		/* get the return value in place */
- 	moveq	r0, #1		/* can't let setjmp() return zero! */
- 
-+#ifdef __MAVERICK__
-+	cfldrd	mvd4,  [ip], #8
-+	nop
-+	cfldrd	mvd5,  [ip], #8
-+	nop
-+	cfldrd	mvd6,  [ip], #8
-+	nop
-+	cfldrd	mvd7,  [ip], #8
-+	nop
-+	cfldrd	mvd8,  [ip], #8
-+	nop
-+	cfldrd	mvd9,  [ip], #8
-+	nop
-+	cfldrd	mvd10, [ip], #8
-+	nop
-+	cfldrd	mvd11, [ip], #8
-+	nop
-+	cfldrd	mvd12, [ip], #8
-+	nop
-+	cfldrd	mvd13, [ip], #8
-+	nop
-+	cfldrd	mvd14, [ip], #8
-+	nop
-+	cfldrd	mvd15, [ip], #8
-+#else
- 	lfmfd	f4, 4, [ip] !	/* load the floating point regs */
-+#endif
- 
- 	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
- END (__longjmp)
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
-@@ -20,6 +20,45 @@
- # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
- #endif
- 
-+#if defined(__MAVERICK__)
-+
-+/* Define bits representing exceptions in the FPU status word.  */
-+enum
-+  {
-+    FE_INVALID = 1,
-+#define FE_INVALID FE_INVALID
-+    FE_OVERFLOW = 4,
-+#define FE_OVERFLOW FE_OVERFLOW
-+    FE_UNDERFLOW = 8,
-+#define FE_UNDERFLOW FE_UNDERFLOW
-+    FE_INEXACT = 16,
-+#define FE_INEXACT FE_INEXACT
-+  };
-+
-+/* Amount to shift by to convert an exception to a mask bit.  */
-+#define FE_EXCEPT_SHIFT	5
-+
-+/* All supported exceptions.  */
-+#define FE_ALL_EXCEPT	\
-+	(FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
-+
-+/* IEEE rounding modes.  */
-+enum
-+  {
-+    FE_TONEAREST = 0,
-+#define FE_TONEAREST    FE_TONEAREST
-+    FE_TOWARDZERO = 0x400,
-+#define FE_TOWARDZERO   FE_TOWARDZERO
-+    FE_DOWNWARD = 0x800,
-+#define FE_DOWNWARD     FE_DOWNWARD
-+    FE_UPWARD = 0xc00,
-+#define FE_UPWARD       FE_UPWARD
-+  };
-+
-+#define FE_ROUND_MASK (FE_UPWARD)
-+
-+#else /* FPA */
-+
- /* Define bits representing exceptions in the FPU status word.  */
- enum
-   {
-@@ -44,6 +83,8 @@
-    modes exist, but you have to encode them in the actual instruction.  */
- #define FE_TONEAREST	0
- 
-+#endif
-+
- /* Type representing exception flags. */
- typedef unsigned long int fexcept_t;
- 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
-@@ -28,7 +28,11 @@
- #ifndef _ASM
- /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
-    saved.  */
-+#ifdef __MAVERICK__
-+typedef int __jmp_buf[34];
-+#else
- typedef int __jmp_buf[22];
- #endif
-+#endif
- 
- #endif
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,9 +18,21 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fegetround (void)
- {
-+#if defined(__MAVERICK__)
-+
-+  unsigned long temp;
-+
-+  _FPU_GETCW (temp);
-+  return temp & FE_ROUND_MASK;
-+
-+#else /* FPA */
-+
-   return FE_TONEAREST;		/* Easy. :-) */
-+
-+#endif
- }
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,12 +18,28 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fesetround (int round)
- {
-+#if defined(__MAVERICK__)
-+  unsigned long temp;
-+
-+  if (round & ~FE_ROUND_MASK)
-+    return 1;
-+
-+  _FPU_GETCW (temp);
-+  temp = (temp & ~FE_ROUND_MASK) | round;
-+  _FPU_SETCW (temp);
-+  return 0;
-+
-+#else /* FPA */
-+
-   /* We only support FE_TONEAREST, so there is no need for any work.  */
-   return (round == FE_TONEAREST)?0:1;
-+
-+#endif
- }
- 
- libm_hidden_def (fesetround)
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
-@@ -1,5 +1,6 @@
- /* FPU control word definitions.  ARM version.
--   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-+   Copyright (C) 1996, 1997, 1998, 2000, 2005
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -20,6 +21,79 @@
- #ifndef _FPU_CONTROL_H
- #define _FPU_CONTROL_H
- 
-+#if defined(__MAVERICK__)
-+
-+/* DSPSC register: (from EP9312 User's Guide)
-+ *
-+ * bits 31..29	- DAID
-+ * bits 28..26	- HVID
-+ * bits 25..24	- RSVD
-+ * bit  23	- ISAT
-+ * bit  22	- UI
-+ * bit  21	- INT
-+ * bit  20	- AEXC
-+ * bits 19..18	- SAT
-+ * bits 17..16	- FCC
-+ * bit  15	- V
-+ * bit  14	- FWDEN
-+ * bit  13	- Invalid
-+ * bit	12	- Denorm
-+ * bits 11..10	- RM
-+ * bits 9..5	- IXE, UFE, OFE, RSVD, IOE
-+ * bits 4..0	- IX, UF, OF, RSVD, IO
-+ */
-+
-+/* masking of interrupts */
-+#define _FPU_MASK_IM	(1 << 5)	/* invalid operation */
-+#define _FPU_MASK_ZM	0		/* divide by zero */
-+#define _FPU_MASK_OM	(1 << 7)	/* overflow */
-+#define _FPU_MASK_UM	(1 << 8)	/* underflow */
-+#define _FPU_MASK_PM	(1 << 9)	/* inexact */
-+#define _FPU_MASK_DM	0		/* denormalized operation */
-+
-+#define _FPU_RESERVED	0xfffff000	/* These bits are reserved.  */
-+
-+#define _FPU_DEFAULT	0x00b00000	/* Default value.  */
-+#define _FPU_IEEE	0x00b003a0	/* Default + exceptions enabled. */
-+
-+/* Type of the control word.  */
-+typedef unsigned int fpu_control_t;
-+
-+/* Macros for accessing the hardware control word.  */
-+#define _FPU_GETCW(cw) ({			\
-+	register int __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv32sc	mvdx0, dspsc\n\t"	\
-+	"cfmvr64l	%0, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (cw), "=r" (__t1), "=r" (__t2)	\
-+	);					\
-+})
-+
-+#define _FPU_SETCW(cw) ({			\
-+	register int __t0, __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %0\n\t"		\
-+	"cfmvsc32	dspsc, mvdx0\n\t"	\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (__t0), "=r" (__t1), "=r" (__t2)	\
-+	: "0" (cw)				\
-+	);					\
-+})
-+
-+/* Default control word set at startup.  */
-+extern fpu_control_t __fpu_control;
-+
-+#else /* FPA */
-+
- /* We have a slight terminology confusion here.  On the ARM, the register
-  * we're interested in is actually the FPU status word - the FPU control
-  * word is something different (which is implementation-defined and only
-@@ -99,4 +173,6 @@
- /* Default control word set at startup.  */
- extern fpu_control_t __fpu_control;
- 
-+#endif
-+
- #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,4 +17,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define __JMP_BUF_SP		32
-+#else
- #define __JMP_BUF_SP		20
-+#endif
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -24,11 +24,41 @@
- 
- ENTRY (__sigsetjmp)
- 	/* Save registers */
-+#ifdef __MAVERICK__
-+	cfstrd	mvd4,  [r0], #8
-+	nop
-+	cfstrd	mvd5,  [r0], #8
-+	nop
-+	cfstrd	mvd6,  [r0], #8
-+	nop
-+	cfstrd	mvd7,  [r0], #8
-+	nop
-+	cfstrd	mvd8,  [r0], #8
-+	nop
-+	cfstrd	mvd9,  [r0], #8
-+	nop
-+	cfstrd	mvd10, [r0], #8
-+	nop
-+	cfstrd	mvd11, [r0], #8
-+	nop
-+	cfstrd	mvd12, [r0], #8
-+	nop
-+	cfstrd	mvd13, [r0], #8
-+	nop
-+	cfstrd	mvd14, [r0], #8
-+	nop
-+	cfstrd	mvd15, [r0], #8
-+#else
- 	sfmea	f4, 4, [r0]!
-+#endif
- 	stmia	r0, {v1-v6, sl, fp, sp, lr}
- 
- 	/* Restore pointer to jmp_buf */
-+#ifdef __MAVERICK__
-+	sub	r0, r0, #96
-+#else
- 	sub	r0, r0, #48
-+#endif
- 
- 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
- 	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/gccframe.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,6 +17,10 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define FIRST_PSEUDO_REGISTER 43
-+#else
- #define FIRST_PSEUDO_REGISTER 27
-+#endif
- 
- #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
-@@ -29,7 +29,7 @@
- #if defined(__ARMEB__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 1
--#elif defined(__VFP_FP__)
-+#elif defined(__VFP_FP__) || defined(__MAVERICK__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 0
- #else
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/bits/endian.h glibc-2.14/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.14/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.14/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.14/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.14/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.14/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.14/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/gccframe.h glibc-2.14/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.14/ports/sysdeps/arm/gmp-mparam.h
diff --git a/patches/glibc/ports-2.14/580-nptl-lowlevellock.patch b/patches/glibc/ports-2.14/580-nptl-lowlevellock.patch
deleted file mode 100644
index a2a141c..0000000
--- a/patches/glibc/ports-2.14/580-nptl-lowlevellock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix build error on arm like on hppa:
-
-arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
-
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/patches/glibc/ports-2.14/610-fpu-cw-mips.patch b/patches/glibc/ports-2.14/610-fpu-cw-mips.patch
deleted file mode 100644
index c624565..0000000
--- a/patches/glibc/ports-2.14/610-fpu-cw-mips.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
-
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h glibc-2.14/glibc-ports-2.14/sysdeps/mips/fpu_control.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
- #define _FPU_RC_UP      0x2
- #define _FPU_RC_DOWN    0x3
- 
--#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
-+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
- 
- 
- /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.14.orig/ports/sysdeps/mips/fpu_control.h glibc-2.14/ports/sysdeps/mips/fpu_control.h
diff --git a/patches/glibc/ports-2.14/630-mips_shn_undef-hack.patch b/patches/glibc/ports-2.14/630-mips_shn_undef-hack.patch
deleted file mode 100644
index 791d76c..0000000
--- a/patches/glibc/ports-2.14/630-mips_shn_undef-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-	    success:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;
diff --git a/patches/glibc/ports-2.14/640-alpha-atfcts.patch b/patches/glibc/ports-2.14/640-alpha-atfcts.patch
deleted file mode 100644
index 7a8a94a..0000000
--- a/patches/glibc/ports-2.14/640-alpha-atfcts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
-@@ -437,7 +437,8 @@
-    the code.  On PPC they were introduced in 2.6.17-rc1,
-    on SH in 2.6.19-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
-+    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
-+    && (!defined __alpha__)
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/patches/glibc/ports-2.14/650-syslog.patch b/patches/glibc/ports-2.14/650-syslog.patch
deleted file mode 100644
index c20cafc..0000000
--- a/patches/glibc/ports-2.14/650-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
-@@ -152,7 +152,7 @@
- #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- 	/* Check for invalid bits. */
- 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
--		syslog(INTERNALLOG,
-+		__syslog(INTERNALLOG,
- 		    "syslog: unknown facility/priority: %x", pri);
- 		pri &= LOG_PRIMASK|LOG_FACMASK;
- 	}
diff --git a/patches/glibc/ports-2.14/660-debug-readlink_chk-readklinkat_chk.patch b/patches/glibc/ports-2.14/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a7052..0000000
--- a/patches/glibc/ports-2.14/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/patches/glibc/ports-2.15/090-Fix-ARM-build-with-GCC-trunk.patch b/patches/glibc/ports-2.15/090-Fix-ARM-build-with-GCC-trunk.patch
deleted file mode 100644
index 1a632fe..0000000
--- a/patches/glibc/ports-2.15/090-Fix-ARM-build-with-GCC-trunk.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Tue, 20 May 2014 21:27:13 +0000
-Subject: [PATCH] Fix ARM build with GCC trunk.
-
-sysdeps/unix/sysv/linux/arm/unwind-resume.c and
-sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static
-variables that are written in C code but only read from toplevel asms.
-Current GCC trunk now optimizes away such apparently write-only static
-variables, so causing a build failure.  This patch marks those
-variables with __attribute_used__ to avoid that optimization.
-
-Tested that this fixes the build for ARM.
-
-	* sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-	(libgcc_s_resume): Use __attribute_used__.
-	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
-	Likewise.
----
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
-    struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-@@ -23,7 +23,8 @@
- #include <pthreadP.h>
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-@@ -21,7 +21,8 @@
- #include <stdio.h>
- #include <unwind.h>
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
diff --git a/patches/glibc/ports-2.15/091-libmemusage-link-failure.patch b/patches/glibc/ports-2.15/091-libmemusage-link-failure.patch
deleted file mode 100644
index 9f9887c..0000000
--- a/patches/glibc/ports-2.15/091-libmemusage-link-failure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 2d80bda39073a35af4b904d27fa1511cd309b26f
-Author: Nathan Sidwell <nathan@codesourcery.com>
-Date:   Fri Jan 6 20:14:44 2012 +0000
-
-    Add ARM dependency of libmemusage.so on libc_nonshared.a.
-
-diff --git a/ports/sysdeps/arm/Makefile b/ports/sysdeps/arm/Makefile
-index 5651161..1a88430 100644
---- a/ports/sysdeps/arm/Makefile
-+++ b/ports/sysdeps/arm/Makefile
-@@ -7,3 +7,8 @@ endif
- ifeq ($(subdir),csu)
- gen-as-const-headers += tlsdesc.sym
- endif
-+
-+# to pull in __aeabi_read_tp, needed for tls
-+ifeq ($(subdir),malloc)
-+$(objpfx)libmemusage.so: $(common-objpfx)libc_nonshared.a
-+endif
diff --git a/patches/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch b/patches/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch
deleted file mode 100644
index 3798cb2..0000000
--- a/patches/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Respect environment CPPFLAGS when we run ./configure so we can inject
-random -D things without having to set CFLAGS/ASFLAGS
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
-+CPPFLAGS += $(CPPFLAGS-config)
- override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
- 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
diff --git a/patches/glibc/ports-2.15/120-i386-x86_64-revert-clone-cfi.patch b/patches/glibc/ports-2.15/120-i386-x86_64-revert-clone-cfi.patch
deleted file mode 100644
index c7f6182..0000000
--- a/patches/glibc/ports-2.15/120-i386-x86_64-revert-clone-cfi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-revert cfi additions to clone on i386/x86_64 to workaround problems in
-gcc's unwinder code.  this is not a bug in glibc, it triggers problems
-elsewhere.  this cfi code does not gain us a whole lot anyways.
-
-http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
-
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/patches/glibc/ports-2.15/140-disable-ldconfig.patch b/patches/glibc/ports-2.15/140-disable-ldconfig.patch
deleted file mode 100644
index 378e1df..0000000
--- a/patches/glibc/ports-2.15/140-disable-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
-file outside of the chroot.  doesnt matter anyways as we wont use the cache
-results (portage will rebuild cache), so running ldconfig is simply a waste
-of time.
-
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
- 	rm -f $(symbolic-link-list)
- 
- install:
-+dont-bother-with-destdir:
- 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
- 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
- 				       $(slibdir) $(libdir)
diff --git a/patches/glibc/ports-2.15/150-queue-header-updates.patch b/patches/glibc/ports-2.15/150-queue-header-updates.patch
deleted file mode 100644
index 7cbe70e..0000000
--- a/patches/glibc/ports-2.15/150-queue-header-updates.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-grab some updates from FreeBSD
-
-http://bugs.gentoo.org/201979
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
-@@ -136,6 +136,11 @@
- 		(var);							\
- 		(var) = ((var)->field.le_next))
- 
-+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = LIST_FIRST((head));				\
-+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
- /*
-  * List access methods.
-  */
-@@ -197,6 +202,16 @@
- #define	SLIST_FOREACH(var, head, field)					\
- 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
- 
-+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = SLIST_FIRST((head));				\
-+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-+	for ((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != NULL;					\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
- /*
-  * Singly-linked List access methods.
-  */
-@@ -242,6 +257,12 @@
- 	(head)->stqh_last = &(elm)->field.stqe_next;			\
- } while (/*CONSTCOND*/0)
- 
-+#define	STAILQ_LAST(head, type, field)					\
-+	(STAILQ_EMPTY((head)) ?						\
-+		NULL :							\
-+	        ((struct type *)(void *)				\
-+		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+
- #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
- 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
- 		(head)->stqh_last = &(elm)->field.stqe_next;		\
-@@ -271,6 +292,11 @@
- 		(var);							\
- 		(var) = ((var)->field.stqe_next))
- 
-+#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = STAILQ_FIRST((head));				\
-+		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	STAILQ_CONCAT(head1, head2) do {				\
- 	if (!STAILQ_EMPTY((head2))) {					\
- 		*(head1)->stqh_last = (head2)->stqh_first;		\
-@@ -437,11 +463,21 @@
- 		(var);							\
- 		(var) = ((var)->field.tqe_next))
- 
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
- 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
- 		(var);							\
- 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
- 
-+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_CONCAT(head1, head2, field) do {				\
- 	if (!TAILQ_EMPTY(head2)) {					\
- 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/patches/glibc/ports-2.15/160-manual-no-perl.patch b/patches/glibc/ports-2.15/160-manual-no-perl.patch
deleted file mode 100644
index 5e2b807..0000000
--- a/patches/glibc/ports-2.15/160-manual-no-perl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-If we're using a cvs snapshot which updates the source files, and
-perl isn't installed yet, then we can't regen the docs.  Not a big
-deal, so just whine a little and continue on our merry way.
-
-http://bugs.gentoo.org/60132
-
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
- libm-err.texi: stamp-libm-err
- stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
- 						     $(dir)/libm-test-ulps))
-+ifneq ($(PERL),no)
- 	pwd=`pwd`; \
- 	$(PERL) $< $$pwd/.. > libm-err-tmp
- 	$(move-if-change) libm-err-tmp libm-err.texi
-+else
-+	echo "Unable to rebuild math docs, no perl installed"
-+	touch libm-err.texi
-+endif
- 	touch $@
- 
- # Generate Texinfo files from the C source for the example programs.
diff --git a/patches/glibc/ports-2.15/170-localedef-fix-trampoline.patch b/patches/glibc/ports-2.15/170-localedef-fix-trampoline.patch
deleted file mode 100644
index 4784a07..0000000
--- a/patches/glibc/ports-2.15/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
-if [ $# -ne 2 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
diff --git a/patches/glibc/ports-2.15/180-resolv-dynamic.patch b/patches/glibc/ports-2.15/180-resolv-dynamic.patch
deleted file mode 100644
index e916bce..0000000
--- a/patches/glibc/ports-2.15/180-resolv-dynamic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -95,6 +96,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
diff --git a/patches/glibc/ports-2.15/200-fadvise64_64.patch b/patches/glibc/ports-2.15/200-fadvise64_64.patch
deleted file mode 100644
index 71bca38..0000000
--- a/patches/glibc/ports-2.15/200-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
diff --git a/patches/glibc/ports-2.15/220-section-comments.patch b/patches/glibc/ports-2.15/220-section-comments.patch
deleted file mode 100644
index d717829..0000000
--- a/patches/glibc/ports-2.15/220-section-comments.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
-
-fixes building on some architectures (like m68k/arm/cris/etc...) because
-it does the right thing
-
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
- #  define __make_section_unallocated(section_string)
- # endif
- 
--/* Tacking on "\n\t#" to the section name makes gcc put it's bogus
-+/* Tacking on "\n#APP\n\t#" to the section name makes gcc put it's bogus
-    section attributes on what looks like a comment to the assembler.  */
- # ifdef HAVE_SECTION_QUOTES
--#  define __sec_comment "\"\n\t#\""
-+#  define __sec_comment "\"\n#APP\n\t#\""
- # else
--#  define __sec_comment "\n\t#"
-+#  define __sec_comment "\n#APP\n\t#"
- # endif
- # define link_warning(symbol, msg) \
-   __make_section_unallocated (".gnu.warning." #symbol) \
diff --git a/patches/glibc/ports-2.15/230-no-inline-gmon.patch b/patches/glibc/ports-2.15/230-no-inline-gmon.patch
deleted file mode 100644
index fa33c2b..0000000
--- a/patches/glibc/ports-2.15/230-no-inline-gmon.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://bugs.gentoo.org/196245
-http://sourceware.org/ml/libc-alpha/2006-05/msg00017.html
-
-Attached is a patch to add __attribute__ ((noinline)) to
-call_gmon_start.
-
-Without this patch, the sec script that processed initfini.s removes a
-part of inlined call_gmon_start, causing undefined label errors.
-
-This patch solves the problem by forcing gcc not to inline
-call_gmon_start with __attribute__ ((noinline)).
-
-Tested by building for arm-none-lixux-gnueabi.  OK to apply?
-
-Kazu Hirata
-
-2006-05-07  Kazu Hirata  &lt;kazu@codesourcery.com&gt;
-
-	* sysdeps/generic/initfini.c (call_gmon_start): Add
-	__attribute__ ((noinline)).
-
-Index: sysdeps/generic/initfini.c
-===================================================================
-
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
-@@ -70,7 +70,7 @@
- /* The beginning of _init:  */
- asm ("\n/*@_init_PROLOG_BEGINS*/");
- 
--static void
-+static void __attribute__ ((noinline))
- call_gmon_start(void)
- {
-   extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
diff --git a/patches/glibc/ports-2.15/260-assume-pipe2.patch b/patches/glibc/ports-2.15/260-assume-pipe2.patch
deleted file mode 100644
index 42e8f4e..0000000
--- a/patches/glibc/ports-2.15/260-assume-pipe2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/250342
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
-
-we cant assume sock_cloexec and pipe2 are bound together as the former defines
-are found in glibc only while the latter are a combo of kernel headers and
-glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
-inside of glibc, we hit a problem.  for example:
-
-#include <grp.h>
-#include <stdio.h>
-main()
-{
-	getgrnam("portage");
-	if (!popen("ls", "r"))
-		perror("popen()");
-}
-
-getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
-__have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
-older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
-stub for it.  so popen() will always fail as glibc assumes pipe2() works.
-
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
-@@ -16,9 +16,14 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#include <fcntl.h>
- #include <sys/socket.h>
- #include <kernel-features.h>
- 
- #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
- int __have_sock_cloexec;
- #endif
-+
-+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
-+int __have_pipe2;
-+#endif
diff --git a/patches/glibc/ports-2.15/270-china.patch b/patches/glibc/ports-2.15/270-china.patch
deleted file mode 100644
index 41d7759..0000000
--- a/patches/glibc/ports-2.15/270-china.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
-@@ -1,7 +1,7 @@
- comment_char %
- escape_char /
- %
--% Chinese language locale for Taiwan R.O.C.
-+% Chinese language locale for Taiwan
- % charmap: BIG5-CP950
- %
- % Original Author:
-@@ -17,7 +17,7 @@
- % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
- 
- LC_IDENTIFICATION
--title      "Chinese locale for Taiwan R.O.C."
-+title      "Chinese locale for Taiwan"
- source     ""
- address    ""
- contact    ""
-@@ -25,7 +25,7 @@
- tel        ""
- fax        ""
- language   "Chinese"
--territory  "Taiwan R.O.C."
-+territory  "Taiwan"
- revision   "0.2"
- date       "2000-08-02"
- %
diff --git a/patches/glibc/ports-2.15/280-new-valencian-locale.patch b/patches/glibc/ports-2.15/280-new-valencian-locale.patch
deleted file mode 100644
index 4cdd108..0000000
--- a/patches/glibc/ports-2.15/280-new-valencian-locale.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=131815
-http://sourceware.org/bugzilla/show_bug.cgi?id=2522
-
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
- ca_ES.UTF-8/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8@valencia/UTF-8 \
-+ca_ES@valencia/ISO-8859-15 \
- ca_FR.UTF-8/UTF-8 \
- ca_FR/ISO-8859-15 \
- ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
-@@ -0,0 +1,96 @@
-+comment_char %
-+escape_char  /
-+%
-+% Valencian (southern Catalan) locale for Spain with Euro
-+%
-+% Note that this locale is almost the same as ca_ES@euro.  The point of having
-+% a separate locale is only for PO translations, which have a lot of social
-+% support and are very appreciated by the Valencian-speaking community.
-+%
-+% Contact: Jordi Mallach
-+% Email: jordi@gnu.org
-+% Tel:
-+% Fax:
-+% Language: ca
-+% Territory: ES
-+% Option: euro
-+% Revision: 1.0
-+% Date: 2006-04-06
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: ISO-8859-15
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Valencian (southern Catalan) locale for Spain with Euro"
-+source     ""
-+address    ""
-+contact    "Jordi Mallach"
-+email      "jordi@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Catalan"
-+territory  "Spain"
-+revision   "1.0"
-+date       "2006-04-06"
-+%
-+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
-+category  "ca_ES@valencia:2006";LC_CTYPE
-+category  "ca_ES@valencia:2006";LC_COLLATE
-+category  "ca_ES@valencia:2006";LC_MONETARY
-+category  "ca_ES@valencia:2006";LC_NUMERIC
-+category  "ca_ES@valencia:2006";LC_TIME
-+category  "ca_ES@valencia:2006";LC_MESSAGES
-+category  "ca_ES@valencia:2006";LC_PAPER
-+category  "ca_ES@valencia:2006";LC_NAME
-+category  "ca_ES@valencia:2006";LC_ADDRESS
-+category  "ca_ES@valencia:2006";LC_TELEPHONE
-+category  "ca_ES@valencia:2006";LC_MEASUREMENT
-+
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "ca_ES"
-+END LC_COLLATE
-+
-+LC_MONETARY
-+copy "ca_ES"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "ca_ES"
-+END LC_NUMERIC
-+
-+LC_TIME
-+copy "ca_ES"
-+END LC_TIME
-+
-+LC_MESSAGES
-+copy "ca_ES"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+copy "ca_ES"
-+END LC_PAPER
-+
-+LC_NAME
-+copy "ca_ES"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "ca_ES"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "ca_ES"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "ca_ES"
-+END LC_MEASUREMENT
diff --git a/patches/glibc/ports-2.15/300-nscd-one-fork.patch b/patches/glibc/ports-2.15/300-nscd-one-fork.patch
deleted file mode 100644
index adc9b3f..0000000
--- a/patches/glibc/ports-2.15/300-nscd-one-fork.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-only fork one to assist in stop-start-daemon assumptions about daemon behavior
-
-http://bugs.gentoo.org/190785
-
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
-@@ -182,6 +182,9 @@
-       if (pid != 0)
- 	exit (0);
- 
-+       if (write_pid (_PATH_NSCDPID) < 0)
-+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
-+
-       int nullfd = open (_PATH_DEVNULL, O_RDWR);
-       if (nullfd != -1)
- 	{
-@@ -231,12 +234,6 @@
- 	for (i = min_close_fd; i < getdtablesize (); i++)
- 	  close (i);
- 
--      pid = fork ();
--      if (pid == -1)
--	error (EXIT_FAILURE, errno, _("cannot fork"));
--      if (pid != 0)
--	exit (0);
--
-       setsid ();
- 
-       if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
- 
-       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
- 
--      if (write_pid (_PATH_NSCDPID) < 0)
--	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
--
-       if (!init_logfile ())
- 	dbg_log (_("Could not create log file"));
- 
diff --git a/patches/glibc/ports-2.15/310-hppa-nptl-carlos.patch b/patches/glibc/ports-2.15/310-hppa-nptl-carlos.patch
deleted file mode 100644
index 4c028b2..0000000
--- a/patches/glibc/ports-2.15/310-hppa-nptl-carlos.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -392,14 +392,14 @@
-      know it is available.  We do not have to clear the memory if we
-      do not have to use the temporary bootstrap_map.  Global variables
-      are initialized to zero by default.  */
--#ifndef DONT_USE_BOOTSTRAP_MAP
-+#if !defined DONT_USE_BOOTSTRAP_MAP
- # ifdef HAVE_BUILTIN_MEMSET
-   __builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
- # else
--  for (size_t cnt = 0;
--       cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
--       ++cnt)
--    bootstrap_map.l_info[cnt] = 0;
-+  /* Clear the whole bootstrap_map structure */
-+  for (char *cnt = (char *)&(bootstrap_map);
-+       cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
-+       *cnt++ = '\0');
- # endif
- # if USE___THREAD
-   bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
-@@ -185,7 +185,7 @@
-      __typeof (*(mem)) __atg5_value = (newvalue);			      \
- 									      \
-      do									      \
--       __atg5_oldval = *__atg5_memp;					      \
-+       __atg5_oldval = *(volatile __typeof (mem))__atg5_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
- 						   __atg5_oldval), 0));	      \
-@@ -206,7 +206,7 @@
-      __typeof (*(mem)) __atg6_value = (value);				      \
- 									      \
-      do									      \
--       __atg6_oldval = *__atg6_memp;					      \
-+       __atg6_oldval = *(volatile __typeof (mem))__atg6_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg6_memp,		      \
- 						   __atg6_oldval	      \
-@@ -224,7 +224,7 @@
-      __typeof (*(mem)) __atg7_value = (value);				      \
- 									      \
-      do									      \
--       __atg7_oldv = *__atg7_memp;					      \
-+       __atg7_oldv = *(volatile __typeof (mem))__atg7_memp;		      \
-      while (__builtin_expect						      \
- 	    (catomic_compare_and_exchange_bool_acq (__atg7_memp,	      \
- 						    __atg7_oldv		      \
-@@ -242,7 +242,7 @@
-     __typeof (mem) __atg8_memp = (mem);					      \
-     __typeof (*(mem)) __atg8_value = (value);				      \
-     do {								      \
--      __atg8_oldval = *__atg8_memp;					      \
-+      __atg8_oldval = *(volatile __typeof (mem))__atg8_memp;		      \
-       if (__atg8_oldval >= __atg8_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -259,7 +259,7 @@
-     __typeof (mem) __atg9_memp = (mem);					      \
-     __typeof (*(mem)) __atg9_value = (value);				      \
-     do {								      \
--      __atg9_oldv = *__atg9_memp;					      \
-+      __atg9_oldv = *(volatile __typeof (mem))__atg9_memp;		      \
-       if (__atg9_oldv >= __atg9_value)					      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -277,7 +277,7 @@
-     __typeof (mem) __atg10_memp = (mem);				      \
-     __typeof (*(mem)) __atg10_value = (value);				      \
-     do {								      \
--      __atg10_oldval = *__atg10_memp;					      \
-+      __atg10_oldval = *(volatile __typeof (mem))__atg10_memp;		      \
-       if (__atg10_oldval <= __atg10_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -361,7 +361,7 @@
- 									      \
-      do									      \
-        {								      \
--	 __atg11_oldval = *__atg11_memp;				      \
-+	 __atg11_oldval = *(volatile __typeof (mem))__atg11_memp;	      \
- 	 if (__builtin_expect (__atg11_oldval <= 0, 0))			      \
- 	   break;							      \
-        }								      \
-@@ -400,7 +400,7 @@
-      __typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit));	      \
- 									      \
-      do									      \
--       __atg14_old = (*__atg14_memp);					      \
-+       __atg14_old = (*(volatile __typeof (mem))__atg14_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg14_memp,	      \
- 						   __atg14_old | __atg14_mask,\
-@@ -418,7 +418,7 @@
-     __typeof (*(mem)) __atg15_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg15_old = (*__atg15_memp);					      \
-+      __atg15_old = (*(volatile __typeof (mem))__atg15_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg15_memp,		      \
- 						  __atg15_old & __atg15_mask, \
-@@ -450,7 +450,7 @@
-      __typeof (*(mem)) __atg16_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg16_old = (*__atg16_memp);					      \
-+       __atg16_old = (*(volatile __typeof (mem))__atg16_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg16_memp,	      \
- 						   __atg16_old & __atg16_mask,\
-@@ -468,7 +468,7 @@
-     __typeof (*(mem)) __atg17_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg17_old = (*__atg17_memp);					      \
-+      __atg17_old = (*(volatile __typeof (mem))__atg17_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg17_memp,		      \
- 						  __atg17_old | __atg17_mask, \
-@@ -484,7 +484,7 @@
-     __typeof (*(mem)) __atg18_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg18_old = (*__atg18_memp);					      \
-+      __atg18_old = (*(volatile __typeof (mem))__atg18_memp);		      \
-     while (__builtin_expect						      \
- 	   (catomic_compare_and_exchange_bool_acq (__atg18_memp,	      \
- 						   __atg18_old | __atg18_mask,\
-@@ -500,7 +500,7 @@
-      __typeof (*(mem)) __atg19_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg19_old = (*__atg19_memp);					      \
-+       __atg19_old = (*(volatile __typeof (mem))__atg19_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
- 						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -265,9 +265,9 @@
- # Files which must not be linked with libpthread.
- tests-nolibpthread = tst-unload
- 
--# This sets the stack resource limit to 1023kb, which is not a multiple
--# of the page size since every architecture's page size is > 1k.
--tst-oddstacklimit-ENV = ; ulimit -s 1023;
-+# This sets the stack resource limit to 8193kb, which is not a multiple
-+# of the page size since every architecture's page size is 4096 bytes.
-+tst-oddstacklimit-ENV = ; ulimit -s 8193;
- 
- distribute = eintr.c tst-cleanup4aux.c
- 
-@@ -426,6 +426,35 @@
- CFLAGS-tst-cleanupx4.c += -fexceptions
- CFLAGS-tst-oncex3.c += -fexceptions
- CFLAGS-tst-oncex4.c += -fexceptions
-+
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
-+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
-+
- CFLAGS-tst-align.c += $(stack-align-test-flags)
- CFLAGS-tst-align3.c += $(stack-align-test-flags)
- CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
-@@ -64,7 +64,7 @@
-       do
- 	lll_futex_wait (&ibarrier->curr_event, event,
- 			ibarrier->private ^ FUTEX_PRIVATE_FLAG);
--      while (event == ibarrier->curr_event);
-+      while (event == *(volatile unsigned int *)&ibarrier->curr_event);
-     }
- 
-   /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -33,7 +33,9 @@
- 
- ifeq ($(have-forced-unwind),yes)
- tests += tst-mqueue8x
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
- CFLAGS-tst-mqueue8x.c += -fexceptions
-+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s) 
- endif
- endif
- 
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -82,7 +82,7 @@
- 	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
- endif
- 
--CFLAGS-vfprintf.c = -Wno-uninitialized
-+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
- CFLAGS-vfwprintf.c = -Wno-uninitialized
- CFLAGS-tst-printf.c = -Wno-format
- CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
-       while (inlen < 0 && errno == EINTR);
-       if (inlen < 0)
- 	{
--	  if (errno == EWOULDBLOCK)
-+	  if (errno == EWOULDBLOCK || errno == EAGAIN)
- 	    continue;
- 	  cu->cu_error.re_errno = errno;
- 	  return (cu->cu_error.re_status = RPC_CANTRECV);
diff --git a/patches/glibc/ports-2.15/330-m68k-sys-user.patch b/patches/glibc/ports-2.15/330-m68k-sys-user.patch
deleted file mode 100644
index faee18f..0000000
--- a/patches/glibc/ports-2.15/330-m68k-sys-user.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-copied from kernel as it is sanitized now
-
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
-@@ -1,3 +1,90 @@
-+#ifndef _SYS_USER_H
-+#define _SYS_USER_H
-+
-+/* Core file format: The core file is written in such a way that gdb
-+   can understand it and provide useful information to the user (under
-+   linux we use the 'trad-core' bfd).  There are quite a number of
-+   obstacles to being able to view the contents of the floating point
-+   registers, and until these are solved you will not be able to view the
-+   contents of them.  Actually, you can read in the core file and look at
-+   the contents of the user struct to find out what the floating point
-+   registers contain.
-+   The actual file contents are as follows:
-+   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-+   in the file.  Directly after this is a copy of the task_struct, which
-+   is currently not used by gdb, but it may come in useful at some point.
-+   All of the registers are stored as part of the upage.  The upage should
-+   always be only one page.
-+   DATA: The data area is stored.  We use current->end_text to
-+   current->brk to pick up all of the user variables, plus any memory
-+   that may have been malloced.  No attempt is made to determine if a page
-+   is demand-zero or if a page is totally unused, we just cover the entire
-+   range.  All of the addresses are rounded in such a way that an integral
-+   number of pages is written.
-+   STACK: We need the stack information in order to get a meaningful
-+   backtrace.  We need to write the data from (esp) to
-+   current->start_stack, so we round each of these off in order to be able
-+   to write an integer number of pages.
-+   The minimum core file size is 3 pages, or 12288 bytes.
-+*/
-+
-+struct user_m68kfp_struct {
-+	unsigned long  fpregs[8*3];	/* fp0-fp7 registers */
-+	unsigned long  fpcntl[3];	/* fp control regs */
-+};
-+
-+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
-+   is still the layout used by user (the new pt_regs doesn't have
-+   all registers). */
-+struct user_regs_struct {
-+	long d1,d2,d3,d4,d5,d6,d7;
-+	long a0,a1,a2,a3,a4,a5,a6;
-+	long d0;
-+	long usp;
-+	long orig_d0;
-+	short stkadj;
-+	short sr;
-+	long pc;
-+	short fmtvec;
-+	short __fill;
-+};
-+
-+
-+/* When the kernel dumps core, it starts by dumping the user struct -
-+   this will be used by gdb to figure out where the data and stack segments
-+   are within the file, and what virtual addresses to use. */
-+struct user{
-+/* We start with the registers, to mimic the way that "memory" is returned
-+   from the ptrace(3,...) function.  */
-+  struct user_regs_struct regs;	/* Where the registers are actually stored */
-+/* ptrace does not yet supply these.  Someday.... */
-+  int u_fpvalid;		/* True if math co-processor being used. */
-+                                /* for this mess. Not yet used. */
-+  struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
-+/* The rest of this junk is to help gdb figure out what goes where */
-+  unsigned long int u_tsize;	/* Text segment size (pages). */
-+  unsigned long int u_dsize;	/* Data segment size (pages). */
-+  unsigned long int u_ssize;	/* Stack segment size (pages). */
-+  unsigned long start_code;     /* Starting virtual address of text. */
-+  unsigned long start_stack;	/* Starting virtual address of stack area.
-+				   This is actually the bottom of the stack,
-+				   the top of the stack is always found in the
-+				   esp register.  */
-+  long int signal;		/* Signal that caused the core dump. */
-+  int reserved;			/* No longer used */
-+  struct user_regs_struct *u_ar0;
-+				/* Used by gdb to help find the values for */
-+				/* the registers. */
-+  struct user_m68kfp_struct* u_fpstate;	/* Math Co-processor pointer. */
-+  unsigned long magic;		/* To uniquely identify a core file */
-+  char u_comm[32];		/* User command that was responsible */
-+};
-+#define NBPG 4096
-+#define UPAGES 1
-+#define HOST_TEXT_START_ADDR (u.start_code)
-+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-+
-+#endif
- /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.15/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/patches/glibc/ports-2.15/340-dl_execstack-PaX-support.patch b/patches/glibc/ports-2.15/340-dl_execstack-PaX-support.patch
deleted file mode 100644
index 2402af0..0000000
--- a/patches/glibc/ports-2.15/340-dl_execstack-PaX-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-	With latest versions of glibc, a lot of apps failed on a PaX enabled
-	system with:
-		 cannot enable executable stack as shared object requires: Permission denied
-	
-	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	to make the stack executable due to some libraries not containing the
-	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-
-	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
-
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
- # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
- #endif
-   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
--    return errno;
-+    if (errno != EACCES) /* PAX is enabled */
-+    	return errno;
- 
-   return 0;
- }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -63,7 +63,10 @@
-       else
- # endif
- 	{
--	  result = errno;
-+	  if (errno == EACCES)  /* PAX is enabled */
-+	    result = 0;
-+	  else
-+	    result = errno;
- 	  goto out;
- 	}
-     }
-@@ -89,7 +92,12 @@
- 	page -= size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
-@@ -115,7 +123,12 @@
- 	page += size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
diff --git a/patches/glibc/ports-2.15/350-pre20040117-pt_pax.patch b/patches/glibc/ports-2.15/350-pre20040117-pt_pax.patch
deleted file mode 100644
index f8f6b83..0000000
--- a/patches/glibc/ports-2.15/350-pre20040117-pt_pax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/patches/glibc/ports-2.15/360-tests-sandbox-libdl-paths.patch b/patches/glibc/ports-2.15/360-tests-sandbox-libdl-paths.patch
deleted file mode 100644
index 9f78c52..0000000
--- a/patches/glibc/ports-2.15/360-tests-sandbox-libdl-paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-when glibc runs its tests, it does so by invoking the local library loader.
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against
-libdl (so that it can load libraries and pull out symbols).  the trouble
-is that when you upgrade from an older glibc to the new one, often times
-internal symbols change name or abi.  this is normally OK as you cannot use
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
-we always say "keep all of the glibc libraries from the same build".  but
-when glibc runs its tests, it uses dynamic paths to point to its new local
-copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
-its path, and when sandbox triggers the loading of libdl, glibc does so
-from the host system system.  this gets us into the case of all libraries
-are from the locally compiled version of glibc except for libdl.so.
-
-Fix by Wormo
-
-http://bugs.gentoo.org/56898
-
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,7 +24,8 @@
- rtld_installed_name=$1; shift
- 
- testout=${common_objpfx}/grp/tst_fgetgrent.out
--library_path=${common_objpfx}
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
- 
- result=0
- 
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -34,7 +34,7 @@
- export GCONV_PATH
- 
- # We have to have some directories in the library path.
--LIBPATH=$codir:$codir/iconvdata
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
- 
- # How the start the iconv(1) program.
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -59,8 +59,11 @@
-   irreversible=${charset}.irreversible
- fi
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # iconv in one direction.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-table-from ${charset} \
-   > ${objpfx}tst-${charset}.table
- 
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -37,6 +37,9 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- ${common_objpfx}elf/ld.so --library-path $common_objpfx \
- ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
- 
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -51,9 +51,12 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
- MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -65,8 +65,11 @@
- LOCPATH=${objpfx}domaindir
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
- cmp ${objpfx}tst-gettext2.out - <<EOF
- String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -36,7 +36,10 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,9 +24,12 @@
- status=0
- trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
- LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
-   ${common_objpfx}malloc/tst-mtrace || status=1
- 
- if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -5,8 +5,8 @@
- rtld_installed_name=$1; shift
- logfile=$common_objpfx/nptl/tst-tls6.out
- 
--# We have to find libc and nptl
--library_path=${common_objpfx}:${common_objpfx}nptl
-+# We have to find libc and nptl (also libdl in case sandbox is in use)
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
- tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- 	  ${common_objpfx}/nptl/tst-tls5"
- 
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -18,7 +18,7 @@
- esac
- 
- # We have to find the libc and the NSS modules.
--library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
-+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
- 
- # Since we use `sort' we must make sure to use the same locale everywhere.
- LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -10,7 +10,10 @@
- else
-   rtld_installed_name=$1; shift
-   runit() {
--    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
-+    
-+  # make sure libdl is also in path in case sandbox is in use
-+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
-   }
- fi
- 
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -19,8 +19,11 @@
- "
- export IFS
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- failed=0
--${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
- cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
- wordexp returned 0
diff --git a/patches/glibc/ports-2.15/380-dont-build-timezone.patch b/patches/glibc/ports-2.15/380-dont-build-timezone.patch
deleted file mode 100644
index 11c358e..0000000
--- a/patches/glibc/ports-2.15/380-dont-build-timezone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/patches/glibc/ports-2.15/400-alpha-xstat.patch b/patches/glibc/ports-2.15/400-alpha-xstat.patch
deleted file mode 100644
index 6e4ab8f..0000000
--- a/patches/glibc/ports-2.15/400-alpha-xstat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-@@ -386,6 +386,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE	1
- #endif
- 
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL	1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
-    after exec is always rounded up to the next page.  */
- #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/patches/glibc/ports-2.15/430-alpha-creat.patch b/patches/glibc/ports-2.15/430-alpha-creat.patch
deleted file mode 100644
index da6ddda..0000000
--- a/patches/glibc/ports-2.15/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/patches/glibc/ports-2.15/440-alpha-cache-shape.patch b/patches/glibc/ports-2.15/440-alpha-cache-shape.patch
deleted file mode 100644
index b3158da..0000000
--- a/patches/glibc/ports-2.15/440-alpha-cache-shape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-older verisons of glibc would build dl-sysdep as shared-only and dl-support as
-static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
-glibc build dl-sysdep as both shared and static which means we now have symbol
-duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
-is both shared/static, there is no point in hooking dl-support anymore, so we
-can punt it.
-
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
--#include "dl-auxv.h"
- #include <elf/dl-support.c>
diff --git a/patches/glibc/ports-2.15/460-alpha-fix-gcc-4.1-warnings.patch b/patches/glibc/ports-2.15/460-alpha-fix-gcc-4.1-warnings.patch
deleted file mode 100644
index a54d823..0000000
--- a/patches/glibc/ports-2.15/460-alpha-fix-gcc-4.1-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-2006-05-30  Falk Hueffner <falk@debian.org>
-
-	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
-	  to ev6 in assembly code.
-
-{standard input}: Assembler messages:
-{standard input}:341: Error: macro requires $at register while noat in effect
-{standard input}:374: Error: macro requires $at register while noat in effect
-{standard input}:438: Error: macro requires $at register while noat in effect
-{standard input}:471: Error: macro requires $at register while noat in effect
-make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
-
-Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
-I cannot really think of anything better than
-
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
- static inline void
- stb_mb(unsigned char val, unsigned long addr)
- {
--  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
-+  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
- }
- 
- static inline void
- stw_mb(unsigned short val, unsigned long addr)
- {
--  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
- }
- 
- static inline void
-@@ -356,7 +356,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned char r;
- 
--  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-+  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-   return r;
- }
- 
-@@ -366,7 +366,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned short r;
- 
--  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-+  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-   return r;
- }
- 
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.15/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/patches/glibc/ports-2.15/490-alpha_alpha-add-fdatasync-support.patch b/patches/glibc/ports-2.15/490-alpha_alpha-add-fdatasync-support.patch
deleted file mode 100644
index acf250d..0000000
--- a/patches/glibc/ports-2.15/490-alpha_alpha-add-fdatasync-support.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/kernel-features.h: define 
-	__ASSUME_FDATASYNC. 
-	* sysdeps/unix/sysv/linux/fdatasync.c: New file.
-	* sysdeps/unix/sysv/linux/Makefile: compile fdatasync.c with
-	-fexceptions.
-	* sysdeps/unix/sysv/linux/syscalls.list: Remove fdatasync.
-
- sysdeps/unix/sysv/linux/Makefile          |    1 
- sysdeps/unix/sysv/linux/fdatasync.c       |   69 ++++++++++++++++++++++++++++++
- sysdeps/unix/sysv/linux/kernel-features.h |    6 ++
- sysdeps/unix/sysv/linux/syscalls.list     |    1 
- 4 files changed, 76 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -21,6 +21,7 @@
- 		   setfsuid setfsgid makedev epoll_pwait signalfd \
- 		   eventfd eventfd_read eventfd_write prlimit
- 
-+CFLAGS-fdatasync.c = -fexceptions
- CFLAGS-gethostid.c = -fexceptions
- CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=0x80000000-__getpagesize()"
- 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* fdatasync -- synchronize at least the data part of a file with 
-+   the underlying media. Linux version. 
-+
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+#include <bp-checks.h>
-+
-+#include <kernel-features.h>
-+
-+#if defined __NR_fdatasync && !defined __ASSUME_FDATASYNC
-+static int __have_no_fdatasync;
-+#endif
-+
-+static int
-+do_fdatasync (int fd)
-+{
-+#ifdef __ASSUME_FDATASYNC
-+  return INLINE_SYSCALL (fdatasync, 1, fd);
-+#elif defined __NR_fdatasync
-+  if (!__builtin_expect (__have_no_fdatasync, 0))
-+    {
-+      int result = INLINE_SYSCALL (fdatasync, 1, fd);
-+      if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
-+	return result;
-+
-+      __have_no_fdatasync = 1;
-+    }
-+#endif
-+  return INLINE_SYSCALL (fsync, 1, fd);
-+}
-+
-+int
-+__fdatasync (int fd)
-+{
-+  if (SINGLE_THREAD_P)
-+    return do_fdatasync (fd);
-+
-+  int oldtype = LIBC_CANCEL_ASYNC ();
-+
-+  int result = do_fdatasync (fd);
-+
-+  LIBC_CANCEL_RESET (oldtype);
-+
-+  return result;
-+}
-+
-+weak_alias (__fdatasync, fdatasync)
-+
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
-@@ -459,6 +459,12 @@
- # define __ASSUME_FUTEX_LOCK_PI	1
- #endif
- 
-+/* Support for fsyncdata syscall was added in 2.6.22 on alpha, but it
-+   was already present in 2.0 kernels on other architectures.  */
-+#if (!defined __alpha || __LINUX_KERNEL_VERSION >= 0x020616)
-+# define __ASSUME_FDATASYNC	1
-+#endif
-+
- /* Support for utimensat syscall was added in 2.6.22, on SH
-    only after 2.6.22-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
- epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
- epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
- epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
--fdatasync	-	fdatasync	Ci:i	fdatasync
- flock		-	flock		i:ii	__flock		flock
- fork		-	fork		i:	__libc_fork	__fork fork
- get_kernel_syms	EXTRA	get_kernel_syms	i:p	get_kernel_syms
diff --git a/patches/glibc/ports-2.15/530-alpha-fix-rtld-fPIC.patch b/patches/glibc/ports-2.15/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index 800a789..0000000
--- a/patches/glibc/ports-2.15/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile glibc-2.15/glibc-ports-2.15/sysdeps/alpha/Makefile
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.15.orig/ports/sysdeps/alpha/Makefile glibc-2.15/ports/sysdeps/alpha/Makefile
diff --git a/patches/glibc/ports-2.15/560-ppc-atomic.patch b/patches/glibc/ports-2.15/560-ppc-atomic.patch
deleted file mode 100644
index ee1cb90..0000000
--- a/patches/glibc/ports-2.15/560-ppc-atomic.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-sniped from suse
-
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
-
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -85,14 +85,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
diff --git a/patches/glibc/ports-2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/patches/glibc/ports-2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
deleted file mode 100644
index 8a05574..0000000
--- a/patches/glibc/ports-2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-http://yann.poupet.free.fr/ep93xx/
-Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
-
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/bits/endian.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
-@@ -12,7 +12,7 @@
- /* FPA floating point units are always big-endian, irrespective of the
-    CPU endianness.  VFP floating point units use the same endianness
-    as the rest of the system.  */
--#ifdef __VFP_FP__
-+#if defined __VFP_FP__ || defined __MAVERICK__
- #define __FLOAT_WORD_ORDER __BYTE_ORDER
- #else
- #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -30,7 +30,33 @@
- 	movs	r0, r1		/* get the return value in place */
- 	moveq	r0, #1		/* can't let setjmp() return zero! */
- 
-+#ifdef __MAVERICK__
-+	cfldrd	mvd4,  [ip], #8
-+	nop
-+	cfldrd	mvd5,  [ip], #8
-+	nop
-+	cfldrd	mvd6,  [ip], #8
-+	nop
-+	cfldrd	mvd7,  [ip], #8
-+	nop
-+	cfldrd	mvd8,  [ip], #8
-+	nop
-+	cfldrd	mvd9,  [ip], #8
-+	nop
-+	cfldrd	mvd10, [ip], #8
-+	nop
-+	cfldrd	mvd11, [ip], #8
-+	nop
-+	cfldrd	mvd12, [ip], #8
-+	nop
-+	cfldrd	mvd13, [ip], #8
-+	nop
-+	cfldrd	mvd14, [ip], #8
-+	nop
-+	cfldrd	mvd15, [ip], #8
-+#else
- 	lfmfd	f4, 4, [ip] !	/* load the floating point regs */
-+#endif
- 
- 	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
- END (__longjmp)
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
-@@ -20,6 +20,45 @@
- # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
- #endif
- 
-+#if defined(__MAVERICK__)
-+
-+/* Define bits representing exceptions in the FPU status word.  */
-+enum
-+  {
-+    FE_INVALID = 1,
-+#define FE_INVALID FE_INVALID
-+    FE_OVERFLOW = 4,
-+#define FE_OVERFLOW FE_OVERFLOW
-+    FE_UNDERFLOW = 8,
-+#define FE_UNDERFLOW FE_UNDERFLOW
-+    FE_INEXACT = 16,
-+#define FE_INEXACT FE_INEXACT
-+  };
-+
-+/* Amount to shift by to convert an exception to a mask bit.  */
-+#define FE_EXCEPT_SHIFT	5
-+
-+/* All supported exceptions.  */
-+#define FE_ALL_EXCEPT	\
-+	(FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
-+
-+/* IEEE rounding modes.  */
-+enum
-+  {
-+    FE_TONEAREST = 0,
-+#define FE_TONEAREST    FE_TONEAREST
-+    FE_TOWARDZERO = 0x400,
-+#define FE_TOWARDZERO   FE_TOWARDZERO
-+    FE_DOWNWARD = 0x800,
-+#define FE_DOWNWARD     FE_DOWNWARD
-+    FE_UPWARD = 0xc00,
-+#define FE_UPWARD       FE_UPWARD
-+  };
-+
-+#define FE_ROUND_MASK (FE_UPWARD)
-+
-+#else /* FPA */
-+
- /* Define bits representing exceptions in the FPU status word.  */
- enum
-   {
-@@ -44,6 +83,8 @@
-    modes exist, but you have to encode them in the actual instruction.  */
- #define FE_TONEAREST	0
- 
-+#endif
-+
- /* Type representing exception flags. */
- typedef unsigned long int fexcept_t;
- 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
-@@ -28,7 +28,11 @@
- #ifndef _ASM
- /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
-    saved.  */
-+#ifdef __MAVERICK__
-+typedef int __jmp_buf[34];
-+#else
- typedef int __jmp_buf[22];
- #endif
-+#endif
- 
- #endif
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,9 +18,21 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fegetround (void)
- {
-+#if defined(__MAVERICK__)
-+
-+  unsigned long temp;
-+
-+  _FPU_GETCW (temp);
-+  return temp & FE_ROUND_MASK;
-+
-+#else /* FPA */
-+
-   return FE_TONEAREST;		/* Easy. :-) */
-+
-+#endif
- }
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
-@@ -18,12 +18,28 @@
-    02111-1307 USA.  */
- 
- #include <fenv.h>
-+#include <fpu_control.h>
- 
- int
- fesetround (int round)
- {
-+#if defined(__MAVERICK__)
-+  unsigned long temp;
-+
-+  if (round & ~FE_ROUND_MASK)
-+    return 1;
-+
-+  _FPU_GETCW (temp);
-+  temp = (temp & ~FE_ROUND_MASK) | round;
-+  _FPU_SETCW (temp);
-+  return 0;
-+
-+#else /* FPA */
-+
-   /* We only support FE_TONEAREST, so there is no need for any work.  */
-   return (round == FE_TONEAREST)?0:1;
-+
-+#endif
- }
- 
- libm_hidden_def (fesetround)
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
-@@ -1,5 +1,6 @@
- /* FPU control word definitions.  ARM version.
--   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-+   Copyright (C) 1996, 1997, 1998, 2000, 2005
-+   Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -20,6 +21,79 @@
- #ifndef _FPU_CONTROL_H
- #define _FPU_CONTROL_H
- 
-+#if defined(__MAVERICK__)
-+
-+/* DSPSC register: (from EP9312 User's Guide)
-+ *
-+ * bits 31..29	- DAID
-+ * bits 28..26	- HVID
-+ * bits 25..24	- RSVD
-+ * bit  23	- ISAT
-+ * bit  22	- UI
-+ * bit  21	- INT
-+ * bit  20	- AEXC
-+ * bits 19..18	- SAT
-+ * bits 17..16	- FCC
-+ * bit  15	- V
-+ * bit  14	- FWDEN
-+ * bit  13	- Invalid
-+ * bit	12	- Denorm
-+ * bits 11..10	- RM
-+ * bits 9..5	- IXE, UFE, OFE, RSVD, IOE
-+ * bits 4..0	- IX, UF, OF, RSVD, IO
-+ */
-+
-+/* masking of interrupts */
-+#define _FPU_MASK_IM	(1 << 5)	/* invalid operation */
-+#define _FPU_MASK_ZM	0		/* divide by zero */
-+#define _FPU_MASK_OM	(1 << 7)	/* overflow */
-+#define _FPU_MASK_UM	(1 << 8)	/* underflow */
-+#define _FPU_MASK_PM	(1 << 9)	/* inexact */
-+#define _FPU_MASK_DM	0		/* denormalized operation */
-+
-+#define _FPU_RESERVED	0xfffff000	/* These bits are reserved.  */
-+
-+#define _FPU_DEFAULT	0x00b00000	/* Default value.  */
-+#define _FPU_IEEE	0x00b003a0	/* Default + exceptions enabled. */
-+
-+/* Type of the control word.  */
-+typedef unsigned int fpu_control_t;
-+
-+/* Macros for accessing the hardware control word.  */
-+#define _FPU_GETCW(cw) ({			\
-+	register int __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv32sc	mvdx0, dspsc\n\t"	\
-+	"cfmvr64l	%0, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (cw), "=r" (__t1), "=r" (__t2)	\
-+	);					\
-+})
-+
-+#define _FPU_SETCW(cw) ({			\
-+	register int __t0, __t1, __t2;		\
-+						\
-+	__asm__ volatile (			\
-+	"cfmvr64l	%1, mvdx0\n\t"		\
-+	"cfmvr64h	%2, mvdx0\n\t"		\
-+	"cfmv64lr	mvdx0, %0\n\t"		\
-+	"cfmvsc32	dspsc, mvdx0\n\t"	\
-+	"cfmv64lr	mvdx0, %1\n\t"		\
-+	"cfmv64hr	mvdx0, %2"		\
-+	: "=r" (__t0), "=r" (__t1), "=r" (__t2)	\
-+	: "0" (cw)				\
-+	);					\
-+})
-+
-+/* Default control word set at startup.  */
-+extern fpu_control_t __fpu_control;
-+
-+#else /* FPA */
-+
- /* We have a slight terminology confusion here.  On the ARM, the register
-  * we're interested in is actually the FPU status word - the FPU control
-  * word is something different (which is implementation-defined and only
-@@ -99,4 +173,6 @@
- /* Default control word set at startup.  */
- extern fpu_control_t __fpu_control;
- 
-+#endif
-+
- #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,4 +17,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define __JMP_BUF_SP		32
-+#else
- #define __JMP_BUF_SP		20
-+#endif
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
-@@ -24,11 +24,41 @@
- 
- ENTRY (__sigsetjmp)
- 	/* Save registers */
-+#ifdef __MAVERICK__
-+	cfstrd	mvd4,  [r0], #8
-+	nop
-+	cfstrd	mvd5,  [r0], #8
-+	nop
-+	cfstrd	mvd6,  [r0], #8
-+	nop
-+	cfstrd	mvd7,  [r0], #8
-+	nop
-+	cfstrd	mvd8,  [r0], #8
-+	nop
-+	cfstrd	mvd9,  [r0], #8
-+	nop
-+	cfstrd	mvd10, [r0], #8
-+	nop
-+	cfstrd	mvd11, [r0], #8
-+	nop
-+	cfstrd	mvd12, [r0], #8
-+	nop
-+	cfstrd	mvd13, [r0], #8
-+	nop
-+	cfstrd	mvd14, [r0], #8
-+	nop
-+	cfstrd	mvd15, [r0], #8
-+#else
- 	sfmea	f4, 4, [r0]!
-+#endif
- 	stmia	r0, {v1-v6, sl, fp, sp, lr}
- 
- 	/* Restore pointer to jmp_buf */
-+#ifdef __MAVERICK__
-+	sub	r0, r0, #96
-+#else
- 	sub	r0, r0, #48
-+#endif
- 
- 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
- 	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/gccframe.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
-@@ -17,6 +17,10 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#ifdef __MAVERICK__
-+#define FIRST_PSEUDO_REGISTER 43
-+#else
- #define FIRST_PSEUDO_REGISTER 27
-+#endif
- 
- #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
-@@ -29,7 +29,7 @@
- #if defined(__ARMEB__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 1
--#elif defined(__VFP_FP__)
-+#elif defined(__VFP_FP__) || defined(__MAVERICK__)
- # define IEEE_DOUBLE_MIXED_ENDIAN 0
- # define IEEE_DOUBLE_BIG_ENDIAN 0
- #else
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/bits/endian.h glibc-2.15/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.15/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.15/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.15/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.15/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.15/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.15/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.15/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.15/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/gccframe.h glibc-2.15/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.15/ports/sysdeps/arm/gmp-mparam.h
diff --git a/patches/glibc/ports-2.15/580-nptl-lowlevellock.patch b/patches/glibc/ports-2.15/580-nptl-lowlevellock.patch
deleted file mode 100644
index a39e463..0000000
--- a/patches/glibc/ports-2.15/580-nptl-lowlevellock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix build error on arm like on hppa:
-
-arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
-
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.15/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/patches/glibc/ports-2.15/610-fpu-cw-mips.patch b/patches/glibc/ports-2.15/610-fpu-cw-mips.patch
deleted file mode 100644
index 8692a1f..0000000
--- a/patches/glibc/ports-2.15/610-fpu-cw-mips.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
-
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h glibc-2.15/glibc-ports-2.15/sysdeps/mips/fpu_control.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
- #define _FPU_RC_UP      0x2
- #define _FPU_RC_DOWN    0x3
- 
--#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
-+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
- 
- 
- /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.15.orig/ports/sysdeps/mips/fpu_control.h glibc-2.15/ports/sysdeps/mips/fpu_control.h
diff --git a/patches/glibc/ports-2.15/630-mips_shn_undef-hack.patch b/patches/glibc/ports-2.15/630-mips_shn_undef-hack.patch
deleted file mode 100644
index 791d76c..0000000
--- a/patches/glibc/ports-2.15/630-mips_shn_undef-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-	    success:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;
diff --git a/patches/glibc/ports-2.15/640-alpha-atfcts.patch b/patches/glibc/ports-2.15/640-alpha-atfcts.patch
deleted file mode 100644
index 7a8a94a..0000000
--- a/patches/glibc/ports-2.15/640-alpha-atfcts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
-@@ -437,7 +437,8 @@
-    the code.  On PPC they were introduced in 2.6.17-rc1,
-    on SH in 2.6.19-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
-+    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
-+    && (!defined __alpha__)
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/patches/glibc/ports-2.15/650-syslog.patch b/patches/glibc/ports-2.15/650-syslog.patch
deleted file mode 100644
index c20cafc..0000000
--- a/patches/glibc/ports-2.15/650-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
-@@ -152,7 +152,7 @@
- #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- 	/* Check for invalid bits. */
- 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
--		syslog(INTERNALLOG,
-+		__syslog(INTERNALLOG,
- 		    "syslog: unknown facility/priority: %x", pri);
- 		pri &= LOG_PRIMASK|LOG_FACMASK;
- 	}
diff --git a/patches/glibc/ports-2.15/660-debug-readlink_chk-readklinkat_chk.patch b/patches/glibc/ports-2.15/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a7052..0000000
--- a/patches/glibc/ports-2.15/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/patches/glibc/ports-2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch b/patches/glibc/ports-2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
deleted file mode 100644
index 59f95aa..0000000
--- a/patches/glibc/ports-2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 175cef4163dd60f95106cfd5f593b8a4e09d02c9 Mon Sep 17 00:00:00 2001
-From: Joseph Myers <joseph@codesourcery.com>
-Date: Tue, 20 May 2014 21:27:13 +0000
-Subject: [PATCH] Fix ARM build with GCC trunk.
-
-sysdeps/unix/sysv/linux/arm/unwind-resume.c and
-sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c have static
-variables that are written in C code but only read from toplevel asms.
-Current GCC trunk now optimizes away such apparently write-only static
-variables, so causing a build failure.  This patch marks those
-variables with __attribute_used__ to avoid that optimization.
-
-Tested that this fixes the build for ARM.
-
-	* sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-	(libgcc_s_resume): Use __attribute_used__.
-	* sysdeps/unix/sysv/linux/arm/unwind-resume.c (libgcc_s_resume):
-	Likewise.
----
- sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
- sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-index 6ccd9b4..660d148 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-@@ -22,7 +22,8 @@
- #include <pthreadP.h>
- 
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-@@ -20,7 +20,8 @@
- #include <stdio.h>
- #include <unwind.h>
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc)
-+  __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- 
--- 
-1.9.4
-
diff --git a/patches/glibc/ports-2.16.0/100-respect-env-CPPFLAGS.patch b/patches/glibc/ports-2.16.0/100-respect-env-CPPFLAGS.patch
deleted file mode 100644
index dce491c..0000000
--- a/patches/glibc/ports-2.16.0/100-respect-env-CPPFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Respect environment CPPFLAGS when we run ./configure so we can inject
-random -D things without having to set CFLAGS/ASFLAGS
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -668,6 +668,7 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
-+CPPFLAGS += $(CPPFLAGS-config)
- override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) $(config-extra-cflags) \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
- 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
diff --git a/patches/glibc/ports-2.16.0/120-i386-x86_64-revert-clone-cfi.patch b/patches/glibc/ports-2.16.0/120-i386-x86_64-revert-clone-cfi.patch
deleted file mode 100644
index c7f6182..0000000
--- a/patches/glibc/ports-2.16.0/120-i386-x86_64-revert-clone-cfi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-revert cfi additions to clone on i386/x86_64 to workaround problems in
-gcc's unwinder code.  this is not a bug in glibc, it triggers problems
-elsewhere.  this cfi code does not gain us a whole lot anyways.
-
-http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
-
-Index: sysdeps/unix/sysv/linux/i386/clone.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/patches/glibc/ports-2.16.0/140-disable-ldconfig.patch b/patches/glibc/ports-2.16.0/140-disable-ldconfig.patch
deleted file mode 100644
index 378e1df..0000000
--- a/patches/glibc/ports-2.16.0/140-disable-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
-file outside of the chroot.  doesnt matter anyways as we wont use the cache
-results (portage will rebuild cache), so running ldconfig is simply a waste
-of time.
-
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
-@@ -116,6 +116,7 @@
- 	rm -f $(symbolic-link-list)
- 
- install:
-+dont-bother-with-destdir:
- 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
- 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
- 				       $(slibdir) $(libdir)
diff --git a/patches/glibc/ports-2.16.0/150-queue-header-updates.patch b/patches/glibc/ports-2.16.0/150-queue-header-updates.patch
deleted file mode 100644
index 7cbe70e..0000000
--- a/patches/glibc/ports-2.16.0/150-queue-header-updates.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-grab some updates from FreeBSD
-
-http://bugs.gentoo.org/201979
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
-
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
-@@ -136,6 +136,11 @@
- 		(var);							\
- 		(var) = ((var)->field.le_next))
- 
-+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = LIST_FIRST((head));				\
-+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
- /*
-  * List access methods.
-  */
-@@ -197,6 +202,16 @@
- #define	SLIST_FOREACH(var, head, field)					\
- 	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
- 
-+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = SLIST_FIRST((head));				\
-+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-+	    (var) = (tvar))
-+
-+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-+	for ((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != NULL;					\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
- /*
-  * Singly-linked List access methods.
-  */
-@@ -242,6 +257,12 @@
- 	(head)->stqh_last = &(elm)->field.stqe_next;			\
- } while (/*CONSTCOND*/0)
- 
-+#define	STAILQ_LAST(head, type, field)					\
-+	(STAILQ_EMPTY((head)) ?						\
-+		NULL :							\
-+	        ((struct type *)(void *)				\
-+		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-+
- #define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
- 	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
- 		(head)->stqh_last = &(elm)->field.stqe_next;		\
-@@ -271,6 +292,11 @@
- 		(var);							\
- 		(var) = ((var)->field.stqe_next))
- 
-+#define STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = STAILQ_FIRST((head));				\
-+		(var) && ((tvar) = STAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	STAILQ_CONCAT(head1, head2) do {				\
- 	if (!STAILQ_EMPTY((head2))) {					\
- 		*(head1)->stqh_last = (head2)->stqh_first;		\
-@@ -437,11 +463,21 @@
- 		(var);							\
- 		(var) = ((var)->field.tqe_next))
- 
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-+	for ((var) = TAILQ_FIRST((head));				\
-+		(var) && ((tvar) = TAILQ_NEXT((var), field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
- 	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
- 		(var);							\
- 		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
- 
-+#define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-+	for ((var) = TAILQ_LAST((head), headname);			\
-+		(var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-+		(var) = (tvar))
-+
- #define	TAILQ_CONCAT(head1, head2, field) do {				\
- 	if (!TAILQ_EMPTY(head2)) {					\
- 		*(head1)->tqh_last = (head2)->tqh_first;		\
diff --git a/patches/glibc/ports-2.16.0/170-localedef-fix-trampoline.patch b/patches/glibc/ports-2.16.0/170-localedef-fix-trampoline.patch
deleted file mode 100644
index 4784a07..0000000
--- a/patches/glibc/ports-2.16.0/170-localedef-fix-trampoline.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
-if [ $# -ne 2 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
diff --git a/patches/glibc/ports-2.16.0/180-resolv-dynamic.patch b/patches/glibc/ports-2.16.0/180-resolv-dynamic.patch
deleted file mode 100644
index e916bce..0000000
--- a/patches/glibc/ports-2.16.0/180-resolv-dynamic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from SuSE
-
-if /etc/resolv.conf is updated, then make sure applications
-already running get the updated information.
-
-http://bugs.gentoo.org/177416
-
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <arpa/nameser.h>
- #include <resolv.h>
- #include <bits/libc-lock.h>
-+#include <sys/stat.h>
- 
- 
- /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -95,6 +96,20 @@
- __res_maybe_init (res_state resp, int preinit)
- {
- 	if (resp->options & RES_INIT) {
-+		static time_t last_mtime, last_check;
-+		time_t now;
-+		struct stat statbuf;
-+		
-+		time (&now);
-+		if (now != last_check) {
-+			last_check = now;
-+			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {
-+				last_mtime = statbuf.st_mtime;
-+				atomicinclock (lock);
-+				atomicinc (__res_initstamp);
-+				atomicincunlock (lock);
-+			}
-+		}
- 		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0)
- 				__res_iclose (resp, true);
diff --git a/patches/glibc/ports-2.16.0/200-fadvise64_64.patch b/patches/glibc/ports-2.16.0/200-fadvise64_64.patch
deleted file mode 100644
index 71bca38..0000000
--- a/patches/glibc/ports-2.16.0/200-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+			      __LONG_LONG_PAIR ((long) (offset >> 31),
-+						(long) offset),
-+			      __LONG_LONG_PAIR ((long) (len >> 31),
-+						(long) len),
-+			      advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }
diff --git a/patches/glibc/ports-2.16.0/260-assume-pipe2.patch b/patches/glibc/ports-2.16.0/260-assume-pipe2.patch
deleted file mode 100644
index 54f0382..0000000
--- a/patches/glibc/ports-2.16.0/260-assume-pipe2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/250342
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=9685
-
-we cant assume sock_cloexec and pipe2 are bound together as the former defines
-are found in glibc only while the latter are a combo of kernel headers and
-glibc.  so if we do a runtime detection of SOCK_CLOEXEC, but pipe2() is a stub
-inside of glibc, we hit a problem.  for example:
-
-#include <grp.h>
-#include <stdio.h>
-main()
-{
-	getgrnam("portage");
-	if (!popen("ls", "r"))
-		perror("popen()");
-}
-
-getgrnam() will detect that the kernel supports SOCK_CLOEXEC and then set both
-__have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
-older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
-stub for it.  so popen() will always fail as glibc assumes pipe2() works.
-
-diff -durN glibc-2.16.0.orig/socket/have_sock_cloexec.c glibc-2.16.0/socket/have_sock_cloexec.c
---- glibc-2.16.0.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.16.0/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
-@@ -15,9 +15,14 @@
-    License along with the GNU C Library; if not, see
-    <http://www.gnu.org/licenses/>.  */
- 
-+#include <fcntl.h>
- #include <sys/socket.h>
- #include <kernel-features.h>
- 
- #if defined SOCK_CLOEXEC && !defined __ASSUME_SOCK_CLOEXEC
- int __have_sock_cloexec;
- #endif
-+
-+#if defined O_CLOEXEC && !defined __ASSUME_PIPE2
-+int __have_pipe2;
-+#endif
diff --git a/patches/glibc/ports-2.16.0/270-china.patch b/patches/glibc/ports-2.16.0/270-china.patch
deleted file mode 100644
index 41d7759..0000000
--- a/patches/glibc/ports-2.16.0/270-china.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
-@@ -1,7 +1,7 @@
- comment_char %
- escape_char /
- %
--% Chinese language locale for Taiwan R.O.C.
-+% Chinese language locale for Taiwan
- % charmap: BIG5-CP950
- %
- % Original Author:
-@@ -17,7 +17,7 @@
- % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
- 
- LC_IDENTIFICATION
--title      "Chinese locale for Taiwan R.O.C."
-+title      "Chinese locale for Taiwan"
- source     ""
- address    ""
- contact    ""
-@@ -25,7 +25,7 @@
- tel        ""
- fax        ""
- language   "Chinese"
--territory  "Taiwan R.O.C."
-+territory  "Taiwan"
- revision   "0.2"
- date       "2000-08-02"
- %
diff --git a/patches/glibc/ports-2.16.0/280-new-valencian-locale.patch b/patches/glibc/ports-2.16.0/280-new-valencian-locale.patch
deleted file mode 100644
index 4cdd108..0000000
--- a/patches/glibc/ports-2.16.0/280-new-valencian-locale.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=131815
-http://sourceware.org/bugzilla/show_bug.cgi?id=2522
-
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
- ca_ES.UTF-8/UTF-8 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8@valencia/UTF-8 \
-+ca_ES@valencia/ISO-8859-15 \
- ca_FR.UTF-8/UTF-8 \
- ca_FR/ISO-8859-15 \
- ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
-@@ -0,0 +1,96 @@
-+comment_char %
-+escape_char  /
-+%
-+% Valencian (southern Catalan) locale for Spain with Euro
-+%
-+% Note that this locale is almost the same as ca_ES@euro.  The point of having
-+% a separate locale is only for PO translations, which have a lot of social
-+% support and are very appreciated by the Valencian-speaking community.
-+%
-+% Contact: Jordi Mallach
-+% Email: jordi@gnu.org
-+% Tel:
-+% Fax:
-+% Language: ca
-+% Territory: ES
-+% Option: euro
-+% Revision: 1.0
-+% Date: 2006-04-06
-+% Application: general
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: ISO-8859-15
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Valencian (southern Catalan) locale for Spain with Euro"
-+source     ""
-+address    ""
-+contact    "Jordi Mallach"
-+email      "jordi@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Catalan"
-+territory  "Spain"
-+revision   "1.0"
-+date       "2006-04-06"
-+%
-+category  "ca_ES@valencia:2006";LC_IDENTIFICATION
-+category  "ca_ES@valencia:2006";LC_CTYPE
-+category  "ca_ES@valencia:2006";LC_COLLATE
-+category  "ca_ES@valencia:2006";LC_MONETARY
-+category  "ca_ES@valencia:2006";LC_NUMERIC
-+category  "ca_ES@valencia:2006";LC_TIME
-+category  "ca_ES@valencia:2006";LC_MESSAGES
-+category  "ca_ES@valencia:2006";LC_PAPER
-+category  "ca_ES@valencia:2006";LC_NAME
-+category  "ca_ES@valencia:2006";LC_ADDRESS
-+category  "ca_ES@valencia:2006";LC_TELEPHONE
-+category  "ca_ES@valencia:2006";LC_MEASUREMENT
-+
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "ca_ES"
-+END LC_COLLATE
-+
-+LC_MONETARY
-+copy "ca_ES"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "ca_ES"
-+END LC_NUMERIC
-+
-+LC_TIME
-+copy "ca_ES"
-+END LC_TIME
-+
-+LC_MESSAGES
-+copy "ca_ES"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+copy "ca_ES"
-+END LC_PAPER
-+
-+LC_NAME
-+copy "ca_ES"
-+END LC_NAME
-+
-+LC_ADDRESS
-+copy "ca_ES"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+copy "ca_ES"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+copy "ca_ES"
-+END LC_MEASUREMENT
diff --git a/patches/glibc/ports-2.16.0/300-nscd-one-fork.patch b/patches/glibc/ports-2.16.0/300-nscd-one-fork.patch
deleted file mode 100644
index 13b2861..0000000
--- a/patches/glibc/ports-2.16.0/300-nscd-one-fork.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-only fork one to assist in stop-start-daemon assumptions about daemon behavior
-
-http://bugs.gentoo.org/190785
-
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
-@@ -203,6 +203,9 @@
- 	    exit (0);
- 	}
- 
-+      if (write_pid (_PATH_NSCDPID) < 0)
-+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
-+
-       int nullfd = open (_PATH_DEVNULL, O_RDWR);
-       if (nullfd != -1)
- 	{
-@@ -252,15 +255,6 @@
- 	for (i = min_close_fd; i < getdtablesize (); i++)
- 	  close (i);
- 
--      if (run_mode == RUN_DAEMONIZE)
--	{
--	  pid = fork ();
--	  if (pid == -1)
--	    error (EXIT_FAILURE, errno, _("cannot fork"));
--	  if (pid != 0)
--	    exit (0);
--	}
--
-       setsid ();
- 
-       if (chdir ("/") != 0)
-@@ -245,9 +242,6 @@
- 
-       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
- 
--      if (write_pid (_PATH_NSCDPID) < 0)
--	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
--
-       if (!init_logfile ())
- 	dbg_log (_("Could not create log file"));
- 
diff --git a/patches/glibc/ports-2.16.0/310-hppa-nptl-carlos.patch b/patches/glibc/ports-2.16.0/310-hppa-nptl-carlos.patch
deleted file mode 100644
index 11e8a65..0000000
--- a/patches/glibc/ports-2.16.0/310-hppa-nptl-carlos.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
-@@ -392,14 +392,14 @@
-      know it is available.  We do not have to clear the memory if we
-      do not have to use the temporary bootstrap_map.  Global variables
-      are initialized to zero by default.  */
--#ifndef DONT_USE_BOOTSTRAP_MAP
-+#if !defined DONT_USE_BOOTSTRAP_MAP
- # ifdef HAVE_BUILTIN_MEMSET
-   __builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
- # else
--  for (size_t cnt = 0;
--       cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
--       ++cnt)
--    bootstrap_map.l_info[cnt] = 0;
-+  /* Clear the whole bootstrap_map structure */
-+  for (char *cnt = (char *)&(bootstrap_map);
-+       cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
-+       *cnt++ = '\0');
- # endif
- # if USE___THREAD
-   bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
-@@ -185,7 +185,7 @@
-      __typeof (*(mem)) __atg5_value = (newvalue);			      \
- 									      \
-      do									      \
--       __atg5_oldval = *__atg5_memp;					      \
-+       __atg5_oldval = *(volatile __typeof (mem))__atg5_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
- 						   __atg5_oldval), 0));	      \
-@@ -206,7 +206,7 @@
-      __typeof (*(mem)) __atg6_value = (value);				      \
- 									      \
-      do									      \
--       __atg6_oldval = *__atg6_memp;					      \
-+       __atg6_oldval = *(volatile __typeof (mem))__atg6_memp;		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg6_memp,		      \
- 						   __atg6_oldval	      \
-@@ -224,7 +224,7 @@
-      __typeof (*(mem)) __atg7_value = (value);				      \
- 									      \
-      do									      \
--       __atg7_oldv = *__atg7_memp;					      \
-+       __atg7_oldv = *(volatile __typeof (mem))__atg7_memp;		      \
-      while (__builtin_expect						      \
- 	    (catomic_compare_and_exchange_bool_acq (__atg7_memp,	      \
- 						    __atg7_oldv		      \
-@@ -242,7 +242,7 @@
-     __typeof (mem) __atg8_memp = (mem);					      \
-     __typeof (*(mem)) __atg8_value = (value);				      \
-     do {								      \
--      __atg8_oldval = *__atg8_memp;					      \
-+      __atg8_oldval = *(volatile __typeof (mem))__atg8_memp;		      \
-       if (__atg8_oldval >= __atg8_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -259,7 +259,7 @@
-     __typeof (mem) __atg9_memp = (mem);					      \
-     __typeof (*(mem)) __atg9_value = (value);				      \
-     do {								      \
--      __atg9_oldv = *__atg9_memp;					      \
-+      __atg9_oldv = *(volatile __typeof (mem))__atg9_memp;		      \
-       if (__atg9_oldv >= __atg9_value)					      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -277,7 +277,7 @@
-     __typeof (mem) __atg10_memp = (mem);				      \
-     __typeof (*(mem)) __atg10_value = (value);				      \
-     do {								      \
--      __atg10_oldval = *__atg10_memp;					      \
-+      __atg10_oldval = *(volatile __typeof (mem))__atg10_memp;		      \
-       if (__atg10_oldval <= __atg10_value)				      \
- 	break;								      \
-     } while (__builtin_expect						      \
-@@ -361,7 +361,7 @@
- 									      \
-      do									      \
-        {								      \
--	 __atg11_oldval = *__atg11_memp;				      \
-+	 __atg11_oldval = *(volatile __typeof (mem))__atg11_memp;	      \
- 	 if (__builtin_expect (__atg11_oldval <= 0, 0))			      \
- 	   break;							      \
-        }								      \
-@@ -400,7 +400,7 @@
-      __typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit));	      \
- 									      \
-      do									      \
--       __atg14_old = (*__atg14_memp);					      \
-+       __atg14_old = (*(volatile __typeof (mem))__atg14_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg14_memp,	      \
- 						   __atg14_old | __atg14_mask,\
-@@ -418,7 +418,7 @@
-     __typeof (*(mem)) __atg15_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg15_old = (*__atg15_memp);					      \
-+      __atg15_old = (*(volatile __typeof (mem))__atg15_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg15_memp,		      \
- 						  __atg15_old & __atg15_mask, \
-@@ -450,7 +450,7 @@
-      __typeof (*(mem)) __atg16_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg16_old = (*__atg16_memp);					      \
-+       __atg16_old = (*(volatile __typeof (mem))__atg16_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg16_memp,	      \
- 						   __atg16_old & __atg16_mask,\
-@@ -468,7 +468,7 @@
-     __typeof (*(mem)) __atg17_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg17_old = (*__atg17_memp);					      \
-+      __atg17_old = (*(volatile __typeof (mem))__atg17_memp);		      \
-     while (__builtin_expect						      \
- 	   (atomic_compare_and_exchange_bool_acq (__atg17_memp,		      \
- 						  __atg17_old | __atg17_mask, \
-@@ -484,7 +484,7 @@
-     __typeof (*(mem)) __atg18_mask = (mask);				      \
- 									      \
-     do									      \
--      __atg18_old = (*__atg18_memp);					      \
-+      __atg18_old = (*(volatile __typeof (mem))__atg18_memp);		      \
-     while (__builtin_expect						      \
- 	   (catomic_compare_and_exchange_bool_acq (__atg18_memp,	      \
- 						   __atg18_old | __atg18_mask,\
-@@ -500,7 +500,7 @@
-      __typeof (*(mem)) __atg19_mask = (mask);				      \
- 									      \
-      do									      \
--       __atg19_old = (*__atg19_memp);					      \
-+       __atg19_old = (*(volatile __typeof (mem))__atg19_memp);		      \
-      while (__builtin_expect						      \
- 	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
- 						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -266,9 +266,9 @@
- # Files which must not be linked with libpthread.
- tests-nolibpthread = tst-unload
- 
--# This sets the stack resource limit to 1023kb, which is not a multiple
--# of the page size since every architecture's page size is > 1k.
--tst-oddstacklimit-ENV = ; ulimit -s 1023;
-+# This sets the stack resource limit to 8193kb, which is not a multiple
-+# of the page size since every architecture's page size is 4096 bytes.
-+tst-oddstacklimit-ENV = ; ulimit -s 8193;
- 
- gen-as-const-headers = pthread-errnos.sym
- 
-@@ -426,6 +426,35 @@
- CFLAGS-tst-cleanupx4.c += -fexceptions
- CFLAGS-tst-oncex3.c += -fexceptions
- CFLAGS-tst-oncex4.c += -fexceptions
-+
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
-+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
-+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
-+
- CFLAGS-tst-align.c += $(stack-align-test-flags)
- CFLAGS-tst-align3.c += $(stack-align-test-flags)
- CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
-@@ -64,7 +64,7 @@
-       do
- 	lll_futex_wait (&ibarrier->curr_event, event,
- 			ibarrier->private ^ FUTEX_PRIVATE_FLAG);
--      while (event == ibarrier->curr_event);
-+      while (event == *(volatile unsigned int *)&ibarrier->curr_event);
-     }
- 
-   /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -33,7 +33,9 @@
- 
- ifeq ($(have-forced-unwind),yes)
- tests += tst-mqueue8x
-+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
- CFLAGS-tst-mqueue8x.c += -fexceptions
-+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s) 
- endif
- endif
- 
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
-@@ -82,7 +82,7 @@
- 	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
- endif
- 
--CFLAGS-vfprintf.c = -Wno-uninitialized
-+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
- CFLAGS-vfwprintf.c = -Wno-uninitialized
- CFLAGS-tst-printf.c = -Wno-format
- CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
-       while (inlen < 0 && errno == EINTR);
-       if (inlen < 0)
- 	{
--	  if (errno == EWOULDBLOCK)
-+	  if (errno == EWOULDBLOCK || errno == EAGAIN)
- 	    continue;
- 	  cu->cu_error.re_errno = errno;
- 	  return (cu->cu_error.re_status = RPC_CANTRECV);
diff --git a/patches/glibc/ports-2.16.0/330-m68k-sys-user.patch b/patches/glibc/ports-2.16.0/330-m68k-sys-user.patch
deleted file mode 100644
index f113996..0000000
--- a/patches/glibc/ports-2.16.0/330-m68k-sys-user.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-copied from kernel as it is sanitized now
-
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
-@@ -1,3 +1,90 @@
-+#ifndef _SYS_USER_H
-+#define _SYS_USER_H
-+
-+/* Core file format: The core file is written in such a way that gdb
-+   can understand it and provide useful information to the user (under
-+   linux we use the 'trad-core' bfd).  There are quite a number of
-+   obstacles to being able to view the contents of the floating point
-+   registers, and until these are solved you will not be able to view the
-+   contents of them.  Actually, you can read in the core file and look at
-+   the contents of the user struct to find out what the floating point
-+   registers contain.
-+   The actual file contents are as follows:
-+   UPAGE: 1 page consisting of a user struct that tells gdb what is present
-+   in the file.  Directly after this is a copy of the task_struct, which
-+   is currently not used by gdb, but it may come in useful at some point.
-+   All of the registers are stored as part of the upage.  The upage should
-+   always be only one page.
-+   DATA: The data area is stored.  We use current->end_text to
-+   current->brk to pick up all of the user variables, plus any memory
-+   that may have been malloced.  No attempt is made to determine if a page
-+   is demand-zero or if a page is totally unused, we just cover the entire
-+   range.  All of the addresses are rounded in such a way that an integral
-+   number of pages is written.
-+   STACK: We need the stack information in order to get a meaningful
-+   backtrace.  We need to write the data from (esp) to
-+   current->start_stack, so we round each of these off in order to be able
-+   to write an integer number of pages.
-+   The minimum core file size is 3 pages, or 12288 bytes.
-+*/
-+
-+struct user_m68kfp_struct {
-+	unsigned long  fpregs[8*3];	/* fp0-fp7 registers */
-+	unsigned long  fpcntl[3];	/* fp control regs */
-+};
-+
-+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
-+   is still the layout used by user (the new pt_regs doesn't have
-+   all registers). */
-+struct user_regs_struct {
-+	long d1,d2,d3,d4,d5,d6,d7;
-+	long a0,a1,a2,a3,a4,a5,a6;
-+	long d0;
-+	long usp;
-+	long orig_d0;
-+	short stkadj;
-+	short sr;
-+	long pc;
-+	short fmtvec;
-+	short __fill;
-+};
-+
-+
-+/* When the kernel dumps core, it starts by dumping the user struct -
-+   this will be used by gdb to figure out where the data and stack segments
-+   are within the file, and what virtual addresses to use. */
-+struct user{
-+/* We start with the registers, to mimic the way that "memory" is returned
-+   from the ptrace(3,...) function.  */
-+  struct user_regs_struct regs;	/* Where the registers are actually stored */
-+/* ptrace does not yet supply these.  Someday.... */
-+  int u_fpvalid;		/* True if math co-processor being used. */
-+                                /* for this mess. Not yet used. */
-+  struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
-+/* The rest of this junk is to help gdb figure out what goes where */
-+  unsigned long int u_tsize;	/* Text segment size (pages). */
-+  unsigned long int u_dsize;	/* Data segment size (pages). */
-+  unsigned long int u_ssize;	/* Stack segment size (pages). */
-+  unsigned long start_code;     /* Starting virtual address of text. */
-+  unsigned long start_stack;	/* Starting virtual address of stack area.
-+				   This is actually the bottom of the stack,
-+				   the top of the stack is always found in the
-+				   esp register.  */
-+  long int signal;		/* Signal that caused the core dump. */
-+  int reserved;			/* No longer used */
-+  struct user_regs_struct *u_ar0;
-+				/* Used by gdb to help find the values for */
-+				/* the registers. */
-+  struct user_m68kfp_struct* u_fpstate;	/* Math Co-processor pointer. */
-+  unsigned long magic;		/* To uniquely identify a core file */
-+  char u_comm[32];		/* User command that was responsible */
-+};
-+#define NBPG 4096
-+#define UPAGES 1
-+#define HOST_TEXT_START_ADDR (u.start_code)
-+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-+
-+#endif
- /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.16.0/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/patches/glibc/ports-2.16.0/340-dl_execstack-PaX-support.patch b/patches/glibc/ports-2.16.0/340-dl_execstack-PaX-support.patch
deleted file mode 100644
index 2402af0..0000000
--- a/patches/glibc/ports-2.16.0/340-dl_execstack-PaX-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-	With latest versions of glibc, a lot of apps failed on a PaX enabled
-	system with:
-		 cannot enable executable stack as shared object requires: Permission denied
-	
-	This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	to make the stack executable due to some libraries not containing the
-	PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-
-	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
-
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
- # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
- #endif
-   if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
--    return errno;
-+    if (errno != EACCES) /* PAX is enabled */
-+    	return errno;
- 
-   return 0;
- }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -63,7 +63,10 @@
-       else
- # endif
- 	{
--	  result = errno;
-+	  if (errno == EACCES)  /* PAX is enabled */
-+	    result = 0;
-+	  else
-+	    result = errno;
- 	  goto out;
- 	}
-     }
-@@ -89,7 +92,12 @@
- 	page -= size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
-@@ -115,7 +123,12 @@
- 	page += size;
-       else
- 	{
--	  if (errno != ENOMEM)	/* Unexpected failure mode.  */
-+	  if (errno == EACCES)		/* PAX is enabled */
-+	    {
-+	      result = 0;
-+	      goto out;
-+	    }
-+	  else if (errno != ENOMEM)	/* Unexpected failure mode.  */
- 	    {
- 	      result = errno;
- 	      goto out;
diff --git a/patches/glibc/ports-2.16.0/350-pre20040117-pt_pax.patch b/patches/glibc/ports-2.16.0/350-pre20040117-pt_pax.patch
deleted file mode 100644
index f8f6b83..0000000
--- a/patches/glibc/ports-2.16.0/350-pre20040117-pt_pax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
-@@ -580,6 +580,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
-@@ -593,6 +594,18 @@
- #define PF_X		(1 << 0)	/* Segment is executable */
- #define PF_W		(1 << 1)	/* Segment is writable */
- #define PF_R		(1 << 2)	/* Segment is readable */
-+#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
-+#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
-+#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
-+#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
-+#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
-+#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
-+#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
-+#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
-+#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
-+#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
-+#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
-+#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
- #define PF_MASKOS	0x0ff00000	/* OS-specific */
- #define PF_MASKPROC	0xf0000000	/* Processor-specific */
- 
diff --git a/patches/glibc/ports-2.16.0/360-tests-sandbox-libdl-paths.patch b/patches/glibc/ports-2.16.0/360-tests-sandbox-libdl-paths.patch
deleted file mode 100644
index 9f78c52..0000000
--- a/patches/glibc/ports-2.16.0/360-tests-sandbox-libdl-paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-when glibc runs its tests, it does so by invoking the local library loader.
-in Gentoo, we build/run inside of our "sandbox" which itself is linked against
-libdl (so that it can load libraries and pull out symbols).  the trouble
-is that when you upgrade from an older glibc to the new one, often times
-internal symbols change name or abi.  this is normally OK as you cannot use
-libc.so from say version 2.3.6 but libpthread.so from say version 2.5, so
-we always say "keep all of the glibc libraries from the same build".  but
-when glibc runs its tests, it uses dynamic paths to point to its new local
-copies of libraries.  if the test doesnt use libdl, then glibc doesnt add
-its path, and when sandbox triggers the loading of libdl, glibc does so
-from the host system system.  this gets us into the case of all libraries
-are from the locally compiled version of glibc except for libdl.so.
-
-Fix by Wormo
-
-http://bugs.gentoo.org/56898
-
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,7 +24,8 @@
- rtld_installed_name=$1; shift
- 
- testout=${common_objpfx}/grp/tst_fgetgrent.out
--library_path=${common_objpfx}
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
- 
- result=0
- 
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -34,7 +34,7 @@
- export GCONV_PATH
- 
- # We have to have some directories in the library path.
--LIBPATH=$codir:$codir/iconvdata
-+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
- 
- # How the start the iconv(1) program.
- ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -59,8 +59,11 @@
-   irreversible=${charset}.irreversible
- fi
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # iconv in one direction.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-table-from ${charset} \
-   > ${objpfx}tst-${charset}.table
- 
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -37,6 +37,9 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- ${common_objpfx}elf/ld.so --library-path $common_objpfx \
- ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
- 
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -51,9 +51,12 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
- MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -65,8 +65,11 @@
- LOCPATH=${objpfx}domaindir
- export LOCPATH
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- # Now run the test.
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
- cmp ${objpfx}tst-gettext2.out - <<EOF
- String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -36,7 +36,10 @@
- LOCPATH=${common_objpfx}localedata
- export LOCPATH
- 
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
-+${common_objpfx}elf/ld.so --library-path $library_path \
- ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
- 
- exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -24,9 +24,12 @@
- status=0
- trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
- LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
--${common_objpfx}elf/ld.so --library-path $common_objpfx \
-+${common_objpfx}elf/ld.so --library-path $library_path \
-   ${common_objpfx}malloc/tst-mtrace || status=1
- 
- if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -5,8 +5,8 @@
- rtld_installed_name=$1; shift
- logfile=$common_objpfx/nptl/tst-tls6.out
- 
--# We have to find libc and nptl
--library_path=${common_objpfx}:${common_objpfx}nptl
-+# We have to find libc and nptl (also libdl in case sandbox is in use)
-+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
- tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- 	  ${common_objpfx}/nptl/tst-tls5"
- 
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -18,7 +18,7 @@
- esac
- 
- # We have to find the libc and the NSS modules.
--library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
-+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
- 
- # Since we use `sort' we must make sure to use the same locale everywhere.
- LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -10,7 +10,10 @@
- else
-   rtld_installed_name=$1; shift
-   runit() {
--    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
-+    
-+  # make sure libdl is also in path in case sandbox is in use
-+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
-   }
- fi
- 
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
-@@ -19,8 +19,11 @@
- "
- export IFS
- 
-+# make sure libdl is also in path in case sandbox is in use
-+library_path=${common_objpfx}:${common_objpfx}/dlfcn
-+
- failed=0
--${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
-+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
- ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
- cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
- wordexp returned 0
diff --git a/patches/glibc/ports-2.16.0/380-dont-build-timezone.patch b/patches/glibc/ports-2.16.0/380-dont-build-timezone.patch
deleted file mode 100644
index 11c358e..0000000
--- a/patches/glibc/ports-2.16.0/380-dont-build-timezone.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/patches/glibc/ports-2.16.0/400-alpha-xstat.patch b/patches/glibc/ports-2.16.0/400-alpha-xstat.patch
deleted file mode 100644
index 6e4ab8f..0000000
--- a/patches/glibc/ports-2.16.0/400-alpha-xstat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-@@ -386,6 +386,11 @@
- # define __ASSUME_GETDENTS32_D_TYPE	1
- #endif
- 
-+/* Starting with version 2.6.4, alpha stat64 syscalls are available.  */
-+#if __LINUX_KERNEL_VERSION >= 0x020604 && defined __alpha__
-+# define __ASSUME_STAT64_SYSCALL	1
-+#endif
-+
- /* Starting with version 2.5.3, the initial location returned by `brk'
-    after exec is always rounded up to the next page.  */
- #if __LINUX_KERNEL_VERSION >= 132355
diff --git a/patches/glibc/ports-2.16.0/430-alpha-creat.patch b/patches/glibc/ports-2.16.0/430-alpha-creat.patch
deleted file mode 100644
index da6ddda..0000000
--- a/patches/glibc/ports-2.16.0/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/patches/glibc/ports-2.16.0/440-alpha-cache-shape.patch b/patches/glibc/ports-2.16.0/440-alpha-cache-shape.patch
deleted file mode 100644
index 5b1a298..0000000
--- a/patches/glibc/ports-2.16.0/440-alpha-cache-shape.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-older verisons of glibc would build dl-sysdep as shared-only and dl-support as
-static-only.  alpha hooks in a cache variable via dl-auxv.h.  newer versions of
-glibc build dl-sysdep as both shared and static which means we now have symbol
-duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
-is both shared/static, there is no point in hooking dl-support anymore, so we
-can punt it.
-
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
-@@ -1,2 +1,1 @@
--#include "dl-auxv.h"
- #include <elf/dl-support.c>
diff --git a/patches/glibc/ports-2.16.0/460-alpha-fix-gcc-4.1-warnings.patch b/patches/glibc/ports-2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
deleted file mode 100644
index f2ff04f..0000000
--- a/patches/glibc/ports-2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-2006-05-30  Falk Hueffner <falk@debian.org>
-
-	* sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
-	  to ev6 in assembly code.
-
-{standard input}: Assembler messages:
-{standard input}:341: Error: macro requires $at register while noat in effect
-{standard input}:374: Error: macro requires $at register while noat in effect
-{standard input}:438: Error: macro requires $at register while noat in effect
-{standard input}:471: Error: macro requires $at register while noat in effect
-make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
-
-Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
-I cannot really think of anything better than
-
- ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
-@@ -178,13 +178,13 @@
- static inline void
- stb_mb(unsigned char val, unsigned long addr)
- {
--  __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
-+  __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
- }
- 
- static inline void
- stw_mb(unsigned short val, unsigned long addr)
- {
--  __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
-+  __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
- }
- 
- static inline void
-@@ -356,7 +356,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned char r;
- 
--  __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-+  __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
-   return r;
- }
- 
-@@ -366,7 +366,7 @@
-   unsigned long int addr = dense_port_to_cpu_addr (port);
-   unsigned short r;
- 
--  __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-+  __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
-   return r;
- }
- 
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.16.0/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/patches/glibc/ports-2.16.0/490-alpha_alpha-add-fdatasync-support.patch b/patches/glibc/ports-2.16.0/490-alpha_alpha-add-fdatasync-support.patch
deleted file mode 100644
index acf250d..0000000
--- a/patches/glibc/ports-2.16.0/490-alpha_alpha-add-fdatasync-support.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-2009-07-25  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/unix/sysv/linux/kernel-features.h: define 
-	__ASSUME_FDATASYNC. 
-	* sysdeps/unix/sysv/linux/fdatasync.c: New file.
-	* sysdeps/unix/sysv/linux/Makefile: compile fdatasync.c with
-	-fexceptions.
-	* sysdeps/unix/sysv/linux/syscalls.list: Remove fdatasync.
-
- sysdeps/unix/sysv/linux/Makefile          |    1 
- sysdeps/unix/sysv/linux/fdatasync.c       |   69 ++++++++++++++++++++++++++++++
- sysdeps/unix/sysv/linux/kernel-features.h |    6 ++
- sysdeps/unix/sysv/linux/syscalls.list     |    1 
- 4 files changed, 76 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -21,6 +21,7 @@
- 		   setfsuid setfsgid makedev epoll_pwait signalfd \
- 		   eventfd eventfd_read eventfd_write prlimit
- 
-+CFLAGS-fdatasync.c = -fexceptions
- CFLAGS-gethostid.c = -fexceptions
- CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=0x80000000-__getpagesize()"
- 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
-@@ -0,0 +1,69 @@
-+/* fdatasync -- synchronize at least the data part of a file with 
-+   the underlying media. Linux version. 
-+
-+   Copyright (C) 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <errno.h>
-+#include <unistd.h>
-+
-+#include <sysdep-cancel.h>
-+#include <sys/syscall.h>
-+#include <bp-checks.h>
-+
-+#include <kernel-features.h>
-+
-+#if defined __NR_fdatasync && !defined __ASSUME_FDATASYNC
-+static int __have_no_fdatasync;
-+#endif
-+
-+static int
-+do_fdatasync (int fd)
-+{
-+#ifdef __ASSUME_FDATASYNC
-+  return INLINE_SYSCALL (fdatasync, 1, fd);
-+#elif defined __NR_fdatasync
-+  if (!__builtin_expect (__have_no_fdatasync, 0))
-+    {
-+      int result = INLINE_SYSCALL (fdatasync, 1, fd);
-+      if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
-+	return result;
-+
-+      __have_no_fdatasync = 1;
-+    }
-+#endif
-+  return INLINE_SYSCALL (fsync, 1, fd);
-+}
-+
-+int
-+__fdatasync (int fd)
-+{
-+  if (SINGLE_THREAD_P)
-+    return do_fdatasync (fd);
-+
-+  int oldtype = LIBC_CANCEL_ASYNC ();
-+
-+  int result = do_fdatasync (fd);
-+
-+  LIBC_CANCEL_RESET (oldtype);
-+
-+  return result;
-+}
-+
-+weak_alias (__fdatasync, fdatasync)
-+
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
-@@ -459,6 +459,12 @@
- # define __ASSUME_FUTEX_LOCK_PI	1
- #endif
- 
-+/* Support for fsyncdata syscall was added in 2.6.22 on alpha, but it
-+   was already present in 2.0 kernels on other architectures.  */
-+#if (!defined __alpha || __LINUX_KERNEL_VERSION >= 0x020616)
-+# define __ASSUME_FDATASYNC	1
-+#endif
-+
- /* Support for utimensat syscall was added in 2.6.22, on SH
-    only after 2.6.22-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
- epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
- epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
- epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
--fdatasync	-	fdatasync	Ci:i	fdatasync
- flock		-	flock		i:ii	__flock		flock
- fork		-	fork		i:	__libc_fork	__fork fork
- get_kernel_syms	EXTRA	get_kernel_syms	i:p	get_kernel_syms
diff --git a/patches/glibc/ports-2.16.0/530-alpha-fix-rtld-fPIC.patch b/patches/glibc/ports-2.16.0/530-alpha-fix-rtld-fPIC.patch
deleted file mode 100644
index 42faaa5..0000000
--- a/patches/glibc/ports-2.16.0/530-alpha-fix-rtld-fPIC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-05-26  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/alpha/Makefile (CFLAGS-rtld.c): add $(PIC-ccflag).
-
- ports/sysdeps/alpha/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile glibc-2.16.0/glibc-ports-2.16.0/sysdeps/alpha/Makefile
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
-@@ -35,7 +35,8 @@
- 
- ifeq ($(subdir),elf)
- # The ld.so startup code cannot use literals until it self-relocates.
--CFLAGS-rtld.c = -mbuild-constants
-+# It uses more than 64k for the small data area.
-+CFLAGS-rtld.c = -mbuild-constants $(PIC-ccflag)
- endif
- 
- # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.16.0.orig/ports/sysdeps/alpha/Makefile glibc-2.16.0/ports/sysdeps/alpha/Makefile
diff --git a/patches/glibc/ports-2.16.0/560-ppc-atomic.patch b/patches/glibc/ports-2.16.0/560-ppc-atomic.patch
deleted file mode 100644
index ee1cb90..0000000
--- a/patches/glibc/ports-2.16.0/560-ppc-atomic.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-sniped from suse
-
-Index: sysdeps/powerpc/bits/atomic.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
-
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -85,14 +85,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -102,14 +102,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpw	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stwcx.	%3,0,%1\n"			      \
-+		        "	stwcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -118,12 +118,12 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (							      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b\n"				      \
- 		      "   " __ARCH_ACQ_INSTR				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -132,11 +132,11 @@
-   ({									      \
-     __typeof (*mem) __val;						      \
-     __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		      "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--		      "		stwcx.	%3,0,%2\n"			      \
-+		      "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+		      "		stwcx.	%2,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&r" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&r" (__val), "+Z" (*mem)			      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -144,12 +144,12 @@
- #define __arch_atomic_exchange_and_add_32(mem, value) \
-   ({									      \
-     __typeof (*mem) __val, __tmp;					      \
--    __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
--		      "		add	%1,%0,%4\n"			      \
--		      "		stwcx.	%1,0,%3\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
-+		      "		add	%1,%0,%3\n"			      \
-+		      "		stwcx.	%1,%y2\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		      : "b" (mem), "r" (value), "m" (*mem)		      \
-+		      : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		      : "r" (value)					      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -157,12 +157,12 @@
- #define __arch_atomic_increment_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		addi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
-@@ -170,27 +170,27 @@
- #define __arch_atomic_decrement_val_32(mem) \
-   ({									      \
-     __typeof (*(mem)) __val;						      \
--    __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
-+    __asm __volatile ("1:	lwarx	%0,%y1\n"			      \
- 		      "		subi	%0,%0,1\n"			      \
--		      "		stwcx.	%0,0,%2\n"			      \
-+		      "		stwcx.	%0,%y1\n"			      \
- 		      "		bne-	1b"				      \
--		      : "=&b" (__val), "=m" (*mem)			      \
--		      : "b" (mem), "m" (*mem)				      \
-+		      : "=&b" (__val), "+Z" (*mem)			      \
-+		      :							      \
- 		      : "cr0", "memory");				      \
-     __val;								      \
-   })
- 
- #define __arch_atomic_decrement_if_positive_32(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	lwarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	lwarx	%0,%y2\n"			      \
- 		       "	cmpwi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stwcx.	%1,0,%3\n"			      \
-+		       "	stwcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*mem)	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (							      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -60,14 +60,14 @@
- ({									      \
-   unsigned int __tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	lwarx	%0,0,%1" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%3,0,%1\n"				      \
-+		    "	stwcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
-@@ -44,14 +44,14 @@
- ({									      \
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile ("   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	 	      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_ACQ "\n"	 	      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -61,14 +61,14 @@
-   unsigned int __tmp, __tmp2;						      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
- 		    "   clrldi  %1,%1,32\n"				      \
--		    "1:	lwarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	lwarx	%0,%y2" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%1,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stwcx.	%4,0,%2\n"				      \
-+		    "	stwcx.	%4,%y2\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp), "=r" (__tmp2)			      \
--		    : "b" (mem), "1" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "=r" (__tmp2), "+Z" (*(mem))	      \
-+		    : "1" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -82,14 +82,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (							      \
--		    "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	" __ARCH_ACQ_INSTR				      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -98,14 +98,14 @@
- ({									      \
-   unsigned long	__tmp;							      \
-   __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		    "1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"		      \
-+		    "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"		      \
- 		    "	subf.	%0,%2,%0\n"				      \
- 		    "	bne	2f\n"					      \
--		    "	stdcx.	%3,0,%1\n"				      \
-+		    "	stdcx.	%3,%y1\n"				      \
- 		    "	bne-	1b\n"					      \
- 		    "2:	"						      \
--		    : "=&r" (__tmp)					      \
--		    : "b" (mem), "r" (oldval), "r" (newval)		      \
-+		    : "=&r" (__tmp), "+Z" (*(mem))			      \
-+		    : "r" (oldval), "r" (newval)			      \
- 		    : "cr0", "memory");					      \
-   __tmp != 0;								      \
- })
-@@ -115,14 +115,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (						      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_ACQ "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	" __ARCH_ACQ_INSTR			      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -132,14 +132,14 @@
-       __typeof (*(mem)) __tmp;						      \
-       __typeof (mem)  __memp = (mem);					      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--		        "1:	ldarx	%0,0,%1" MUTEX_HINT_REL "\n"	      \
-+		        "1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
- 		        "	cmpd	%0,%2\n"			      \
- 		        "	bne	2f\n"				      \
--		        "	stdcx.	%3,0,%1\n"			      \
-+		        "	stdcx.	%3,%y1\n"			      \
- 		        "	bne-	1b\n"				      \
- 		        "2:	"					      \
--		        : "=&r" (__tmp)					      \
--		        : "b" (__memp), "r" (oldval), "r" (newval)	      \
-+		        : "=&r" (__tmp), "+Z" (*__memp)			      \
-+		        : "r" (oldval), "r" (newval)			      \
- 		        : "cr0", "memory");				      \
-       __tmp;								      \
-   })
-@@ -148,12 +148,12 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_ACQ "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_ACQ "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b\n"				      \
- 		  " " __ARCH_ACQ_INSTR					      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -162,11 +162,11 @@
-     ({									      \
-       __typeof (*mem) __val;						      \
-       __asm __volatile (__ARCH_REL_INSTR "\n"				      \
--			"1:	ldarx	%0,0,%2" MUTEX_HINT_REL "\n"	      \
--			"	stdcx.	%3,0,%2\n"			      \
-+			"1:	ldarx	%0,%y1" MUTEX_HINT_REL "\n"	      \
-+			"	stdcx.	%2,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&r" (__val), "=m" (*mem)			      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&r" (__val), "+Z" (*(mem))			      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -174,12 +174,12 @@
- #define __arch_atomic_exchange_and_add_64(mem, value) \
-     ({									      \
-       __typeof (*mem) __val, __tmp;					      \
--      __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
--			"	add	%1,%0,%4\n"			      \
--			"	stdcx.	%1,0,%3\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
-+			"	add	%1,%0,%3\n"			      \
-+			"	stdcx.	%1,%y2\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--			: "b" (mem), "r" (value), "m" (*mem)		      \
-+			: "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+			: "r" (value)					      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -187,12 +187,12 @@
- #define __arch_atomic_increment_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	addi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
-@@ -200,27 +200,27 @@
- #define __arch_atomic_decrement_val_64(mem) \
-     ({									      \
-       __typeof (*(mem)) __val;						      \
--      __asm __volatile ("1:	ldarx	%0,0,%2\n"			      \
-+      __asm __volatile ("1:	ldarx	%0,%y1\n"			      \
- 			"	subi	%0,%0,1\n"			      \
--			"	stdcx.	%0,0,%2\n"			      \
-+			"	stdcx.	%0,%y1\n"			      \
- 			"	bne-	1b"				      \
--			: "=&b" (__val), "=m" (*mem)			      \
--			: "b" (mem), "m" (*mem)				      \
-+			: "=&b" (__val), "+Z" (*(mem))			      \
-+			:						      \
- 			: "cr0", "memory");				      \
-       __val;								      \
-     })
- 
- #define __arch_atomic_decrement_if_positive_64(mem) \
-   ({ int __val, __tmp;							      \
--     __asm __volatile ("1:	ldarx	%0,0,%3\n"			      \
-+     __asm __volatile ("1:	ldarx	%0,%y2\n"			      \
- 		       "	cmpdi	0,%0,0\n"			      \
- 		       "	addi	%1,%0,-1\n"			      \
- 		       "	ble	2f\n"				      \
--		       "	stdcx.	%1,0,%3\n"			      \
-+		       "	stdcx.	%1,%y2\n"			      \
- 		       "	bne-	1b\n"				      \
- 		       "2:	" __ARCH_ACQ_INSTR			      \
--		       : "=&b" (__val), "=&r" (__tmp), "=m" (*mem)	      \
--		       : "b" (mem), "m" (*mem)				      \
-+		       : "=&b" (__val), "=&r" (__tmp), "+Z" (*(mem))	      \
-+		       :						      \
- 		       : "cr0", "memory");				      \
-      __val;								      \
-   })
diff --git a/patches/glibc/ports-2.16.0/580-nptl-lowlevellock.patch b/patches/glibc/ports-2.16.0/580-nptl-lowlevellock.patch
deleted file mode 100644
index 185331c..0000000
--- a/patches/glibc/ports-2.16.0/580-nptl-lowlevellock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix build error on arm like on hppa:
-
-arm-unknown-linux-gnu-gcc ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c -c -std=gnu99 -fgnu89-inline -O2 -Wall -Winline -Wwrite-strings -fmerge-all-constants -fno-strict-aliasing -g -pipe -Wstrict-prototypes   -fPIC    -I../include -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl -I/var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl -I../ports/sysdeps/arm/elf -I../ports/sysdeps/unix/sysv/linux/arm/nptl -I../ports/sysdeps/unix/sysv/linux/arm -I../nptl/sysdeps/unix/sysv/linux -I../nptl/sysdeps/pthread -I../sysdeps/pthread -I../ports/sysdeps/unix/sysv/linux -I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -I../sysdeps/unix/common -I../sysdeps/unix/mman -I../sysdeps/unix/inet -I../nptl/sysdeps/unix/sysv -I../ports/sysdeps/unix/sysv -I../sysdeps/unix/sysv -I../ports/sysdeps/unix/arm -I../nptl/sysdeps/unix -I../ports/sysdeps/unix -I../sysdeps/unix -I../sysdeps/posix -I../ports/sysdeps/arm/fpu -I../ports/sysdeps/arm/nptl -I../ports/sysdeps/arm -I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -I../sysdeps/generic/elf -I../sysdeps/generic -I../nptl -I../ports  -I.. -I../libio -I. -nostdinc -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include -isystem /usr/lib/gcc/arm-unknown-linux-gnu/4.3.2/include-fixed -isystem /usr/arm-unknown-linux-gnu/usr/include -D_LIBC_REENTRANT -include ../include/libc-symbols.h  -DPIC -DSHARED      -o /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -MD -MP -MF /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os.dt -MT /var/tmp/portage/cross-arm-unknown-linux-gnu/glibc-2.8_p20080602/work/build-default-arm-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os -DNOT_IN_libc=1 -DIS_IN_rtld=1
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
-
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>		/* Need THREAD_*, and header.*.  */
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.16.0/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/patches/glibc/ports-2.16.0/610-fpu-cw-mips.patch b/patches/glibc/ports-2.16.0/610-fpu-cw-mips.patch
deleted file mode 100644
index 0c0daf3..0000000
--- a/patches/glibc/ports-2.16.0/610-fpu-cw-mips.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
-
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
-@@ -86,7 +86,7 @@
- #define _FPU_RC_UP      0x2
- #define _FPU_RC_DOWN    0x3
- 
--#define _FPU_RESERVED 0xfe3c0000  /* Reserved bits in cw */
-+#define _FPU_RESERVED 0xfebc0000  /* Reserved bits in cw */
- 
- 
- /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.16.0.orig/ports/sysdeps/mips/fpu_control.h glibc-2.16.0/ports/sysdeps/mips/fpu_control.h
diff --git a/patches/glibc/ports-2.16.0/630-mips_shn_undef-hack.patch b/patches/glibc/ports-2.16.0/630-mips_shn_undef-hack.patch
deleted file mode 100644
index 791d76c..0000000
--- a/patches/glibc/ports-2.16.0/630-mips_shn_undef-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
- 	      /* FALLTHROUGH */
- 	    case STB_GLOBAL:
-	    success:
-+#ifdef __mips__
-+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
-+		 symbols, we skip them. */
-+	      if (sym->st_shndx == SHN_UNDEF)
-+		break;
-+#endif
- 	      /* Global definition.  Just what we need.  */
- 	      result->s = sym;
- 	      result->m = (struct link_map *) map;
diff --git a/patches/glibc/ports-2.16.0/640-alpha-atfcts.patch b/patches/glibc/ports-2.16.0/640-alpha-atfcts.patch
deleted file mode 100644
index 7a8a94a..0000000
--- a/patches/glibc/ports-2.16.0/640-alpha-atfcts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
-@@ -437,7 +437,8 @@
-    the code.  On PPC they were introduced in 2.6.17-rc1,
-    on SH in 2.6.19-rc1.  */
- #if __LINUX_KERNEL_VERSION >= 0x020611 \
--    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613)
-+    && (!defined __sh__ || __LINUX_KERNEL_VERSION >= 0x020613) \
-+    && (!defined __alpha__)
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/patches/glibc/ports-2.16.0/650-syslog.patch b/patches/glibc/ports-2.16.0/650-syslog.patch
deleted file mode 100644
index c20cafc..0000000
--- a/patches/glibc/ports-2.16.0/650-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
-@@ -152,7 +152,7 @@
- #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
- 	/* Check for invalid bits. */
- 	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
--		syslog(INTERNALLOG,
-+		__syslog(INTERNALLOG,
- 		    "syslog: unknown facility/priority: %x", pri);
- 		pri &= LOG_PRIMASK|LOG_FACMASK;
- 	}
diff --git a/patches/glibc/ports-2.16.0/660-debug-readlink_chk-readklinkat_chk.patch b/patches/glibc/ports-2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a7052..0000000
--- a/patches/glibc/ports-2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
diff --git a/patches/gmp/4.3.0/100-multiplicity-that-does-not-fit-an-int.patch b/patches/gmp/4.3.0/100-multiplicity-that-does-not-fit-an-int.patch
deleted file mode 100644
index f60e88f..0000000
--- a/patches/gmp/4.3.0/100-multiplicity-that-does-not-fit-an-int.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/mpz/remove.c b/mpz/remove.c
---- a/mpz/remove.c
-+++ b/mpz/remove.c
-@@ -23,7 +23,7 @@
- unsigned long int
- mpz_remove (mpz_ptr dest, mpz_srcptr src, mpz_srcptr f)
- {
--  mpz_t fpow[40];		/* inexhaustible...until year 2020 or so */
-+  mpz_t fpow[GMP_LIMB_BITS];		/* Really MP_SIZE_T_BITS */
-   mpz_t x, rem;
-   unsigned long int pwr;
-   int p;
-@@ -69,7 +69,7 @@
-       mpz_set (dest, x);
-     }
- 
--  pwr = (1 << p) - 1;
-+  pwr = (1L << p) - 1;
- 
-   mpz_clear (fpow[p]);
- 
-diff --git a/mpz/remove.c b/mpz/remove.c
---- a/mpz/remove.c
-+++ b/mpz/remove.c
-@@ -80,7 +80,7 @@
-       mpz_tdiv_qr (x, rem, dest, fpow[p]);
-       if (SIZ (rem) == 0)
- 	{
--	  pwr += 1 << p;
-+	  pwr += 1L << p;
- 	  mpz_set (dest, x);
- 	}
-       mpz_clear (fpow[p]);
diff --git a/patches/gmp/4.3.0/110-unbounded-alloc.patch b/patches/gmp/4.3.0/110-unbounded-alloc.patch
deleted file mode 100644
index 78e0588..0000000
--- a/patches/gmp/4.3.0/110-unbounded-alloc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/mpn/generic/toom44_mul.c b/mpn/generic/toom44_mul.c
---- a/mpn/generic/toom44_mul.c
-+++ b/mpn/generic/toom44_mul.c
-@@ -116,17 +116,16 @@
- 
-   TMP_MARK;
- 
--  as1  = TMP_SALLOC_LIMBS (n + 1);
--  asm1 = TMP_SALLOC_LIMBS (n + 1);
--  as2  = TMP_SALLOC_LIMBS (n + 1);
--  ash  = TMP_SALLOC_LIMBS (n + 1);
--  asmh = TMP_SALLOC_LIMBS (n + 1);
--
--  bs1  = TMP_SALLOC_LIMBS (n + 1);
--  bsm1 = TMP_SALLOC_LIMBS (n + 1);
--  bs2  = TMP_SALLOC_LIMBS (n + 1);
--  bsh  = TMP_SALLOC_LIMBS (n + 1);
--  bsmh = TMP_SALLOC_LIMBS (n + 1);
-+  as1  = TMP_ALLOC_LIMBS (10 * n + 10);
-+  asm1 = as1  + n + 1;
-+  as2  = asm1 + n + 1;
-+  ash  = as2  + n + 1;
-+  asmh = ash  + n + 1;
-+  bs1  = asmh + n + 1;
-+  bsm1 = bs1  + n + 1;
-+  bs2  = bsm1 + n + 1;
-+  bsh  = bs2  + n + 1;
-+  bsmh = bsh  + n + 1;
- 
-   gp = pp;
-   hp = pp + n + 1;
diff --git a/patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch b/patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
deleted file mode 100644
index f60e88f..0000000
--- a/patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/mpz/remove.c b/mpz/remove.c
---- a/mpz/remove.c
-+++ b/mpz/remove.c
-@@ -23,7 +23,7 @@
- unsigned long int
- mpz_remove (mpz_ptr dest, mpz_srcptr src, mpz_srcptr f)
- {
--  mpz_t fpow[40];		/* inexhaustible...until year 2020 or so */
-+  mpz_t fpow[GMP_LIMB_BITS];		/* Really MP_SIZE_T_BITS */
-   mpz_t x, rem;
-   unsigned long int pwr;
-   int p;
-@@ -69,7 +69,7 @@
-       mpz_set (dest, x);
-     }
- 
--  pwr = (1 << p) - 1;
-+  pwr = (1L << p) - 1;
- 
-   mpz_clear (fpow[p]);
- 
-diff --git a/mpz/remove.c b/mpz/remove.c
---- a/mpz/remove.c
-+++ b/mpz/remove.c
-@@ -80,7 +80,7 @@
-       mpz_tdiv_qr (x, rem, dest, fpow[p]);
-       if (SIZ (rem) == 0)
- 	{
--	  pwr += 1 << p;
-+	  pwr += 1L << p;
- 	  mpz_set (dest, x);
- 	}
-       mpz_clear (fpow[p]);
diff --git a/patches/gmp/4.3.1/110-unbounded-alloc.patch b/patches/gmp/4.3.1/110-unbounded-alloc.patch
deleted file mode 100644
index 78e0588..0000000
--- a/patches/gmp/4.3.1/110-unbounded-alloc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/mpn/generic/toom44_mul.c b/mpn/generic/toom44_mul.c
---- a/mpn/generic/toom44_mul.c
-+++ b/mpn/generic/toom44_mul.c
-@@ -116,17 +116,16 @@
- 
-   TMP_MARK;
- 
--  as1  = TMP_SALLOC_LIMBS (n + 1);
--  asm1 = TMP_SALLOC_LIMBS (n + 1);
--  as2  = TMP_SALLOC_LIMBS (n + 1);
--  ash  = TMP_SALLOC_LIMBS (n + 1);
--  asmh = TMP_SALLOC_LIMBS (n + 1);
--
--  bs1  = TMP_SALLOC_LIMBS (n + 1);
--  bsm1 = TMP_SALLOC_LIMBS (n + 1);
--  bs2  = TMP_SALLOC_LIMBS (n + 1);
--  bsh  = TMP_SALLOC_LIMBS (n + 1);
--  bsmh = TMP_SALLOC_LIMBS (n + 1);
-+  as1  = TMP_ALLOC_LIMBS (10 * n + 10);
-+  asm1 = as1  + n + 1;
-+  as2  = asm1 + n + 1;
-+  ash  = as2  + n + 1;
-+  asmh = ash  + n + 1;
-+  bs1  = asmh + n + 1;
-+  bsm1 = bs1  + n + 1;
-+  bs2  = bsm1 + n + 1;
-+  bsh  = bs2  + n + 1;
-+  bsmh = bsh  + n + 1;
- 
-   gp = pp;
-   hp = pp + n + 1;
diff --git a/patches/gmp/5.0.1/100-fix-tests-ABI-long-long.patch b/patches/gmp/5.0.1/100-fix-tests-ABI-long-long.patch
deleted file mode 100644
index b6e303e..0000000
--- a/patches/gmp/5.0.1/100-fix-tests-ABI-long-long.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: http://gmplib.org:8000/gmp-5.0/raw-rev/794410151f5f
-
-Tweaked to remove the hunk in the Changelog, as it did not apply cleanly
-( and who needs Changelogs? ;-) )
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1267122532 -3600
-# Node ID 794410151f5f966bcb5c3489b6441614990efe7c
-# Parent  948660e2e56d9cfaae035082b8fd473985505fb6
-Fix a test case to work for long long limbs.
-
-diff -r 948660e2e56d -r 794410151f5f tests/mpz/t-perfpow.c
---- a/tests/mpz/t-perfpow.c	Thu Feb 25 16:08:21 2010 +0100
-+++ b/tests/mpz/t-perfpow.c	Thu Feb 25 19:28:52 2010 +0100
-@@ -2,7 +2,7 @@
- 
-    Contributed to the GNU project by Torbjorn Granlund and Martin Boij.
- 
--Copyright 2008, 2009 Free Software Foundation, Inc.
-+Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -109,7 +109,8 @@
- {
-   mpz_t n, np, temp, primes[NRP];
-   int i, j, k, unique, destroy, res;
--  unsigned long int nrprimes, primebits, g, exp[NRP], e;
-+  unsigned long int nrprimes, primebits;
-+  mp_limb_t g, exp[NRP], e;
-   gmp_randstate_ptr rands;
- 
-   rands = RANDS;
-
diff --git a/patches/gmp/5.0.1/110-get-mpn_sub_1-size-argument-right.patch b/patches/gmp/5.0.1/110-get-mpn_sub_1-size-argument-right.patch
deleted file mode 100644
index 2e0a1af..0000000
--- a/patches/gmp/5.0.1/110-get-mpn_sub_1-size-argument-right.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
-    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
- 
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -28,7 +28,6 @@
- #include "gmp-impl.h"
- 
- 
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/patches/gmp/5.0.1/120-fix-r0-clobbering-issue.patch b/patches/gmp/5.0.1/120-fix-r0-clobbering-issue.patch
deleted file mode 100644
index d12d6b2..0000000
--- a/patches/gmp/5.0.1/120-fix-r0-clobbering-issue.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Removed ChangeLog part
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1342891151 -7200
-# Node ID 829215e83ff1db3cd00e510a737092df691442d5
-# Parent  816c18dbd492050ef8892e91602d9e758abc2988
-Fix r0 clobbering issue with "large" code affecting elf+darwin PIC.
-
-diff -r 816c18dbd492 -r 829215e83ff1 mpn/powerpc32/vmx/mod_34lsub1.asm
---- a/mpn/powerpc32/vmx/mod_34lsub1.asm	Tue Jun 19 15:02:48 2012 +0200
-+++ b/mpn/powerpc32/vmx/mod_34lsub1.asm	Sat Jul 21 19:19:11 2012 +0200
-@@ -1,6 +1,7 @@
- dnl  PowerPC-32 mpn_mod_34lsub1 -- mpn remainder mod 2^24-1.
- 
--dnl  Copyright 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+dnl  Copyright 2002, 2003, 2005, 2006, 2007, 2012 Free Software Foundation,
-+dnl  Inc.
- 
- dnl  This file is part of the GNU MP Library.
- 
-@@ -135,15 +136,15 @@
- 
- 	andi.	r7, up, 15
- 	vxor	a0, v0, v0
--	lis	r0, 0xaaaa
-+	lis	r9, 0xaaaa
- 	vxor	a1, v0, v0
--	ori	r0, r0, 0xaaab
-+	ori	r9, r9, 0xaaab
- 	vxor	a2, v0, v0
- 	li	r5, 16
- 	vxor	c0, v0, v0
- 	li	r6, 32
- 	vxor	c1, v0, v0
--	LEAL(	r11, cnsts)
-+	LEAL(	r11, cnsts)		C CAUTION clobbers r0 for elf, darwin
- 	vxor	c2, v0, v0
- 	vxor	z, v0, v0
- 
-@@ -158,7 +159,7 @@
- 	vsldoi	a2, z, a2, 12
- 
- 	addi	n, n, 9
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -174,7 +175,7 @@
- 	vsldoi	a1, z, a1, 8
- 
- 	addi	n, n, 6
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -188,7 +189,7 @@
- 	vsldoi	a0, z, a0, 4
- 
- 	addi	n, n, 3
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -197,7 +198,7 @@
- 	b	L(0)
- 
- L(aligned16):
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-
diff --git a/patches/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch b/patches/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch
deleted file mode 100644
index 2e0a1af..0000000
--- a/patches/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
-    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
- 
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -28,7 +28,6 @@
- #include "gmp-impl.h"
- 
- 
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/patches/gmp/5.0.2/120-fix-r0-clobbering-issue.patch b/patches/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
deleted file mode 100644
index d12d6b2..0000000
--- a/patches/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Removed ChangeLog part
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1342891151 -7200
-# Node ID 829215e83ff1db3cd00e510a737092df691442d5
-# Parent  816c18dbd492050ef8892e91602d9e758abc2988
-Fix r0 clobbering issue with "large" code affecting elf+darwin PIC.
-
-diff -r 816c18dbd492 -r 829215e83ff1 mpn/powerpc32/vmx/mod_34lsub1.asm
---- a/mpn/powerpc32/vmx/mod_34lsub1.asm	Tue Jun 19 15:02:48 2012 +0200
-+++ b/mpn/powerpc32/vmx/mod_34lsub1.asm	Sat Jul 21 19:19:11 2012 +0200
-@@ -1,6 +1,7 @@
- dnl  PowerPC-32 mpn_mod_34lsub1 -- mpn remainder mod 2^24-1.
- 
--dnl  Copyright 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+dnl  Copyright 2002, 2003, 2005, 2006, 2007, 2012 Free Software Foundation,
-+dnl  Inc.
- 
- dnl  This file is part of the GNU MP Library.
- 
-@@ -135,15 +136,15 @@
- 
- 	andi.	r7, up, 15
- 	vxor	a0, v0, v0
--	lis	r0, 0xaaaa
-+	lis	r9, 0xaaaa
- 	vxor	a1, v0, v0
--	ori	r0, r0, 0xaaab
-+	ori	r9, r9, 0xaaab
- 	vxor	a2, v0, v0
- 	li	r5, 16
- 	vxor	c0, v0, v0
- 	li	r6, 32
- 	vxor	c1, v0, v0
--	LEAL(	r11, cnsts)
-+	LEAL(	r11, cnsts)		C CAUTION clobbers r0 for elf, darwin
- 	vxor	c2, v0, v0
- 	vxor	z, v0, v0
- 
-@@ -158,7 +159,7 @@
- 	vsldoi	a2, z, a2, 12
- 
- 	addi	n, n, 9
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -174,7 +175,7 @@
- 	vsldoi	a1, z, a1, 8
- 
- 	addi	n, n, 6
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -188,7 +189,7 @@
- 	vsldoi	a0, z, a0, 4
- 
- 	addi	n, n, 3
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -197,7 +198,7 @@
- 	b	L(0)
- 
- L(aligned16):
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-
diff --git a/patches/gmp/5.1.1/100-fix-bulldozer-piledriver.patch b/patches/gmp/5.1.1/100-fix-bulldozer-piledriver.patch
deleted file mode 100644
index f6faca1..0000000
--- a/patches/gmp/5.1.1/100-fix-bulldozer-piledriver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1368052461 -7200
-# Node ID 11fbd825bc45385d00b69c30bd7566acee11f0d2
-# Parent  bd4c950486ab4c161ea69b91c25150719c3cb700
-Fix typo.
-
-diff -r bd4c950486ab -r 11fbd825bc45 mpn/x86_64/bd1/mul_1.asm
---- a/mpn/x86_64/bd1/mul_1.asm	Thu May 02 18:20:37 2013 +0200
-+++ b/mpn/x86_64/bd1/mul_1.asm	Thu May 09 00:34:21 2013 +0200
-@@ -53,7 +53,7 @@
- IFDOS(`	define(`v0', ``%r9'')	') dnl
- IFDOS(`	define(`r9', ``rdi'')	') dnl
- IFDOS(`	define(`n',  ``%r8'')	') dnl
--IFDOS(`	define(`r8', ``r11'')	') dnl
-+IFDOS(`	define(`r8', ``rbx'')	') dnl
- 
- ASM_START()
- 	TEXT
-
diff --git a/patches/gmp/5.1.1/110-mpz_powm_ui.patch b/patches/gmp/5.1.1/110-mpz_powm_ui.patch
deleted file mode 100644
index f0d240c..0000000
--- a/patches/gmp/5.1.1/110-mpz_powm_ui.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1363174284 -3600
-# Node ID ec4d88674036804b26f22c6a2bfca6ae1e92d370
-# Parent  e616ff715c34e112d0a5f7535d31ffe1194a5c7d
-(mod): Adhere to mpn_mu_div_qr's overlap requirements.
-
-diff -r e616ff715c34 -r ec4d88674036 mpz/powm_ui.c
---- a/mpz/powm_ui.c	Sun Feb 17 19:40:16 2013 +0100
-+++ b/mpz/powm_ui.c	Wed Mar 13 12:31:24 2013 +0100
-@@ -2,8 +2,8 @@
- 
-    Contributed to the GNU project by Torbjorn Granlund.
- 
--Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2005, 2008,
--2009, 2011, 2012 Free Software Foundation, Inc.
-+Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2005, 2008, 2009,
-+2011, 2012, 2013 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -70,9 +70,14 @@
-     }
-   else
-     {
-+      /* We need to allocate separate remainder area, since mpn_mu_div_qr does
-+	 not handle overlap between the numerator and remainder areas.
-+	 FIXME: Make it handle such overlap.  */
-+      mp_ptr rp = TMP_ALLOC_LIMBS (dn);
-       mp_size_t itch = mpn_mu_div_qr_itch (nn, dn, 0);
-       mp_ptr scratch = TMP_ALLOC_LIMBS (itch);
--      mpn_mu_div_qr (qp, np, np, nn, dp, dn, scratch);
-+      mpn_mu_div_qr (qp, rp, np, nn, dp, dn, scratch);
-+      MPN_COPY (np, rp, dn);
-     }
- 
-   TMP_FREE;
-
diff --git a/patches/gmp/5.1.1/120-fix-mpn_sbpi1_div_qr_sec.patch b/patches/gmp/5.1.1/120-fix-mpn_sbpi1_div_qr_sec.patch
deleted file mode 100644
index 13a50ad..0000000
--- a/patches/gmp/5.1.1/120-fix-mpn_sbpi1_div_qr_sec.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1373624469 -7200
-# Node ID a447c0c537891ed23edf180594a89616364ee633
-# Parent  6540e0b2925ead29f7158bb182e4fabfb9441433
-Partial rewrite.
-
-diff -r 6540e0b2925e -r a447c0c53789 mpn/generic/sbpi1_div_sec.c
---- a/mpn/generic/sbpi1_div_sec.c	Mon Jul 01 19:16:32 2013 +0200
-+++ b/mpn/generic/sbpi1_div_sec.c	Fri Jul 12 12:21:09 2013 +0200
-@@ -8,7 +8,7 @@
-    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
-    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
- 
--Copyright 2011, 2012 Free Software Foundation, Inc.
-+Copyright 2011, 2012, 2013 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -29,6 +29,28 @@
- #include "gmp-impl.h"
- #include "longlong.h"
- 
-+/* This side-channel silent division algorithm reduces the partial remainder by
-+   GMP_NUMB_BITS/2 bits at a time, compared to GMP_NUMB_BITS for the main
-+   division algorithm.  We do not insists on reducing by exactly
-+   GMP_NUMB_BITS/2, but may leave a partial remainder that is D*B^i to 3D*B^i
-+   too large (B is the limb base, D is the divisor, and i is the induction
-+   variable); the subsequent step will handle the extra partial remainder bits.
-+
-+   WIth that partial remainder reduction, each step generates a quotient "half
-+   limb".  The outer loop generates two quotient half limbs, an upper (q1h) and
-+   a lower (q0h) which are stored sparsely in separate limb arrays.  These
-+   arrays are added at the end; using separate arrays avoids data-dependent
-+   carry propagation which could else pose a side-channel leakage problem.
-+
-+   The quotient half limbs may be between -3 to 0 from the accurate value
-+   ("accurate" being the one which corresponds to a reduction to a principal
-+   partial remainder).  Too small quotient half limbs correspond to too large
-+   remainders, which we reduce later, as described above.
-+
-+   In order to keep quotients from getting too big, corresponding to a negative
-+   partial remainder, we use an inverse which is sligtly smaller than usually.
-+*/
-+
- #if OPERATION_sbpi1_div_qr_sec
- /* Needs (dn + 1) + (nn - dn) + (nn - dn) = 2nn - dn + 1 limbs at tp. */
- #define FNAME mpn_sbpi1_div_qr_sec
-@@ -49,7 +71,7 @@
-        mp_limb_t dinv,
-        mp_ptr tp)
- {
--  mp_limb_t nh, cy, q1h, q0h, dummy, h;
-+  mp_limb_t nh, cy, q1h, q0h, dummy, cnd;
-   mp_size_t i;
-   mp_ptr hp;
- #if OPERATION_sbpi1_div_qr_sec
-@@ -72,77 +94,69 @@
- #endif
-     }
- 
-+  /* Decremenet inverse to keep quotient half limbs from being too large.  */
-+  dinv -= dinv != 0;				/* FIXME: cmp-to-int */
-+
-   /* Create a divisor copy shifted half a limb.  */
-   hp = tp;					/* (dn + 1) limbs */
--  cy = mpn_lshift (hp, dp, dn, GMP_NUMB_BITS / 2);
--  hp[dn] = dp[dn - 1] >> GMP_NUMB_BITS / 2;
-+  hp[dn] = mpn_lshift (hp, dp, dn, GMP_NUMB_BITS / 2);
- 
- #if OPERATION_sbpi1_div_qr_sec
-   qlp = tp + (dn + 1);				/* (nn - dn) limbs */
-   qhp = tp + (nn + 1);				/* (nn - dn) limbs */
- #endif
- 
--  np += nn;
-+  np += nn - dn;
-+  nh = 0;
- 
--  /* Main loop.  Develop one full limb per iteration, but do it in two steps in
--     order to avoid conditionals.  Quotient bits will be either correct or
--     underestimates.  When a quotient is underestimated, the next quotient will
--     compensate, since quotients are to be added at consecutive weight distance
--     GMP_NUMB_BITS/2.  We make two quotient arrays, each with GMP_NUMB_BITS/2+2
--     bits per entry.  The arrays are added late after the loop.  Separate
--     arrays avoid data-dependent carry propagation.  */
--  nh = 0;
-   for (i = nn - dn - 1; i >= 0; i--)
-     {
-       np--;
- 
--      nh = (nh << GMP_NUMB_BITS/2) + (np[0] >> GMP_NUMB_BITS/2);
-+      nh = (nh << GMP_NUMB_BITS/2) + (np[dn] >> GMP_NUMB_BITS/2);
-       umul_ppmm (q1h, dummy, nh, dinv);
-       q1h += nh;
- #if OPERATION_sbpi1_div_qr_sec
-       qhp[i] = q1h;
- #endif
--      cy = mpn_submul_1 (np - dn, hp, dn + 1, q1h);
-+      mpn_submul_1 (np, hp, dn + 1, q1h);
- 
--      nh = np[0];
-+      nh = np[dn];
-       umul_ppmm (q0h, dummy, nh, dinv);
-       q0h += nh;
- #if OPERATION_sbpi1_div_qr_sec
-       qlp[i] = q0h;
- #endif
--      cy = mpn_submul_1 (np - dn, dp, dn, q0h);
--
--      nh -= cy;
-+      nh -= mpn_submul_1 (np, dp, dn, q0h);
-     }
- 
--  np[0] = nh;
--
--  np -= dn;
--
-   /* 1st adjustment depends on extra high remainder limb.  */
--  h = np[dn];
-+  cnd = nh != 0;				/* FIXME: cmp-to-int */
- #if OPERATION_sbpi1_div_qr_sec
--  qlp[0] += h;
-+  qlp[0] += cnd;
- #endif
--  h -= mpn_subcnd_n (np, np, dp, dn, h);
-+  nh -= mpn_subcnd_n (np, np, dp, dn, cnd);
- 
--  /* 2nd adjustment depends on remainder/divisor comparision as well as whether
-+  /* 2nd adjustment depends on remainder/divisor comparison as well as whether
-      extra remainder limb was nullified by previous subtract.  */
-   cy = mpn_sub_n (np, np, dp, dn);
--  cy = cy == h;				/* FIXME: might leak on some archs */
-+  cy = cy - nh;
- #if OPERATION_sbpi1_div_qr_sec
--  qlp[0] += cy;
-+  qlp[0] += 1 - cy;
- #endif
--  mpn_addcnd_n (np, np, dp, dn, 1 - cy);
-+  mpn_addcnd_n (np, np, dp, dn, cy);
- 
-+  /* 3rd adjustment depends on remainder/divisor comparison.  */
-+  cy = mpn_sub_n (np, np, dp, dn);
-+#if OPERATION_sbpi1_div_qr_sec
-+  qlp[0] += 1 - cy;
-+#endif
-+  mpn_addcnd_n (np, np, dp, dn, cy);
-+
-+#if OPERATION_sbpi1_div_qr_sec
-   /* Combine quotient halves into final quotient.  */
--#if OPERATION_sbpi1_div_qr_sec
--  qh = 0;
--  if (nn - dn != 0)
--    {
--      qh = mpn_lshift (qhp, qhp, nn - dn, GMP_NUMB_BITS/2);
--      qh += mpn_add_n (qp, qhp, qlp, nn - dn);
--    }
-+  qh = mpn_lshift (qhp, qhp, nn - dn, GMP_NUMB_BITS/2);
-+  qh += mpn_add_n (qp, qhp, qlp, nn - dn);
- 
-   return qh;
- #else
-
diff --git a/patches/gmp/5.1.1/130-do-not-clobber-f16-f18.patch b/patches/gmp/5.1.1/130-do-not-clobber-f16-f18.patch
deleted file mode 100644
index 9f9f470..0000000
--- a/patches/gmp/5.1.1/130-do-not-clobber-f16-f18.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1369216954 -7200
-# Node ID 394bdf8fdaee749660cc5680cc0636ea0242fae7
-# Parent  0771124b9f13b218a3f07f7dd7c127961974489d
-Don't clobber f16-f18.
-
-diff -r 0771124b9f13 -r 394bdf8fdaee mpn/ia64/divrem_2.asm
---- a/mpn/ia64/divrem_2.asm	Mon May 20 16:56:05 2013 +0200
-+++ b/mpn/ia64/divrem_2.asm	Wed May 22 12:02:34 2013 +0200
-@@ -1,6 +1,6 @@
- dnl  IA-64 mpn_divrem_2 -- Divide an mpn number by a normalized 2-limb number.
- 
--dnl  Copyright 2010 Free Software Foundation, Inc.
-+dnl  Copyright 2010, 2013 Free Software Foundation, Inc.
- 
- dnl  This file is part of the GNU MP Library.
- 
-@@ -98,17 +98,17 @@
- 	br.call.sptk.many b0 = mpn_invert_limb
- 	;;
- 	setf.sig f11 = r8		// di (non-final)
--	setf.sig f18 = r39		// d1
--	setf.sig f17 = r36		// d0
-+	setf.sig f34 = r39		// d1
-+	setf.sig f33 = r36		// d0
- 	mov	 r1 = r43
- 	;;
- 	mov	 r17 = 1
- 	setf.sig f9 = r38		// n2
--	xma.l	 f6 = f11, f18, f0	// t0 = LO(di * d1)
-+	xma.l	 f6 = f11, f34, f0	// t0 = LO(di * d1)
- 	;;
- 	setf.sig f10 = r37		// n1
- 	setf.sig f15 = r17		// 1
--	xma.hu	 f8 = f11, f17, f0	// s0 = HI(di * d0)
-+	xma.hu	 f8 = f11, f33, f0	// s0 = HI(di * d0)
- 	;;
- 	getf.sig r17 = f6
- 	getf.sig r16 = f8
-@@ -178,7 +178,7 @@
-   (p9)	br.cond.dptk .L52
- .L46:
- ')
--	setf.sig f16 = r8		// di
-+	setf.sig f32 = r8		// di
- 	shladd	 r32 = r35, 3, r32
- 	;;
- 
-@@ -189,8 +189,8 @@
- 	;;
-  (p8)	mov	 r37 = r0
-  (p9)	ld8	 r37 = [r34], -8
--	xma.hu	 f8 = f9, f16, f10	//				0,29
--	xma.l	 f12 = f9, f16, f10	//				0
-+	xma.hu	 f8 = f9, f32, f10	//				0,29
-+	xma.l	 f12 = f9, f32, f10	//				0
- 	;;
- 	getf.sig r20 = f12		// q0				4
- 	xma.l	 f13 = f15, f8, f9	// q += n2			4
-@@ -198,8 +198,8 @@
- 	;;
- 	getf.sig r18 = f13		//				8
- 	xma.l	 f7 = f14, f13, f10	//				8
--	xma.l	 f6 = f17, f13, f17	// t0 = LO(d0*q+d0)		8
--	xma.hu	 f9 = f17, f13, f17	// t1 = HI(d0*q+d0)		9
-+	xma.l	 f6 = f33, f13, f33	// t0 = LO(d0*q+d0)		8
-+	xma.hu	 f9 = f33, f13, f33	// t1 = HI(d0*q+d0)		9
- 	;;
- 	getf.sig r38 = f7		// n1				12
- 	getf.sig r16 = f6		//				13
-
diff --git a/patches/gmp/6.1.0/100-fix-broadwell-skylake.patch b/patches/gmp/6.1.0/100-fix-broadwell-skylake.patch
deleted file mode 100644
index 9afd339..0000000
--- a/patches/gmp/6.1.0/100-fix-broadwell-skylake.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <torbjorng@google.com>
-# Date 1450109109 -3600
-# Node ID 67d4ee9dead1ed8b1c9f4eb320ac72208fe1a015
-# Parent  20bf21d5f600710d62b040ea9b20da22871db1f1
-Add FUNC_EXITs.
-
-diff -r 20bf21d5f600 -r 67d4ee9dead1 NEWS
---- a/NEWS	Mon Dec 14 08:37:18 2015 +0100
-+++ b/NEWS	Mon Dec 14 17:05:09 2015 +0100
-@@ -4,6 +4,11 @@
- medium, provided this notice is preserved.
- 
- 
-+Changes between GMP version 6.1.1 and 6.1.0
-+
-+  BUGS FIXED
-+  * .
-+
- Changes between GMP version 6.0.* and 6.1.0
- 
-   BUGS FIXED
-diff -r 20bf21d5f600 -r 67d4ee9dead1 mpn/x86_64/coreibwl/mul_basecase.asm
---- a/mpn/x86_64/coreibwl/mul_basecase.asm	Mon Dec 14 08:37:18 2015 +0100
-+++ b/mpn/x86_64/coreibwl/mul_basecase.asm	Mon Dec 14 17:05:09 2015 +0100
-@@ -94,6 +94,7 @@
- 
- L(s11):	mov	%rax, (rp)
- 	mov	%r9, 8(rp)
-+	FUNC_EXIT()
- 	ret
- 
- L(s2x):	cmp	$2, vn
-@@ -105,6 +106,7 @@
- 	mov	%rax, (rp)
- 	mov	%r9, 8(rp)
- 	mov	%r10, 16(rp)
-+	FUNC_EXIT()
- 	ret
- 
- L(s22):	add	%r8, %r9		C 1
-@@ -121,6 +123,7 @@
- 	mov	%r9, 8(rp)
- 	mov	%r10, 16(rp)
- 	mov	%rdx, 24(rp)
-+	FUNC_EXIT()
- 	ret
- 
- 	ALIGN(16)
-@@ -294,6 +297,7 @@
- 	pop	%r12
- 	pop	%rbp
- 	pop	%rbx
-+	FUNC_EXIT()
- 	ret
- 
- L(f2):
-
diff --git a/patches/libelf/0.8.12/100-fix-64-bit-detection.patch b/patches/libelf/0.8.12/100-fix-64-bit-detection.patch
deleted file mode 100644
index 7995443..0000000
--- a/patches/libelf/0.8.12/100-fix-64-bit-detection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur libelf-0.8.10.orig/configure libelf-0.8.10/configure
---- libelf-0.8.10.orig/configure	2007-09-07 14:08:06.000000000 +0200
-+++ libelf-0.8.10/configure	2008-10-23 22:43:19.000000000 +0200
-@@ -1595,7 +1595,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_long_long=0
-+  ac_cv_sizeof_long_long=8
- else
-   cat > conftest.$ac_ext <<EOF
- #line 1602 "configure"
-diff -dur libelf-0.8.10.orig/configure.in libelf-0.8.10/configure.in
---- libelf-0.8.10.orig/configure.in	2007-09-07 14:07:59.000000000 +0200
-+++ libelf-0.8.10/configure.in	2008-10-23 22:43:10.000000000 +0200
-@@ -90,7 +90,7 @@
- AC_CHECK_SIZEOF(short,2)
- AC_CHECK_SIZEOF(int,4)
- AC_CHECK_SIZEOF(long,4)
--AC_CHECK_SIZEOF(long long,0)
-+AC_CHECK_SIZEOF(long long,8)
- # Windows port
- AC_CHECK_SIZEOF(__int64, 0)
- 
diff --git a/patches/libelf/0.8.13/100-fix-64-bit-detection.patch b/patches/libelf/0.8.13/100-fix-64-bit-detection.patch
deleted file mode 100644
index 7995443..0000000
--- a/patches/libelf/0.8.13/100-fix-64-bit-detection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur libelf-0.8.10.orig/configure libelf-0.8.10/configure
---- libelf-0.8.10.orig/configure	2007-09-07 14:08:06.000000000 +0200
-+++ libelf-0.8.10/configure	2008-10-23 22:43:19.000000000 +0200
-@@ -1595,7 +1595,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
--  ac_cv_sizeof_long_long=0
-+  ac_cv_sizeof_long_long=8
- else
-   cat > conftest.$ac_ext <<EOF
- #line 1602 "configure"
-diff -dur libelf-0.8.10.orig/configure.in libelf-0.8.10/configure.in
---- libelf-0.8.10.orig/configure.in	2007-09-07 14:07:59.000000000 +0200
-+++ libelf-0.8.10/configure.in	2008-10-23 22:43:10.000000000 +0200
-@@ -90,7 +90,7 @@
- AC_CHECK_SIZEOF(short,2)
- AC_CHECK_SIZEOF(int,4)
- AC_CHECK_SIZEOF(long,4)
--AC_CHECK_SIZEOF(long long,0)
-+AC_CHECK_SIZEOF(long long,8)
- # Windows port
- AC_CHECK_SIZEOF(__int64, 0)
- 
diff --git a/patches/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch b/patches/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch
deleted file mode 100644
index 382c841..0000000
--- a/patches/libiconv/1.14/100-srclib_stdio.in.h-remove-gets-declarations.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -r -u libiconv-1.14/srclib/stdio.in.h.orig libiconv-1.14/srclib/stdio.in.h
---- libiconv-1.14/srclib/stdio.in.h.orig	2013-02-22 13:52:46.336327969 -0600
-+++ libiconv-1.14/srclib/stdio.in.h	2013-02-22 13:54:27.948207059 -0600
-@@ -679,22 +679,11 @@
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
diff --git a/patches/libtool/2.4.6/2.4.5-pass-ldflags.patch b/patches/libtool/2.4.6/2.4.5-pass-ldflags.patch
deleted file mode 100644
index d35e343..0000000
--- a/patches/libtool/2.4.6/2.4.5-pass-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libtool-2.4.5.orig/build-aux/ltmain.in	2015-01-16 12:52:04.000000000 -0600
-+++ libtool-2.4.5/build-aux/ltmain.in	2015-02-07 22:45:14.421079200 -0600
-@@ -5356,7 +5356,8 @@ func_mode_link ()
-       # -stdlib=*            select c++ std lib with clang
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+      -shared-libgcc|-static-libgcc|-static-libgfortran|-static-libstdc++)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
diff --git a/patches/ltrace/0.5.2/100-allow-cross-compile.patch b/patches/ltrace/0.5.2/100-allow-cross-compile.patch
deleted file mode 100644
index 10440ad..0000000
--- a/patches/ltrace/0.5.2/100-allow-cross-compile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -durN ltrace-0.5.2.orig/Makefile.in ltrace-0.5.2/Makefile.in
---- ltrace-0.5.2.orig/Makefile.in	2009-05-21 19:14:54.000000000 +0200
-+++ ltrace-0.5.2/Makefile.in	2009-06-27 15:30:34.000000000 +0200
-@@ -2,8 +2,14 @@
- # ltrace's Makefile.in
- #
- 
--#OS		:= $(shell uname -s)
- OS		:= @HOST_OS@
-+ARCH		:= $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/      \
-+						   -e s/sun4u/sparc64/  \
-+						   -e s/arm.*/arm/      \
-+						   -e s/sa110/arm/      \
-+						   -e s/ppc64/ppc/      \
-+						   -e s/s390x/s390/)
-+export ARCH
- 
- TOPDIR		= $(shell pwd)
- 
-diff -durN ltrace-0.5.2.orig/configure ltrace-0.5.2/configure
---- ltrace-0.5.2.orig/configure	2009-05-21 19:14:57.000000000 +0200
-+++ ltrace-0.5.2/configure	2009-06-27 15:30:34.000000000 +0200
-@@ -660,6 +660,7 @@
- host_cpu
- host_vendor
- host_os
-+HOST_ARCH
- HOST_OS
- CC
- CFLAGS
-@@ -1823,6 +1824,7 @@
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
- 
-+HOST_ARCH="$host_cpu"
- case "$host_os" in
-   linux-gnu*) host_os=linux-gnu
- esac
-@@ -5406,6 +5408,7 @@
- host_cpu!$host_cpu$ac_delim
- host_vendor!$host_vendor$ac_delim
- host_os!$host_os$ac_delim
-+HOST_ARCH!$HOST_ARCH$ac_delim
- HOST_OS!$HOST_OS$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
-@@ -5426,7 +5429,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -durN ltrace-0.5.2.orig/configure.ac ltrace-0.5.2/configure.ac
---- ltrace-0.5.2.orig/configure.ac	2009-05-21 19:14:54.000000000 +0200
-+++ ltrace-0.5.2/configure.ac	2009-06-27 15:30:34.000000000 +0200
-@@ -11,6 +11,8 @@
- esac
- HOST_OS="$host_os"
- AC_SUBST(HOST_OS)
-+HOST_ARCH="$host_cpu"
-+AC_SUBST(HOST_ARCH)
- 
- dnl Checks for programs.
- AC_PROG_CC
-diff -durN ltrace-0.5.2.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.2/sysdeps/linux-gnu/Makefile
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/Makefile	2009-05-21 19:14:54.000000000 +0200
-+++ ltrace-0.5.2/sysdeps/linux-gnu/Makefile	2009-06-27 15:30:34.000000000 +0200
-@@ -1,6 +1,3 @@
--ARCH		:=	$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
--			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
--
- CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
- 
- OBJ		=	events.o trace.o proc.o breakpoint.o
diff --git a/patches/ltrace/0.5.2/110-alpha-support.patch b/patches/ltrace/0.5.2/110-alpha-support.patch
deleted file mode 100644
index f121ca1..0000000
--- a/patches/ltrace/0.5.2/110-alpha-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -durN ltrace-0.5.2.orig/Makefile.in ltrace-0.5.2/Makefile.in
---- ltrace-0.5.2.orig/Makefile.in	2009-06-27 15:34:04.000000000 +0200
-+++ ltrace-0.5.2/Makefile.in	2009-06-27 15:34:27.000000000 +0200
-@@ -5,6 +5,7 @@
- OS		:= @HOST_OS@
- ARCH		:= $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/      \
- 						   -e s/sun4u/sparc64/  \
-+						   -e s/alpha.*/alpha/  \
- 						   -e s/arm.*/arm/      \
- 						   -e s/sa110/arm/      \
- 						   -e s/ppc64/ppc/      \
diff --git a/patches/ltrace/0.5.2/120-debian-ltrace-0.5.2-2.patch b/patches/ltrace/0.5.2/120-debian-ltrace-0.5.2-2.patch
deleted file mode 100644
index 6d62315..0000000
--- a/patches/ltrace/0.5.2/120-debian-ltrace-0.5.2-2.patch
+++ /dev/null
@@ -1,240 +0,0 @@
---- ltrace-0.5.2.orig/TODO
-+++ ltrace-0.5.2/TODO
-@@ -37,3 +37,4 @@
- * debug: change "-d" option to be something like "-d elf,events", or "-d breakpoints"
- * Find out if a process is sharing memory with its parent?
- * When using -p, find out if that process is sharing memory with other procs
-+* After a clone(), syscalls may be seen as sysrets in s390 (see trace.c:syscall_p())
---- ltrace-0.5.2.orig/process_event.c
-+++ ltrace-0.5.2/process_event.c
-@@ -170,7 +170,7 @@
- 			enable_breakpoint(proc->pid, proc->breakpoint_being_enabled);
- 			proc->breakpoint_being_enabled = NULL;
- 		}
--		if (proc->parent->state == STATE_ATTACHED && options.follow) {
-+		if (options.follow) {
- 			proc->state = STATE_ATTACHED;
- 		} else {
- 			proc->state = STATE_IGNORED;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/ppc/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/ppc/trace.c
-@@ -50,9 +50,9 @@
- 			*sysnum =
- 			    (int)ptrace(PTRACE_PEEKUSER, proc->pid,
- 					sizeof(long) * PT_R0, 0);
--			if (proc->callstack_depth > 0
--			    && proc->callstack[proc->callstack_depth -
--					       1].is_syscall) {
-+			if (proc->callstack_depth > 0 &&
-+					proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+					proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			}
- 			return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/i386/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/i386/trace.c
-@@ -32,7 +32,8 @@
- 		*sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 4 * ORIG_EAX, 0);
- 
- 		if (proc->callstack_depth > 0 &&
--		    proc->callstack[proc->callstack_depth - 1].is_syscall) {
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 			return 2;
- 		}
- 
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/ia64/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/ia64/trace.c
-@@ -106,8 +106,8 @@
- 		if (insn == 0x1000000000 || insn == 0x1ffffffffff) {
- 			*sysnum = r15;
- 			if (proc->callstack_depth > 0 &&
--			    proc->callstack[proc->callstack_depth -
--					    1].is_syscall) {
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			}
- 			return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/m68k/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/m68k/trace.c
-@@ -36,9 +36,8 @@
- 		if (*sysnum >= 0) {
- 			depth = proc->callstack_depth;
- 			if (depth > 0 &&
--			    proc->callstack[depth - 1].is_syscall &&
--			    proc->callstack[depth - 1].c_un.syscall ==
--			    *sysnum) {
-+					proc->callstack[depth - 1].is_syscall &&
-+					proc->callstack[depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			} else {
- 				return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/alpha/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/alpha/trace.c
-@@ -36,8 +36,9 @@
- 			return 0;
- 		*sysnum =
- 		    ptrace(PTRACE_PEEKUSER, proc->pid, 0 /* REG_R0 */ , 0);
--		if (proc->callstack_depth > 0
--		    && proc->callstack[proc->callstack_depth - 1].is_syscall) {
-+		if (proc->callstack_depth > 0 &&
-+		    proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+			proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 			return 2;
- 		}
- 		if (*sysnum >= 0 && *sysnum < 500) {
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/sparc/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/sparc/trace.c
-@@ -33,9 +33,9 @@
- 		insn = ptrace(PTRACE_PEEKTEXT, proc->pid, ip, 0);
- 		if ((insn & 0xc1f8007f) == 0x81d00010) {
- 			*sysnum = ((proc_archdep *) proc->arch_ptr)->regs.r_g1;
--			if ((proc->callstack_depth > 0)
--			    && proc->callstack[proc->callstack_depth -
--					       1].is_syscall) {
-+			if (proc->callstack_depth > 0 &&
-+					proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+					proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 				return 2;
- 			} else if (*sysnum >= 0) {
- 				return 1;
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/mipsel/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/mipsel/trace.c
-@@ -60,33 +60,34 @@
- int
- syscall_p(Process *proc, int status, int *sysnum) {
- 	if (WIFSTOPPED(status)
--	    && WSTOPSIG(status) == (SIGTRAP | proc->tracesysgood)) {
--       /* get the user's pc (plus 8) */
--       long pc = (long)get_instruction_pointer(proc);
--       /* fetch the SWI instruction */
--       int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 4, 0);
--       int num = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 8, 0);
--       
--/*
--  On a mipsel,  syscall looks like:
--  24040fa1    li v0, 0x0fa1   # 4001 --> _exit syscall
--  0000000c    syscall
-- */
--      if(insn!=0x0000000c){
--          return 0;
--      }
--
--      *sysnum = (num & 0xFFFF) - 4000;
--      /* if it is a syscall, return 1 or 2 */
--      if (proc->callstack_depth > 0 &&
--          proc->callstack[proc->callstack_depth - 1].is_syscall) {
--          return 2;
--      }
--      
--      if (*sysnum >= 0) {
--          return 1;
--      }
--   }
-+			&& WSTOPSIG(status) == (SIGTRAP | proc->tracesysgood)) {
-+		/* get the user's pc (plus 8) */
-+		long pc = (long)get_instruction_pointer(proc);
-+		/* fetch the SWI instruction */
-+		int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 4, 0);
-+		int num = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 8, 0);
-+
-+		/*
-+		   On a mipsel,  syscall looks like:
-+		   24040fa1    li v0, 0x0fa1   # 4001 --> _exit syscall
-+		   0000000c    syscall
-+		 */
-+		if(insn!=0x0000000c){
-+			return 0;
-+		}
-+
-+		*sysnum = (num & 0xFFFF) - 4000;
-+		/* if it is a syscall, return 1 or 2 */
-+		if (proc->callstack_depth > 0 &&
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
-+			return 2;
-+		}
-+
-+		if (*sysnum >= 0) {
-+			return 1;
-+		}
-+	}
- 	return 0;
- }
- /**
-@@ -119,34 +120,34 @@
- */
- long
- gimme_arg(enum tof type, Process *proc, int arg_num, arg_type_info *info) {
--    long ret;
--    debug(2,"type %d arg %d",type,arg_num);
--    if (type == LT_TOF_FUNCTION || type == LT_TOF_SYSCALL){
--        if(arg_num <4){
--            ret=ptrace(PTRACE_PEEKUSER,proc->pid,off_a0+arg_num,0);
--            debug(2,"ret = %#lx",ret);
--            return ret;
--        } else {
--            // If we need this, I think we can look at [sp+16] for arg_num==4.
--            CP;
--            return 0;
--        }
--    } 
--    if(arg_num>=0){
--       fprintf(stderr,"args on return?");
--    }
--    if(type == LT_TOF_FUNCTIONR) {
--        return  ptrace(PTRACE_PEEKUSER,proc->pid,off_v0,0);
--    }
--    if (type == LT_TOF_SYSCALLR) {
--        unsigned a3=ptrace(PTRACE_PEEKUSER, proc->pid,off_a3,0);
--        unsigned v0=ptrace(PTRACE_PEEKUSER, proc->pid,off_v0,0);
--        if(!a3){
--            return v0;
--        }
--        return -1;
--    }
--    fprintf(stderr, "gimme_arg called with wrong arguments\n");
-+	long ret;
-+	debug(2,"type %d arg %d",type,arg_num);
-+	if (type == LT_TOF_FUNCTION || type == LT_TOF_SYSCALL){
-+		if(arg_num <4){
-+			ret=ptrace(PTRACE_PEEKUSER,proc->pid,off_a0+arg_num,0);
-+			debug(2,"ret = %#lx",ret);
-+			return ret;
-+		} else {
-+			// If we need this, I think we can look at [sp+16] for arg_num==4.
-+			CP;
-+			return 0;
-+		}
-+	} 
-+	if(arg_num>=0){
-+		fprintf(stderr,"args on return?");
-+	}
-+	if(type == LT_TOF_FUNCTIONR) {
-+		return  ptrace(PTRACE_PEEKUSER,proc->pid,off_v0,0);
-+	}
-+	if (type == LT_TOF_SYSCALLR) {
-+		unsigned a3=ptrace(PTRACE_PEEKUSER, proc->pid,off_a3,0);
-+		unsigned v0=ptrace(PTRACE_PEEKUSER, proc->pid,off_v0,0);
-+		if(!a3){
-+			return v0;
-+		}
-+		return -1;
-+	}
-+	fprintf(stderr, "gimme_arg called with wrong arguments\n");
- 	return 0;
- }
- 
---- ltrace-0.5.2.orig/sysdeps/linux-gnu/x86_64/trace.c
-+++ ltrace-0.5.2/sysdeps/linux-gnu/x86_64/trace.c
-@@ -41,7 +41,8 @@
- 		*sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 8 * ORIG_RAX, 0);
- 
- 		if (proc->callstack_depth > 0 &&
--		    proc->callstack[proc->callstack_depth - 1].is_syscall) {
-+				proc->callstack[proc->callstack_depth - 1].is_syscall &&
-+				proc->callstack[proc->callstack_depth - 1].c_un.syscall == *sysnum) {
- 			return 2;
- 		}
- 
diff --git a/patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.patch b/patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.patch
deleted file mode 100644
index 20396d6..0000000
--- a/patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -durN ltrace-0.5.2.orig/configure ltrace-0.5.2/configure
---- ltrace-0.5.2.orig/configure	2009-09-14 18:47:45.000000000 +0200
-+++ ltrace-0.5.2/configure	2009-09-14 18:49:18.000000000 +0200
-@@ -1829,6 +1829,9 @@
-   linux-gnu*) host_os=linux-gnu
- esac
- HOST_OS="$host_os"
-+case "${HOST_OS}" in
-+  linux-*) HOST_OS=linux-gnu;;
-+esac
- 
- 
- ac_ext=c
-diff -durN ltrace-0.5.2.orig/configure.ac ltrace-0.5.2/configure.ac
---- ltrace-0.5.2.orig/configure.ac	2009-09-14 18:47:45.000000000 +0200
-+++ ltrace-0.5.2/configure.ac	2009-09-14 18:49:18.000000000 +0200
-@@ -10,6 +10,9 @@
-   linux-gnu*) host_os=linux-gnu
- esac
- HOST_OS="$host_os"
-+case "${HOST_OS}" in
-+  linux-*) HOST_OS=linux-gnu;;
-+esac
- AC_SUBST(HOST_OS)
- HOST_ARCH="$host_cpu"
- AC_SUBST(HOST_ARCH)
diff --git a/patches/ltrace/0.5.3/100-allow-cross-compile.patch b/patches/ltrace/0.5.3/100-allow-cross-compile.patch
deleted file mode 100644
index 58572cd..0000000
--- a/patches/ltrace/0.5.3/100-allow-cross-compile.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
-
-http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
-
-Index: ltrace-0.5.3/common.h
-===================================================================
---- ltrace-0.5.3.orig/common.h	2009-10-23 23:13:45.700282578 -0700
-+++ ltrace-0.5.3/common.h	2009-10-23 23:14:13.550371553 -0700
-@@ -1,3 +1,5 @@
-+#ifndef COMMON_H
-+#define COMMON_H
- #include <sys/types.h>
- #include <sys/time.h>
- #include <stdio.h>
-@@ -251,3 +253,5 @@ extern void * sym2addr(Process *, struct
- #if 0				/* not yet */
- extern int umoven(Process * proc, void * addr, int len, void * laddr);
- #endif
-+#endif
-+
-Index: ltrace-0.5.3/configure
-===================================================================
---- ltrace-0.5.3.orig/configure	2009-10-23 23:13:45.630316494 -0700
-+++ ltrace-0.5.3/configure	2009-10-23 23:13:59.672869527 -0700
-@@ -30,7 +30,7 @@ int main () {
-   return cplus_demangle();
- }
- EOF
--if gcc conftest.c -liberty 2>/dev/null
-+if $CC conftest.c -liberty 2>/dev/null
- then
-   HAVE_LIBIBERTY=1
-   echo "yes"
-@@ -48,7 +48,7 @@ int main () {
-   return __cxa_demangle();
- }
- EOF
--if gcc conftest.c -lsupc++ 2>/dev/null
-+if $CC conftest.c -lsupc++ 2>/dev/null
- then
-   HAVE_LIBSUPC__=1
-   echo "yes"
-@@ -67,7 +67,7 @@ int main () {
-   return 0;
- }
- EOF
--if gcc conftest.c 2>/dev/null
-+if $CC conftest.c 2>/dev/null
- then
-   HAVE_ELF_C_READ_MMAP=1
-   echo "yes"
-@@ -77,15 +77,12 @@ else
- fi
- rm -f conftest.c a.out
- 
--CC=gcc
--CPPFLAGS=' -I /usr/include/libelf'
- CFLAGS='-g -O2'
- LIBS='-lelf -lsupc++ -liberty '
--INSTALL='/usr/bin/install -c'
-+INSTALL='install -c'
- iquote='-iquote '
- iquoteend=''
- 
--prefix=/usr/local
- sysconfdir='${prefix}/etc'
- bindir='${prefix}/bin'
- mandir='${prefix}/share/man'
-Index: ltrace-0.5.3/debug.h
-===================================================================
---- ltrace-0.5.3.orig/debug.h	2009-10-23 23:13:45.670276809 -0700
-+++ ltrace-0.5.3/debug.h	2009-10-23 23:14:26.440319785 -0700
-@@ -1,3 +1,5 @@
-+#ifndef DEBUG_H
-+#define DEBUG_H
- #include <features.h>
- 
- /* debug levels:
-@@ -14,4 +16,4 @@ void debug_(int level, const char *file,
- int xinfdump(long, void *, int);
- 
- # define debug(level, expr...) debug_(level, __FILE__, __LINE__, expr)
--
-+#endif
diff --git a/patches/ltrace/0.5.3/110-alpha-support.patch b/patches/ltrace/0.5.3/110-alpha-support.patch
deleted file mode 100644
index 838b84b..0000000
--- a/patches/ltrace/0.5.3/110-alpha-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.3/sysdeps/linux-gnu/Makefile
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile	2009-07-25 17:13:02.000000000 +0200
-+++ ltrace-0.5.3/sysdeps/linux-gnu/Makefile	2010-01-01 22:20:45.000000000 +0100
-@@ -2,6 +2,7 @@
- 				-e s/i.86/i386/ \
- 				-e s/sun4u/sparc64/ \
- 				-e s/sparc64/sparc/ \
-+				-e s/alpha.*/alpha/ \
- 				-e s/arm.*/arm/ \
- 				-e s/sa110/arm/ \
- 				-e s/ppc64/ppc/ \
diff --git a/patches/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch b/patches/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch
deleted file mode 100644
index 483c743..0000000
--- a/patches/ltrace/0.5.3/120-debian-ltrace_0.5.3-2.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Debian patch courtesy of the Debian ltrace maintainer Juan Cespedes <cespedes@debian.org>
-
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/breakpoint.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/breakpoint.c
-@@ -6,8 +6,6 @@
- #include "common.h"
- #include "arch.h"
- 
--static unsigned char break_insn[] = BREAKPOINT_VALUE;
--
- #ifdef ARCH_HAVE_ENABLE_BREAKPOINT
- extern void arch_enable_breakpoint(pid_t, Breakpoint *);
- void
-@@ -20,6 +18,9 @@
- 	arch_enable_breakpoint(pid, sbp);
- }
- #else
-+
-+static unsigned char break_insn[] = BREAKPOINT_VALUE;
-+
- void
- enable_breakpoint(pid_t pid, Breakpoint *sbp) {
- 	unsigned int i, j;
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/arm/breakpoint.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/arm/breakpoint.c
-@@ -24,10 +24,7 @@
- 
- #include <sys/ptrace.h>
- #include "config.h"
--#include "arch.h"
--#include "options.h"
--#include "output.h"
--#include "debug.h"
-+#include "common.h"
- 
- void
- arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
-@@ -59,8 +56,6 @@
- void
- arch_disable_breakpoint(pid_t pid, const Breakpoint *sbp) {
- 	unsigned int i, j;
--	const unsigned char break_insn[] = BREAKPOINT_VALUE;
--	const unsigned char thumb_break_insn[] = THUMB_BREAKPOINT_VALUE;
- 
- 	debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr);
- 
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/plt.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/plt.c
-@@ -1,4 +1,5 @@
- #include <gelf.h>
-+#include <sys/ptrace.h>
- #include "common.h"
- 
- /* A bundle is 128 bits */
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/breakpoint.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/breakpoint.c
-@@ -6,10 +6,7 @@
- 
- #include <sys/ptrace.h>
- #include <string.h>
--#include "arch.h"
--#include "options.h"
--#include "output.h"
--#include "debug.h"
-+#include "common.h"
- 
- static long long
- extract_bit_field(char *bundle, int from, int len) {
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ia64/regs.c
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ia64/regs.c
-@@ -7,7 +7,6 @@
- #include <asm/rse.h>
- 
- #include <stddef.h>
--#include "debug.h"
- #include "common.h"
- 
- void *
diff --git a/patches/ltrace/0.5.3/130-add-sysdep.patch b/patches/ltrace/0.5.3/130-add-sysdep.patch
deleted file mode 100644
index 6fd8d26..0000000
--- a/patches/ltrace/0.5.3/130-add-sysdep.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
-
-http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
-
-Index: ltrace-0.5.3/Makefile.in
-===================================================================
---- ltrace-0.5.3.orig/Makefile.in	2009-10-23 22:06:08.130304691 -0700
-+++ ltrace-0.5.3/Makefile.in	2009-10-23 22:06:53.160369614 -0700
-@@ -39,6 +39,8 @@ ltrace:		main.o libltrace.a
- libltrace.a: 	sysdeps/sysdep.o $(OBJ)
- 		$(AR) rcv $@ $^
- 
-+$(OBJ):		sysdeps/sysdep.o
-+
- sysdeps/sysdep.o: dummy
- 		$(MAKE) -C sysdeps/$(OS)
- 
diff --git a/patches/ltrace/0.5.3/140-mips-remove-CP.patch b/patches/ltrace/0.5.3/140-mips-remove-CP.patch
deleted file mode 100644
index 4532a8f..0000000
--- a/patches/ltrace/0.5.3/140-mips-remove-CP.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
-
-http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
-
-Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/trace.c
-===================================================================
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/trace.c	2009-10-23 23:15:59.822783128 -0700
-+++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/trace.c	2009-10-23 23:16:10.441268788 -0700
-@@ -127,7 +127,6 @@ gimme_arg(enum tof type, Process *proc, 
- 			return ret;
- 		} else {
- 			// If we need this, I think we can look at [sp+16] for arg_num==4.
--			CP;
- 			return 0;
- 		}
- 	}
diff --git a/patches/ltrace/0.5.3/140-mips.patch b/patches/ltrace/0.5.3/140-mips.patch
deleted file mode 100644
index b01b7a9..0000000
--- a/patches/ltrace/0.5.3/140-mips.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-This patch is courtesy of OpenEmbedded, by Khem Raj <raj.khem@gmail.com>
-
-http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=b85b779688f0abc389e3c25d06b54de8b86385c1
-
-Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/plt.c
-===================================================================
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/plt.c	2009-10-23 23:25:59.292780574 -0700
-+++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/plt.c	2009-10-23 23:26:22.671522220 -0700
-@@ -1,4 +1,4 @@
--#include <debug.h>
-+#include "debug.h"
- #include <gelf.h>
- #include <sys/ptrace.h>
- #include "common.h"
-Index: ltrace-0.5.3/sysdeps/linux-gnu/mipsel/regs.c
-===================================================================
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/mipsel/regs.c	2009-10-23 23:25:59.312777529 -0700
-+++ ltrace-0.5.3/sysdeps/linux-gnu/mipsel/regs.c	2009-10-23 23:26:08.190311896 -0700
-@@ -4,7 +4,6 @@
- #include <sys/types.h>
- #include <sys/ptrace.h>
- #include <asm/ptrace.h>
--#include <linux/user.h>
- 
- #include "common.h"
- #include "mipsel.h"
-Index: ltrace-0.5.3/handle_event.c
-===================================================================
---- ltrace-0.5.3.orig/handle_event.c	2009-10-23 23:29:48.780274445 -0700
-+++ ltrace-0.5.3/handle_event.c	2009-10-23 23:37:32.260284055 -0700
-@@ -573,7 +573,8 @@ handle_breakpoint(Event *event) {
- 			void *old_addr;
- 			struct library_symbol *sym= event->proc->callstack[i].c_un.libfunc;
- 			assert(sym);
--			old_addr = dict_find_entry(event->proc->breakpoints, sym2addr(event->proc, sym))->addr;
-+			struct Breakpoint *tbp = dict_find_entry(event->proc->breakpoints, sym2addr(event->proc, sym));
-+			old_addr = tbp->addr;
- 			addr=sym2addr(event->proc,sym);
- 			assert(old_addr !=0 && addr !=0);
- 			if(addr != old_addr){
diff --git a/patches/ltrace/0.5.3/150-allow-configurable-arch.patch b/patches/ltrace/0.5.3/150-allow-configurable-arch.patch
deleted file mode 100644
index 7208ca8..0000000
--- a/patches/ltrace/0.5.3/150-allow-configurable-arch.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-This patch is to ensure the proper ARCH is selected when cross compiling.  Make
-sure to call the configure script with, e.g., HOST=arm ./configure to select 
-the arm sysdeps.
-
-	Joachim Nilsson <jocke@vmlinux.org>
-
-diff -ru ltrace-0.5.3.orig/configure ltrace-0.5.3/configure
---- ltrace-0.5.3.orig/configure	2010-01-02 11:05:55.000000000 +0100
-+++ ltrace-0.5.3/configure	2010-01-02 20:49:11.000000000 +0100
-@@ -110,7 +110,7 @@
- #
- # Makefile.in -> Makefile
- #
--x_subst_vars='PACKAGE_VERSION HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
-+x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
- 
- for i in $x_subst_vars
- do
-Only in ltrace-0.5.3: configure~
-diff -ru ltrace-0.5.3.orig/Makefile.in ltrace-0.5.3/Makefile.in
---- ltrace-0.5.3.orig/Makefile.in	2010-01-02 11:05:55.000000000 +0100
-+++ ltrace-0.5.3/Makefile.in	2010-01-03 01:28:41.000000000 +0100
-@@ -1,10 +1,12 @@
- #
- # ltrace's Makefile.in
- #
--
-+MY_TARGET       = @HOST@
-+ifdef MY_TARGET
-+ARCH            = $(MY_TARGET)
-+endif
- #OS		:= $(shell uname -s)
- OS		:= @HOST_OS@
--
- TOPDIR		= $(shell pwd)
- 
- prefix		= @prefix@
-Only in ltrace-0.5.3: Makefile.in~
-diff -ru ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.3/sysdeps/linux-gnu/Makefile
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/Makefile	2010-01-02 11:05:55.000000000 +0100
-+++ ltrace-0.5.3/sysdeps/linux-gnu/Makefile	2010-01-02 20:49:51.000000000 +0100
-@@ -1,4 +1,4 @@
--ARCH		:=	$(shell uname -m | sed \
-+ARCH		?=	$(shell uname -m | sed \
- 				-e s/i.86/i386/ \
- 				-e s/sun4u/sparc64/ \
- 				-e s/sparc64/sparc/ \
-Only in ltrace-0.5.3/sysdeps/linux-gnu: Makefile~
diff --git a/patches/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch b/patches/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch
deleted file mode 100644
index b57a166..0000000
--- a/patches/ltrace/0.5.3/160-fix-missing-ptrace-defines.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-This patch tries to fix the issue when PTRACE_EVENT_FORK is not found in the standard
-system headers.  The begininngs of this was already in place in trace.c, this patch
-only takes that idea and puts it in a shared include file for trace.c *and* events.c.
-The latter of which otherwise fails to build on Arm.
-
-	Joachim Nilsson <jocke@vmlinux.org>
-
-diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/events.c ltrace-0.5.3/sysdeps/linux-gnu/events.c
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/events.c	2009-07-25 17:13:02.000000000 +0200
-+++ ltrace-0.5.3/sysdeps/linux-gnu/events.c	2010-01-03 14:33:46.000000000 +0100
-@@ -7,9 +7,8 @@
- #include <errno.h>
- #include <signal.h>
- #include <string.h>
--#include <sys/ptrace.h>
- 
--#include "common.h"
-+#include "trace.h"
- 
- static Event event;
- 
-diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.c ltrace-0.5.3/sysdeps/linux-gnu/trace.c
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.c	2009-07-25 17:13:02.000000000 +0200
-+++ ltrace-0.5.3/sysdeps/linux-gnu/trace.c	2010-01-03 14:33:38.000000000 +0100
-@@ -5,10 +5,9 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
--#include "ptrace.h"
- #include <asm/unistd.h>
- 
--#include "common.h"
-+#include "trace.h"
- 
- /* If the system headers did not provide the constants, hard-code the normal
-    values.  */
-diff -ruN ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.h ltrace-0.5.3/sysdeps/linux-gnu/trace.h
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/trace.h	1970-01-01 01:00:00.000000000 +0100
-+++ ltrace-0.5.3/sysdeps/linux-gnu/trace.h	2010-01-03 14:33:26.000000000 +0100
-@@ -0,0 +1,32 @@
-+/* If the system headers did not provide the constants, hard-code the normal values. */
-+#ifndef __SYSDEPS_TRACE_H__
-+#define __SYSDEPS_TRACE_H__
-+
-+#include "ptrace.h"
-+#include "common.h"
-+
-+#ifndef PTRACE_EVENT_FORK
-+#warning  PTRACE_EVENT_FORK not found... redefining.
-+#define PTRACE_OLDSETOPTIONS    21
-+#define PTRACE_SETOPTIONS       0x4200
-+#define PTRACE_GETEVENTMSG      0x4201
-+
-+/* options set using PTRACE_SETOPTIONS */
-+#define PTRACE_O_TRACESYSGOOD   0x00000001
-+#define PTRACE_O_TRACEFORK      0x00000002
-+#define PTRACE_O_TRACEVFORK     0x00000004
-+#define PTRACE_O_TRACECLONE     0x00000008
-+#define PTRACE_O_TRACEEXEC      0x00000010
-+#define PTRACE_O_TRACEVFORKDONE 0x00000020
-+#define PTRACE_O_TRACEEXIT      0x00000040
-+
-+/* Wait extended result codes for the above trace options.  */
-+#define PTRACE_EVENT_FORK       1
-+#define PTRACE_EVENT_VFORK      2
-+#define PTRACE_EVENT_CLONE      3
-+#define PTRACE_EVENT_EXEC       4
-+#define PTRACE_EVENT_VFORK_DONE 5
-+#define PTRACE_EVENT_EXIT       6
-+
-+#endif /* PTRACE_EVENT_FORK */
-+#endif /* __SYSDEPS_TRACE_H__ */
---- ltrace-0.5.3.orig/sysdeps/linux-gnu/ppc/plt.c	2009-07-25 09:13:02.000000000 -0600
-+++ ltrace-0.5.3/sysdeps/linux-gnu/ppc/plt.c	2010-09-28 18:30:07.091618190 -0600
-@@ -1,5 +1,6 @@
- #include <gelf.h>
- #include "common.h"
-+#include "ptrace.h"
- 
- GElf_Addr
- arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) {
diff --git a/patches/ltrace/0.5.3/170-lib-supcc.patch b/patches/ltrace/0.5.3/170-lib-supcc.patch
deleted file mode 100644
index 8842b91..0000000
--- a/patches/ltrace/0.5.3/170-lib-supcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: ltrace-0.5.3/configure
-===================================================================
---- ltrace-0.5.3/configure
-+++ ltrace-0.5.3/configure
-@@ -78,7 +78,10 @@ fi
- rm -f conftest.c a.out
- 
- CFLAGS='-g -O2'
--LIBS='-lelf -lsupc++ -liberty '
-+LIBS='-lelf'
-+[ -n "$HAVE_LIBSUPC__" ] && LIBS="$LIBS -lsupc++"
-+[ -n "$HAVE_LIBIBERTY" ] && LIBS="$LIBS -liberty"
-+
- INSTALL='install -c'
- iquote='-iquote '
- iquoteend=''
diff --git a/patches/ltrace/0.5.3/180-libltrace-genindex.patch b/patches/ltrace/0.5.3/180-libltrace-genindex.patch
deleted file mode 100644
index 0b1629b..0000000
--- a/patches/ltrace/0.5.3/180-libltrace-genindex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in
---- ltrace-0.5.3.org/Makefile.in	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/Makefile.in	2011-08-21 18:40:53.000000000 +0200
-@@ -39,7 +40,7 @@
- 		$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- libltrace.a: 	sysdeps/sysdep.o $(OBJ)
--		$(AR) rcv $@ $^
-+		$(AR) rscv $@ $^
- 
- $(OBJ):		sysdeps/sysdep.o
- 
diff --git a/patches/ltrace/0.5.3/190-ar-configurable.patch b/patches/ltrace/0.5.3/190-ar-configurable.patch
deleted file mode 100644
index 28856a3..0000000
--- a/patches/ltrace/0.5.3/190-ar-configurable.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in
---- ltrace-0.5.3.org/Makefile.in	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/Makefile.in	2011-08-21 18:40:53.000000000 +0200
-@@ -15,6 +15,7 @@
- mandir		= @mandir@
- docdir		= $(prefix)/share/doc/ltrace
- 
-+AR		=	@AR@
- CC		=	@CC@
- CFLAGS		=	-Wall @CFLAGS@
- CPPFLAGS	=	-iquote $(TOPDIR) -iquote $(TOPDIR)/sysdeps/$(OS) -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
-
-diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure
---- ltrace-0.5.3.org/configure	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/configure	2011-08-21 18:54:46.000000000 +0200
-@@ -113,7 +117,7 @@
- #
- # Makefile.in -> Makefile
- #
--x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
-+x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL AR CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
- 
- for i in $x_subst_vars
- do
diff --git a/patches/ltrace/0.5.3/200-configure-hostos.patch b/patches/ltrace/0.5.3/200-configure-hostos.patch
deleted file mode 100644
index 36563f4..0000000
--- a/patches/ltrace/0.5.3/200-configure-hostos.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure
---- ltrace-0.5.3.org/configure	2011-08-21 18:55:15.000000000 +0200
-+++ ltrace-0.5.3/configure	2011-08-21 18:54:46.000000000 +0200
-@@ -15,8 +15,12 @@
- echo $PACKAGE_VERSION
- 
- echo -n "checking HOST_OS... "
--HOST_OS=$( uname -s )
--if [ "$HOST_OS" = "Linux" ]
-+if [ -z "$HOST_OS" ] ; then
-+  HOST_OS=$( uname -s )
-+else
-+  echo -n "using preset: "
-+fi
-+if [ "$HOST_OS" = "Linux" -o "$HOST_OS" = "linux" ]
- then
-   HOST_OS="linux-gnu"
- fi
diff --git a/patches/ltrace/0.7.3/001-avoid-libstdc++.patch b/patches/ltrace/0.7.3/001-avoid-libstdc++.patch
deleted file mode 100644
index 9cbf557..0000000
--- a/patches/ltrace/0.7.3/001-avoid-libstdc++.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Juan Cespedes <cespedes@debian.org>
-Description: avoid warning from dpkg-shlibdeps:
-  package could avoid a useless dependency if ltrace was not
-  linked against libstdc++.so.6 (it uses none of the library's symbols)
-Last-Update: 2013-12-30
-
- 
---- a/configure.ac	2013-09-17 01:04:28.000000000 +0200
-+++ b/configure.ac	2013-12-30 12:24:20.000000000 +0100
-@@ -113,6 +113,15 @@
- 	libstdcxx_LIBS=""])
- AC_SUBST(libstdcxx_LIBS)
- 
-+if test "x$liberty_LIBS" != "x"
-+then
-+  libsupcxx_LIBS=""
-+  libstdcxx_LIBS=""
-+elif test "x$libsupcxx_LIBS" != "x"
-+then
-+  libstdcxx_LIBS=""
-+fi
-+
- 
- dnl Check security_get_boolean_active availability.
- AC_CHECK_HEADERS(selinux/selinux.h)
---- a/configure	2013-09-17 01:07:46.000000000 +0100
-+++ b/configure	2013-12-30 12:34:23.000000000 +0100
-@@ -11826,6 +11826,15 @@
- 
- 
- 
-+if test "x$liberty_LIBS" != "x"
-+then
-+  libsupcxx_LIBS=""
-+  libstdcxx_LIBS=""
-+elif test "x$libsupcxx_LIBS" != "x"
-+then
-+  libstdcxx_LIBS=""
-+fi
-+
- 
- for ac_header in selinux/selinux.h
- do :
diff --git a/patches/ltrace/0.7.3/002-printf-p.patch b/patches/ltrace/0.7.3/002-printf-p.patch
deleted file mode 100644
index 10631d9..0000000
--- a/patches/ltrace/0.7.3/002-printf-p.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Juan Cespedes <cespedes@debian.org>
-Description: Prevent freeing static-alloc'd memory for %p and %n in printf
-Bug-Debian: http://bugs.debian.org/614994
-Forwarded: http://lists.alioth.debian.org/pipermail/ltrace-devel/2013-September/000953.html
-Last-Update: 2014-01-02
-
-
---- ltrace-0.7.3.orig/printf.c
-+++ ltrace-0.7.3/printf.c
-@@ -168,7 +168,7 @@ form_next_param(struct param_enum *self,
- 		type_init_pointer(infop, array, 1);
- 
- 	} else if (format_type == ARGTYPE_POINTER) {
--		type_init_pointer(infop, elt_info, 1);
-+		type_init_pointer(infop, elt_info, 0);
- 
- 	} else {
- 		*infop = *type_get_simple(format_type);
diff --git a/patches/ltrace/0.7.3/003-alpha-debug.h.patch b/patches/ltrace/0.7.3/003-alpha-debug.h.patch
deleted file mode 100644
index 237026d..0000000
--- a/patches/ltrace/0.7.3/003-alpha-debug.h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Juan Cespedes <cespedes@debian.org>
-Description: fixed FTBFS on alpha
-  don't include "debug.h" twice
-Last-Update: 2014-01-02
-Bug-Debian: http://bugs.debian.org/678721
-
-
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/alpha/trace.c
-+++ ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c
-@@ -29,7 +29,6 @@
- 
- #include "proc.h"
- #include "common.h"
--#include "debug.h"
- 
- #if (!defined(PTRACE_PEEKUSER) && defined(PTRACE_PEEKUSR))
- # define PTRACE_PEEKUSER PTRACE_PEEKUSR
diff --git a/patches/ltrace/0.7.3/004-compile-warning.patch b/patches/ltrace/0.7.3/004-compile-warning.patch
deleted file mode 100644
index ad65829..0000000
--- a/patches/ltrace/0.7.3/004-compile-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Juan Cespedes <cespedes@debian.org>
-Description: Fix compile warning
-Last-Update: 2014-01-02
-Forwarded: not-needed
-
-
---- ltrace-0.7.3.orig/value.c
-+++ ltrace-0.7.3/value.c
-@@ -284,7 +284,7 @@ value_init_deref(struct value *ret_val,
- 
- 	/* We need "long" to be long enough to hold platform
- 	 * pointers.  */
--	typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))];
-+	(void)sizeof(char[1 - 2*(sizeof(l) < sizeof(void *))]);
- 
- 	value_common_init(ret_val, valp->inferior, valp,
- 			  valp->type->u.ptr_info.info, 0);
---- ltrace-0.7.3.orig/lens_default.c
-+++ ltrace-0.7.3/lens_default.c
-@@ -344,7 +344,7 @@ format_array(FILE *stream, struct value
- {
- 	/* We need "long" to be long enough to cover the whole address
- 	 * space.  */
--	typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))];
-+	(void)sizeof(char[1 - 2*(sizeof(long) < sizeof(void *))]);
- 	long l;
- 	if (expr_eval_word(length, value, arguments, &l) < 0)
- 		return -1;
diff --git a/patches/ltrace/0.7.3/005-sparc-ftbfs.patch b/patches/ltrace/0.7.3/005-sparc-ftbfs.patch
deleted file mode 100644
index 266a8e6..0000000
--- a/patches/ltrace/0.7.3/005-sparc-ftbfs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Juan Cespedes <cespedes@debian.org>
-Description: fixes compilation on sparc
-Last-Update: 2014-01-02
-
-
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/sparc/plt.c
-+++ ltrace-0.7.3/sysdeps/linux-gnu/sparc/plt.c
-@@ -19,8 +19,9 @@
-  */
- 
- #include <gelf.h>
-+
- #include "proc.h"
--#include "common.h"
-+#include "library.h"
- 
- GElf_Addr
- arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) {
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/sparc/trace.c
-+++ ltrace-0.7.3/sysdeps/linux-gnu/sparc/trace.c
-@@ -26,8 +26,10 @@
- #include <sys/wait.h>
- #include <signal.h>
- #include <string.h>
-+
- #include "ptrace.h"
- #include "proc.h"
-+#include "backend.h"
- #include "common.h"
- 
- void
diff --git a/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch b/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch
deleted file mode 100644
index 443bee4..0000000
--- a/patches/ltrace/0.7.3/006-unexpected-breakpoint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Juan Cespedes <cespedes@debian.org>
-Description: continue after unexpected breakpoint
-  (instead of decrementing PC and execute int3 again and again)
-Last-Update: 2014-01-03
-
-
---- ltrace-0.7.3.orig/handle_event.c
-+++ ltrace-0.7.3/handle_event.c
-@@ -656,9 +656,12 @@ handle_breakpoint(Event *event)
- 
- 	if ((sbp = address2bpstruct(leader, brk_addr)) != NULL)
- 		breakpoint_on_hit(sbp, event->proc);
--	else if (event->proc->state != STATE_IGNORED)
-+	else if (event->proc->state != STATE_IGNORED) {
- 		output_line(event->proc,
- 			    "unexpected breakpoint at %p", brk_addr);
-+		continue_process(event->proc->pid);
-+		return;
-+	}
- 
- 	/* breakpoint_on_hit may delete its own breakpoint, so we have
- 	 * to look it up again.  */
diff --git a/patches/ltrace/0.7.3/007-gcc-5.patch b/patches/ltrace/0.7.3/007-gcc-5.patch
deleted file mode 100644
index 4c62f85..0000000
--- a/patches/ltrace/0.7.3/007-gcc-5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8c3674c86688a79a8689772c3d0c84d6e7aaa118 Mon Sep 17 00:00:00 2001
-From: Petr Machata <pmachata@redhat.com>
-Date: Tue, 8 Jan 2013 23:22:49 +0100
-Subject: Fix conditions in elf_read_u{16,32,64}
-
-- The calling convention of need_data is 0 on success, <0 on failure.
-  The condition seems to have it all mixed, using both a ! and a
-  comparison.
-
-diff --git a/ltrace-elf.c b/ltrace-elf.c
-index 29c204f..0ecdc38 100644
---- a/ltrace-elf.c
-+++ b/ltrace-elf.c
-@@ -219,7 +219,7 @@ need_data(Elf_Data *data, GElf_Xword offset, GElf_Xword size)
- 	int								\
- 	NAME(Elf_Data *data, GElf_Xword offset, uint##SIZE##_t *retp)	\
- 	{								\
--		if (!need_data(data, offset, SIZE / 8) < 0)		\
-+		if (need_data(data, offset, SIZE / 8) < 0)		\
- 			return -1;					\
- 									\
- 		if (data->d_buf == NULL) /* NODATA section */ {		\
--- 
-cgit v0.10.2
-
diff --git a/patches/ltrace/0.7.3/008-glibc-2.24.patch b/patches/ltrace/0.7.3/008-glibc-2.24.patch
deleted file mode 100644
index 85b008b..0000000
--- a/patches/ltrace/0.7.3/008-glibc-2.24.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urpN ltrace-0.7.3.orig/sysdeps/linux-gnu/proc.c ltrace-0.7.3/sysdeps/linux-gnu/proc.c
---- ltrace-0.7.3.orig/sysdeps/linux-gnu/proc.c	2013-01-02 06:24:46.000000000 -0800
-+++ ltrace-0.7.3/sysdeps/linux-gnu/proc.c	2016-11-13 11:24:32.760365875 -0800
-@@ -240,14 +240,18 @@ process_tasks(pid_t pid, pid_t **ret_tas
- 	size_t alloc = 0;
- 
- 	while (1) {
--		struct dirent entry;
- 		struct dirent *result;
--		if (readdir_r(d, &entry, &result) != 0) {
--			free(tasks);
--			return -1;
--		}
--		if (result == NULL)
-+
-+		errno = 0;
-+		result = readdir(d);
-+		if (result == NULL) {
-+			if (errno) {
-+				free(tasks);
-+				closedir(d);
-+				return -1;
-+			}
- 			break;
-+		}
- 		if (result->d_type == DT_DIR && all_digits(result->d_name)) {
- 			pid_t npid = atoi(result->d_name);
- 			if (n >= alloc) {
diff --git a/patches/mpc/0.8.1/100-fix-build-with-mpfr-3_0_9.diff b/patches/mpc/0.8.1/100-fix-build-with-mpfr-3_0_9.diff
deleted file mode 100644
index 88e1517..0000000
--- a/patches/mpc/0.8.1/100-fix-build-with-mpfr-3_0_9.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- trunk/src/acos.c	2009/12/08 16:49:43	733
-+++ trunk/src/acos.c	2009/12/09 20:51:38	734
-@@ -188,10 +188,7 @@
-   else
-     rnd_im = rnd_im == GMP_RNDU ? GMP_RNDD
-       : rnd_im == GMP_RNDD ? GMP_RNDU
--#if MPFR_VERSION_MAJOR >= 3
--      : rnd_im == GMP_RNDA ? GMP_RNDZ
--#endif
--      : rnd_im;
-+      : rnd_im; /* both RNDZ and RNDA map to themselves for -asin(z) */
-   rnd1 = RNDC(GMP_RNDN, rnd_im);
-   mpfr_init2 (pi_over_2, p);
-   for (;;)
diff --git a/patches/mpfr/2.4.0/100-printf-hh-ll.patch b/patches/mpfr/2.4.0/100-printf-hh-ll.patch
deleted file mode 100644
index e2a9f81..0000000
--- a/patches/mpfr/2.4.0/100-printf-hh-ll.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES
---- mpfr-2.4.0-a/PATCHES	2009-01-26 12:52:01.000000000 +0000
-+++ mpfr-2.4.0-b/PATCHES	2009-02-20 17:27:44.000000000 +0000
-@@ -0,0 +1 @@
-+printf-hh-ll
-diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION
---- mpfr-2.4.0-a/VERSION	2009-01-26 12:52:01.000000000 +0000
-+++ mpfr-2.4.0-b/VERSION	2009-02-20 17:27:44.000000000 +0000
-@@ -1 +1 @@
--2.4.0
-+2.4.0-p1
-diff -Naurd mpfr-2.4.0-a/acinclude.m4 mpfr-2.4.0-b/acinclude.m4
---- mpfr-2.4.0-a/acinclude.m4	2009-01-26 12:52:01.000000000 +0000
-+++ mpfr-2.4.0-b/acinclude.m4	2009-01-26 12:52:01.000000000 +0000
-@@ -722,6 +722,16 @@
-          [AC_DEFINE([NPRINTF_J], 1, [gmp_printf cannot read intmax_t])])
- fi
- 
-+MPFR_FUNC_PRINTF_SPEC([%hhd], [char], [
-+#include <gmp.h>
-+         ], [gmp_],,
-+         [AC_DEFINE([NPRINTF_HH], 1, [gmp_printf cannot use 'hh' length modifier])])
-+
-+MPFR_FUNC_PRINTF_SPEC([%lld], [long long int], [
-+#include <gmp.h>
-+         ], [gmp_],,
-+         [AC_DEFINE([NPRINTF_LL], 1, [gmp_printf cannot read long long int])])
-+
- MPFR_FUNC_PRINTF_SPEC([%.0Lf], [long double], [
- #include <gmp.h>
-          ], [gmp_],,
-diff -Naurd mpfr-2.4.0-a/configure mpfr-2.4.0-b/configure
---- mpfr-2.4.0-a/configure	2009-01-26 12:54:36.000000000 +0000
-+++ mpfr-2.4.0-b/configure	2009-02-20 17:38:36.000000000 +0000
-@@ -24874,6 +24874,170 @@
- fi
- 
- 
-+{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%hhd\"" >&5
-+$as_echo_n "checking if gmp_printf supports \"%hhd\"... " >&6; }
-+if test "$cross_compiling" = yes; then
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }; }
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+
-+#include <gmp.h>
-+
-+
-+int
-+main ()
-+{
-+
-+  char s[256];
-+  char a = 0;
-+  return (gmp_sprintf (s, "%hhd", a) != 1) ? 1 : 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define NPRINTF_HH 1
-+_ACEOF
-+
-+fi
-+rm -rf conftest.dSYM
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%lld\"" >&5
-+$as_echo_n "checking if gmp_printf supports \"%lld\"... " >&6; }
-+if test "$cross_compiling" = yes; then
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }; }
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdio.h>
-+
-+#include <gmp.h>
-+
-+
-+int
-+main ()
-+{
-+
-+  char s[256];
-+  long long int a = 0;
-+  return (gmp_sprintf (s, "%lld", a) != 1) ? 1 : 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define NPRINTF_LL 1
-+_ACEOF
-+
-+fi
-+rm -rf conftest.dSYM
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+
-+
-+
-+
- { $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%.0Lf\"" >&5
- $as_echo_n "checking if gmp_printf supports \"%.0Lf\"... " >&6; }
- if test "$cross_compiling" = yes; then
-diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h
---- mpfr-2.4.0-a/mpfr.h	2009-01-26 12:52:01.000000000 +0000
-+++ mpfr-2.4.0-b/mpfr.h	2009-02-20 17:27:44.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "2.4.0"
-+#define MPFR_VERSION_STRING "2.4.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.0-a/tests/tfprintf.c mpfr-2.4.0-b/tests/tfprintf.c
---- mpfr-2.4.0-a/tests/tfprintf.c	2009-01-26 12:52:00.000000000 +0000
-+++ mpfr-2.4.0-b/tests/tfprintf.c	2009-02-20 16:31:02.000000000 +0000
-@@ -146,6 +146,7 @@
-   short sh = -1;
-   unsigned short ush = 1;
-   int i = -1;
-+  int j = 1;
-   unsigned int ui = 1;
-   long lo = -1;
-   unsigned long ulo = 1;
-@@ -179,12 +180,11 @@
- 
-   limb[0] = limb[1] = limb[2] = ~ (mp_limb_t) 0;
- 
--  check_vfprintf (fout, "a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui,
--                  ulo, &uch);
--  check_length (1, uch, 28, hhu);
--  check_vfprintf (fout, "a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i,
-+  check_vfprintf (fout, "a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
-+  check_length (1, j, 22, d);
-+  check_vfprintf (fout, "a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i,
-                   lo, &ulo);
--  check_length (2, ulo, 37, lu);
-+  check_length (2, ulo, 36, lu);
-   check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
-   check_length (3, ush, 29, hu);
-   check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
-@@ -208,13 +208,18 @@
-   check_length (9, sz, 30, zu);
- #endif
- 
-+#ifndef NPRINTF_HH
-+  check_vfprintf (fout, "a. %hhi, b.%RA, c. %hhu%hhn", sch, mpfr, uch, &uch);
-+  check_length (10, uch, 21, hhu);
-+#endif
-+
- #if (__GNU_MP_VERSION * 10 + __GNU_MP_VERSION_MINOR) >= 42
-   /* The 'M' specifier was added in gmp 4.2.0 */
-   check_vfprintf (fout, "a. %Mx b. %Re%Mn", limb[0], mpfr, &limb[0]);
-   if (limb[0] != 14 + BITS_PER_MP_LIMB / 4 || limb[1] != ~ (mp_limb_t) 0
-       || limb[2] != ~ (mp_limb_t) 0)
-     {
--      printf ("Error in test #10: mpfr_vfprintf did not print %d characters"
-+      printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
-               " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
-       exit (1);
-     }
-@@ -227,13 +232,13 @@
-   if (limb[0] != 14 + 3 * BITS_PER_MP_LIMB / 4 || limb[1] != (mp_limb_t) 0
-       || limb[2] != ~ (mp_limb_t) 0)
-     {
--      printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
-+      printf ("Error in test #12: mpfr_vfprintf did not print %d characters"
-               " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
-       exit (1);
-     }
- #endif
- 
--#ifdef HAVE_LONG_LONG
-+#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
-   {
-     long long llo = -1;
-     unsigned long long ullo = 1;
-diff -Naurd mpfr-2.4.0-a/tests/tprintf.c mpfr-2.4.0-b/tests/tprintf.c
---- mpfr-2.4.0-a/tests/tprintf.c	2009-01-26 12:52:00.000000000 +0000
-+++ mpfr-2.4.0-b/tests/tprintf.c	2009-02-20 16:31:02.000000000 +0000
-@@ -150,6 +150,7 @@
-   short sh = -1;
-   unsigned short ush = 1;
-   int i = -1;
-+  int j = 1;
-   unsigned int ui = 1;
-   long lo = -1;
-   unsigned long ulo = 1;
-@@ -178,11 +179,10 @@
-   mpfr_set_f (mpfr, mpf, GMP_RNDN);
-   prec = mpfr_get_prec (mpfr);
- 
--  check_vprintf ("a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui, ulo,
--                 &uch);
--  check_length (1, uch, 28, hhu);
--  check_vprintf ("a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i, lo, &ulo);
--  check_length (2, ulo, 37, lu);
-+  check_vprintf ("a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
-+  check_length (1, j, 22, d);
-+  check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo);
-+  check_length (2, ulo, 36, lu);
-   check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
-   check_length (3, ush, 29, hu);
-   check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
-@@ -204,7 +204,12 @@
-   check_length (9, sz, 30, zu);
- #endif
- 
--#ifdef HAVE_LONG_LONG
-+#ifndef NPRINTF_HH
-+  check_vprintf ("a. %hhi, b. %Ra, c. %hhu%hhn", sch, mpfr, uch, &uch);
-+  check_length (10, uch, 22, hhu);
-+#endif
-+
-+#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
-   {
-     long long llo = -1;
-     unsigned long long ullo = 1;
-diff -Naurd mpfr-2.4.0-a/vasprintf.c mpfr-2.4.0-b/vasprintf.c
---- mpfr-2.4.0-a/vasprintf.c	2009-01-26 12:52:01.000000000 +0000
-+++ mpfr-2.4.0-b/vasprintf.c	2009-02-20 16:31:02.000000000 +0000
-@@ -235,10 +235,14 @@
-       break;
-     case 'h':
-       if (*++format == 'h')
-+#ifndef NPRINTF_HH
-         {
-           ++format;
-           specinfo->arg_type = CHAR_ARG;
-         }
-+#else
-+        specinfo->arg_type = UNSUPPORTED;
-+#endif
-       else
-         specinfo->arg_type = SHORT_ARG;
-       break;
-@@ -246,7 +250,7 @@
-       if (*++format == 'l')
-         {
-           ++format;
--#ifdef HAVE_LONG_LONG
-+#if defined (HAVE_LONG_LONG) && !defined(NPRINTF_LL)
-           specinfo->arg_type = LONG_LONG_ARG;
- #else
-           specinfo->arg_type = UNSUPPORTED;
-diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c
---- mpfr-2.4.0-a/version.c	2009-01-26 12:52:01.000000000 +0000
-+++ mpfr-2.4.0-b/version.c	2009-02-20 17:27:44.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.0";
-+  return "2.4.0-p1";
- }
diff --git a/patches/mpfr/2.4.0/110-mpfr_snprintf.patch b/patches/mpfr/2.4.0/110-mpfr_snprintf.patch
deleted file mode 100644
index 92af137..0000000
--- a/patches/mpfr/2.4.0/110-mpfr_snprintf.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES
---- mpfr-2.4.0-a/PATCHES	2009-02-25 13:27:38.000000000 +0000
-+++ mpfr-2.4.0-b/PATCHES	2009-02-25 13:42:26.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_snprintf
-diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION
---- mpfr-2.4.0-a/VERSION	2009-02-20 17:27:44.000000000 +0000
-+++ mpfr-2.4.0-b/VERSION	2009-02-25 13:41:31.000000000 +0000
-@@ -1 +1 @@
--2.4.0-p1
-+2.4.0-p2
-diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h
---- mpfr-2.4.0-a/mpfr.h	2009-02-20 17:27:44.000000000 +0000
-+++ mpfr-2.4.0-b/mpfr.h	2009-02-25 13:41:31.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "2.4.0-p1"
-+#define MPFR_VERSION_STRING "2.4.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.0-a/printf.c mpfr-2.4.0-b/printf.c
---- mpfr-2.4.0-a/printf.c	2009-01-26 12:52:01.000000000 +0000
-+++ mpfr-2.4.0-b/printf.c	2009-02-25 13:41:22.000000000 +0000
-@@ -154,16 +154,16 @@
-   int ret;
-   size_t min_size;
- 
--  /* C99 allows SIZE to be null */
--  if (size == 0)
--    return 0;
--
--  MPFR_ASSERTD (buf != NULL);
--
-   GET_STR (ret, str, fmt);
--  min_size = (size_t)ret < size ? (size_t)ret : size - 1;
--  strncpy (buf, str, min_size);
--  buf[min_size + 1] = '\0';
-+
-+  /* C99 allows SIZE to be zero */
-+  if (size != 0)
-+    {
-+      MPFR_ASSERTN (buf != NULL);
-+      min_size = (size_t)ret < size ? (size_t)ret : size - 1;
-+      strncpy (buf, str, min_size);
-+      buf[min_size] = '\0';
-+    }
- 
-   mpfr_free_str (str);
-   return ret;
-@@ -176,16 +176,17 @@
-   int ret;
-   int min_size;
- 
--  /* C99 allows SIZE to be null */
--  if (size == 0)
--    return 0;
-+  GET_STR_VA (ret, str, fmt, ap);
- 
--  MPFR_ASSERTD (buf != NULL);
-+  /* C99 allows SIZE to be zero */
-+  if (size != 0)
-+    {
-+      MPFR_ASSERTN (buf != NULL);
-+      min_size = (size_t)ret < size ? (size_t)ret : size - 1;
-+      strncpy (buf, str, min_size);
-+      buf[min_size] = '\0';
-+    }
- 
--  GET_STR_VA (ret, str, fmt, ap);
--  min_size = (size_t)ret < size ? (size_t)ret : size - 1;
--  strncpy (buf, str, min_size);
--  buf[min_size + 1] = '\0';
-   mpfr_free_str (str);
-   return ret;
- }
-diff -Naurd mpfr-2.4.0-a/tests/tsprintf.c mpfr-2.4.0-b/tests/tsprintf.c
---- mpfr-2.4.0-a/tests/tsprintf.c	2009-01-26 12:52:00.000000000 +0000
-+++ mpfr-2.4.0-b/tests/tsprintf.c	2009-02-25 13:41:22.000000000 +0000
-@@ -72,21 +72,37 @@
- 
-   /* test mpfr_snprintf */
-   p = (int) (randlimb () % n0);
--  n1 = mpfr_snprintf (buffer, p, fmt, x);
--  if ((p != 0 && n0 != n1) || (p == 0 && n1 != 0))
-+  if (p == 0 && (randlimb () & 1) == 0)
-+    {
-+      n1 = mpfr_snprintf (NULL, 0, fmt, x);
-+    }
-+  else
-+    {
-+      buffer[p] = 17;
-+      n1 = mpfr_snprintf (buffer, p, fmt, x);
-+      if (buffer[p] != 17)
-+        {
-+          printf ("Buffer overflow in mpfr_snprintf for p = %d!\n", p);
-+          exit (1);
-+        }
-+    }
-+  if (n0 != n1)
-     {
-       printf ("Error in mpfr_snprintf (s, %d, \"%s\", x) return value\n",
-               p, fmt);
-       printf ("expected: %d\ngot:      %d\n", n0, n1);
-       exit (1);
-     }
--  if (strncmp (expected, buffer, p) != 0)
-+  if ((p > 1 && strncmp (expected, buffer, p-1) != 0)
-+      || (p == 1 && buffer[0] != '\0'))
-     {
--      printf ("Error in mpfr_snprintf (s, %d, \"%s\", x);\n", p, fmt);
--      printf ("expected: \"%s\"\ngot:      \"%s\"\n", expected, buffer);
-+      char part_expected[p];
-+      strncpy (part_expected, expected, p);
-+      part_expected[p-1] = '\0';
-+      printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...);\n", p, fmt);
-+      printf ("expected: \"%s\"\ngot:      \"%s\"\n", part_expected, buffer);
-       exit (1);
-     }
--
-   return n0;
- }
- 
-@@ -116,8 +132,21 @@
- 
-   /* test mpfr_snprintf */
-   p = (int) (randlimb () % n0);
--  n1 = mpfr_vsnprintf (buffer, p, fmt, ap1);
--  if ((p != 0 && n0 != n1) || (p == 0 && n1 != 0))
-+  if (p == 0 && (randlimb () & 1) == 0)
-+    {
-+      n1 = mpfr_vsnprintf (NULL, 0, fmt, ap1);
-+    }
-+  else
-+    {
-+      buffer[p] = 17;
-+      n1 = mpfr_vsnprintf (buffer, p, fmt, ap1);
-+      if (buffer[p] != 17)
-+        {
-+          printf ("Buffer overflow in mpfr_vsnprintf for p = %d!\n", p);
-+          exit (1);
-+        }
-+    }
-+  if (n0 != n1)
-     {
-       printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...) return value\n",
-               p, fmt);
-@@ -126,10 +155,14 @@
-       va_end (ap1);
-       exit (1);
-     }
--  if (strncmp (expected, buffer, p) != 0)
-+  if ((p > 1 && strncmp (expected, buffer, p-1) != 0)
-+      || (p == 1 && buffer[0] != '\0'))
-     {
-+      char part_expected[p];
-+      strncpy (part_expected, expected, p);
-+      part_expected[p-1] = '\0';
-       printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...);\n", p, fmt);
--      printf ("expected: \"%s\"\ngot:      \"%s\"\n", expected, buffer);
-+      printf ("expected: \"%s\"\ngot:      \"%s\"\n", part_expected, buffer);
- 
-       va_end (ap1);
-       exit (1);
-diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c
---- mpfr-2.4.0-a/version.c	2009-02-20 17:27:44.000000000 +0000
-+++ mpfr-2.4.0-b/version.c	2009-02-25 13:41:31.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.0-p1";
-+  return "2.4.0-p2";
- }
diff --git a/patches/mpfr/2.4.1/100-remainder-neg.patch b/patches/mpfr/2.4.1/100-remainder-neg.patch
deleted file mode 100644
index ae92788..0000000
--- a/patches/mpfr/2.4.1/100-remainder-neg.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
---- mpfr-2.4.1-a/PATCHES	2009-02-20 09:43:17.000000000 +0000
-+++ mpfr-2.4.1-b/PATCHES	2009-02-27 16:56:29.000000000 +0000
-@@ -0,0 +1 @@
-+remainder-neg
-diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
---- mpfr-2.4.1-a/VERSION	2009-02-25 16:16:08.000000000 +0000
-+++ mpfr-2.4.1-b/VERSION	2009-02-27 16:55:37.000000000 +0000
-@@ -1 +1 @@
--2.4.1
-+2.4.1-p1
-diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
---- mpfr-2.4.1-a/mpfr.h	2009-02-25 16:16:08.000000000 +0000
-+++ mpfr-2.4.1-b/mpfr.h	2009-02-27 16:55:38.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "2.4.1"
-+#define MPFR_VERSION_STRING "2.4.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.1-a/rem1.c mpfr-2.4.1-b/rem1.c
---- mpfr-2.4.1-a/rem1.c	2009-02-20 09:43:17.000000000 +0000
-+++ mpfr-2.4.1-b/rem1.c	2009-02-27 16:55:15.000000000 +0000
-@@ -170,7 +170,12 @@
-     }
- 
-   if (mpz_cmp_ui (r, 0) == 0)
--    inex = mpfr_set_ui (rem, 0, GMP_RNDN);
-+    {
-+      inex = mpfr_set_ui (rem, 0, GMP_RNDN);
-+      /* take into account sign of x */
-+      if (signx < 0)
-+        mpfr_neg (rem, rem, GMP_RNDN);
-+    }
-   else
-     {
-       if (rnd_q == GMP_RNDN)
-@@ -190,6 +195,9 @@
-                 *quo += 1;
-             }
-         }
-+      /* take into account sign of x */
-+      if (signx < 0)
-+        mpz_neg (r, r);
-       inex = mpfr_set_z (rem, r, rnd);
-       /* if ex > ey, rem should be multiplied by 2^ey, else by 2^ex */
-       MPFR_EXP (rem) += (ex > ey) ? ey : ex;
-@@ -198,13 +206,6 @@
-   if (quo)
-     *quo *= sign;
- 
--  /* take into account sign of x */
--  if (signx < 0)
--    {
--      mpfr_neg (rem, rem, GMP_RNDN);
--      inex = -inex;
--    }
--
-   mpz_clear (mx);
-   mpz_clear (my);
-   mpz_clear (r);
-diff -Naurd mpfr-2.4.1-a/tests/tremquo.c mpfr-2.4.1-b/tests/tremquo.c
---- mpfr-2.4.1-a/tests/tremquo.c	2009-02-20 09:43:15.000000000 +0000
-+++ mpfr-2.4.1-b/tests/tremquo.c	2009-02-27 16:55:15.000000000 +0000
-@@ -25,6 +25,36 @@
- 
- #include "mpfr-test.h"
- 
-+static void
-+bug20090227 (void)
-+{
-+  mpfr_t x, y, r1, r2;
-+  int inex1, inex2;
-+
-+  mpfr_init2 (x, 118);
-+  mpfr_init2 (y, 181);
-+  mpfr_init2 (r1, 140);
-+  mpfr_init2 (r2, 140);
-+  mpfr_set_si (x, -1, GMP_RNDN);
-+  mpfr_set_str_binary (y, "1.100100100001111110110101010001000100001011010001100001000110100110001001100011001100010100010111000000011011100000111001101000100101001000000100100111000001000100010100110011111010");
-+  inex1 = mpfr_remainder (r1, x, y, GMP_RNDU);
-+  /* since the quotient is -1, r1 is the rounding of x+y */
-+  inex2 = mpfr_add (r2, x, y, GMP_RNDU);
-+  if (mpfr_cmp (r1, r2))
-+    {
-+      printf ("Error in mpfr_remainder (bug20090227)\n");
-+      printf ("Expected ");
-+      mpfr_dump (r2);
-+      printf ("Got      ");
-+      mpfr_dump (r1);
-+      exit (1);
-+    }
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+  mpfr_clear (r1);
-+  mpfr_clear (r2);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -50,6 +80,8 @@
- 
-   tests_start_mpfr ();
- 
-+  bug20090227 ();
-+
-   mpfr_init (x);
-   mpfr_init (y);
-   mpfr_init (r);
-diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
---- mpfr-2.4.1-a/version.c	2009-02-25 16:16:08.000000000 +0000
-+++ mpfr-2.4.1-b/version.c	2009-02-27 16:55:38.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.1";
-+  return "2.4.1-p1";
- }
diff --git a/patches/mpfr/2.4.1/110-assert.patch b/patches/mpfr/2.4.1/110-assert.patch
deleted file mode 100644
index c6b6aac..0000000
--- a/patches/mpfr/2.4.1/110-assert.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
---- mpfr-2.4.1-a/PATCHES	2009-03-04 13:15:05.000000000 +0000
-+++ mpfr-2.4.1-b/PATCHES	2009-03-04 13:17:04.000000000 +0000
-@@ -0,0 +1 @@
-+assert
-diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
---- mpfr-2.4.1-a/VERSION	2009-02-27 16:55:37.000000000 +0000
-+++ mpfr-2.4.1-b/VERSION	2009-03-04 13:16:46.000000000 +0000
-@@ -1 +1 @@
--2.4.1-p1
-+2.4.1-p2
-diff -Naurd mpfr-2.4.1-a/mpfr-gmp.c mpfr-2.4.1-b/mpfr-gmp.c
---- mpfr-2.4.1-a/mpfr-gmp.c	2009-02-20 09:43:17.000000000 +0000
-+++ mpfr-2.4.1-b/mpfr-gmp.c	2009-03-04 13:16:39.000000000 +0000
-@@ -301,7 +301,7 @@
-       if (linenum != -1)
-         fprintf (stderr, "%d: ", linenum);
-     }
--  fprintf (stderr, " assertion failed: %s\n", expr);
-+  fprintf (stderr, "MPFR assertion failed: %s\n", expr);
-   abort();
- }
- 
-diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
---- mpfr-2.4.1-a/mpfr.h	2009-02-27 16:55:38.000000000 +0000
-+++ mpfr-2.4.1-b/mpfr.h	2009-03-04 13:16:46.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "2.4.1-p1"
-+#define MPFR_VERSION_STRING "2.4.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
---- mpfr-2.4.1-a/version.c	2009-02-27 16:55:38.000000000 +0000
-+++ mpfr-2.4.1-b/version.c	2009-03-04 13:16:46.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.1-p1";
-+  return "2.4.1-p2";
- }
diff --git a/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch b/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch
deleted file mode 100644
index e85136a..0000000
--- a/patches/mpfr/2.4.1/120-cast-to-void-ptr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naurd mpfr-2.4.1-a/tests/tfprintf.c mpfr-2.4.1-b/tests/tfprintf.c
---- mpfr-2.4.1-a/tests/tfprintf.c	2009-02-20 09:43:15.000000000 +0000
-+++ mpfr-2.4.1-b/tests/tfprintf.c	2009-03-10 01:12:45.000000000 +0000
-@@ -195,7 +195,7 @@
-   check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz);
-   check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi);
-   check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr,
--                  &i);
-+                  (void *) &i);
-   check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
- 
- #ifndef NPRINTF_T
-diff -Naurd mpfr-2.4.1-a/tests/tprintf.c mpfr-2.4.1-b/tests/tprintf.c
---- mpfr-2.4.1-a/tests/tprintf.c	2009-02-20 09:43:15.000000000 +0000
-+++ mpfr-2.4.1-b/tests/tprintf.c	2009-03-10 01:12:45.000000000 +0000
-@@ -191,7 +191,8 @@
-   check_length (5, sz, 34, zu);
-   check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz);
-   check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi);
--  check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", mpfr, mpq, &mpfr, &i);
-+  check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p",
-+                 mpfr, mpq, &mpfr, (void *) &i);
-   check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
- 
- #ifndef NPRINTF_T
diff --git a/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch b/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch
deleted file mode 100644
index 08e21f2..0000000
--- a/patches/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
---- mpfr-2.4.1-a/PATCHES	2009-03-10 01:44:39.000000000 +0000
-+++ mpfr-2.4.1-b/PATCHES	2009-03-10 01:44:40.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf-mp_limb_t
-diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
---- mpfr-2.4.1-a/VERSION	2009-03-04 13:16:46.000000000 +0000
-+++ mpfr-2.4.1-b/VERSION	2009-03-10 01:44:40.000000000 +0000
-@@ -1 +1 @@
--2.4.1-p2
-+2.4.1-p4
-diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
---- mpfr-2.4.1-a/mpfr.h	2009-03-04 13:16:46.000000000 +0000
-+++ mpfr-2.4.1-b/mpfr.h	2009-03-10 01:44:40.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "2.4.1-p2"
-+#define MPFR_VERSION_STRING "2.4.1-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.1-a/vasprintf.c mpfr-2.4.1-b/vasprintf.c
---- mpfr-2.4.1-a/vasprintf.c	2009-02-20 09:43:17.000000000 +0000
-+++ mpfr-2.4.1-b/vasprintf.c	2009-03-10 01:44:40.000000000 +0000
-@@ -398,7 +398,7 @@
-         (void) va_arg ((ap), mpq_srcptr);       \
-         break;                                  \
-       case MP_LIMB_ARG:                         \
--        (void) va_arg ((ap), mp_ptr);           \
-+        (void) va_arg ((ap), mp_limb_t);        \
-         break;                                  \
-       case MP_LIMB_ARRAY_ARG:                   \
-         (void) va_arg ((ap), mp_ptr);           \
-diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
---- mpfr-2.4.1-a/version.c	2009-03-04 13:16:46.000000000 +0000
-+++ mpfr-2.4.1-b/version.c	2009-03-10 01:44:40.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.1-p2";
-+  return "2.4.1-p4";
- }
diff --git a/patches/mpfr/2.4.1/140-zeta_ui-shift.patch b/patches/mpfr/2.4.1/140-zeta_ui-shift.patch
deleted file mode 100644
index 710c698..0000000
--- a/patches/mpfr/2.4.1/140-zeta_ui-shift.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
---- mpfr-2.4.1-a/PATCHES	2009-03-13 02:50:47.000000000 +0000
-+++ mpfr-2.4.1-b/PATCHES	2009-03-13 02:50:48.000000000 +0000
-@@ -0,0 +1 @@
-+zeta_ui-shift
-diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
---- mpfr-2.4.1-a/VERSION	2009-03-10 01:44:40.000000000 +0000
-+++ mpfr-2.4.1-b/VERSION	2009-03-13 02:50:48.000000000 +0000
-@@ -1 +1 @@
--2.4.1-p4
-+2.4.1-p5
-diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
---- mpfr-2.4.1-a/mpfr.h	2009-03-10 01:44:40.000000000 +0000
-+++ mpfr-2.4.1-b/mpfr.h	2009-03-13 02:50:48.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "2.4.1-p4"
-+#define MPFR_VERSION_STRING "2.4.1-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
---- mpfr-2.4.1-a/version.c	2009-03-10 01:44:40.000000000 +0000
-+++ mpfr-2.4.1-b/version.c	2009-03-13 02:50:48.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.1-p4";
-+  return "2.4.1-p5";
- }
-diff -Naurd mpfr-2.4.1-a/zeta_ui.c mpfr-2.4.1-b/zeta_ui.c
---- mpfr-2.4.1-a/zeta_ui.c	2009-02-20 09:43:17.000000000 +0000
-+++ mpfr-2.4.1-b/zeta_ui.c	2009-03-13 02:50:48.000000000 +0000
-@@ -177,7 +177,9 @@
-                   mpz_mul_ui (t, t, 2 * k - 1);
-                 }
-               mpz_div_2exp (t, t, 1);
--              if (n < 1UL << (BITS_PER_MP_LIMB / 2))
-+              /* Warning: the test below assumes that an unsigned long
-+                 has no padding bits. */
-+              if (n < 1UL << ((sizeof(unsigned long) * CHAR_BIT) / 2))
-                 /* (n - k + 1) * (n + k - 1) < n^2 */
-                 mpz_divexact_ui (t, t, (n - k + 1) * (n + k - 1));
-               else
diff --git a/patches/mpfr/2.4.1/150-test-tmul.patch b/patches/mpfr/2.4.1/150-test-tmul.patch
deleted file mode 100644
index 8b757d3..0000000
--- a/patches/mpfr/2.4.1/150-test-tmul.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up ./tests/Makefile.am.orig ./tests/Makefile.am
---- ./tests/Makefile.am.orig	2009-07-28 16:28:55.377059021 +0300
-+++ ./tests/Makefile.am	2009-07-28 16:31:01.136810734 +0300
-@@ -20,7 +20,7 @@ check_PROGRAMS = tversion tinternals tin
- 
- EXTRA_DIST = tgeneric.c tgeneric_ui.c mpf_compat.h inp_str.data tmul.dat
- 
--tmul_CPPFLAGS = -DMPFR_SRCDIR=$(srcdir)
-+tmul_CPPFLAGS = -DMPFR_SRCDIR=\"$(srcdir)\"
- 
- LDADD = libfrtests.la $(MPFR_LIBM) $(top_builddir)/libmpfr.la
- INCLUDES = -I$(top_srcdir) -I$(top_builddir)
-diff -up ./tests/tmul.c.orig ./tests/tmul.c
---- ./tests/tmul.c.orig	2009-07-28 16:29:03.761058919 +0300
-+++ ./tests/tmul.c	2009-07-28 16:30:46.369812215 +0300
-@@ -26,10 +26,8 @@ MA 02110-1301, USA. */
- #include "mpfr-test.h"
- 
- #ifndef MPFR_SRCDIR
--#define MPFR_SRCDIR .
-+#define MPFR_SRCDIR "."
- #endif
--#define QUOTE(X) NAME(X)
--#define NAME(X) #X
- 
- #ifdef CHECK_EXTERNAL
- static int
-@@ -482,10 +480,10 @@ check_regression (void)
-   mpfr_inits2 (6177, x, y, z, (mpfr_ptr) 0);
-   /* we read long strings from a file since ISO C90 does not support strings of
-      length > 509 */
--  fp = fopen (QUOTE (MPFR_SRCDIR)"/tmul.dat", "r");
-+  fp = fopen (MPFR_SRCDIR "/tmul.dat", "r");
-   if (fp == NULL)
-     {
--      fprintf (stderr, "Error, cannot open "QUOTE (MPFR_SRCDIR)"/tmul.dat\n");
-+      fprintf (stderr, "Error, cannot open " MPFR_SRCDIR "/tmul.dat\n");
-       exit (1);
-     }
-   get_string (s, fp);
diff --git a/patches/mpfr/2.4.2/100-sin_cos_underflow.patch b/patches/mpfr/2.4.2/100-sin_cos_underflow.patch
deleted file mode 100644
index 2721517..0000000
--- a/patches/mpfr/2.4.2/100-sin_cos_underflow.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-07 13:37:12.000000000 +0000
-@@ -0,0 +1 @@
-+sin_cos_underflow
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-07 13:37:12.000000000 +0000
-@@ -1 +1 @@
--2.4.2
-+2.4.2-p1
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-07 13:37:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2"
-+#define MPFR_VERSION_STRING "2.4.2-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/sin_cos.c mpfr-2.4.2-b/sin_cos.c
---- mpfr-2.4.2-a/sin_cos.c	2009-11-30 02:43:09.000000000 +0000
-+++ mpfr-2.4.2-b/sin_cos.c	2009-12-07 13:37:12.000000000 +0000
-@@ -82,17 +82,19 @@
-       if (y != x)
-         /* y and x differ, thus we can safely try to compute y first */
-         {
--          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0, rnd_mode,
--                                            { inexy = _inexact;
--                                              goto small_input; });
-+          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+            y, x, -2 * expx, 2, 0, rnd_mode,
-+            { inexy = _inexact;
-+              goto small_input; });
-           if (0)
-             {
-             small_input:
-               /* we can go here only if we can round sin(x) */
--              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
--                                                1, 0, rnd_mode,
--                                                { inexz = _inexact;
--                                                  goto end; });
-+              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+                z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
-+                { inexz = _inexact;
-+                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
-+                  goto end; });
-             }
- 
-           /* if we go here, one of the two MPFR_FAST_COMPUTE_IF_SMALL_INPUT
-@@ -101,18 +103,19 @@
-       else /* y and x are the same variable: try to compute z first, which
-               necessarily differs */
-         {
--          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
--                                            1, 0, rnd_mode,
--                                            { inexz = _inexact;
--                                              goto small_input2; });
-+          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+            z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
-+            { inexz = _inexact;
-+              goto small_input2; });
-           if (0)
-             {
-             small_input2:
-               /* we can go here only if we can round cos(x) */
--              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0,
--                                                rnd_mode,
--                                                { inexy = _inexact;
--                                                  goto end; });
-+              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+                y, x, -2 * expx, 2, 0, rnd_mode,
-+                { inexy = _inexact;
-+                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
-+                  goto end; });
-             }
-         }
-       m += 2 * (-expx);
-@@ -207,7 +210,6 @@
-   mpfr_clear (xr);
- 
-  end:
--  /* FIXME: update the underflow flag if need be. */
-   MPFR_SAVE_EXPO_FREE (expo);
-   mpfr_check_range (y, inexy, rnd_mode);
-   mpfr_check_range (z, inexz, rnd_mode);
-diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
---- mpfr-2.4.2-a/tests/tsin_cos.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/tests/tsin_cos.c	2009-12-07 13:37:12.000000000 +0000
-@@ -382,23 +382,56 @@
- consistency (void)
- {
-   mpfr_t x, s1, s2, c1, c2;
-+  mp_exp_t emin, emax;
-   mp_rnd_t rnd;
-+  unsigned int flags_sin, flags_cos, flags, flags_before, flags_ref;
-+  int inex_sin, inex_cos, inex, inex_ref;
-   int i;
- 
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-   for (i = 0; i <= 10000; i++)
-     {
-       mpfr_init2 (x, MPFR_PREC_MIN + (randlimb () % 8));
-       mpfr_inits2 (MPFR_PREC_MIN + (randlimb () % 8), s1, s2, c1, c2,
-                    (mpfr_ptr) 0);
--      tests_default_random (x, 256, -5, 50);
--      rnd = RND_RAND ();
--      mpfr_sin (s1, x, rnd);
--      mpfr_cos (c1, x, rnd);
--      mpfr_sin_cos (s2, c2, x, rnd);
--      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)))
-+      if (i < 8 * GMP_RND_MAX)
-         {
--          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,\nx = ",
--                  mpfr_print_rnd_mode (rnd));
-+          int j = i / GMP_RND_MAX;
-+          if (j & 1)
-+            mpfr_set_emin (MPFR_EMIN_MIN);
-+          mpfr_set_si (x, (j & 2) ? 1 : -1, GMP_RNDN);
-+          mpfr_set_exp (x, mpfr_get_emin ());
-+          rnd = (mpfr_rnd_t) (i % GMP_RND_MAX);
-+          flags_before = 0;
-+          if (j & 4)
-+            mpfr_set_emax (-17);
-+        }
-+      else
-+        {
-+          tests_default_random (x, 256, -5, 50);
-+          rnd = RND_RAND ();
-+          flags_before = (randlimb () & 1) ?
-+            (unsigned int) (MPFR_FLAGS_ALL ^ MPFR_FLAGS_ERANGE) :
-+            (unsigned int) 0;
-+        }
-+      __gmpfr_flags = flags_before;
-+      inex_sin = mpfr_sin (s1, x, rnd);
-+      flags_sin = __gmpfr_flags;
-+      __gmpfr_flags = flags_before;
-+      inex_cos = mpfr_cos (c1, x, rnd);
-+      flags_cos = __gmpfr_flags;
-+      __gmpfr_flags = flags_before;
-+      inex = !!mpfr_sin_cos (s2, c2, x, rnd);
-+      flags = __gmpfr_flags;
-+      inex_ref = inex_sin || inex_cos;
-+      flags_ref = flags_sin | flags_cos;
-+      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)) ||
-+          inex != inex_ref || flags != flags_ref)
-+        {
-+          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,"
-+                  " i = %d\nx = ", mpfr_print_rnd_mode (rnd), i);
-           mpfr_dump (x);
-           printf ("s1 = ");
-           mpfr_dump (s1);
-@@ -408,9 +441,16 @@
-           mpfr_dump (c1);
-           printf ("c2 = ");
-           mpfr_dump (c2);
-+          printf ("inex_sin = %d, inex_cos = %d, inex = %d (expected %d)\n",
-+                  inex_sin, inex_cos, inex, inex_ref);
-+          printf ("flags_sin = 0x%x, flags_cos = 0x%x, "
-+                  "flags = 0x%x (expected 0x%x)\n",
-+                  flags_sin, flags_cos, flags, flags_ref);
-           exit (1);
-         }
-       mpfr_clears (x, s1, s2, c1, c2, (mpfr_ptr) 0);
-+      mpfr_set_emin (emin);
-+      mpfr_set_emax (emax);
-     }
- }
- 
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-07 13:37:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2";
-+  return "2.4.2-p1";
- }
diff --git a/patches/mpfr/2.4.2/110-longlong.h.patch b/patches/mpfr/2.4.2/110-longlong.h.patch
deleted file mode 100644
index fa85d8e..0000000
--- a/patches/mpfr/2.4.2/110-longlong.h.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-18 12:03:30.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-18 12:05:19.000000000 +0000
-@@ -0,0 +1 @@
-+longlong.h
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-18 12:05:09.000000000 +0000
-@@ -1 +1 @@
--2.4.2-p1
-+2.4.2-p2
-diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
---- mpfr-2.4.2-a/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
-@@ -1011,7 +1011,15 @@
- #endif /* __m88000__ */
- 
- #if defined (__mips) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UDItype _r;							\
-+    _r = (UDItype) u * v;						\
-+    (w1) = _r >> 32;							\
-+    (w0) = (USItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
-@@ -1024,7 +1032,16 @@
- #endif /* __mips */
- 
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UTItype _r;							\
-+    _r = (UTItype) u * v;						\
-+    (w1) = _r >> 64;							\
-+    (w0) = (UDItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-18 12:05:09.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2-p1"
-+#define MPFR_VERSION_STRING "2.4.2-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-18 12:05:09.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2-p1";
-+  return "2.4.2-p2";
- }
diff --git a/patches/mpfr/2.4.2/120-gmp5.patch b/patches/mpfr/2.4.2/120-gmp5.patch
deleted file mode 100644
index 3ce4952..0000000
--- a/patches/mpfr/2.4.2/120-gmp5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2010-01-11 15:27:18.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2010-01-11 15:30:31.000000000 +0000
-@@ -0,0 +1 @@
-+gmp5
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2010-01-11 15:29:40.000000000 +0000
-@@ -1 +1 @@
--2.4.2-p2
-+2.4.2-p3
-diff -Naurd mpfr-2.4.2-a/configure mpfr-2.4.2-b/configure
---- mpfr-2.4.2-a/configure	2009-11-30 02:44:35.000000000 +0000
-+++ mpfr-2.4.2-b/configure	2010-01-11 15:28:56.000000000 +0000
-@@ -20449,6 +20449,9 @@
- main ()
- {
- 
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- 
-diff -Naurd mpfr-2.4.2-a/configure.in mpfr-2.4.2-b/configure.in
---- mpfr-2.4.2-a/configure.in	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/configure.in	2009-11-30 02:43:08.000000000 +0000
-@@ -424,6 +424,9 @@
- #include "gmp.h"
- #include "gmp-impl.h"
- ]], [[
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- ]])], [AC_MSG_RESULT(yes)], [
-diff -Naurd mpfr-2.4.2-a/mpfr-impl.h mpfr-2.4.2-b/mpfr-impl.h
---- mpfr-2.4.2-a/mpfr-impl.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-impl.h	2010-01-11 15:28:01.000000000 +0000
-@@ -65,6 +65,12 @@
- # ifndef __GMP_IMPL_H__
- #  include "gmp-impl.h"
- # endif
-+# ifndef BITS_PER_MP_LIMB
-+#  define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+# endif
-+#ifndef mpn_sqr_n
-+# define mpn_sqr_n mpn_sqr
-+#endif
- # ifdef MPFR_NEED_LONGLONG_H
- #  include "longlong.h"
- # endif
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2010-01-11 15:29:40.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2-p2"
-+#define MPFR_VERSION_STRING "2.4.2-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2010-01-11 15:29:40.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2-p2";
-+  return "2.4.2-p3";
- }
diff --git a/patches/mpfr/3.0.0/110-mpfr_out_str.patch b/patches/mpfr/3.0.0/110-mpfr_out_str.patch
deleted file mode 100644
index da98aab..0000000
--- a/patches/mpfr/3.0.0/110-mpfr_out_str.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-06-23 11:02:49.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-06-23 11:03:36.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_out_str
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-06-23 11:03:20.000000000 +0000
-@@ -1 +1 @@
--3.0.0
-+3.0.0-p1
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-06-23 11:03:20.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0"
-+#define MPFR_VERSION_STRING "3.0.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/mpfr.texi mpfr-3.0.0-b/mpfr.texi
---- mpfr-3.0.0-a/mpfr.texi	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.texi	2010-06-23 11:03:12.000000000 +0000
-@@ -2050,7 +2050,7 @@
- are printed. If @var{base} is greater than 10, @samp{@@} will be used
- instead of @samp{e} as exponent delimiter.
- 
--Return the number of bytes written, or if an error occurred, return 0.
-+Return the number of characters written, or if an error occurred, return 0.
- @end deftypefun
- 
- @deftypefun size_t mpfr_inp_str (mpfr_t @var{rop}, FILE *@var{stream}, int @var{base}, mpfr_rnd_t @var{rnd})
-diff -Naurd mpfr-3.0.0-a/out_str.c mpfr-3.0.0-b/out_str.c
---- mpfr-3.0.0-a/out_str.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/out_str.c	2010-06-23 11:03:12.000000000 +0000
-@@ -22,6 +22,16 @@
- 
- #include "mpfr-impl.h"
- 
-+/* Warning! S should not contain "%". */
-+#define OUT_STR_RET(S)                          \
-+  do                                            \
-+    {                                           \
-+      int r;                                    \
-+      r = fprintf (stream, (S));                \
-+      return r < 0 ? 0 : r;                     \
-+    }                                           \
-+  while (0)
-+
- size_t
- mpfr_out_str (FILE *stream, int base, size_t n_digits, mpfr_srcptr op,
-               mpfr_rnd_t rnd_mode)
-@@ -29,6 +39,7 @@
-   char *s, *s0;
-   size_t l;
-   mpfr_exp_t e;
-+  int err;
- 
-   MPFR_ASSERTN (base >= 2 && base <= 62);
- 
-@@ -36,37 +47,16 @@
-   if (stream == NULL)
-     stream = stdout;
- 
--  if (MPFR_IS_NAN(op))
--    {
--      fprintf (stream, "@NaN@");
--      return 3;
--    }
--
--  if (MPFR_IS_INF(op))
--    {
--      if (MPFR_SIGN(op) > 0)
--        {
--          fprintf (stream, "@Inf@");
--          return 3;
--        }
--      else
--        {
--          fprintf (stream, "-@Inf@");
--          return 4;
--        }
--    }
--
--  if (MPFR_IS_ZERO(op))
-+  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (op)))
-     {
--      if (MPFR_SIGN(op) > 0)
--        {
--          fprintf(stream, "0");
--          return 1;
--        }
-+      if (MPFR_IS_NAN (op))
-+        OUT_STR_RET ("@NaN@");
-+      else if (MPFR_IS_INF (op))
-+        OUT_STR_RET (MPFR_IS_POS (op) ? "@Inf@" : "-@Inf@");
-       else
-         {
--          fprintf(stream, "-0");
--          return 2;
-+          MPFR_ASSERTD (MPFR_IS_ZERO (op));
-+          OUT_STR_RET (MPFR_IS_POS (op) ? "0" : "-0");
-         }
-     }
- 
-@@ -77,21 +67,31 @@
- 
-   l = strlen (s) + 1; /* size of allocated block returned by mpfr_get_str
-                          - may be incorrect, as only an upper bound? */
--  if (*s == '-')
--    fputc (*s++, stream);
- 
--  /* outputs mantissa */
--  fputc (*s++, stream); e--; /* leading digit */
--  fputc ((unsigned char) MPFR_DECIMAL_POINT, stream);
--  fputs (s, stream);         /* rest of mantissa */
-+  /* outputs possible sign and significand */
-+  err = (*s == '-' && fputc (*s++, stream) == EOF)
-+    || fputc (*s++, stream) == EOF  /* leading digit */
-+    || fputc ((unsigned char) MPFR_DECIMAL_POINT, stream) == EOF
-+    || fputs (s, stream) == EOF;     /* trailing significand */
-   (*__gmp_free_func) (s0, l);
-+  if (MPFR_UNLIKELY (err))
-+    return 0;
-+
-+  e--;  /* due to the leading digit */
- 
-   /* outputs exponent */
-   if (e)
-     {
-+      int r;
-+
-       MPFR_ASSERTN(e >= LONG_MIN);
-       MPFR_ASSERTN(e <= LONG_MAX);
--      l += fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
-+
-+      r = fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
-+      if (MPFR_UNLIKELY (r < 0))
-+        return 0;
-+
-+      l += r;
-     }
- 
-   return l;
-diff -Naurd mpfr-3.0.0-a/tests/tout_str.c mpfr-3.0.0-b/tests/tout_str.c
---- mpfr-3.0.0-a/tests/tout_str.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tout_str.c	2010-06-23 11:03:12.000000000 +0000
-@@ -46,22 +46,54 @@
- special (void)
- {
-   mpfr_t x;
-+  unsigned int n;
- 
-   mpfr_init (x);
- 
-   mpfr_set_nan (x);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 5)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, NaN, MPFR_RNDN) wrote %u "
-+              "characters instead of 5.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_inf (x, 1);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 5)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, +Inf, MPFR_RNDN) wrote %u "
-+               "characters instead of 5.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_inf (x, -1);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 6)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, -Inf, MPFR_RNDN) wrote %u "
-+               "characters instead of 6.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_set_ui (x, 0, MPFR_RNDN);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 1)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, +0, MPFR_RNDN) wrote %u "
-+               "characters instead of 1.\n", n);
-+      exit (1);
-+    }
-+
-   mpfr_neg (x, x, MPFR_RNDN);
--  mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
-+  if (n != 2)
-+    {
-+      printf ("Error: mpfr_out_str (file, 10, 0, -0, MPFR_RNDN) wrote %u "
-+               "characters instead of 2.\n", n);
-+      exit (1);
-+    }
- 
-   mpfr_clear (x);
- }
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-06-23 11:03:20.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0";
-+  return "3.0.0-p1";
- }
diff --git a/patches/mpfr/3.0.0/120-alloca.patch b/patches/mpfr/3.0.0/120-alloca.patch
deleted file mode 100644
index af6dfb2..0000000
--- a/patches/mpfr/3.0.0/120-alloca.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/Makefile.in mpfr-3.0.0-b/Makefile.in
---- mpfr-3.0.0-a/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-+++ mpfr-3.0.0-b/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-@@ -239,6 +239,7 @@
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-06-23 11:03:36.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-06-25 13:23:13.000000000 +0000
-@@ -0,0 +1 @@
-+alloca
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-06-25 13:23:13.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p1
-+3.0.0-p2
-diff -Naurd mpfr-3.0.0-a/acinclude.m4 mpfr-3.0.0-b/acinclude.m4
---- mpfr-3.0.0-a/acinclude.m4	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/acinclude.m4	2010-06-10 11:00:14.000000000 +0000
-@@ -59,6 +59,9 @@
- dnl sys/fpu.h - MIPS specific
- AC_CHECK_HEADERS([sys/time.h sys/fpu.h])
- 
-+dnl Check how to get `alloca'
-+AC_FUNC_ALLOCA
-+
- dnl SIZE_MAX macro
- gl_SIZE_MAX
- 
-diff -Naurd mpfr-3.0.0-a/configure mpfr-3.0.0-b/configure
---- mpfr-3.0.0-a/configure	2010-06-10 11:00:51.000000000 +0000
-+++ mpfr-3.0.0-b/configure	2010-06-25 13:23:05.000000000 +0000
-@@ -783,6 +783,7 @@
- OBJDUMP
- DLLTOOL
- AS
-+ALLOCA
- MPFR_LIBM
- ANSI2KNR
- U
-@@ -5622,6 +5623,197 @@
- done
- 
- 
-+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-+# for constant arguments.  Useless!
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-+$as_echo_n "checking for working alloca.h... " >&6; }
-+if test "${ac_cv_working_alloca_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <alloca.h>
-+int
-+main ()
-+{
-+char *p = (char *) alloca (2 * sizeof (int));
-+			  if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_working_alloca_h=yes
-+else
-+  ac_cv_working_alloca_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-+$as_echo "$ac_cv_working_alloca_h" >&6; }
-+if test $ac_cv_working_alloca_h = yes; then
-+
-+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-+
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-+$as_echo_n "checking for alloca... " >&6; }
-+if test "${ac_cv_func_alloca_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __GNUC__
-+# define alloca __builtin_alloca
-+#else
-+# ifdef _MSC_VER
-+#  include <malloc.h>
-+#  define alloca _alloca
-+# else
-+#  ifdef HAVE_ALLOCA_H
-+#   include <alloca.h>
-+#  else
-+#   ifdef _AIX
-+ #pragma alloca
-+#   else
-+#    ifndef alloca /* predefined by HP cc +Olibcalls */
-+char *alloca ();
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+int
-+main ()
-+{
-+char *p = (char *) alloca (1);
-+				    if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_alloca_works=yes
-+else
-+  ac_cv_func_alloca_works=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-+$as_echo "$ac_cv_func_alloca_works" >&6; }
-+
-+if test $ac_cv_func_alloca_works = yes; then
-+
-+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-+
-+else
-+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-+# that cause trouble.  Some versions do not even contain alloca or
-+# contain a buggy version.  If you still want to use their alloca,
-+# use ar to extract alloca.o from them instead of compiling alloca.c.
-+
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-+
-+$as_echo "#define C_ALLOCA 1" >>confdefs.h
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-+if test "${ac_cv_os_cray+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#if defined CRAY && ! defined CRAY2
-+webecray
-+#else
-+wenotbecray
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "webecray" >/dev/null 2>&1; then :
-+  ac_cv_os_cray=yes
-+else
-+  ac_cv_os_cray=no
-+fi
-+rm -f conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-+$as_echo "$ac_cv_os_cray" >&6; }
-+if test $ac_cv_os_cray = yes; then
-+  for ac_func in _getb67 GETB67 getb67; do
-+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CRAY_STACKSEG_END $ac_func
-+_ACEOF
-+
-+    break
-+fi
-+
-+  done
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-+$as_echo_n "checking stack direction for C alloca... " >&6; }
-+if test "${ac_cv_c_stack_direction+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_c_stack_direction=0
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+find_stack_direction ()
-+{
-+  static char *addr = 0;
-+  auto char dummy;
-+  if (addr == 0)
-+    {
-+      addr = &dummy;
-+      return find_stack_direction ();
-+    }
-+  else
-+    return (&dummy > addr) ? 1 : -1;
-+}
-+
-+int
-+main ()
-+{
-+  return find_stack_direction () < 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_c_stack_direction=1
-+else
-+  ac_cv_c_stack_direction=-1
-+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_c_stack_direction" >&5
-+$as_echo "$ac_cv_c_stack_direction" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+#define STACK_DIRECTION $ac_cv_c_stack_direction
-+_ACEOF
-+
-+
-+fi
-+
-+
- 
-   for ac_header in stdint.h
- do :
-@@ -7564,13 +7756,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:7567: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:7759: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:7570: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:7762: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:7573: output\"" >&5)
-+  (eval echo "\"\$as_me:7765: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -8772,7 +8964,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 8775 "configure"' > conftest.$ac_ext
-+  echo '#line 8967 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -10032,11 +10224,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10035: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10227: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10039: \$? = $ac_status" >&5
-+   echo "$as_me:10231: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10371,11 +10563,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10374: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10566: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:10378: \$? = $ac_status" >&5
-+   echo "$as_me:10570: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -10476,11 +10668,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10479: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10671: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10483: \$? = $ac_status" >&5
-+   echo "$as_me:10675: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10531,11 +10723,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:10534: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10726: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:10538: \$? = $ac_status" >&5
-+   echo "$as_me:10730: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -12915,7 +13107,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 12918 "configure"
-+#line 13110 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -13011,7 +13203,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 13014 "configure"
-+#line 13206 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-06-25 13:23:13.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p1"
-+#define MPFR_VERSION_STRING "3.0.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/Makefile.in mpfr-3.0.0-b/tests/Makefile.in
---- mpfr-3.0.0-a/tests/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-+++ mpfr-3.0.0-b/tests/Makefile.in	2010-06-10 11:00:52.000000000 +0000
-@@ -960,6 +960,7 @@
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-23 11:03:20.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-06-25 13:23:13.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p1";
-+  return "3.0.0-p2";
- }
diff --git a/patches/mpfr/3.0.0/130-gamma_underflow.patch b/patches/mpfr/3.0.0/130-gamma_underflow.patch
deleted file mode 100644
index cf8a936..0000000
--- a/patches/mpfr/3.0.0/130-gamma_underflow.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-07-10 00:11:19.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-07-10 00:12:50.000000000 +0000
-@@ -0,0 +1 @@
-+gamma_underflow
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-07-10 00:11:53.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p2
-+3.0.0-p3
-diff -Naurd mpfr-3.0.0-a/gamma.c mpfr-3.0.0-b/gamma.c
---- mpfr-3.0.0-a/gamma.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/gamma.c	2010-07-10 00:11:46.000000000 +0000
-@@ -274,7 +274,7 @@
-       /* we want an upper bound for x * [log(2-x)-1].
-          since x < 0, we need a lower bound on log(2-x) */
-       mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
--      mpfr_log (xp, xp, MPFR_RNDD);
-+      mpfr_log2 (xp, xp, MPFR_RNDD);
-       mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
-       mpfr_mul (xp, xp, x, MPFR_RNDU);
- 
-@@ -303,8 +303,8 @@
-         {
-           mpfr_sub (tmp, tmp, tmp2, MPFR_RNDZ); /* low bnd on |sin(Pi*(2-x))| */
-           mpfr_ui_div (tmp, 12, tmp, MPFR_RNDU); /* upper bound */
--          mpfr_log (tmp, tmp, MPFR_RNDU);
--          mpfr_add (tmp, tmp, xp, MPFR_RNDU);
-+          mpfr_log2 (tmp, tmp, MPFR_RNDU);
-+          mpfr_add (xp, tmp, xp, MPFR_RNDU);
-           underflow = mpfr_cmp_si (xp, expo.saved_emin - 2) <= 0;
-         }
- 
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-07-10 00:11:53.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p2"
-+#define MPFR_VERSION_STRING "3.0.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/tgamma.c mpfr-3.0.0-b/tests/tgamma.c
---- mpfr-3.0.0-a/tests/tgamma.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tgamma.c	2010-07-10 00:11:46.000000000 +0000
-@@ -461,6 +461,20 @@
-   mpfr_clear (x);
- }
- 
-+/* bug found by Stathis, only occurs on 32-bit machines */
-+static void
-+test20100709 (void)
-+{
-+  mpfr_t x;
-+  int inex;
-+
-+  mpfr_init2 (x, 100);
-+  mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
-+  inex = mpfr_gamma (x, x, MPFR_RNDN);
-+  MPFR_ASSERTN(MPFR_IS_ZERO(x) && MPFR_IS_NEG(x) && inex > 0);
-+  mpfr_clear (x);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -471,6 +485,7 @@
-   test_generic (2, 100, 2);
-   gamma_integer ();
-   test20071231 ();
-+  test20100709 ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-06-25 13:23:13.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-07-10 00:11:53.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p2";
-+  return "3.0.0-p3";
- }
diff --git a/patches/mpfr/3.0.0/140-mpfr_cmp_set_ui_si.patch b/patches/mpfr/3.0.0/140-mpfr_cmp_set_ui_si.patch
deleted file mode 100644
index 67d6a6a..0000000
--- a/patches/mpfr/3.0.0/140-mpfr_cmp_set_ui_si.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-09-07 08:44:01.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-09-07 08:48:46.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_cmp/set_ui/si
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-07-10 00:11:53.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-09-07 08:46:06.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p3
-+3.0.0-p4
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-07-10 00:11:53.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-09-07 08:46:06.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p3"
-+#define MPFR_VERSION_STRING "3.0.0-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -798,35 +798,45 @@
-      anyway. Checking with other ICC versions is needed. Possibly detect
-      whether warnings are produced or not with a configure test.
-    + Remove C++ too, since it complains too much. */
-+/* Added casts to improve robustness in case of undefined behavior and
-+   compiler extensions based on UB (in particular -fwrapv). MPFR doesn't
-+   use such extensions, but these macros will be used by 3rd-party code,
-+   where such extensions may be required.
-+   Moreover casts to unsigned long have been added to avoid warnings in
-+   programs that use MPFR and are compiled with -Wconversion; such casts
-+   are OK since if X is a constant expression, then (unsigned long) X is
-+   also a constant expression, so that the optimizations still work. */
- #if defined (__GNUC__) && !defined(__ICC) && !defined(__cplusplus)
- #if (__GNUC__ >= 2)
- #undef mpfr_cmp_ui
--/* We use the fact that mpfr_sgn on NaN sets the erange flag and returns 0. */
--#define mpfr_cmp_ui(_f,_u)                 \
-- (__builtin_constant_p (_u) && (_u) == 0 ? \
--   mpfr_sgn (_f) :                         \
--   mpfr_cmp_ui_2exp ((_f),(_u),0))
-+/* We use the fact that mpfr_sgn on NaN sets the erange flag and returns 0.
-+   But warning! mpfr_sgn is specified as a macro in the API, thus the macro
-+   mustn't be used if side effects are possible, like here. */
-+#define mpfr_cmp_ui(_f,_u)                                      \
-+  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+   (mpfr_sgn) (_f) :                                            \
-+   mpfr_cmp_ui_2exp ((_f), (unsigned long) (_u), 0))
- #undef mpfr_cmp_si
--#define mpfr_cmp_si(_f,_s)                 \
-- (__builtin_constant_p (_s) && (_s) >= 0 ? \
--   mpfr_cmp_ui ((_f), (_s)) :              \
--   mpfr_cmp_si_2exp ((_f), (_s), 0))
-+#define mpfr_cmp_si(_f,_s)                              \
-+  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?      \
-+   mpfr_cmp_ui ((_f), (unsigned long) (long) (_s)) :    \
-+   mpfr_cmp_si_2exp ((_f), (long) (_s), 0))
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #undef mpfr_set_ui
--#define mpfr_set_ui(_f,_u,_r)              \
-- (__builtin_constant_p (_u) && (_u) == 0 ? \
--   __extension__ ({                        \
--     mpfr_ptr _p = (_f);                   \
--     _p->_mpfr_sign = 1;                   \
--     _p->_mpfr_exp = __MPFR_EXP_ZERO;      \
--     (void) (_r); 0; }) :                  \
--   mpfr_set_ui_2exp ((_f), (_u), 0, (_r)))
-+#define mpfr_set_ui(_f,_u,_r)                                   \
-+  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+   __extension__ ({                                             \
-+       mpfr_ptr _p = (_f);                                      \
-+       _p->_mpfr_sign = 1;                                      \
-+       _p->_mpfr_exp = __MPFR_EXP_ZERO;                         \
-+       (void) (_r); 0; }) :                                     \
-+   mpfr_set_ui_2exp ((_f), (unsigned long) (_u), 0, (_r)))
- #endif
- #undef mpfr_set_si
--#define mpfr_set_si(_f,_s,_r)              \
-- (__builtin_constant_p (_s) && (_s) >= 0 ? \
--   mpfr_set_ui ((_f), (_s), (_r)) :        \
--   mpfr_set_si_2exp ((_f), (_s), 0, (_r)))
-+#define mpfr_set_si(_f,_s,_r)                                   \
-+  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?              \
-+   mpfr_set_ui ((_f), (unsigned long) (long) (_s), (_r)) :      \
-+   mpfr_set_si_2exp ((_f), (long) (_s), 0, (_r)))
- #endif
- #endif
- 
-diff -Naurd mpfr-3.0.0-a/tests/tcmp_ui.c mpfr-3.0.0-b/tests/tcmp_ui.c
---- mpfr-3.0.0-a/tests/tcmp_ui.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tcmp_ui.c	2010-09-07 08:45:12.000000000 +0000
-@@ -88,6 +88,126 @@
-   mpfr_clear (x);
- }
- 
-+/* Since mpfr_cmp_ui and mpfr_cmp_si are also implemented by a macro
-+   with __builtin_constant_p for GCC, check that side effects are
-+   handled correctly. */
-+static void
-+check_macros (void)
-+{
-+  mpfr_t x;
-+  int c;
-+
-+  mpfr_init2 (x, 32);
-+
-+  c = 0;
-+  mpfr_set_ui (x, 17, MPFR_RNDN);
-+  if (mpfr_cmp_ui (x, 17) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_ui(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_ui (x, (c++, 17)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_ui(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 1)
-+    {
-+      printf ("Error 3 on mpfr_cmp_ui(x,17) in check_macros\n"
-+              "(c = %d instead of 1)\n", c);
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, 17) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_si(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, (c++, 17)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_si(x,17) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 2)
-+    {
-+      printf ("Error 3 on mpfr_cmp_si(x,17) in check_macros\n"
-+              "(c = %d instead of 2)\n", c);
-+      exit (1);
-+    }
-+
-+  c = 0;
-+  mpfr_set_ui (x, 0, MPFR_RNDN);
-+  if (mpfr_cmp_ui (x, 0) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_ui(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_ui (x, (c++, 0)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_ui(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 1)
-+    {
-+      printf ("Error 3 on mpfr_cmp_ui(x,0) in check_macros\n"
-+              "(c = %d instead of 1)\n", c);
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, 0) != 0)
-+    {
-+      printf ("Error 1 on mpfr_cmp_si(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (mpfr_cmp_si (x, (c++, 0)) != 0)
-+    {
-+      printf ("Error 2 on mpfr_cmp_si(x,0) in check_macros\n");
-+      exit (1);
-+    }
-+  if (c != 2)
-+    {
-+      printf ("Error 3 on mpfr_cmp_si(x,0) in check_macros\n"
-+              "(c = %d instead of 2)\n", c);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+}
-+
-+/* Bug in r7114 */
-+static void
-+test_macros (void)
-+{
-+  mpfr_t x[3];
-+  mpfr_ptr p;
-+
-+  mpfr_inits (x[0], x[1], x[2], (mpfr_ptr) 0);
-+  mpfr_set_ui (x[0], 0, MPFR_RNDN);
-+  p = x[0];
-+  if (mpfr_cmp_ui (p++, 0) != 0)
-+    {
-+      printf ("Error in mpfr_cmp_ui macro: result should be 0.\n");
-+      exit (1);
-+    }
-+  if (p != x[1])
-+    {
-+      printf ("Error in mpfr_cmp_ui macro: p - x[0] = %d (expecting 1)\n",
-+              (int) (p - x[0]));
-+      exit (1);
-+    }
-+  p = x[0];
-+  if (mpfr_cmp_si (p++, 0) != 0)
-+    {
-+      printf ("Error in mpfr_cmp_si macro: result should be 0.\n");
-+      exit (1);
-+    }
-+  if (p != x[1])
-+    {
-+      printf ("Error in mpfr_cmp_si macro: p - x[0] = %d (expecting 1)\n",
-+              (int) (p - x[0]));
-+      exit (1);
-+    }
-+  mpfr_clears (x[0], x[1], x[2], (mpfr_ptr) 0);
-+}
-+
- int
- main (void)
- {
-@@ -216,6 +336,8 @@
-   mpfr_clear (x);
- 
-   check_nan ();
-+  check_macros ();
-+  test_macros ();
- 
-   tests_end_mpfr ();
-   return 0;
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-07-10 00:11:53.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-09-07 08:46:06.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p3";
-+  return "3.0.0-p4";
- }
diff --git a/patches/mpfr/3.0.0/150-tcan_round.patch b/patches/mpfr/3.0.0/150-tcan_round.patch
deleted file mode 100644
index 292e7a5..0000000
--- a/patches/mpfr/3.0.0/150-tcan_round.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-10-21 20:28:38.000000000 +0000
-@@ -0,0 +1 @@
-+tcan_round
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-09-07 08:46:06.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-10-21 20:28:38.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p4
-+3.0.0-p5
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-09-07 08:46:06.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-10-21 20:28:38.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p4"
-+#define MPFR_VERSION_STRING "3.0.0-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/tests/tcan_round.c mpfr-3.0.0-b/tests/tcan_round.c
---- mpfr-3.0.0-a/tests/tcan_round.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tcan_round.c	2010-10-21 20:28:38.000000000 +0000
-@@ -41,7 +41,7 @@
-       /* avoid mpn_random which leaks memory */
-       for (i = 0; i < n; i++)
-         buf[i] = randlimb ();
--      p = (mpfr_prec_t) randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN;
-+      p = randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN;
-       err = p + randlimb () % GMP_NUMB_BITS;
-       r1 = mpfr_round_p (buf, n, err, p);
-       r2 = mpfr_can_round_raw (buf, n, MPFR_SIGN_POS, err,
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-09-07 08:46:06.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-10-21 20:28:38.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p4";
-+  return "3.0.0-p5";
- }
diff --git a/patches/mpfr/3.0.0/160-mpfr_sub1.patch b/patches/mpfr/3.0.0/160-mpfr_sub1.patch
deleted file mode 100644
index 2ce98e9..0000000
--- a/patches/mpfr/3.0.0/160-mpfr_sub1.patch
+++ /dev/null
@@ -1,628 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-10-21 20:59:32.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_sub1
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-10-21 20:59:32.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p5
-+3.0.0-p6
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-10-21 20:59:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p5"
-+#define MPFR_VERSION_STRING "3.0.0-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/sub1.c mpfr-3.0.0-b/sub1.c
---- mpfr-3.0.0-a/sub1.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/sub1.c	2010-10-21 20:59:32.000000000 +0000
-@@ -37,7 +37,9 @@
-   mp_size_t cancel2, an, bn, cn, cn0;
-   mp_limb_t *ap, *bp, *cp;
-   mp_limb_t carry, bb, cc, borrow = 0;
--  int inexact, shift_b, shift_c, is_exact = 1, down = 0, add_exp = 0;
-+  int inexact, shift_b, shift_c, add_exp = 0;
-+  int cmp_low = 0; /* used for rounding to nearest: 0 if low(b) = low(c),
-+                      negative if low(b) < low(c), positive if low(b)>low(c) */
-   int sh, k;
-   MPFR_TMP_DECL(marker);
- 
-@@ -196,7 +198,8 @@
-     }
- 
- #ifdef DEBUG
--  printf ("shift_b=%d shift_c=%d diffexp=%lu\n", shift_b, shift_c,
-+  printf ("rnd=%s shift_b=%d shift_c=%d diffexp=%lu\n",
-+          mpfr_print_rnd_mode (rnd_mode), shift_b, shift_c,
-           (unsigned long) diff_exp);
- #endif
- 
-@@ -307,17 +310,18 @@
-     {
-       if (MPFR_LIKELY(sh))
-         {
--          is_exact = (carry == 0);
-           /* can decide except when carry = 2^(sh-1) [middle]
-              or carry = 0 [truncate, but cannot decide inexact flag] */
--          down = (carry < (MPFR_LIMB_ONE << (sh - 1)));
-           if (carry > (MPFR_LIMB_ONE << (sh - 1)))
-             goto add_one_ulp;
--          else if ((0 < carry) && down)
-+          else if ((0 < carry) && (carry < (MPFR_LIMB_ONE << (sh - 1))))
-             {
-               inexact = -1; /* result if smaller than exact value */
-               goto truncate;
-             }
-+          /* now carry = 2^(sh-1), in which case cmp_low=2,
-+             or carry = 0, in which case cmp_low=0 */
-+          cmp_low = (carry == 0) ? 0 : 2;
-         }
-     }
-   else /* directed rounding: set rnd_mode to RNDZ iff toward zero */
-@@ -344,12 +348,32 @@
-   cn -= (long int) an + cancel2;
- 
- #ifdef DEBUG
--  printf ("last %d bits from a are %lu, bn=%ld, cn=%ld\n",
-+  printf ("last sh=%d bits from a are %lu, bn=%ld, cn=%ld\n",
-           sh, (unsigned long) carry, (long) bn, (long) cn);
- #endif
- 
-+  /* for rounding to nearest, we couldn't conclude up to here in the following
-+     cases:
-+     1. sh = 0, then cmp_low=0: we can either truncate, subtract one ulp
-+        or add one ulp: -1 ulp < low(b)-low(c) < 1 ulp
-+     2. sh > 0 but the low sh bits from high(b)-high(c) equal 2^(sh-1):
-+        -0.5 ulp <= -1/2^sh < low(b)-low(c)-0.5 < 1/2^sh <= 0.5 ulp
-+        we can't decide the rounding, in that case cmp_low=2:
-+        either we truncate and flag=-1, or we add one ulp and flag=1
-+     3. the low sh>0 bits from high(b)-high(c) equal 0: we know we have to
-+        truncate but we can't decide the ternary value, here cmp_low=0:
-+        -0.5 ulp <= -1/2^sh < low(b)-low(c) < 1/2^sh <= 0.5 ulp
-+        we always truncate and inexact can be any of -1,0,1
-+  */
-+
-+  /* note: here cn might exceed cn0, in which case we consider a zero limb */
-   for (k = 0; (bn > 0) || (cn > 0); k = 1)
-     {
-+      /* if cmp_low < 0, we know low(b) - low(c) < 0
-+         if cmp_low > 0, we know low(b) - low(c) > 0
-+            (more precisely if cmp_low = 2, low(b) - low(c) = 0.5 ulp so far)
-+         if cmp_low = 0, so far low(b) - low(c) = 0 */
-+
-       /* get next limbs */
-       bb = (bn > 0) ? bp[--bn] : 0;
-       if ((cn > 0) && (cn-- <= cn0))
-@@ -357,76 +381,115 @@
-       else
-         cc = 0;
- 
--      /* down is set when low(b) < low(c) */
--      if (down == 0)
--        down = (bb < cc);
-+      /* cmp_low compares low(b) and low(c) */
-+      if (cmp_low == 0) /* case 1 or 3 */
-+        cmp_low = (bb < cc) ? -2+k : (bb > cc) ? 1 : 0;
-+
-+      /* Case 1 for k=0 splits into 7 subcases:
-+         1a: bb > cc + half
-+         1b: bb = cc + half
-+         1c: 0 < bb - cc < half
-+         1d: bb = cc
-+         1e: -half < bb - cc < 0
-+         1f: bb - cc = -half
-+         1g: bb - cc < -half
-+
-+         Case 2 splits into 3 subcases:
-+         2a: bb > cc
-+         2b: bb = cc
-+         2c: bb < cc
-+
-+         Case 3 splits into 3 subcases:
-+         3a: bb > cc
-+         3b: bb = cc
-+         3c: bb < cc
-+      */
- 
-       /* the case rounding to nearest with sh=0 is special since one couldn't
-          subtract above 1/2 ulp in the trailing limb of the result */
--      if ((rnd_mode == MPFR_RNDN) && sh == 0 && k == 0)
-+      if (rnd_mode == MPFR_RNDN && sh == 0 && k == 0) /* case 1 for k=0 */
-         {
-           mp_limb_t half = MPFR_LIMB_HIGHBIT;
- 
--          is_exact = (bb == cc);
--
-           /* add one ulp if bb > cc + half
-              truncate if cc - half < bb < cc + half
-              sub one ulp if bb < cc - half
-           */
- 
--          if (down)
-+          if (cmp_low < 0) /* bb < cc: -1 ulp < low(b) - low(c) < 0,
-+                              cases 1e, 1f and 1g */
-             {
-               if (cc >= half)
-                 cc -= half;
--              else
-+              else /* since bb < cc < half, bb+half < 2*half */
-                 bb += half;
-+              /* now we have bb < cc + half:
-+                 we have to subtract one ulp if bb < cc,
-+                 and truncate if bb > cc */
-             }
--          else /* bb >= cc */
-+          else if (cmp_low >= 0) /* bb >= cc, cases 1a to 1d */
-             {
-               if (cc < half)
-                 cc += half;
--              else
-+              else /* since bb >= cc >= half, bb - half >= 0 */
-                 bb -= half;
-+              /* now we have bb > cc - half: we have to add one ulp if bb > cc,
-+                 and truncate if bb < cc */
-+              if (cmp_low > 0)
-+                cmp_low = 2;
-             }
-         }
- 
- #ifdef DEBUG
--      printf ("    bb=%lu cc=%lu down=%d is_exact=%d\n",
--              (unsigned long) bb, (unsigned long) cc, down, is_exact);
-+      printf ("k=%u bb=%lu cc=%lu cmp_low=%d\n", k,
-+              (unsigned long) bb, (unsigned long) cc, cmp_low);
- #endif
--      if (bb < cc)
-+      if (cmp_low < 0) /* low(b) - low(c) < 0: either truncate or subtract
-+                          one ulp */
-         {
-           if (rnd_mode == MPFR_RNDZ)
--            goto sub_one_ulp;
-+            goto sub_one_ulp; /* set inexact=-1 */
-           else if (rnd_mode != MPFR_RNDN) /* round away */
-             {
-               inexact = 1;
-               goto truncate;
-             }
--          else /* round to nearest: special case here since for sh=k=0
--                  bb = bb0 - MPFR_LIMB_HIGHBIT */
-+          else /* round to nearest */
-             {
--              if (is_exact && sh == 0)
--                {
--                  /* For k=0 we can't decide exactness since it may depend
--                     from low order bits.
--                     For k=1, the first low limbs matched: low(b)-low(c)<0. */
--                  if (k)
--                    {
--                      inexact = 1;
--                      goto truncate;
--                    }
--                }
--              else if (down && sh == 0)
--                goto sub_one_ulp;
--              else
--                {
--                  inexact = (is_exact) ? 1 : -1;
-+              /* If cmp_low < 0 and bb > cc, then -0.5 ulp < low(b)-low(c) < 0,
-+                 whatever the value of sh.
-+                 If sh>0, then cmp_low < 0 implies that the initial neglected
-+                 sh bits were 0 (otherwise cmp_low=2 initially), thus the
-+                 weight of the new bits is less than 0.5 ulp too.
-+                 If k > 0 (and sh=0) this means that either the first neglected
-+                 limbs bb and cc were equal (thus cmp_low was 0 for k=0),
-+                 or we had bb - cc = -0.5 ulp or 0.5 ulp.
-+                 The last case is not possible here since we would have
-+                 cmp_low > 0 which is sticky.
-+                 In the first case (where we have cmp_low = -1), we truncate,
-+                 whereas in the 2nd case we have cmp_low = -2 and we subtract
-+                 one ulp.
-+              */
-+              if (bb > cc || sh > 0 || cmp_low == -1)
-+                {  /* -0.5 ulp < low(b)-low(c) < 0,
-+                      bb > cc corresponds to cases 1e and 1f1
-+                      sh > 0 corresponds to cases 3c and 3b3
-+                      cmp_low = -1 corresponds to case 1d3 (also 3b3) */
-+                  inexact = 1;
-                   goto truncate;
-                 }
-+              else if (bb < cc) /* here sh = 0 and low(b)-low(c) < -0.5 ulp,
-+                                   this corresponds to cases 1g and 1f3 */
-+                goto sub_one_ulp;
-+              /* the only case where we can't conclude is sh=0 and bb=cc,
-+                 i.e., we have low(b) - low(c) = -0.5 ulp (up to now), thus
-+                 we don't know if we must truncate or subtract one ulp.
-+                 Note: for sh=0 we can't have low(b) - low(c) = -0.5 ulp up to
-+                 now, since low(b) - low(c) > 1/2^sh */
-             }
-         }
--      else if (bb > cc)
-+      else if (cmp_low > 0) /* 0 < low(b) - low(c): either truncate or
-+                               add one ulp */
-         {
-           if (rnd_mode == MPFR_RNDZ)
-             {
-@@ -437,34 +500,70 @@
-             goto add_one_ulp;
-           else /* round to nearest */
-             {
--              if (is_exact)
-+              if (bb > cc)
-                 {
--                  inexact = -1;
--                  goto truncate;
-+                  /* if sh=0, then bb>cc means that low(b)-low(c) > 0.5 ulp,
-+                     and similarly when cmp_low=2 */
-+                  if (cmp_low == 2) /* cases 1a, 1b1, 2a and 2b1 */
-+                    goto add_one_ulp;
-+                  /* sh > 0 and cmp_low > 0: this implies that the sh initial
-+                     neglected bits were 0, and the remaining low(b)-low(c)>0,
-+                     but its weight is less than 0.5 ulp */
-+                  else /* 0 < low(b) - low(c) < 0.5 ulp, this corresponds to
-+                          cases 3a, 1d1 and 3b1 */
-+                    {
-+                      inexact = -1;
-+                      goto truncate;
-+                    }
-                 }
--              else if (down)
-+              else if (bb < cc) /* 0 < low(b) - low(c) < 0.5 ulp, cases 1c,
-+                                   1b3, 2b3 and 2c */
-                 {
--                  inexact = 1;
-+                  inexact = -1;
-                   goto truncate;
-                 }
--              else
--                goto add_one_ulp;
-+              /* the only case where we can't conclude is bb=cc, i.e.,
-+                 low(b) - low(c) = 0.5 ulp (up to now), thus we don't know
-+                 if we must truncate or add one ulp. */
-             }
-         }
-+      /* after k=0, we cannot conclude in the following cases, we split them
-+         according to the values of bb and cc for k=1:
-+         1b. sh=0 and cmp_low = 1 and bb-cc = half [around 0.5 ulp]
-+             1b1. bb > cc: add one ulp, inex = 1
-+             1b2: bb = cc: cannot conclude
-+             1b3: bb < cc: truncate, inex = -1
-+         1d. sh=0 and cmp_low = 0 and bb-cc = 0 [around 0]
-+             1d1: bb > cc: truncate, inex = -1
-+             1d2: bb = cc: cannot conclude
-+             1d3: bb < cc: truncate, inex = +1
-+         1f. sh=0 and cmp_low = -1 and bb-cc = -half [around -0.5 ulp]
-+             1f1: bb > cc: truncate, inex = +1
-+             1f2: bb = cc: cannot conclude
-+             1f3: bb < cc: sub one ulp, inex = -1
-+         2b. sh > 0 and cmp_low = 2 and bb=cc [around 0.5 ulp]
-+             2b1. bb > cc: add one ulp, inex = 1
-+             2b2: bb = cc: cannot conclude
-+             2b3: bb < cc: truncate, inex = -1
-+         3b. sh > 0 and cmp_low = 0 [around 0]
-+             3b1. bb > cc: truncate, inex = -1
-+             3b2: bb = cc: cannot conclude
-+             3b3: bb < cc: truncate, inex = +1
-+      */
-     }
- 
--  if ((rnd_mode == MPFR_RNDN) && !is_exact)
-+  if ((rnd_mode == MPFR_RNDN) && cmp_low != 0)
-     {
-       /* even rounding rule */
-       if ((ap[0] >> sh) & 1)
-         {
--          if (down)
-+          if (cmp_low < 0)
-             goto sub_one_ulp;
-           else
-             goto add_one_ulp;
-         }
-       else
--        inexact = (down) ? 1 : -1;
-+        inexact = (cmp_low > 0) ? -1 : 1;
-     }
-   else
-     inexact = 0;
-diff -Naurd mpfr-3.0.0-a/tests/tfma.c mpfr-3.0.0-b/tests/tfma.c
---- mpfr-3.0.0-a/tests/tfma.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tfma.c	2010-10-21 20:59:32.000000000 +0000
-@@ -337,6 +337,94 @@
-   mpfr_clears (x, y, z, r, (mpfr_ptr) 0);
- }
- 
-+static void
-+bug20101018 (void)
-+{
-+  mpfr_t x, y, z, t, u;
-+  int i;
-+
-+  mpfr_init2 (x, 64);
-+  mpfr_init2 (y, 64);
-+  mpfr_init2 (z, 64);
-+  mpfr_init2 (t, 64);
-+  mpfr_init2 (u, 64);
-+
-+  mpfr_set_str (x, "0xf.fffffffffffffffp-14766", 16, MPFR_RNDN);
-+  mpfr_set_str (y, "-0xf.fffffffffffffffp+317", 16, MPFR_RNDN);
-+  mpfr_set_str (z, "0x8.3ffffffffffe3ffp-14443", 16, MPFR_RNDN);
-+  mpfr_set_str (t, "0x8.7ffffffffffc7ffp-14444", 16, MPFR_RNDN);
-+  i = mpfr_fma (u, x, y, z, MPFR_RNDN);
-+  if (mpfr_cmp (u, t) != 0)
-+    {
-+      printf ("Wrong result in bug20101018 (a)\n");
-+      printf ("Expected ");
-+      mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN);
-+      printf ("\nGot      ");
-+      mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN);
-+      printf ("\n");
-+      exit (1);
-+    }
-+  if (i <= 0)
-+    {
-+      printf ("Wrong ternary value in bug20101018 (a)\n");
-+      printf ("Expected > 0\n");
-+      printf ("Got      %d\n", i);
-+      exit (1);
-+    }
-+
-+  mpfr_set_str (x, "-0xf.fffffffffffffffp-11420", 16, MPFR_RNDN);
-+  mpfr_set_str (y, "0xf.fffffffffffffffp+9863", 16, MPFR_RNDN);
-+  mpfr_set_str (z, "0x8.fffff80ffffffffp-1551", 16, MPFR_RNDN);
-+  mpfr_set_str (t, "0x9.fffff01ffffffffp-1552", 16, MPFR_RNDN);
-+  i = mpfr_fma (u, x, y, z, MPFR_RNDN);
-+  if (mpfr_cmp (u, t) != 0)
-+    {
-+      printf ("Wrong result in bug20101018 (b)\n");
-+      printf ("Expected ");
-+      mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN);
-+      printf ("\nGot      ");
-+      mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN);
-+      printf ("\n");
-+      exit (1);
-+    }
-+  if (i <= 0)
-+    {
-+      printf ("Wrong ternary value in bug20101018 (b)\n");
-+      printf ("Expected > 0\n");
-+      printf ("Got      %d\n", i);
-+      exit (1);
-+    }
-+
-+  mpfr_set_str (x, "0xf.fffffffffffffffp-2125", 16, MPFR_RNDN);
-+  mpfr_set_str (y, "-0xf.fffffffffffffffp-6000", 16, MPFR_RNDN);
-+  mpfr_set_str (z, "0x8p-8119", 16, MPFR_RNDN);
-+  mpfr_set_str (t, "0x8.000000000000001p-8120", 16, MPFR_RNDN);
-+  i = mpfr_fma (u, x, y, z, MPFR_RNDN);
-+  if (mpfr_cmp (u, t) != 0)
-+    {
-+      printf ("Wrong result in bug20101018 (c)\n");
-+      printf ("Expected ");
-+      mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN);
-+      printf ("\nGot      ");
-+      mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN);
-+      printf ("\n");
-+      exit (1);
-+    }
-+  if (i <= 0)
-+    {
-+      printf ("Wrong ternary value in bug20101018 (c)\n");
-+      printf ("Expected > 0\n");
-+      printf ("Got      %d\n", i);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+  mpfr_clear (z);
-+  mpfr_clear (t);
-+  mpfr_clear (u);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -345,6 +433,8 @@
- 
-   tests_start_mpfr ();
- 
-+  bug20101018 ();
-+
-   mpfr_init (x);
-   mpfr_init (s);
-   mpfr_init (y);
-diff -Naurd mpfr-3.0.0-a/tests/tsub.c mpfr-3.0.0-b/tests/tsub.c
---- mpfr-3.0.0-a/tests/tsub.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tsub.c	2010-10-21 20:59:32.000000000 +0000
-@@ -201,6 +201,8 @@
-   if (mpfr_cmp (z, x))
-     {
-       printf ("Error in mpfr_sub (2)\n");
-+      printf ("Expected "); mpfr_print_binary (x); puts ("");
-+      printf ("Got      "); mpfr_print_binary (z); puts ("");
-       exit (1);
-     }
-   mpfr_set_str_binary (x, "1.1110111011110001110111011111111111101000011001011100101100101101");
-@@ -478,6 +480,156 @@
-   mpfr_clear (u);
- }
- 
-+/* Bug found by Jakub Jelinek
-+ * http://bugzilla.redhat.com/643657
-+ * https://gforge.inria.fr/tracker/index.php?func=detail&aid=11301
-+ * The consequence can be either an assertion failure (i = 2 in the
-+ * testcase below, in debug mode) or an incorrectly rounded value.
-+ */
-+static void
-+bug20101017 (void)
-+{
-+  mpfr_t a, b, c;
-+  int inex;
-+  int i;
-+
-+  mpfr_init2 (a, GMP_NUMB_BITS * 2);
-+  mpfr_init2 (b, GMP_NUMB_BITS);
-+  mpfr_init2 (c, GMP_NUMB_BITS);
-+
-+  /* a = 2^(2N) + k.2^(2N-1) + 2^N and b = 1
-+     with N = GMP_NUMB_BITS and k = 0 or 1.
-+     c = a - b should round to the same value as a. */
-+
-+  for (i = 2; i <= 3; i++)
-+    {
-+      mpfr_set_ui_2exp (a, i, GMP_NUMB_BITS - 1, MPFR_RNDN);
-+      mpfr_add_ui (a, a, 1, MPFR_RNDN);
-+      mpfr_mul_2ui (a, a, GMP_NUMB_BITS, MPFR_RNDN);
-+      mpfr_set_ui (b, 1, MPFR_RNDN);
-+      inex = mpfr_sub (c, a, b, MPFR_RNDN);
-+      mpfr_set (b, a, MPFR_RNDN);
-+      if (! mpfr_equal_p (c, b))
-+        {
-+          printf ("Error in bug20101017 for i = %d.\n", i);
-+          printf ("Expected ");
-+          mpfr_out_str (stdout, 16, 0, b, MPFR_RNDN);
-+          putchar ('\n');
-+          printf ("Got      ");
-+          mpfr_out_str (stdout, 16, 0, c, MPFR_RNDN);
-+          putchar ('\n');
-+          exit (1);
-+        }
-+      if (inex >= 0)
-+        {
-+          printf ("Error in bug20101017 for i = %d: bad inex value.\n", i);
-+          printf ("Expected negative, got %d.\n", inex);
-+          exit (1);
-+        }
-+    }
-+
-+  mpfr_set_prec (a, 64);
-+  mpfr_set_prec (b, 129);
-+  mpfr_set_prec (c, 2);
-+  mpfr_set_str_binary (b, "0.100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001E65");
-+  mpfr_set_str_binary (c, "0.10E1");
-+  inex = mpfr_sub (a, b, c, MPFR_RNDN);
-+  if (mpfr_cmp_ui_2exp (a, 1, 64) != 0 || inex >= 0)
-+    {
-+      printf ("Error in mpfr_sub for b-c for b=2^64+1+2^(-64), c=1\n");
-+      printf ("Expected result 2^64 with inex < 0\n");
-+      printf ("Got "); mpfr_print_binary (a);
-+      printf (" with inex=%d\n", inex);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (a, b, c, (mpfr_ptr) 0);
-+}
-+
-+/* hard test of rounding */
-+static void
-+check_rounding (void)
-+{
-+  mpfr_t a, b, c, res;
-+  mpfr_prec_t p;
-+  long k, l;
-+  int i;
-+
-+#define MAXKL (2 * GMP_NUMB_BITS)
-+  for (p = MPFR_PREC_MIN; p <= GMP_NUMB_BITS; p++)
-+    {
-+      mpfr_init2 (a, p);
-+      mpfr_init2 (res, p);
-+      mpfr_init2 (b, p + 1 + MAXKL);
-+      mpfr_init2 (c, MPFR_PREC_MIN);
-+
-+      /* b = 2^p + 1 + 2^(-k), c = 2^(-l) */
-+      for (k = 0; k <= MAXKL; k++)
-+        for (l = 0; l <= MAXKL; l++)
-+          {
-+            mpfr_set_ui_2exp (b, 1, p, MPFR_RNDN);
-+            mpfr_add_ui (b, b, 1, MPFR_RNDN);
-+            mpfr_mul_2ui (b, b, k, MPFR_RNDN);
-+            mpfr_add_ui (b, b, 1, MPFR_RNDN);
-+            mpfr_div_2ui (b, b, k, MPFR_RNDN);
-+            mpfr_set_ui_2exp (c, 1, -l, MPFR_RNDN);
-+            i = mpfr_sub (a, b, c, MPFR_RNDN);
-+            /* b - c = 2^p + 1 + 2^(-k) - 2^(-l), should be rounded to
-+               2^p for l <= k, and 2^p+2 for l < k */
-+            if (l <= k)
-+              {
-+                if (mpfr_cmp_ui_2exp (a, 1, p) != 0)
-+                  {
-+                    printf ("Wrong result in check_rounding\n");
-+                    printf ("p=%lu k=%ld l=%ld\n", p, k, l);
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("Expected 2^%lu\n", p);
-+                    printf ("Got      "); mpfr_print_binary (a); puts ("");
-+                    exit (1);
-+                  }
-+                if (i >= 0)
-+                  {
-+                    printf ("Wrong ternary value in check_rounding\n");
-+                    printf ("p=%lu k=%ld l=%ld\n", p, k, l);
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("a="); mpfr_print_binary (a); puts ("");
-+                    printf ("Expected < 0, got %d\n", i);
-+                    exit (1);
-+                  }
-+              }
-+            else /* l < k */
-+              {
-+                mpfr_set_ui_2exp (res, 1, p, MPFR_RNDN);
-+                mpfr_add_ui (res, res, 2, MPFR_RNDN);
-+                if (mpfr_cmp (a, res) != 0)
-+                  {
-+                    printf ("Wrong result in check_rounding\n");
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("Expected "); mpfr_print_binary (res); puts ("");
-+                    printf ("Got      "); mpfr_print_binary (a); puts ("");
-+                    exit (1);
-+                  }
-+                if (i <= 0)
-+                  {
-+                    printf ("Wrong ternary value in check_rounding\n");
-+                    printf ("b="); mpfr_print_binary (b); puts ("");
-+                    printf ("c="); mpfr_print_binary (c); puts ("");
-+                    printf ("Expected > 0, got %d\n", i);
-+                    exit (1);
-+                  }
-+              }
-+          }
-+
-+      mpfr_clear (a);
-+      mpfr_clear (res);
-+      mpfr_clear (b);
-+      mpfr_clear (c);
-+    }
-+}
-+
- #define TEST_FUNCTION test_sub
- #define TWO_ARGS
- #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
-@@ -491,6 +643,8 @@
- 
-   tests_start_mpfr ();
- 
-+  bug20101017 ();
-+  check_rounding ();
-   check_diverse ();
-   check_inexact ();
-   bug_ddefour ();
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-10-21 20:28:38.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-10-21 20:59:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p5";
-+  return "3.0.0-p6";
- }
diff --git a/patches/mpfr/3.0.0/170-mpfr_set_ld.patch b/patches/mpfr/3.0.0/170-mpfr_set_ld.patch
deleted file mode 100644
index 9209afe..0000000
--- a/patches/mpfr/3.0.0/170-mpfr_set_ld.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-10-21 21:18:26.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_set_ld
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-10-21 21:18:26.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p6
-+3.0.0-p7
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-10-21 21:18:26.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p6"
-+#define MPFR_VERSION_STRING "3.0.0-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.0-a/set_ld.c mpfr-3.0.0-b/set_ld.c
---- mpfr-3.0.0-a/set_ld.c	2010-06-10 11:00:14.000000000 +0000
-+++ mpfr-3.0.0-b/set_ld.c	2010-10-21 21:18:26.000000000 +0000
-@@ -102,21 +102,25 @@
-             {
-               x /= div13; /* exact */
-               shift_exp += 8192;
-+              mpfr_div_2si (t, t, 8192, MPFR_RNDZ);
-             }
-           if (ABS (x) >= div12)
-             {
-               x /= div12; /* exact */
-               shift_exp += 4096;
-+              mpfr_div_2si (t, t, 4096, MPFR_RNDZ);
-             }
-           if (ABS (x) >= div11)
-             {
-               x /= div11; /* exact */
-               shift_exp += 2048;
-+              mpfr_div_2si (t, t, 2048, MPFR_RNDZ);
-             }
-           if (ABS (x) >= div10)
-             {
-               x /= div10; /* exact */
-               shift_exp += 1024;
-+              mpfr_div_2si (t, t, 1024, MPFR_RNDZ);
-             }
-           /* warning: we may have DBL_MAX=2^1024*(1-2^(-53)) < x < 2^1024,
-              therefore we have one extra exponent reduction step */
-@@ -124,9 +128,10 @@
-             {
-               x /= div9; /* exact */
-               shift_exp += 512;
-+              mpfr_div_2si (t, t, 512, MPFR_RNDZ);
-             }
-         } /* Check overflow of double */
--      else
-+      else /* no overflow on double */
-         {
-           long double div9, div10, div11;
- 
-@@ -149,29 +154,34 @@
-                 {
-                   x /= div13; /* exact */
-                   shift_exp -= 8192;
-+                  mpfr_mul_2si (t, t, 8192, MPFR_RNDZ);
-                 }
-               if (ABS (x) <= div12)
-                 {
-                   x /= div12; /* exact */
-                   shift_exp -= 4096;
-+                  mpfr_mul_2si (t, t, 4096, MPFR_RNDZ);
-                 }
-               if (ABS (x) <= div11)
-                 {
-                   x /= div11; /* exact */
-                   shift_exp -= 2048;
-+                  mpfr_mul_2si (t, t, 2048, MPFR_RNDZ);
-                 }
-               if (ABS (x) <= div10)
-                 {
-                   x /= div10; /* exact */
-                   shift_exp -= 1024;
-+                  mpfr_mul_2si (t, t, 1024, MPFR_RNDZ);
-                 }
-               if (ABS(x) <= div9)
-                 {
-                   x /= div9;  /* exact */
-                   shift_exp -= 512;
-+                  mpfr_mul_2si (t, t, 512, MPFR_RNDZ);
-                 }
-             }
--          else
-+          else /* no underflow */
-             {
-               inexact = mpfr_set_d (u, (double) x, MPFR_RNDZ);
-               MPFR_ASSERTD (inexact == 0);
-diff -Naurd mpfr-3.0.0-a/tests/tset_ld.c mpfr-3.0.0-b/tests/tset_ld.c
---- mpfr-3.0.0-a/tests/tset_ld.c	2010-06-10 11:00:13.000000000 +0000
-+++ mpfr-3.0.0-b/tests/tset_ld.c	2010-10-21 21:18:26.000000000 +0000
-@@ -147,12 +147,39 @@
- test_fixed_bugs (void)
- {
-   mpfr_t x;
--  long double d;
-+  long double l, m;
- 
-   /* bug found by Steve Kargl (2009-03-14) */
-   mpfr_init2 (x, 64);
-   mpfr_set_ui_2exp (x, 1, -16447, MPFR_RNDN);
--  d = mpfr_get_ld (x, MPFR_RNDN);  /* an assertion failed in init2.c:50 */
-+  mpfr_get_ld (x, MPFR_RNDN);  /* an assertion failed in init2.c:50 */
-+
-+  /* bug reported by Jakub Jelinek (2010-10-17)
-+     https://gforge.inria.fr/tracker/?func=detail&aid=11300 */
-+  mpfr_set_prec (x, MPFR_LDBL_MANT_DIG);
-+  /* l = 0x1.23456789abcdef0123456789abcdp-914L; */
-+  l = 8.215640181713713164092636634579e-276;
-+  mpfr_set_ld (x, l, MPFR_RNDN);
-+  m = mpfr_get_ld (x, MPFR_RNDN);
-+  if (m != l)
-+    {
-+      printf ("Error in get_ld o set_ld for l=%Le\n", l);
-+      printf ("Got m=%Le instead of l\n", m);
-+      exit (1);
-+    }
-+
-+  /* another similar test which failed with extended double precision and the
-+     generic code for mpfr_set_ld */
-+  /* l = 0x1.23456789abcdef0123456789abcdp-968L; */
-+  l = 4.560596445887084662336528403703e-292;
-+  mpfr_set_ld (x, l, MPFR_RNDN);
-+  m = mpfr_get_ld (x, MPFR_RNDN);
-+  if (m != l)
-+    {
-+      printf ("Error in get_ld o set_ld for l=%Le\n", l);
-+      printf ("Got m=%Le instead of l\n", m);
-+      exit (1);
-+    }
- 
-   mpfr_clear (x);
- }
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-10-21 20:59:32.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-10-21 21:18:26.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p6";
-+  return "3.0.0-p7";
- }
diff --git a/patches/mpfr/3.0.0/180-macros.patch b/patches/mpfr/3.0.0/180-macros.patch
deleted file mode 100644
index 58a490f..0000000
--- a/patches/mpfr/3.0.0/180-macros.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
---- mpfr-3.0.0-a/PATCHES	2010-11-09 15:15:07.000000000 +0000
-+++ mpfr-3.0.0-b/PATCHES	2010-11-09 15:15:07.000000000 +0000
-@@ -0,0 +1 @@
-+macros
-diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
---- mpfr-3.0.0-a/VERSION	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/VERSION	2010-11-09 15:15:07.000000000 +0000
-@@ -1 +1 @@
--3.0.0-p7
-+3.0.0-p8
-diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
---- mpfr-3.0.0-a/mpfr.h	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/mpfr.h	2010-11-09 15:15:07.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.0.0-p7"
-+#define MPFR_VERSION_STRING "3.0.0-p8"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -67,6 +67,16 @@
- # define _MPFR_H_HAVE_INTMAX_T 1
- #endif
- 
-+/* Avoid some problems with macro expansion if the user defines macros
-+   with the same name as keywords. By convention, identifiers and macro
-+   names starting with mpfr_ are reserved by MPFR. */
-+typedef void            mpfr_void;
-+typedef int             mpfr_int;
-+typedef unsigned int    mpfr_uint;
-+typedef long            mpfr_long;
-+typedef unsigned long   mpfr_ulong;
-+typedef size_t          mpfr_size_t;
-+
- /* Definition of rounding modes (DON'T USE MPFR_RNDNA!).
-    Warning! Changing the contents of this enum should be seen as an
-    interface change since the old and the new types are not compatible
-@@ -136,7 +146,7 @@
- typedef mp_exp_t     mpfr_exp_t;
- 
- /* Definition of the standard exponent limits */
--#define MPFR_EMAX_DEFAULT ((mpfr_exp_t) (((unsigned long) 1 << 30) - 1))
-+#define MPFR_EMAX_DEFAULT ((mpfr_exp_t) (((mpfr_ulong) 1 << 30) - 1))
- #define MPFR_EMIN_DEFAULT (-(MPFR_EMAX_DEFAULT))
- 
- /* Definition of the main structure */
-@@ -725,13 +735,13 @@
-    unexpected results with future compilers and aggressive optimisations.
-    Why not working only with signed types, using INT_MIN and LONG_MIN? */
- #if __GMP_MP_SIZE_T_INT
--#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+2))
--#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+1))
--#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+3))
-+#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+2))
-+#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+1))
-+#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+3))
- #else
--#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+2))
--#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+1))
--#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+3))
-+#define __MPFR_EXP_NAN  ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+2))
-+#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+1))
-+#define __MPFR_EXP_INF  ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+3))
- #endif
- 
- /* Define MPFR_USE_EXTENSION to avoid "gcc -pedantic" warnings. */
-@@ -760,9 +770,9 @@
- #define mpfr_inf_p(_x)      ((_x)->_mpfr_exp == __MPFR_EXP_INF)
- #define mpfr_zero_p(_x)     ((_x)->_mpfr_exp == __MPFR_EXP_ZERO)
- #define mpfr_regular_p(_x)  ((_x)->_mpfr_exp >  __MPFR_EXP_INF)
--#define mpfr_sgn(_x)                                          \
--  ((_x)->_mpfr_exp < __MPFR_EXP_INF ?                         \
--   (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (void) 0), 0 : \
-+#define mpfr_sgn(_x)                                               \
-+  ((_x)->_mpfr_exp < __MPFR_EXP_INF ?                              \
-+   (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (mpfr_void) 0), 0 : \
-    MPFR_SIGN (_x))
- 
- /* Prevent them from using as lvalues */
-@@ -805,7 +815,19 @@
-    Moreover casts to unsigned long have been added to avoid warnings in
-    programs that use MPFR and are compiled with -Wconversion; such casts
-    are OK since if X is a constant expression, then (unsigned long) X is
--   also a constant expression, so that the optimizations still work. */
-+   also a constant expression, so that the optimizations still work. The
-+   warnings are probably related to the following two bugs:
-+     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=4210
-+     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38470 (possibly a variant)
-+   and the casts could be removed once these bugs are fixed.
-+   Casts shouldn't be used on the generic calls (to the ..._2exp functions),
-+   where implicit conversions are performed. Indeed, having at least one
-+   implicit conversion in the macro allows the compiler to emit diagnostics
-+   when normally expected, for instance in the following call:
-+     mpfr_set_ui (x, "foo", MPFR_RNDN);
-+   If this is not possible (for future macros), one of the tricks described
-+   on http://groups.google.com/group/comp.std.c/msg/e92abd24bf9eaf7b could
-+   be used. */
- #if defined (__GNUC__) && !defined(__ICC) && !defined(__cplusplus)
- #if (__GNUC__ >= 2)
- #undef mpfr_cmp_ui
-@@ -813,45 +835,45 @@
-    But warning! mpfr_sgn is specified as a macro in the API, thus the macro
-    mustn't be used if side effects are possible, like here. */
- #define mpfr_cmp_ui(_f,_u)                                      \
--  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+  (__builtin_constant_p (_u) && (mpfr_ulong) (_u) == 0 ?        \
-    (mpfr_sgn) (_f) :                                            \
--   mpfr_cmp_ui_2exp ((_f), (unsigned long) (_u), 0))
-+   mpfr_cmp_ui_2exp ((_f), (_u), 0))
- #undef mpfr_cmp_si
--#define mpfr_cmp_si(_f,_s)                              \
--  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?      \
--   mpfr_cmp_ui ((_f), (unsigned long) (long) (_s)) :    \
--   mpfr_cmp_si_2exp ((_f), (long) (_s), 0))
-+#define mpfr_cmp_si(_f,_s)                                      \
-+  (__builtin_constant_p (_s) && (mpfr_long) (_s) >= 0 ?         \
-+   mpfr_cmp_ui ((_f), (mpfr_ulong) (mpfr_long) (_s)) :          \
-+   mpfr_cmp_si_2exp ((_f), (_s), 0))
- #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95
- #undef mpfr_set_ui
- #define mpfr_set_ui(_f,_u,_r)                                   \
--  (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ?     \
-+  (__builtin_constant_p (_u) && (mpfr_ulong) (_u) == 0 ?        \
-    __extension__ ({                                             \
-        mpfr_ptr _p = (_f);                                      \
-        _p->_mpfr_sign = 1;                                      \
-        _p->_mpfr_exp = __MPFR_EXP_ZERO;                         \
--       (void) (_r); 0; }) :                                     \
--   mpfr_set_ui_2exp ((_f), (unsigned long) (_u), 0, (_r)))
-+       (mpfr_void) (_r); 0; }) :                                \
-+   mpfr_set_ui_2exp ((_f), (_u), 0, (_r)))
- #endif
- #undef mpfr_set_si
- #define mpfr_set_si(_f,_s,_r)                                   \
--  (__builtin_constant_p (_s) && (long) (_s) >= 0 ?              \
--   mpfr_set_ui ((_f), (unsigned long) (long) (_s), (_r)) :      \
--   mpfr_set_si_2exp ((_f), (long) (_s), 0, (_r)))
-+  (__builtin_constant_p (_s) && (mpfr_long) (_s) >= 0 ?         \
-+   mpfr_set_ui ((_f), (mpfr_ulong) (mpfr_long) (_s), (_r)) :    \
-+   mpfr_set_si_2exp ((_f), (_s), 0, (_r)))
- #endif
- #endif
- 
- /* Macro version of mpfr_stack interface for fast access */
--#define mpfr_custom_get_size(p) ((size_t)                            \
-+#define mpfr_custom_get_size(p) ((mpfr_size_t)                          \
-        (((p)+GMP_NUMB_BITS-1)/GMP_NUMB_BITS*sizeof (mp_limb_t)))
- #define mpfr_custom_init(m,p) do {} while (0)
--#define mpfr_custom_get_significand(x) ((void*)((x)->_mpfr_d))
-+#define mpfr_custom_get_significand(x) ((mpfr_void*)((x)->_mpfr_d))
- #define mpfr_custom_get_exp(x) ((x)->_mpfr_exp)
- #define mpfr_custom_move(x,m) do { ((x)->_mpfr_d = (mp_limb_t*)(m)); } while (0)
- #define mpfr_custom_init_set(x,k,e,p,m) do {                   \
-   mpfr_ptr _x = (x);                                           \
-   mpfr_exp_t _e;                                               \
-   mpfr_kind_t _t;                                              \
--  int _s, _k;                                                  \
-+  mpfr_int _s, _k;                                             \
-   _k = (k);                                                    \
-   if (_k >= 0)  {                                              \
-     _t = (mpfr_kind_t) _k;                                     \
-@@ -868,11 +890,13 @@
-   _x->_mpfr_exp  = _e;                                         \
-   _x->_mpfr_d    = (mp_limb_t*) (m);                           \
-  } while (0)
--#define mpfr_custom_get_kind(x)                                              \
--  ( (x)->_mpfr_exp >  __MPFR_EXP_INF ? (int)MPFR_REGULAR_KIND*MPFR_SIGN (x) \
--  : (x)->_mpfr_exp == __MPFR_EXP_INF ? (int)MPFR_INF_KIND*MPFR_SIGN (x)     \
--  : (x)->_mpfr_exp == __MPFR_EXP_NAN ? (int)MPFR_NAN_KIND                   \
--  : (int) MPFR_ZERO_KIND * MPFR_SIGN (x) )
-+#define mpfr_custom_get_kind(x)                                         \
-+  ( (x)->_mpfr_exp >  __MPFR_EXP_INF ?                                  \
-+    (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (x)                        \
-+  : (x)->_mpfr_exp == __MPFR_EXP_INF ?                                  \
-+    (mpfr_int) MPFR_INF_KIND * MPFR_SIGN (x)                            \
-+  : (x)->_mpfr_exp == __MPFR_EXP_NAN ? (mpfr_int) MPFR_NAN_KIND         \
-+  : (mpfr_int) MPFR_ZERO_KIND * MPFR_SIGN (x) )
- 
- 
- #endif /* MPFR_USE_NO_MACRO */
-diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
---- mpfr-3.0.0-a/version.c	2010-10-21 21:18:26.000000000 +0000
-+++ mpfr-3.0.0-b/version.c	2010-11-09 15:15:07.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.0-p7";
-+  return "3.0.0-p8";
- }
diff --git a/patches/mpfr/3.0.1/110-asin_exprange.patch b/patches/mpfr/3.0.1/110-asin_exprange.patch
deleted file mode 100644
index d79a6f9..0000000
--- a/patches/mpfr/3.0.1/110-asin_exprange.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-04-12 10:50:02.000000000 +0000
-@@ -0,0 +1 @@
-+asin_exprange
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-04-12 10:50:02.000000000 +0000
-@@ -1 +1 @@
--3.0.1
-+3.0.1-p1
-diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c
---- mpfr-3.0.1-a/asin.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/asin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -63,11 +63,14 @@
- 
-   compared = mpfr_cmp_ui (xp, 1);
- 
-+  MPFR_SAVE_EXPO_MARK (expo);
-+
-   if (MPFR_UNLIKELY (compared >= 0))
-     {
-       mpfr_clear (xp);
-       if (compared > 0)                  /* asin(x) = NaN for |x| > 1 */
-         {
-+          MPFR_SAVE_EXPO_FREE (expo);
-           MPFR_SET_NAN (asin);
-           MPFR_RET_NAN;
-         }
-@@ -80,13 +83,11 @@
-               inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode));
-               MPFR_CHANGE_SIGN (asin);
-             }
--          mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */
--          return inexact;
-+          mpfr_div_2ui (asin, asin, 1, rnd_mode);
-         }
-     }
--
--  MPFR_SAVE_EXPO_MARK (expo);
--
-+  else
-+    {
-   /* Compute exponent of 1 - ABS(x) */
-   mpfr_ui_sub (xp, 1, xp, MPFR_RNDD);
-   MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0);
-@@ -115,6 +116,7 @@
-   inexact = mpfr_set (asin, xp, rnd_mode);
- 
-   mpfr_clear (xp);
-+    }
- 
-   MPFR_SAVE_EXPO_FREE (expo);
-   return mpfr_check_range (asin, inexact, rnd_mode);
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1"
-+#define MPFR_VERSION_STRING "3.0.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c
---- mpfr-3.0.1-a/tests/tasin.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tasin.c	2011-04-12 10:50:02.000000000 +0000
-@@ -219,6 +219,49 @@
-   mpfr_clear (y);
- }
- 
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (1);
-+  mpfr_set_emax (1);
-+  mpfr_clear_flags ();
-+  inex = mpfr_asin (y, x, MPFR_RNDA);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN);
-+  ex_inex = -1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (void)
- {
-@@ -226,6 +269,7 @@
- 
-   special ();
-   special_overflow ();
-+  reduced_expo_range ();
- 
-   test_generic (2, 100, 15);
- 
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-04-12 10:50:02.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1";
-+  return "3.0.1-p1";
- }
diff --git a/patches/mpfr/3.0.1/120-rec_sqrt-carry.patch b/patches/mpfr/3.0.1/120-rec_sqrt-carry.patch
deleted file mode 100644
index 0367d84..0000000
--- a/patches/mpfr/3.0.1/120-rec_sqrt-carry.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-04 11:18:33.000000000 +0000
-@@ -0,0 +1 @@
-+rec_sqrt-carry
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-04 11:18:33.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p1
-+3.0.1-p2
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p1"
-+#define MPFR_VERSION_STRING "3.0.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c
---- mpfr-3.0.1-a/rec_sqrt.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/rec_sqrt.c	2011-05-04 11:18:33.000000000 +0000
-@@ -375,20 +375,37 @@
-       MPFR_ASSERTD(un == ln + 1 || un == ln + 2);
-       /* the high un-ln limbs of u will overlap the low part of {x+ln,xn},
-          we need to add or subtract the overlapping part {u + ln, un - ln} */
-+      /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1
-+         below (with size = th) mustn't be used. In such a case, the limb
-+         (carry) will be 0, so that this is semantically a no-op, but if
-+         mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a
-+         non-atomic read/write in a place that is not always allocated,
-+         with the possible consequences: a crash if the corresponding
-+         address is not mapped, or (rather unlikely) memory corruption
-+         if another process/thread writes at the same place; things may
-+         be worse with future GMP versions. Hence the tests carry != 0. */
-       if (neg == 0)
-         {
-           if (ln > 0)
-             MPN_COPY (x, u, ln);
-           cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln);
-           /* add cu at x+un */
--          cy += mpn_add_1 (x + un, x + un, th, cu);
-+          if (cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy += mpn_add_1 (x + un, x + un, th, cu);
-+            }
-         }
-       else /* negative case */
-         {
-           /* subtract {u+ln, un-ln} from {x+ln,un} */
-           cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln);
-           /* carry cy is at x+un, like cu */
--          cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+          if (cy + cu != 0)
-+            {
-+              MPFR_ASSERTD (th != 0);
-+              cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */
-+            }
-           /* cy cannot be zero, since the most significant bit of Xh is 1,
-              and the correction is bounded by 2^{-h+3} */
-           MPFR_ASSERTD(cy == 0);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-04-12 10:50:02.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-04 11:18:33.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p1";
-+  return "3.0.1-p2";
- }
diff --git a/patches/mpfr/3.0.1/130-atan-expo-range.patch b/patches/mpfr/3.0.1/130-atan-expo-range.patch
deleted file mode 100644
index 251b837..0000000
--- a/patches/mpfr/3.0.1/130-atan-expo-range.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-05 00:00:35.000000000 +0000
-@@ -0,0 +1 @@
-+atan-expo-range
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-05 00:00:35.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p2
-+3.0.1-p3
-diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c
---- mpfr-3.0.1-a/atan.c	2011-04-04 10:19:18.000000000 +0000
-+++ mpfr-3.0.1-b/atan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -431,5 +431,5 @@
-   MPFR_GROUP_CLEAR (group);
- 
-   MPFR_SAVE_EXPO_FREE (expo);
--  return mpfr_check_range (arctgt, inexact, rnd_mode);
-+  return mpfr_check_range (atan, inexact, rnd_mode);
- }
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p2"
-+#define MPFR_VERSION_STRING "3.0.1-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c
---- mpfr-3.0.1-a/tests/tatan.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/tatan.c	2011-05-05 00:00:35.000000000 +0000
-@@ -535,6 +535,52 @@
-   mpfr_clears (a, x, y, (mpfr_ptr) 0);
- }
- 
-+/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html
-+ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure).
-+ */
-+static void
-+reduced_expo_range (void)
-+{
-+  mpfr_exp_t emin, emax;
-+  mpfr_t x, y, ex_y;
-+  int inex, ex_inex;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0);
-+  mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN);
-+
-+  mpfr_set_emin (-5);
-+  mpfr_set_emax (-5);
-+  mpfr_clear_flags ();
-+  inex = mpfr_atan (y, x, MPFR_RNDN);
-+  flags = __gmpfr_flags;
-+  mpfr_set_emin (emin);
-+  mpfr_set_emax (emax);
-+
-+  mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN);
-+  ex_inex = 1;
-+  ex_flags = MPFR_FLAGS_INEXACT;
-+
-+  if (SIGN (inex) != ex_inex || flags != ex_flags ||
-+      ! mpfr_equal_p (y, ex_y))
-+    {
-+      printf ("Error in reduced_expo_range\non x = ");
-+      mpfr_dump (x);
-+      printf ("Expected y = ");
-+      mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", ex_inex, ex_flags);
-+      printf ("Got      y = ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\n         inex = %d, flags = %u\n", SIGN (inex), flags);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, ex_y, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -546,6 +592,7 @@
-   smallvals_atan2 ();
-   atan2_bug_20071003 ();
-   atan2_different_prec ();
-+  reduced_expo_range ();
- 
-   test_generic_atan  (2, 200, 17);
-   test_generic_atan2 (2, 200, 17);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-04 11:18:33.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-05 00:00:35.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p2";
-+  return "3.0.1-p3";
- }
diff --git a/patches/mpfr/3.0.1/140-texp-zero.patch b/patches/mpfr/3.0.1/140-texp-zero.patch
deleted file mode 100644
index fd74087..0000000
--- a/patches/mpfr/3.0.1/140-texp-zero.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES
---- mpfr-3.0.1-a/PATCHES	2011-05-09 14:48:24.000000000 +0000
-+++ mpfr-3.0.1-b/PATCHES	2011-05-09 14:48:24.000000000 +0000
-@@ -0,0 +1 @@
-+texp-zero
-diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION
---- mpfr-3.0.1-a/VERSION	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/VERSION	2011-05-09 14:48:24.000000000 +0000
-@@ -1 +1 @@
--3.0.1-p3
-+3.0.1-p4
-diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h
---- mpfr-3.0.1-a/mpfr.h	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/mpfr.h	2011-05-09 14:48:24.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 0
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.0.1-p3"
-+#define MPFR_VERSION_STRING "3.0.1-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c
---- mpfr-3.0.1-a/tests/texp.c	2011-04-04 10:19:17.000000000 +0000
-+++ mpfr-3.0.1-b/tests/texp.c	2011-05-09 14:48:24.000000000 +0000
-@@ -170,7 +170,9 @@
-       mpfr_set_prec (x, prec);
-       mpfr_set_prec (y, prec);
-       mpfr_set_prec (z, prec);
--      mpfr_urandomb (x, RANDS);
-+      do
-+        mpfr_urandomb (x, RANDS);
-+      while (MPFR_IS_ZERO (x));  /* 0 is handled by mpfr_exp only */
-       rnd = RND_RAND ();
-       mpfr_exp_2 (y, x, rnd);
-       mpfr_exp_3 (z, x, rnd);
-diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c
---- mpfr-3.0.1-a/version.c	2011-05-05 00:00:35.000000000 +0000
-+++ mpfr-3.0.1-b/version.c	2011-05-09 14:48:24.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.0.1-p3";
-+  return "3.0.1-p4";
- }
diff --git a/patches/mpfr/3.1.0/110-mpfr_unlikely.patch b/patches/mpfr/3.1.0/110-mpfr_unlikely.patch
deleted file mode 100644
index 437b1a2..0000000
--- a/patches/mpfr/3.1.0/110-mpfr_unlikely.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
diff --git a/patches/mpfr/3.1.0/120-lib-search-path.patch b/patches/mpfr/3.1.0/120-lib-search-path.patch
deleted file mode 100644
index 4714ac9..0000000
--- a/patches/mpfr/3.1.0/120-lib-search-path.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
-@@ -0,0 +1 @@
-+lib-search-path
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p1
-+3.1.0-p2
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p1"
-+#define MPFR_VERSION_STRING "3.1.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p1";
-+  return "3.1.0-p2";
- }
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
---- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-@@ -65,8 +65,24 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
---- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-@@ -1124,11 +1124,27 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
- all: all-am
- 
- .SUFFIXES:
diff --git a/patches/mpfr/3.1.0/130-vasprintf.patch b/patches/mpfr/3.1.0/130-vasprintf.patch
deleted file mode 100644
index aa1cfbc..0000000
--- a/patches/mpfr/3.1.0/130-vasprintf.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p2
-+3.1.0-p3
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p2"
-+#define MPFR_VERSION_STRING "3.1.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
---- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -1178,7 +1178,7 @@
-   mpfr_exp_t exp;
-   char * str;
-   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
--  const int keep_trailing_zeros = spec_g && spec.alt;
-+  const int keep_trailing_zeros = !spec_g || spec.alt;
- 
-   /* WARNING: an empty precision field is forbidden (it means precision = 6
-      and it should have been changed to 6 before the function call) */
-@@ -1356,7 +1356,7 @@
-   else
-     /* 1 <= |p| */
-     {
--      size_t nsd;  /* Number of significant digits */
-+      size_t str_len;
- 
-       /* Determine the position of the most significant decimal digit. */
-       exp = floor_log10 (p);
-@@ -1365,12 +1365,10 @@
-         /* P is too large to print all its integral part digits */
-         return -1;
- 
--      np->ip_size = exp + 1;
--
--      nsd = spec.prec + np->ip_size;
-       if (dec_info == NULL)
--        {
--          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
-+        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
-+          str =
-+            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
-           register_string (np->sl, str);
-         }
-       else
-@@ -1379,81 +1377,60 @@
-           str = dec_info->str;
-         }
-       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
-+      str_len = strlen (str);
-+
-+      /* integral part */
-+      if (exp > str_len)
-+        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
-+           power of 10 (p integer, so no fractional part) */
-+        {
-+          np->ip_trailing_zeros = exp - str_len;
-+          np->ip_size = str_len;
-+        }
-+      else
-+        np->ip_size = exp;
- 
-       if (spec.group)
-         /* thousands separator in integral part */
-         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
- 
--      if (nsd == 0 || (spec_g && !spec.alt))
--        /* compute how much non-zero digits in integral and fractional
--           parts */
-+      /* fractional part */
-+      str += np->ip_size;
-+      str_len -= np->ip_size;
-+      if (!keep_trailing_zeros)
-+        /* remove trailing zeros, if any */
-         {
--          size_t str_len;
--          str_len = strlen (str); /* note: the sign has been skipped */
--
--          if (exp > str_len)
--            /* mpfr_get_str doesn't give the trailing zeros when p is a
--               multiple of 10 (p integer, so no fractional part) */
--            {
--              np->ip_trailing_zeros = exp - str_len;
--              np->ip_size = str_len;
--              if (spec.alt)
--                np->point = MPFR_DECIMAL_POINT;
--            }
--          else
--            /* str may contain some digits which are in fractional part */
-+          char *ptr = str + str_len - 1; /* pointer to the last digit of
-+                                            str */
-+          while ((*ptr == '0') && (str_len != 0))
-             {
--              char *ptr;
--
--              ptr = str + str_len - 1; /* points to the end of str */
--              str_len -= np->ip_size;  /* number of digits in fractional
--                                          part */
--
--              if (!keep_trailing_zeros)
--                /* remove trailing zeros, if any */
--                {
--                  while ((*ptr == '0') && (str_len != 0))
--                    {
--                      --ptr;
--                      --str_len;
--                    }
--                }
--
--              if (str_len > INT_MAX)
--                /* too many digits in fractional part */
--                return -1;
--
--              if (str_len != 0)
--                /* some digits in fractional part */
--                {
--                  np->point = MPFR_DECIMAL_POINT;
--                  np->fp_ptr = str + np->ip_size;
--                  np->fp_size = str_len;
--                }
-+              --ptr;
-+              --str_len;
-             }
-         }
--      else
--        /* spec.prec digits in fractional part */
-+
-+      if (str_len > 0)
-+        /* some nonzero digits in fractional part */
-         {
--          if (np->ip_size == exp - 1)
--            /* the absolute value of the number has been rounded up to a power
--               of ten.
--               Insert an additional zero in integral part and put the rest of
--               them in fractional part. */
--            np->ip_trailing_zeros = 1;
-+          if (str_len > INT_MAX)
-+            /* too many digits in fractional part */
-+            return -1;
- 
--          if (spec.prec != 0)
--            {
--              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
--              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_ptr = str;
-+          np->fp_size = str_len;
-+        }
- 
--              np->point = MPFR_DECIMAL_POINT;
--              np->fp_ptr = str + np->ip_size;
--              np->fp_size = spec.prec;
--            }
--          else if (spec.alt)
--            np->point = MPFR_DECIMAL_POINT;
-+      if (keep_trailing_zeros && str_len < spec.prec)
-+        /* add missing trailing zeros */
-+        {
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_trailing_zeros = spec.prec - np->fp_size;
-         }
-+
-+      if (spec.alt)
-+        /* add decimal point even if no digits follow it */
-+        np->point = MPFR_DECIMAL_POINT;
-     }
- 
-   return 0;
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p2";
-+  return "3.1.0-p3";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
---- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -475,6 +475,18 @@
-   check_sprintf ("-1.", "%- #0.1RG", x);
- 
-   /* precision zero */
-+  mpfr_set_d (x, 9.5, MPFR_RNDN);
-+  check_sprintf ("9",    "%.0RDf", x);
-+  check_sprintf ("10",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 19.5, MPFR_RNDN);
-+  check_sprintf ("19",    "%.0RDf", x);
-+  check_sprintf ("20",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 99.5, MPFR_RNDN);
-+  check_sprintf ("99",    "%.0RDf", x);
-+  check_sprintf ("100",   "%.0RUf", x);
-+
-   mpfr_set_d (x, -9.5, MPFR_RNDN);
-   check_sprintf ("-10",    "%.0RDf", x);
-   check_sprintf ("-10",    "%.0RYf", x);
-@@ -1078,6 +1090,23 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+bug20111102 (void)
-+{
-+  mpfr_t t;
-+  char s[100];
-+
-+  mpfr_init2 (t, 84);
-+  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
-+  mpfr_sprintf (s, "%.20RNg", t);
-+  if (strcmp (s, "1000") != 0)
-+    {
-+      printf ("Error in bug20111102, expected 1000, got %s\n", s);
-+      exit (1);
-+    }
-+  mpfr_clear (t);
-+}
-+
- /* In particular, the following test makes sure that the rounding
-  * for %Ra and %Rb is not done on the MPFR number itself (as it
-  * would overflow). Note: it has been reported on comp.std.c that
-@@ -1161,6 +1190,7 @@
-   locale = setlocale (LC_ALL, "C");
- #endif
- 
-+  bug20111102 ();
-   native_types ();
-   hexadecimal ();
-   binary ();
diff --git a/patches/mpfr/3.1.0/140-gmp41compat.patch b/patches/mpfr/3.1.0/140-gmp41compat.patch
deleted file mode 100644
index 4b1ba08..0000000
--- a/patches/mpfr/3.1.0/140-gmp41compat.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
-@@ -0,0 +1 @@
-+gmp41compat
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p3
-+3.1.0-p4
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
---- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
-@@ -2994,11 +2994,12 @@
- 
-    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
-      behavior no longer depends on the platform (assuming this is also
--     true for GMP's random generator).  As a consequence, the returned
--     values can be different between MPFR 3.1 and previous MPFR
--     versions.  Note: as the reproducibility of these functions was not
--     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
--     as backward incompatible with previous versions.
-+     true for GMP's random generator, which is not the case between GMP
-+     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
-+     the returned values can be different between MPFR 3.1 and previous
-+     MPFR versions.  Note: as the reproducibility of these functions
-+     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
-+     regarded as backward incompatible with previous versions.
- 
- 
- 
-@@ -4239,13 +4240,13 @@
- Node: Type and Macro Changes129308
- Node: Added Functions132029
- Node: Changed Functions134972
--Node: Removed Functions139167
--Node: Other Changes139579
--Node: Contributors141108
--Node: References143574
--Node: GNU Free Documentation License145315
--Node: Concept Index167758
--Node: Function and Type Index173677
-+Node: Removed Functions139253
-+Node: Other Changes139665
-+Node: Contributors141194
-+Node: References143660
-+Node: GNU Free Documentation License145401
-+Node: Concept Index167844
-+Node: Function and Type Index173763
- 
- End Tag Table
- 
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
---- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
-@@ -3466,8 +3466,9 @@
- a lack of specification.
- 
- @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
--Their behavior no longer depends on the platform (assuming this is also
--true for GMP's random generator).  As a consequence, the returned values
-+Their behavior no longer depends on the platform (assuming this is also true
-+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
-+@code{gmp_randinit_default} is used).  As a consequence, the returned values
- can be different between MPFR 3.1 and previous MPFR versions.
- Note: as the reproducibility of these functions was not specified
- before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p3"
-+#define MPFR_VERSION_STRING "3.1.0-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p3";
-+  return "3.1.0-p4";
- }
-diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
---- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -114,21 +114,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.895943"
-+# define C2 "0.848824"
-+#else
-+# define C1 "0.479652"
-+# define C2 "0.648529"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.895943") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.895943, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.848824") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.848824, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
---- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -160,23 +160,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.8488312"
-+# define C2 "0.8156509"
-+#else
-+# define C1 "0.6485367"
-+# define C2 "0.9362717"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandom (x, s, MPFR_RNDN);
--  /* the following values are obtained on a 32-bit computer, we should get
--     the same values on a 64-bit computer */
--  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8488312, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandom (x, s, MPFR_RNDN);
--  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8156509, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
diff --git a/patches/mpfr/3.1.0/150-logging-freeze.patch b/patches/mpfr/3.1.0/150-logging-freeze.patch
deleted file mode 100644
index c664cee..0000000
--- a/patches/mpfr/3.1.0/150-logging-freeze.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
-@@ -0,0 +1 @@
-+logging-freeze
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p4
-+3.1.0-p5
-diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
---- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
---- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
-@@ -29,7 +29,7 @@
-   MPFR_LOG_FUNC
-     (("x[%Pu]=%.*Rg u=%d rnd=%d",
-       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
--     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
-+     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
- 
-   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
-     {
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p4"
-+#define MPFR_VERSION_STRING "3.1.0-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
---- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p4";
-+  return "3.1.0-p5";
- }
diff --git a/patches/mpfr/3.1.0/160-logging-varfmt.patch b/patches/mpfr/3.1.0/160-logging-varfmt.patch
deleted file mode 100644
index 0f4bfad..0000000
--- a/patches/mpfr/3.1.0/160-logging-varfmt.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
-@@ -0,0 +1 @@
-+logging-varfmt
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p5
-+3.1.0-p6
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-@@ -1592,7 +1592,7 @@
-   do                                                                    \
-     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
-         (mpfr_log_current <= mpfr_log_level))                           \
--      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
-+      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
-                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
-   while (0)
- 
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p5"
-+#define MPFR_VERSION_STRING "3.1.0-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p5";
-+  return "3.1.0-p6";
- }
diff --git a/patches/mpfr/3.1.0/170-large-prec.patch b/patches/mpfr/3.1.0/170-large-prec.patch
deleted file mode 100644
index 08e7b57..0000000
--- a/patches/mpfr/3.1.0/170-large-prec.patch
+++ /dev/null
@@ -1,591 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-08 15:17:03.000000000 +0000
-@@ -0,0 +1 @@
-+large-prec
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-08 15:17:03.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p6
-+3.1.0-p7
-diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c
---- mpfr-3.1.0-a/src/add1.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1.c	2012-03-08 15:17:03.000000000 +0000
-@@ -44,12 +44,12 @@
-   bq = MPFR_PREC(b);
-   cq = MPFR_PREC(c);
- 
--  an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */
-+  an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */
-   aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS;
-   sh = aq2 - aq;                  /* non-significant bits in low limb */
- 
--  bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */
--  cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
- 
-   ap = MPFR_MANT(a);
-   bp = MPFR_MANT(b);
-@@ -124,7 +124,7 @@
-       dif = aq2 - diff_exp;
-       /* dif is the number of bits of c which overlap with a' */
- 
--      difn = (dif-1)/GMP_NUMB_BITS + 1;
-+      difn = MPFR_PREC2LIMBS (dif);
-       /* only the highest difn limbs from c have to be considered */
-       if (MPFR_UNLIKELY(difn > cn))
-         {
-diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c
---- mpfr-3.1.0-a/src/add1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -107,7 +107,7 @@
- 
-   /* Read prec and num of limbs */
-   p = MPFR_PREC(b);
--  n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS;
-+  n = MPFR_PREC2LIMBS (p);
-   MPFR_UNSIGNED_MINUS_MODULO(sh, p);
-   bx = MPFR_GET_EXP(b);
-   d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c));
-diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c
---- mpfr-3.1.0-a/src/agm.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/agm.c	2012-03-08 15:17:03.000000000 +0000
-@@ -91,7 +91,7 @@
-   q = MPFR_PREC(r);
-   p = q + MPFR_INT_CEIL_LOG2(q) + 15;
-   MPFR_ASSERTD (p >= 7); /* see algorithms.tex */
--  s = (p - 1) / GMP_NUMB_BITS + 1;
-+  s = MPFR_PREC2LIMBS (p);
- 
-   /* b (op2) and a (op1) are the 2 operands but we want b >= a */
-   compare = mpfr_cmp (op1, op2);
-@@ -285,7 +285,7 @@
- 
-       /* Next iteration */
-       MPFR_ZIV_NEXT (loop, p);
--      s = (p - 1) / GMP_NUMB_BITS + 1;
-+      s = MPFR_PREC2LIMBS (p);
-     }
-   MPFR_ZIV_FREE (loop);
- 
-diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c
---- mpfr-3.1.0-a/src/eq.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/eq.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,8 +56,8 @@
-   if (uexp != vexp)
-     return 0; /* no bit agree */
- 
--  usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1;
--  vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1;
-+  usize = MPFR_LIMB_SIZE (u);
-+  vsize = MPFR_LIMB_SIZE (v);
- 
-   if (vsize > usize) /* exchange u and v */
-     {
-diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c
---- mpfr-3.1.0-a/src/exp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/exp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -133,7 +133,7 @@
-               mp_size_t yn;
-               int sh;
- 
--              yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+              yn = MPFR_LIMB_SIZE (y);
-               sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y);
-               MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh;
-               inexact = 1;
-diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c
---- mpfr-3.1.0-a/src/get_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_d.c	2012-03-08 15:17:03.000000000 +0000
-@@ -100,7 +100,7 @@
-           nbits += (1021 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE );
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c
---- mpfr-3.1.0-a/src/get_flt.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_flt.c	2012-03-08 15:17:03.000000000 +0000
-@@ -92,7 +92,7 @@
-           nbits += (125 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT);
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c
---- mpfr-3.1.0-a/src/get_str.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_str.c	2012-03-08 15:17:03.000000000 +0000
-@@ -2351,7 +2351,7 @@
- 
-       /* the first digit will contain only r bits */
-       prec = (m - 1) * pow2 + r; /* total number of bits */
--      n = (prec - 1) / GMP_NUMB_BITS + 1;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       MPFR_TMP_MARK (marker);
-       x1 = MPFR_TMP_LIMBS_ALLOC (n + 1);
-@@ -2417,12 +2417,12 @@
-       exact = 1;
- 
-       /* number of limbs */
--      n = 1 + (prec - 1) / GMP_NUMB_BITS;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       /* a will contain the approximation of the mantissa */
-       a = MPFR_TMP_LIMBS_ALLOC (n);
- 
--      nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+      nx = MPFR_LIMB_SIZE (x);
- 
-       if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or
-                                 division to perform */
-diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c
---- mpfr-3.1.0-a/src/init2.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/init2.c	2012-03-08 15:17:03.000000000 +0000
-@@ -51,7 +51,7 @@
-      which both have an odd mantissa */
-   MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
--  xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
-   tmp   = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize));
- 
-   MPFR_PREC(x) = p;                /* Set prec */
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-@@ -67,7 +67,7 @@
- 
-   /* Now, the unit bit is represented. */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of represented fractional bits (including the trailing 0's) */
- 
-   x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS);
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-03-09 12:06:26.000000000 +0000
-@@ -646,10 +646,24 @@
-  **************** mpfr_t properties *******************
-  ******************************************************/
- 
-+/* In the following macro, p is usually a mpfr_prec_t, but this macro
-+   works with other integer types (without integer overflow). Checking
-+   that p >= 1 in debug mode is useful here because this macro can be
-+   used on a computed precision (in particular, this formula does not
-+   work for a degenerate case p = 0, and could give different results
-+   on different platforms). But let us not use an assertion checking
-+   in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid
-+   too much expansion for assertions (in practice, this should be a
-+   problem just when testing MPFR with the --enable-assert configure
-+   option and the -ansi -pedantic-errors gcc compiler flags). */
-+#define MPFR_PREC2LIMBS(p) \
-+  (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1)
-+
- #define MPFR_PREC(x)      ((x)->_mpfr_prec)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_MANT(x)      ((x)->_mpfr_d)
--#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1)
-+#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
-+#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
- 
- 
- /******************************************************
-@@ -749,7 +763,8 @@
- #define MPFR_IS_FP(x)       (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x))
- #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF)
- #define MPFR_IS_PURE_FP(x)  (!MPFR_IS_SINGULAR(x) && \
--  (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1))
-+  (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)]  \
-+                  & MPFR_LIMB_HIGHBIT) != 0), 1))
- 
- #define MPFR_ARE_SINGULAR(x,y) \
-   (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y)))
-@@ -1061,7 +1076,7 @@
- /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */
- #define MPFR_SET_ONE(x)                                               \
- do {                                                                  \
--  mp_size_t _size = MPFR_LIMB_SIZE(x) - 1;                            \
-+  mp_size_t _size = MPFR_LAST_LIMB(x);                                \
-   MPFR_SET_POS(x);                                                    \
-   MPFR_EXP(x) = 1;                                                    \
-   MPN_ZERO ( MPFR_MANT(x), _size);                                    \
-@@ -1213,8 +1228,8 @@
-     _destp = MPFR_MANT (dest);                                              \
-     if (MPFR_UNLIKELY (_destprec >= _srcprec))                              \
-       {                                                                     \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs;       \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec) - _srcs;                       \
-         MPN_COPY (_destp + _dests, srcp, _srcs);                            \
-         MPN_ZERO (_destp, _dests);                                          \
-         inexact = 0;                                                        \
-@@ -1227,8 +1242,8 @@
-         mp_limb_t _rb, _sb, _ulp;                                           \
-                                                                             \
-         /* Compute Position and shift */                                    \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec);                               \
-         MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec);                        \
-         _sp = (srcp) + _srcs - _dests;                                      \
-                                                                             \
-@@ -1372,7 +1387,7 @@
-       if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src)))            \
-         {                                                               \
-           MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src),                  \
--                    (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \
-+                    MPFR_LIMB_SIZE (src));                              \
-           inexact = 0;                                                  \
-         }                                                               \
-       else                                                              \
-@@ -1682,7 +1697,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE))            \
-    {                                                                    \
-      (g).alloc = (num) * _size * sizeof (mp_limb_t);                    \
-@@ -1733,7 +1748,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  (g).alloc = (num) * _size * sizeof (mp_limb_t);                        \
-  if (MPFR_LIKELY (_oalloc == 0))                                        \
-    (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc);         \
-@@ -1886,7 +1901,7 @@
-        MPFR_NORETURN_ATTR;
- 
- __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t,
--                                                unsigned long));
-+                                                mpfr_prec_t));
- 
- __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*,
-                                                             unsigned long));
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p6"
-+#define MPFR_VERSION_STRING "3.1.0-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c
---- mpfr-3.1.0-a/src/mul.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul.c	2012-03-08 15:17:03.000000000 +0000
-@@ -93,15 +93,15 @@
- 
-   ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c);
- 
--  bq = MPFR_PREC(b);
--  cq = MPFR_PREC(c);
-+  bq = MPFR_PREC (b);
-+  cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   /* <= k, thus no int overflow */
-   MPFR_ASSERTD(tn <= k);
- 
-@@ -292,12 +292,12 @@
-   bq = MPFR_PREC (b);
-   cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
- 
-   /* Check for no size_t overflow*/
-diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c
---- mpfr-3.1.0-a/src/pow.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/pow.c	2012-03-08 15:17:03.000000000 +0000
-@@ -136,7 +136,7 @@
-      (b) all the 'z' bits are zero
-   */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of z+0 bits */
- 
-   yn = prec / GMP_NUMB_BITS;
-diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c
---- mpfr-3.1.0-a/src/print_raw.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/print_raw.c	2012-03-08 15:17:03.000000000 +0000
-@@ -84,7 +84,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   printf("%s ", str);
-   for(n-- ; n>=0 ; n--)
-@@ -109,7 +109,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   for(n-- ; n>=0 ; n--)
-     {
-diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c
---- mpfr-3.1.0-a/src/round_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -55,12 +55,12 @@
- 
-   MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX);
- 
--  nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */
-+  nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */
- 
-   /* check if x has enough allocated space for the significand */
-   /* Get the number of limbs from the precision.
-      (Compatible with all allocation methods) */
--  ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  ow = MPFR_LIMB_SIZE (x);
-   if (nw > ow)
-     {
-       /* FIXME: Variable can't be created using custom allocation,
-diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c
---- mpfr-3.1.0-a/src/round_raw_generic.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_raw_generic.c	2012-03-08 15:17:03.000000000 +0000
-@@ -80,7 +80,7 @@
-       (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg)))
-     return 0;
- 
--  xsize = (xprec-1)/GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (xprec);
-   nw = yprec / GMP_NUMB_BITS;
-   rw = yprec & (GMP_NUMB_BITS - 1);
- 
-diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c
---- mpfr-3.1.0-a/src/set.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set.c	2012-03-08 15:17:03.000000000 +0000
-@@ -48,8 +48,7 @@
-       /* Same precision and b is not singular:
-        * just copy the mantissa, and set the exponent and the sign
-        * The result is exact. */
--      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b),
--                (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS);
-+      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b));
-       MPFR_RET (0);
-     }
-   else
-diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c
---- mpfr-3.1.0-a/src/set_f.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_f.c	2012-03-08 15:17:03.000000000 +0000
-@@ -43,7 +43,7 @@
-   if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0)
-     MPFR_CHANGE_SIGN (y);
- 
--  sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+  sy = MPFR_LIMB_SIZE (y);
-   my = MPFR_MANT(y);
-   mx = PTR(x);
- 
-diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c
---- mpfr-3.1.0-a/src/set_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
-   /* Calculate the new number of limbs */
--  xsize = (p - 1) / GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
- 
-   /* Realloc only if the new size is greater than the old */
-   xoldsize = MPFR_GET_ALLOC_SIZE (x);
-diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c
---- mpfr-3.1.0-a/src/setmax.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/setmax.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   mp_limb_t *xp;
- 
-   MPFR_SET_EXP (x, e);
--  xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+  xn = MPFR_LIMB_SIZE (x);
-   sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x);
-   xp = MPFR_MANT(x);
-   xp[0] = MP_LIMB_T_MAX << sh;
-diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c
---- mpfr-3.1.0-a/src/sqr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sqr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,11 +56,11 @@
-   ax = 2 * MPFR_GET_EXP (b);
-   bq = MPFR_PREC(b);
- 
--  MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX);
- 
--  bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */
--  tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square,
--                                               2*bn or 2*bn-1 */
-+  bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */
-+  tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square,
-+                                    2*bn or 2*bn-1 */
- 
-   if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD))
-     return mpfr_mul (a, b, b, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c
---- mpfr-3.1.0-a/src/stack_interface.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/stack_interface.c	2012-03-08 15:17:03.000000000 +0000
-@@ -26,7 +26,7 @@
- size_t
- mpfr_custom_get_size (mpfr_prec_t prec)
- {
--  return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB;
-+  return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
- }
- 
- #undef mpfr_custom_init
-diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c
---- mpfr-3.1.0-a/src/strtofr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/strtofr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -467,7 +467,7 @@
-       /* Set y to the value of the ~prec most significant bits of pstr->mant
-          (as long as we guarantee correct rounding, we don't need to get
-          exactly prec bits). */
--      ysize = (prec - 1) / GMP_NUMB_BITS + 1;
-+      ysize = MPFR_PREC2LIMBS (prec);
-       /* prec bits corresponds to ysize limbs */
-       ysize_bits = ysize * GMP_NUMB_BITS;
-       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
-diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c
---- mpfr-3.1.0-a/src/sub1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sub1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -155,8 +155,8 @@
-   MPFR_ASSERTD(MPFR_IS_PURE_FP(c));
- 
-   /* Read prec and num of limbs */
--  p = MPFR_PREC(b);
--  n = (p-1)/GMP_NUMB_BITS+1;
-+  p = MPFR_PREC (b);
-+  n = MPFR_PREC2LIMBS (p);
- 
-   /* Fast cmp of |b| and |c|*/
-   bx = MPFR_GET_EXP (b);
-diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c
---- mpfr-3.1.0-a/src/urandomb.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/urandomb.c	2012-03-08 15:17:03.000000000 +0000
-@@ -31,13 +31,20 @@
-    a sufficient number of limbs */
- void
- mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate,
--               unsigned long int nbits)
-+               mpfr_prec_t nbits)
- {
-   mpz_t z;
- 
-+  MPFR_ASSERTN (nbits >= 1);
-   /* To be sure to avoid the potential allocation of mpz_urandomb */
--  ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1;
-+  ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits);
-   PTR(z)   = mp;
-+#if __MPFR_GMP(5,0,0)
-+  /* Check for integer overflow (unless mp_bitcnt_t is signed,
-+     but according to the GMP manual, this shouldn't happen).
-+     Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */
-+  MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1);
-+#endif
-   mpz_urandomb (z, rstate, nbits);
- }
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-08 15:17:03.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p6";
-+  return "3.1.0-p7";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c
---- mpfr-3.1.0-a/tests/tinits.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tinits.c	2012-03-08 15:17:03.000000000 +0000
-@@ -1,4 +1,4 @@
--/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
-+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears.
- 
- Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
- Contributed by the Arenaire and Caramel projects, INRIA.
-@@ -20,18 +20,43 @@
- http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
- 
-+#include <stdlib.h>
-+
- #include "mpfr-test.h"
- 
- int
- main (void)
- {
-   mpfr_t a, b, c;
-+  long large_prec;
- 
-   tests_start_mpfr ();
-+
-   mpfr_inits (a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-   mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-+
-+  /* test for precision 2^31-1, see
-+     https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */
-+  large_prec = 2147483647;
-+  if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
-+    {
-+      /* We assume that the precision won't be increased internally. */
-+      if (large_prec > MPFR_PREC_MAX)
-+        large_prec = MPFR_PREC_MAX;
-+      mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0);
-+      mpfr_set_ui (a, 17, MPFR_RNDN);
-+      mpfr_set (b, a, MPFR_RNDN);
-+      if (mpfr_get_ui (a, MPFR_RNDN) != 17)
-+        {
-+          printf ("Error in mpfr_init2 with precision 2^31-1\n");
-+          exit (1);
-+        }
-+      mpfr_clears (a, b, (mpfr_ptr) 0);
-+    }
-+
-   tests_end_mpfr ();
-+
-   return 0;
- }
diff --git a/patches/mpfr/3.1.0/180-__gmp_const.patch b/patches/mpfr/3.1.0/180-__gmp_const.patch
deleted file mode 100644
index 94444b6..0000000
--- a/patches/mpfr/3.1.0/180-__gmp_const.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-12 11:59:47.000000000 +0000
-@@ -0,0 +1 @@
-+__gmp_const
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-12 11:59:47.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p7
-+3.1.0-p8
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-12 11:59:47.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p7"
-+#define MPFR_VERSION_STRING "3.1.0-p8"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -39,6 +39,18 @@
- # include <gmp.h>
- #endif
- 
-+/* GMP's internal __gmp_const macro has been removed on 2012-03-04:
-+     http://gmplib.org:8000/gmp/rev/d287cfaf6732
-+   const is standard and now assumed to be available. If the __gmp_const
-+   definition is no longer present in GMP, this probably means that GMP
-+   assumes that const is available; thus let's define it to const.
-+   Note: this is a temporary fix that can be backported to previous MPFR
-+   versions. In the future, __gmp_const should be replaced by const like
-+   in GMP. */
-+#ifndef __gmp_const
-+# define __gmp_const const
-+#endif
-+
- /* Avoid some problems with macro expansion if the user defines macros
-    with the same name as keywords. By convention, identifiers and macro
-    names starting with mpfr_ are reserved by MPFR. */
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-12 11:59:47.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p7";
-+  return "3.1.0-p8";
- }
diff --git a/patches/mpfr/3.1.0/190-gamma-underflow.patch b/patches/mpfr/3.1.0/190-gamma-underflow.patch
deleted file mode 100644
index 3de1d19..0000000
--- a/patches/mpfr/3.1.0/190-gamma-underflow.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-04-27 01:13:15.000000000 +0000
-@@ -0,0 +1 @@
-+gamma-underflow
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-04-27 01:13:15.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p8
-+3.1.0-p9
-diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
---- mpfr-3.1.0-a/src/gamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
-@@ -296,7 +296,7 @@
-       /* we want an upper bound for x * [log(2-x)-1].
-          since x < 0, we need a lower bound on log(2-x) */
-       mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
--      mpfr_log2 (xp, xp, MPFR_RNDD);
-+      mpfr_log (xp, xp, MPFR_RNDD);
-       mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
-       mpfr_mul (xp, xp, x, MPFR_RNDU);
- 
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-04-27 01:13:15.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p8"
-+#define MPFR_VERSION_STRING "3.1.0-p9"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-04-27 01:13:15.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p8";
-+  return "3.1.0-p9";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
---- mpfr-3.1.0-a/tests/tgamma.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
-@@ -478,6 +478,36 @@
-   mpfr_clear (x);
- }
- 
-+/* bug found by Giridhar Tammana */
-+static void
-+test20120426 (void)
-+{
-+  mpfr_t xa, xb;
-+  int i;
-+  mpfr_exp_t emin;
-+
-+  mpfr_init2 (xa, 53);
-+  mpfr_init2 (xb, 53);
-+  mpfr_set_d (xb, -168.5, MPFR_RNDN);
-+  emin = mpfr_get_emin ();
-+  mpfr_set_emin (-1073);
-+  i = mpfr_gamma (xa, xb, MPFR_RNDN);
-+  i = mpfr_subnormalize (xa, i, MPFR_RNDN); /* new ternary value */
-+  mpfr_set_str (xb, "-9.5737343987585366746184749943e-304", 10, MPFR_RNDN);
-+  if (!((i > 0) && (mpfr_cmp (xa, xb) == 0)))
-+    {
-+      printf ("Error in test20120426, i=%d\n", i);
-+      printf ("expected ");
-+      mpfr_print_binary (xb); putchar ('\n');
-+      printf ("got      ");
-+      mpfr_print_binary (xa); putchar ('\n');
-+      exit (1);
-+    }
-+  mpfr_set_emin (emin);
-+  mpfr_clear (xa);
-+  mpfr_clear (xb);
-+}
-+
- static void
- exprange (void)
- {
-@@ -821,6 +851,7 @@
-   gamma_integer ();
-   test20071231 ();
-   test20100709 ();
-+  test20120426 ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
diff --git a/patches/mpfr/3.1.0/200-gamma-overunderflow.patch b/patches/mpfr/3.1.0/200-gamma-overunderflow.patch
deleted file mode 100644
index e6d6051..0000000
--- a/patches/mpfr/3.1.0/200-gamma-overunderflow.patch
+++ /dev/null
@@ -1,487 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-05-07 18:52:45.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-05-07 18:52:45.000000000 +0000
-@@ -0,0 +1 @@
-+gamma-overunderflow
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-05-07 18:52:45.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p9
-+3.1.0-p10
-diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
---- mpfr-3.1.0-a/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/gamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -100,7 +100,8 @@
-   mpfr_t xp, GammaTrial, tmp, tmp2;
-   mpz_t fact;
-   mpfr_prec_t realprec;
--  int compared, inex, is_integer;
-+  int compared, is_integer;
-+  int inex = 0;  /* 0 means: result gamma not set yet */
-   MPFR_GROUP_DECL (group);
-   MPFR_SAVE_EXPO_DECL (expo);
-   MPFR_ZIV_DECL (loop);
-@@ -377,6 +378,15 @@
-       mpfr_mul (GammaTrial, tmp2, xp, MPFR_RNDN); /* Pi*(2-x), error (1+u)^2 */
-       err_g = MPFR_GET_EXP(GammaTrial);
-       mpfr_sin (GammaTrial, GammaTrial, MPFR_RNDN); /* sin(Pi*(2-x)) */
-+      /* If tmp is +Inf, we compute exp(lngamma(x)). */
-+      if (mpfr_inf_p (tmp))
-+        {
-+          inex = mpfr_explgamma (gamma, x, &expo, tmp, tmp2, rnd_mode);
-+          if (inex)
-+            goto end;
-+          else
-+            goto ziv_next;
-+        }
-       err_g = err_g + 1 - MPFR_GET_EXP(GammaTrial);
-       /* let g0 the true value of Pi*(2-x), g the computed value.
-          We have g = g0 + h with |h| <= |(1+u^2)-1|*g.
-@@ -411,11 +421,16 @@
-       if (MPFR_LIKELY (MPFR_CAN_ROUND (GammaTrial, realprec - err_g,
-                                        MPFR_PREC(gamma), rnd_mode)))
-         break;
-+
-+    ziv_next:
-       MPFR_ZIV_NEXT (loop, realprec);
-     }
-+
-+ end:
-   MPFR_ZIV_FREE (loop);
- 
--  inex = mpfr_set (gamma, GammaTrial, rnd_mode);
-+  if (inex == 0)
-+    inex = mpfr_set (gamma, GammaTrial, rnd_mode);
-   MPFR_GROUP_CLEAR (group);
-   mpz_clear (fact);
- 
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -49,9 +49,72 @@
-     mpfr_set_ui_2exp (s, 9, -1, MPFR_RNDN); /* 4.5 */
- }
- 
--#ifndef IS_GAMMA
-+#ifdef IS_GAMMA
-+
-+/* This function is called in case of intermediate overflow/underflow.
-+   The s1 and s2 arguments are temporary MPFR numbers, having the
-+   working precision. If the result could be determined, then the
-+   flags are updated via pexpo, y is set to the result, and the
-+   (non-zero) ternary value is returned. Otherwise 0 is returned
-+   in order to perform the next Ziv iteration. */
- static int
--unit_bit (mpfr_srcptr (x))
-+mpfr_explgamma (mpfr_ptr y, mpfr_srcptr x, mpfr_save_expo_t *pexpo,
-+                mpfr_ptr s1, mpfr_ptr s2, mpfr_rnd_t rnd)
-+{
-+  mpfr_t t1, t2;
-+  int inex1, inex2, sign;
-+  MPFR_BLOCK_DECL (flags1);
-+  MPFR_BLOCK_DECL (flags2);
-+  MPFR_GROUP_DECL (group);
-+
-+  MPFR_BLOCK (flags1, inex1 = mpfr_lgamma (s1, &sign, x, MPFR_RNDD));
-+  MPFR_ASSERTN (inex1 != 0);
-+  /* s1 = RNDD(lngamma(x)), inexact */
-+  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags1)))
-+    {
-+      if (MPFR_SIGN (s1) > 0)
-+        {
-+          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_OVERFLOW);
-+          return mpfr_overflow (y, rnd, sign);
-+        }
-+      else
-+        {
-+          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_UNDERFLOW);
-+          return mpfr_underflow (y, rnd == MPFR_RNDN ? MPFR_RNDZ : rnd, sign);
-+        }
-+    }
-+
-+  mpfr_set (s2, s1, MPFR_RNDN);     /* exact */
-+  mpfr_nextabove (s2);              /* v = RNDU(lngamma(z0)) */
-+
-+  if (sign < 0)
-+    rnd = MPFR_INVERT_RND (rnd);  /* since the result with be negated */
-+  MPFR_GROUP_INIT_2 (group, MPFR_PREC (y), t1, t2);
-+  MPFR_BLOCK (flags1, inex1 = mpfr_exp (t1, s1, rnd));
-+  MPFR_BLOCK (flags2, inex2 = mpfr_exp (t2, s2, rnd));
-+  /* t1 is the rounding with mode 'rnd' of a lower bound on |Gamma(x)|,
-+     t2 is the rounding with mode 'rnd' of an upper bound, thus if both
-+     are equal, so is the wanted result. If t1 and t2 differ or the flags
-+     differ, at some point of Ziv's loop they should agree. */
-+  if (mpfr_equal_p (t1, t2) && flags1 == flags2)
-+    {
-+      MPFR_ASSERTN ((inex1 > 0 && inex2 > 0) || (inex1 < 0 && inex2 < 0));
-+      mpfr_set4 (y, t1, MPFR_RNDN, sign);  /* exact */
-+      if (sign < 0)
-+        inex1 = - inex1;
-+      MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, flags1);
-+    }
-+  else
-+    inex1 = 0;  /* couldn't determine the result */
-+  MPFR_GROUP_CLEAR (group);
-+
-+  return inex1;
-+}
-+
-+#else
-+
-+static int
-+unit_bit (mpfr_srcptr x)
- {
-   mpfr_exp_t expo;
-   mpfr_prec_t prec;
-@@ -75,6 +138,7 @@
- 
-   return (x0 >> (prec % GMP_NUMB_BITS)) & 1;
- }
-+
- #endif
- 
- /* lngamma(x) = log(gamma(x)).
-@@ -99,12 +163,14 @@
-   mpfr_t s, t, u, v, z;
-   unsigned long m, k, maxm;
-   mpz_t *INITIALIZED(B);  /* variable B declared as initialized */
--  int inexact, compared;
-+  int compared;
-+  int inexact = 0;  /* 0 means: result y not set yet */
-   mpfr_exp_t err_s, err_t;
-   unsigned long Bm = 0; /* number of allocated B[] */
-   unsigned long oldBm;
-   double d;
-   MPFR_SAVE_EXPO_DECL (expo);
-+  MPFR_ZIV_DECL (loop);
- 
-   compared = mpfr_cmp_ui (z0, 1);
- 
-@@ -122,7 +188,7 @@
-   if (MPFR_EXP(z0) <= - (mpfr_exp_t) MPFR_PREC(y))
-     {
-       mpfr_t l, h, g;
--      int ok, inex2;
-+      int ok, inex1, inex2;
-       mpfr_prec_t prec = MPFR_PREC(y) + 14;
-       MPFR_ZIV_DECL (loop);
- 
-@@ -157,14 +223,14 @@
-           mpfr_sub (h, h, g, MPFR_RNDD);
-           mpfr_mul (g, z0, z0, MPFR_RNDU);
-           mpfr_add (h, h, g, MPFR_RNDU);
--          inexact = mpfr_prec_round (l, MPFR_PREC(y), rnd);
-+          inex1 = mpfr_prec_round (l, MPFR_PREC(y), rnd);
-           inex2 = mpfr_prec_round (h, MPFR_PREC(y), rnd);
-           /* Caution: we not only need l = h, but both inexact flags should
-              agree. Indeed, one of the inexact flags might be zero. In that
-              case if we assume lngamma(z0) cannot be exact, the other flag
-              should be correct. We are conservative here and request that both
-              inexact flags agree. */
--          ok = SAME_SIGN (inexact, inex2) && mpfr_cmp (l, h) == 0;
-+          ok = SAME_SIGN (inex1, inex2) && mpfr_cmp (l, h) == 0;
-           if (ok)
-             mpfr_set (y, h, rnd); /* exact */
-           mpfr_clear (l);
-@@ -172,8 +238,9 @@
-           mpfr_clear (g);
-           if (ok)
-             {
-+              MPFR_ZIV_FREE (loop);
-               MPFR_SAVE_EXPO_FREE (expo);
--              return mpfr_check_range (y, inexact, rnd);
-+              return mpfr_check_range (y, inex1, rnd);
-             }
-           /* since we have log|gamma(x)| = - log|x| - gamma*x + O(x^2),
-              if x ~ 2^(-n), then we have a n-bit approximation, thus
-@@ -205,9 +272,10 @@
-          thus lngamma(x) = log(Pi*(x-1)/sin(Pi*(2-x))) - lngamma(2-x) */
- 
-       w = precy + MPFR_INT_CEIL_LOG2 (precy);
-+      w += MPFR_INT_CEIL_LOG2 (w) + 14;
-+      MPFR_ZIV_INIT (loop, w);
-       while (1)
-         {
--          w += MPFR_INT_CEIL_LOG2 (w) + 14;
-           MPFR_ASSERTD(w >= 3);
-           mpfr_set_prec (s, w);
-           mpfr_set_prec (t, w);
-@@ -288,7 +356,9 @@
-                                   + (rnd == MPFR_RNDN)))
-                 goto end;
-             }
-+          MPFR_ZIV_NEXT (loop, w);
-         }
-+      MPFR_ZIV_FREE (loop);
-     }
- 
-   /* now z0 > 1 */
-@@ -298,10 +368,10 @@
-   /* since k is O(w), the value of log(z0*...*(z0+k-1)) is about w*log(w),
-      so there is a cancellation of ~log(w) in the argument reconstruction */
-   w = precy + MPFR_INT_CEIL_LOG2 (precy);
--
--  do
-+  w += MPFR_INT_CEIL_LOG2 (w) + 13;
-+  MPFR_ZIV_INIT (loop, w);
-+  while (1)
-     {
--      w += MPFR_INT_CEIL_LOG2 (w) + 13;
-       MPFR_ASSERTD (w >= 3);
- 
-       /* argument reduction: we compute gamma(z0 + k), where the series
-@@ -441,6 +511,15 @@
- #ifdef IS_GAMMA
-       err_s = MPFR_GET_EXP(s);
-       mpfr_exp (s, s, MPFR_RNDN);
-+      /* If s is +Inf, we compute exp(lngamma(z0)). */
-+      if (mpfr_inf_p (s))
-+        {
-+          inexact = mpfr_explgamma (y, z0, &expo, s, t, rnd);
-+          if (inexact)
-+            goto end0;
-+          else
-+            goto ziv_next;
-+        }
-       /* before the exponential, we have s = s0 + h where
-          |h| <= (2m+48)*ulp(s), thus exp(s0) = exp(s) * exp(-h).
-          For |h| <= 1/4, we have |exp(h)-1| <= 1.2*|h| thus
-@@ -480,16 +559,26 @@
-       err_s = (err_t == err_s) ? 1 + err_s : ((err_t > err_s) ? err_t : err_s);
-       err_s += 1 - MPFR_GET_EXP(s);
- #endif
-+      if (MPFR_LIKELY (MPFR_CAN_ROUND (s, w - err_s, precy, rnd)))
-+        break;
-+#ifdef IS_GAMMA
-+    ziv_next:
-+#endif
-+      MPFR_ZIV_NEXT (loop, w);
-     }
--  while (MPFR_UNLIKELY (!MPFR_CAN_ROUND (s, w - err_s, precy, rnd)));
- 
-+#ifdef IS_GAMMA
-+ end0:
-+#endif
-   oldBm = Bm;
-   while (Bm--)
-     mpz_clear (B[Bm]);
-   (*__gmp_free_func) (B, oldBm * sizeof (mpz_t));
- 
-  end:
--  inexact = mpfr_set (y, s, rnd);
-+  if (inexact == 0)
-+    inexact = mpfr_set (y, s, rnd);
-+  MPFR_ZIV_FREE (loop);
- 
-   mpfr_clear (s);
-   mpfr_clear (t);
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-05-07 18:52:45.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p9"
-+#define MPFR_VERSION_STRING "3.1.0-p10"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-05-07 18:52:45.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p9";
-+  return "3.1.0-p10";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
---- mpfr-3.1.0-a/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tgamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -838,6 +838,175 @@
-     exit (1);
- }
- 
-+/* Test mpfr_gamma in precision p1 by comparing it with exp(lgamma(x))
-+   computing with a working precision p2. Assume that x is not an
-+   integer <= 2. */
-+static void
-+exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2)
-+{
-+  mpfr_t yd, yu, zd, zu;
-+  int inexd, inexu, sign;
-+  int underflow = -1, overflow = -1;  /* -1: we don't know */
-+  int got_underflow, got_overflow;
-+
-+  if (mpfr_integer_p (x) && mpfr_cmp_si (x, 2) <= 0)
-+    {
-+      printf ("Warning! x is an integer <= 2 in exp_lgamma: ");
-+      mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); putchar ('\n');
-+      return;
-+    }
-+  mpfr_inits2 (p2, yd, yu, (mpfr_ptr) 0);
-+  inexd = mpfr_lgamma (yd, &sign, x, MPFR_RNDD);
-+  mpfr_set (yu, yd, MPFR_RNDN);  /* exact */
-+  if (inexd)
-+    mpfr_nextabove (yu);
-+  mpfr_clear_flags ();
-+  mpfr_exp (yd, yd, MPFR_RNDD);
-+  if (! mpfr_underflow_p ())
-+    underflow = 0;
-+  if (mpfr_overflow_p ())
-+    overflow = 1;
-+  mpfr_clear_flags ();
-+  mpfr_exp (yu, yu, MPFR_RNDU);
-+  if (mpfr_underflow_p ())
-+    underflow = 1;
-+  if (! mpfr_overflow_p ())
-+    overflow = 0;
-+  if (sign < 0)
-+    {
-+      mpfr_neg (yd, yd, MPFR_RNDN);  /* exact */
-+      mpfr_neg (yu, yu, MPFR_RNDN);  /* exact */
-+      mpfr_swap (yd, yu);
-+    }
-+  /* yd < Gamma(x) < yu (strict inequalities since x != 1 and x != 2) */
-+  mpfr_inits2 (p1, zd, zu, (mpfr_ptr) 0);
-+  mpfr_clear_flags ();
-+  inexd = mpfr_gamma (zd, x, MPFR_RNDD);  /* zd <= Gamma(x) < yu */
-+  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
-+  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
-+  if (! mpfr_less_p (zd, yu) || inexd > 0 ||
-+      got_underflow != underflow ||
-+      got_overflow != overflow)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+      printf ("yu = ");
-+      mpfr_dump (yu);
-+      printf ("zd = ");
-+      mpfr_dump (zd);
-+      printf ("got inexd = %d, expected <= 0\n", inexd);
-+      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
-+      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
-+      exit (1);
-+    }
-+  mpfr_clear_flags ();
-+  inexu = mpfr_gamma (zu, x, MPFR_RNDU);  /* zu >= Gamma(x) > yd */
-+  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
-+  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
-+  if (! mpfr_greater_p (zu, yd) || inexu < 0 ||
-+      got_underflow != underflow ||
-+      got_overflow != overflow)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+      printf ("yd = ");
-+      mpfr_dump (yd);
-+      printf ("zu = ");
-+      mpfr_dump (zu);
-+      printf ("got inexu = %d, expected >= 0\n", inexu);
-+      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
-+      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
-+      exit (1);
-+    }
-+  if (mpfr_equal_p (zd, zu))
-+    {
-+      if (inexd != 0 || inexu != 0)
-+        {
-+          printf ("Error in exp_lgamma on x = ");
-+          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+          printf ("zd = zu, thus exact, but inexd = %d and inexu = %d\n",
-+                  inexd, inexu);
-+          exit (1);
-+        }
-+      MPFR_ASSERTN (got_underflow == 0);
-+      MPFR_ASSERTN (got_overflow == 0);
-+    }
-+  else if (inexd == 0 || inexu == 0)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+          printf ("zd != zu, thus inexact, but inexd = %d and inexu = %d\n",
-+                  inexd, inexu);
-+          exit (1);
-+    }
-+  mpfr_clears (yd, yu, zd, zu, (mpfr_ptr) 0);
-+}
-+
-+static void
-+exp_lgamma_tests (void)
-+{
-+  mpfr_t x;
-+  mpfr_exp_t emin, emax;
-+  int i;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+  set_emin (MPFR_EMIN_MIN);
-+  set_emax (MPFR_EMAX_MAX);
-+
-+  mpfr_init2 (x, 96);
-+  for (i = 3; i <= 8; i++)
-+    {
-+      mpfr_set_ui (x, i, MPFR_RNDN);
-+      exp_lgamma (x, 53, 64);
-+      mpfr_nextbelow (x);
-+      exp_lgamma (x, 53, 64);
-+      mpfr_nextabove (x);
-+      mpfr_nextabove (x);
-+      exp_lgamma (x, 53, 64);
-+    }
-+  mpfr_set_str (x, "1.7", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-90.6308260837372266e+15", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* The following test gives a large positive result < +Inf */
-+  mpfr_set_str (x, "1.2b13fc45a92dea1@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* Idem for a large negative result > -Inf */
-+  mpfr_set_str (x, "-1.2b13fc45a92de81@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* The following two tests trigger an endless loop in r8186
-+     on 64-bit machines (64-bit exponent). The second one (due
-+     to undetected overflow) is a direct consequence of the
-+     first one, due to the call of Gamma(2-x) if x < 1. */
-+  mpfr_set_str (x, "1.2b13fc45a92dec8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-1.2b13fc45a92dea8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* Similar tests (overflow threshold) for 32-bit machines. */
-+  mpfr_set_str (x, "2ab68d8.657542f855111c61", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);
-+  mpfr_set_str (x, "-2ab68d6.657542f855111c61", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);
-+  /* The following test is an overflow on 32-bit and 64-bit machines.
-+     Revision r8189 fails on 64-bit machines as the flag is unset. */
-+  mpfr_set_str (x, "1.2b13fc45a92ded8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* On the following tests, with r8196, one gets an underflow on
-+     32-bit machines, while a normal result is expected (see FIXME
-+     in gamma.c:382). */
-+  mpfr_set_str (x, "-2ab68d6.657542f855111c6104", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);  /* failure on 32-bit machines */
-+  mpfr_set_str (x, "-12b13fc45a92deb.1c6c5bc964", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);  /* failure on 64-bit machines */
-+  mpfr_clear (x);
-+
-+  set_emin (emin);
-+  set_emax (emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -852,6 +1021,7 @@
-   test20071231 ();
-   test20100709 ();
-   test20120426 ();
-+  exp_lgamma_tests ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
diff --git a/patches/mpfr/3.1.1/110-get_decimal64.patch b/patches/mpfr/3.1.1/110-get_decimal64.patch
deleted file mode 100644
index d73a3d7..0000000
--- a/patches/mpfr/3.1.1/110-get_decimal64.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:28:51.000000000 +0000
-@@ -0,0 +1 @@
-+get_decimal64
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-07-03 15:01:13.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:28:51.000000000 +0000
-@@ -1 +1 @@
--3.1.1
-+3.1.1-p1
-diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c
---- mpfr-3.1.1-a/src/get_d64.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/get_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -32,6 +32,10 @@
- 
- #ifdef MPFR_WANT_DECIMAL_FLOATS
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- #ifdef DPD_FORMAT
- static int T[1000] = {
-   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32,
-@@ -142,26 +146,14 @@
- static _Decimal64
- get_decimal64_min (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 0;
--  x.s.manh = 0;
--  x.s.manl = 1;
--  return x.d;
-+  return negative ? - 1E-398dd : 1E-398dd;
- }
- 
- /* construct the decimal64 largest finite number with given sign */
- static _Decimal64
- get_decimal64_max (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 1919;
--  x.s.manh = 1048575; /* 2^20-1 */
--  x.s.manl = ~0;
--  return x.d;
-+  return negative ? - DEC64_MAX : DEC64_MAX;
- }
- 
- /* one-to-one conversion:
-@@ -334,7 +326,8 @@
-   /* the largest decimal64 number is just below 10^(385) < 2^1279 */
-   else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */
-     {
--      if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+      if (rnd_mode == MPFR_RNDZ
-+          || (rnd_mode == MPFR_RNDU && negative != 0)
-           || (rnd_mode == MPFR_RNDD && negative == 0))
-         return get_decimal64_max (negative);
-       else
-@@ -354,6 +347,15 @@
-              which corresponds to s=[0.]1000...000 and e=-397 */
-           if (e < -397)
-             {
-+              if (rnd_mode == MPFR_RNDN && e == -398)
-+                {
-+                  /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal),
-+                     src should round to +/- 1E-398 in MPFR_RNDN. */
-+                  mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA);
-+                  return e == -398 && s[negative] <= '5' ?
-+                    get_decimal64_zero (negative) :
-+                    get_decimal64_min (negative);
-+                }
-               if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN
-                   || (rnd_mode == MPFR_RNDD && negative == 0)
-                   || (rnd_mode == MPFR_RNDU && negative != 0))
-@@ -379,7 +381,8 @@
-          which corresponds to s=[0.]9999...999 and e=385 */
-       else if (e > 385)
-         {
--          if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+          if (rnd_mode == MPFR_RNDZ
-+              || (rnd_mode == MPFR_RNDU && negative != 0)
-               || (rnd_mode == MPFR_RNDD && negative == 0))
-             return get_decimal64_max (negative);
-           else
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-07-03 15:01:19.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1"
-+#define MPFR_VERSION_STRING "3.1.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1";
-+  return "3.1.1-p1";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c
---- mpfr-3.1.1-a/tests/tget_set_d64.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tget_set_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,6 +25,10 @@
- #include <stdlib.h> /* for exit */
- #include "mpfr-test.h"
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- /* #define DEBUG */
- 
- static void
-@@ -149,6 +153,15 @@
-   mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ);
-   mpfr_set (y, x, MPFR_RNDZ);
-   d = mpfr_get_decimal64 (x, MPFR_RNDU);
-+  ASSERT_ALWAYS (d == DEC64_MAX);
-+  mpfr_set_ui (x, 0, MPFR_RNDZ);
-+  mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-+  ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-+
-+  mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ);
-+  mpfr_set (y, x, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDA);
-+  ASSERT_ALWAYS (d == -DEC64_MAX);
-   mpfr_set_ui (x, 0, MPFR_RNDZ);
-   mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-   ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-@@ -225,6 +238,83 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+check_overflow (void)
-+{
-+  mpfr_t x;
-+  int err = 0, neg, rnd;
-+
-+  mpfr_init2 (x, 96);
-+  for (neg = 0; neg < 2; neg++)
-+    RND_LOOP (rnd)
-+      {
-+        _Decimal64 d, e;
-+        mpfr_rnd_t r = (mpfr_rnd_t) rnd;
-+        int sign = neg ? -1 : 1;
-+
-+        e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX;
-+        /* This tests the binary exponent e > 1279 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 1 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the decimal exponent e > 385 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 2 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the last else (-382 <= e <= 385) of get_d64.c */
-+        mpfr_set_decimal64 (x, e, MPFR_RNDA);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 3 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+      }
-+  mpfr_clear (x);
-+  if (err)
-+    exit (1);
-+}
-+
-+static void
-+check_tiny (void)
-+{
-+  mpfr_t x;
-+  _Decimal64 d;
-+
-+  /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round
-+     to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between
-+     0 and 1E-398 is not a representable binary number, so that there
-+     are no tests for it. */
-+  mpfr_init2 (x, 128);
-+  mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_clear (x);
-+}
-+
- int
- main (void)
- {
-@@ -241,6 +331,8 @@
-   check_inf_nan ();
-   check_random ();
-   check_native ();
-+  check_overflow ();
-+  check_tiny ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/patches/mpfr/3.1.1/120-strtofr-ternary-value.patch b/patches/mpfr/3.1.1/120-strtofr-ternary-value.patch
deleted file mode 100644
index 76dbc45..0000000
--- a/patches/mpfr/3.1.1/120-strtofr-ternary-value.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:35:12.000000000 +0000
-@@ -0,0 +1 @@
-+strtofr-ternary-value
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:35:12.000000000 +0000
-@@ -1 +1 @@
--3.1.1-p1
-+3.1.1-p2
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:35:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1-p1"
-+#define MPFR_VERSION_STRING "3.1.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c
---- mpfr-3.1.1-a/src/strtofr.c	2012-07-03 15:01:16.000000000 +0000
-+++ mpfr-3.1.1-b/src/strtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -667,6 +667,20 @@
-           /* (z, exp_z) = base^(exp_base-pstr_size) */
-           z = result + 2*ysize + 1;
-           err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize);
-+          /* Since we want y/z rounded toward zero, we must get an upper
-+             bound of z. If err >= 0, the error on z is bounded by 2^err. */
-+          if (err >= 0)
-+            {
-+              mp_limb_t cy;
-+              unsigned long h = err / GMP_NUMB_BITS;
-+              unsigned long l = err - h * GMP_NUMB_BITS;
-+
-+              if (h >= ysize) /* not enough precision in z */
-+                goto next_loop;
-+              cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l);
-+              if (cy != 0) /* the code below requires z on ysize limbs */
-+                goto next_loop;
-+            }
-           exact = exact && (err == -1);
-           if (err == -2)
-             goto underflow; /* FIXME: Sure? */
-@@ -730,6 +744,7 @@
-                                        MPFR_RNDN, rnd, MPFR_PREC(x)))
-         break;
- 
-+    next_loop:
-       /* update the prec for next loop */
-       MPFR_ZIV_NEXT (loop, prec);
-     } /* loop */
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:35:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1-p1";
-+  return "3.1.1-p2";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c
---- mpfr-3.1.1-a/tests/tstrtofr.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tstrtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -1105,6 +1105,92 @@
-   mpfr_clear (y);
- }
- 
-+/* From a bug reported by Joseph S. Myers
-+   https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */
-+static void
-+bug20120814 (void)
-+{
-+  mpfr_exp_t emin = -30, e;
-+  mpfr_t x, y;
-+  int r;
-+  char s[64], *p;
-+
-+  mpfr_init2 (x, 2);
-+  mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN);
-+  mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD);
-+  s[0] = s[1];
-+  s[1] = '.';
-+  for (p = s; *p != 0; p++) ;
-+  *p = 'e';
-+  sprintf (p + 1, "%d", (int) e - 1);
-+
-+  mpfr_init2 (y, 4);
-+  r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN);
-+  if (r <= 0 || ! mpfr_equal_p (x, y))
-+    {
-+      printf ("Error in bug20120814\n");
-+      printf ("mpfr_strtofr failed on string \"%s\"\n", s);
-+      printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin);
-+      printf ("Got inex = %-6d and y = ", r);
-+      mpfr_dump (y);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+}
-+
-+static void
-+bug20120829 (void)
-+{
-+  mpfr_t x1, x2, e;
-+  int inex1, inex2, i, r;
-+  char s[48] = "1e-1";
-+
-+  mpfr_init2 (e, 128);
-+  mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0);
-+
-+  inex1 = mpfr_set_si (e, -1, MPFR_RNDN);
-+  MPFR_ASSERTN (inex1 == 0);
-+
-+  for (i = 1; i <= sizeof(s) - 5; i++)
-+    {
-+      s[3+i] = '0';
-+      s[4+i] = 0;
-+      inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN);
-+      MPFR_ASSERTN (inex1 == 0);
-+      RND_LOOP(r)
-+        {
-+          mpfr_rnd_t rnd = (mpfr_rnd_t) r;
-+
-+          inex1 = mpfr_exp10 (x1, e, rnd);
-+          inex1 = SIGN (inex1);
-+          inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd);
-+          inex2 = SIGN (inex2);
-+          /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do:
-+             strtofr.c:...: MPFR assertion failed: cy == 0
-+             r8396 is OK.
-+             On 64-bit machines, for i = 15,
-+             r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0)
-+             r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize
-+             r8394 and r8396 are OK.
-+          */
-+          if (! mpfr_equal_p (x1, x2) || inex1 != inex2)
-+            {
-+              printf ("Error in bug20120829 for i = %d, rnd = %s\n",
-+                      i, mpfr_print_rnd_mode (rnd));
-+              printf ("Expected inex = %d, x = ", inex1);
-+              mpfr_dump (x1);
-+              printf ("Got      inex = %d, x = ", inex2);
-+              mpfr_dump (x2);
-+              exit (1);
-+            }
-+        }
-+    }
-+
-+  mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1117,6 +1203,8 @@
-   check_retval ();
-   bug20081028 ();
-   test20100310 ();
-+  bug20120814 ();
-+  bug20120829 ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/patches/mpfr/3.1.1/130-gmp51-compat.patch b/patches/mpfr/3.1.1/130-gmp51-compat.patch
deleted file mode 100644
index ecf7537..0000000
--- a/patches/mpfr/3.1.1/130-gmp51-compat.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2013-02-22 12:17:27.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2013-02-22 12:18:34.000000000 +0000
-@@ -0,0 +1 @@
-+gmp51-compat
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2013-02-22 12:18:20.000000000 +0000
-@@ -1 +1 @@
--3.1.1-p2
-+3.1.1-p3
-diff -Naurd mpfr-3.1.1-a/src/get_f.c mpfr-3.1.1-b/src/get_f.c
---- mpfr-3.1.1-a/src/get_f.c	2012-07-03 15:01:19.000000000 +0000
-+++ mpfr-3.1.1-b/src/get_f.c	2013-02-22 12:18:06.000000000 +0000
-@@ -61,7 +61,7 @@
- 
-           sx = PREC (x);
-           SIZ (x) = sx;
--          xp = LIMBS (x);
-+          xp = PTR (x);
-           for (i = 0; i < sx; i++)
-             xp[i] = MP_LIMB_T_MAX;
- 
-diff -Naurd mpfr-3.1.1-a/src/mpfr-gmp.h mpfr-3.1.1-b/src/mpfr-gmp.h
---- mpfr-3.1.1-a/src/mpfr-gmp.h	2012-07-03 15:01:16.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr-gmp.h	2013-02-22 12:18:06.000000000 +0000
-@@ -163,7 +163,6 @@
- #define SIZ(x) ((x)->_mp_size)
- #define ABSIZ(x) ABS (SIZ (x))
- #define PTR(x) ((x)->_mp_d)
--#define LIMBS(x) ((x)->_mp_d)
- #define EXP(x) ((x)->_mp_exp)
- #define PREC(x) ((x)->_mp_prec)
- #define ALLOC(x) ((x)->_mp_alloc)
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2013-02-22 12:18:20.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1-p2"
-+#define MPFR_VERSION_STRING "3.1.1-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2013-02-22 12:18:20.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1-p2";
-+  return "3.1.1-p3";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tadd.c mpfr-3.1.1-b/tests/tadd.c
---- mpfr-3.1.1-a/tests/tadd.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tadd.c	2013-02-22 12:18:06.000000000 +0000
-@@ -20,7 +20,7 @@
- http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
- 
--#define NUM 30000
-+#define N 30000
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -674,7 +674,7 @@
- 
-   mpfr_init2 (one, MPFR_PREC_MIN);
-   mpfr_set_ui (one, 1, MPFR_RNDN);
--  for (n = 0; n < NUM; n++)
-+  for (n = 0; n < N; n++)
-     {
-       mpfr_prec_t prec_a, prec_b, prec_c;
-       mpfr_exp_t tb=0, tc, diff;
-diff -Naurd mpfr-3.1.1-a/tests/tgeneric.c mpfr-3.1.1-b/tests/tgeneric.c
---- mpfr-3.1.1-a/tests/tgeneric.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tgeneric.c	2013-02-22 12:18:06.000000000 +0000
-@@ -121,7 +121,7 @@
- #endif
- 
- static void
--test_generic (mpfr_prec_t p0, mpfr_prec_t p1, unsigned int N)
-+test_generic (mpfr_prec_t p0, mpfr_prec_t p1, unsigned int nmax)
- {
-   mpfr_prec_t prec, xprec, yprec;
-   mpfr_t x, y, z, t, w;
-@@ -155,7 +155,7 @@
-       mpfr_set_prec (w, yprec);
- 
-       /* Note: in precision p1, we test 4 special cases. */
--      for (n = 0; n < (prec == p1 ? N + 4 : N); n++)
-+      for (n = 0; n < (prec == p1 ? nmax + 4 : nmax); n++)
-         {
-           int infinite_input = 0;
- 
diff --git a/patches/mpfr/3.1.2/110-exp_2.patch b/patches/mpfr/3.1.2/110-exp_2.patch
deleted file mode 100644
index 731ea92..0000000
--- a/patches/mpfr/3.1.2/110-exp_2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/PATCHES	2013-09-26 10:52:52.000000000 +0000
-@@ -0,0 +1 @@
-+exp_2
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2013-03-13 15:37:28.000000000 +0000
-+++ mpfr-3.1.2-b/VERSION	2013-09-26 10:52:52.000000000 +0000
-@@ -1 +1 @@
--3.1.2
-+3.1.2-p1
-diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c
---- mpfr-3.1.2-a/src/exp_2.c	2013-03-13 15:37:28.000000000 +0000
-+++ mpfr-3.1.2-b/src/exp_2.c	2013-09-26 10:52:52.000000000 +0000
-@@ -204,7 +204,7 @@
-           for (k = 0; k < K; k++)
-             {
-               mpz_mul (ss, ss, ss);
--              exps <<= 1;
-+              exps *= 2;
-               exps += mpz_normalize (ss, ss, q);
-             }
-           mpfr_set_z (s, ss, MPFR_RNDN);
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2013-03-13 15:37:37.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2"
-+#define MPFR_VERSION_STRING "3.1.2-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2013-03-13 15:37:34.000000000 +0000
-+++ mpfr-3.1.2-b/src/version.c	2013-09-26 10:52:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2";
-+  return "3.1.2-p1";
- }
diff --git a/patches/mpfr/3.1.2/120-fits-smallneg.patch b/patches/mpfr/3.1.2/120-fits-smallneg.patch
deleted file mode 100644
index b229c18..0000000
--- a/patches/mpfr/3.1.2/120-fits-smallneg.patch
+++ /dev/null
@@ -1,605 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2013-09-26 10:56:55.000000000 +0000
-+++ mpfr-3.1.2-b/PATCHES	2013-09-26 10:56:55.000000000 +0000
-@@ -0,0 +1 @@
-+fits-smallneg
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/VERSION	2013-09-26 10:56:55.000000000 +0000
-@@ -1 +1 @@
--3.1.2-p1
-+3.1.2-p2
-diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h
---- mpfr-3.1.2-a/src/fits_u.h	2013-03-13 15:37:35.000000000 +0000
-+++ mpfr-3.1.2-b/src/fits_u.h	2013-09-26 10:56:55.000000000 +0000
-@@ -32,17 +32,20 @@
-   int res;
- 
-   if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
--    /* Zero always fit */
--    return MPFR_IS_ZERO (f) ? 1 : 0;
--  else if (MPFR_IS_NEG (f))
--    /* Negative numbers don't fit */
--    return 0;
--  /* now it fits if
--     (a) f <= MAXIMUM
--     (b) round(f, prec(slong), rnd) <= MAXIMUM */
-+    return MPFR_IS_ZERO (f) ? 1 : 0;  /* Zero always fits */
- 
-   e = MPFR_GET_EXP (f);
- 
-+  if (MPFR_IS_NEG (f))
-+    return e >= 1 ? 0  /* f <= -1 does not fit */
-+      : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1)  /* directed mode */
-+      : e < 0 ? 1  /* f > -1/2 fits in MPFR_RNDN */
-+      : mpfr_powerof2_raw(f);  /* -1/2 fits, -1 < f < -1/2 don't */
-+
-+  /* Now it fits if
-+     (a) f <= MAXIMUM
-+     (b) round(f, prec(slong), rnd) <= MAXIMUM */
-+
-   /* first compute prec(MAXIMUM); fits in an int */
-   for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++);
- 
-diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c
---- mpfr-3.1.2-a/src/fits_uintmax.c	2013-03-13 15:37:33.000000000 +0000
-+++ mpfr-3.1.2-b/src/fits_uintmax.c	2013-09-26 10:56:55.000000000 +0000
-@@ -27,51 +27,19 @@
- #include "mpfr-intmax.h"
- #include "mpfr-impl.h"
- 
--#ifdef _MPFR_H_HAVE_INTMAX_T
--
--/* We can't use fits_u.h <= mpfr_cmp_ui */
--int
--mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd)
--{
--  mpfr_exp_t e;
--  int prec;
--  uintmax_t s;
--  mpfr_t x;
--  int res;
--
--  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
--    /* Zero always fit */
--    return MPFR_IS_ZERO (f) ? 1 : 0;
--  else if (MPFR_IS_NEG (f))
--    /* Negative numbers don't fit */
--    return 0;
--  /* now it fits if
--     (a) f <= MAXIMUM
--     (b) round(f, prec(slong), rnd) <= MAXIMUM */
--
--  e = MPFR_GET_EXP (f);
--
--  /* first compute prec(MAXIMUM); fits in an int */
--  for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++);
--
--  /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */
--
--  /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */
--  if (e <= prec - 1)
--    return 1;
-+/* Note: though mpfr-impl.h is included in fits_u.h, we also include it
-+   above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not
-+   defined; this is necessary to avoid an empty translation unit, which
-+   is forbidden by ISO C. Without this, a failing test can be reproduced
-+   by creating an invalid stdint.h somewhere in the default include path
-+   and by compiling MPFR with "gcc -ansi -pedantic-errors". */
- 
--  /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */
--  if (e >= prec + 1)
--    return 0;
-+#ifdef _MPFR_H_HAVE_INTMAX_T
- 
--  MPFR_ASSERTD (e == prec);
-+#define FUNCTION   mpfr_fits_uintmax_p
-+#define MAXIMUM    MPFR_UINTMAX_MAX
-+#define TYPE       uintmax_t
- 
--  /* hard case: first round to prec bits, then check */
--  mpfr_init2 (x, prec);
--  mpfr_set (x, f, rnd);
--  res = MPFR_GET_EXP (x) == e;
--  mpfr_clear (x);
--  return res;
--}
-+#include "fits_u.h"
- 
- #endif
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2013-09-26 10:56:55.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p1"
-+#define MPFR_VERSION_STRING "3.1.2-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/version.c	2013-09-26 10:56:55.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p1";
-+  return "3.1.2-p2";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c
---- mpfr-3.1.2-a/tests/tfits.c	2013-03-13 15:37:45.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tfits.c	2013-09-26 10:56:55.000000000 +0000
-@@ -33,155 +33,176 @@
- #include "mpfr-intmax.h"
- #include "mpfr-test.h"
- 
--#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); }
--#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); }
-+#define ERROR1(N)                                               \
-+  do                                                            \
-+    {                                                           \
-+      printf("Error %d for rnd = %s and x = ", N,               \
-+             mpfr_print_rnd_mode ((mpfr_rnd_t) r));             \
-+      mpfr_dump(x);                                             \
-+      exit(1);                                                  \
-+    }                                                           \
-+  while (0)
- 
- static void check_intmax (void);
- 
- int
- main (void)
- {
--  mpfr_t x;
-+  mpfr_t x, y;
-+  int i, r;
- 
-   tests_start_mpfr ();
- 
-   mpfr_init2 (x, 256);
-+  mpfr_init2 (y, 8);
- 
--  /* Check NAN */
--  mpfr_set_nan (x);
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR1;
-+  RND_LOOP (r)
-+    {
- 
--  /* Check INF */
--  mpfr_set_inf (x, 1);
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR1;
-+      /* Check NAN */
-+      mpfr_set_nan (x);
-+      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (1);
-+      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (2);
-+      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (3);
-+      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (4);
-+      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (5);
-+      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (6);
- 
--  /* Check Zero */
--  MPFR_SET_ZERO (x);
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
-+      /* Check INF */
-+      mpfr_set_inf (x, 1);
-+      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (7);
-+      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (8);
-+      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (9);
-+      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (10);
-+      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (11);
-+      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (12);
- 
--  /* Check small op */
--  mpfr_set_str1 (x, "1@-1");
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
-+      /* Check Zero */
-+      MPFR_SET_ZERO (x);
-+      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (13);
-+      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (14);
-+      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (15);
-+      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (16);
-+      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (17);
-+      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (18);
- 
--  /* Check 17 */
--  mpfr_set_ui (x, 17, MPFR_RNDN);
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
-+      /* Check small positive op */
-+      mpfr_set_str1 (x, "1@-1");
-+      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (19);
-+      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (20);
-+      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (21);
-+      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (22);
-+      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (23);
-+      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (24);
- 
--  /* Check all other values */
--  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
--  mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR1;
--  mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR1;
-+      /* Check 17 */
-+      mpfr_set_ui (x, 17, MPFR_RNDN);
-+      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (25);
-+      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (26);
-+      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (27);
-+      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (28);
-+      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (29);
-+      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (30);
- 
--  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
--  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
-+      /* Check all other values */
-+      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
-+      mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
-+      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (31);
-+      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (32);
-+      mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
-+      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (33);
-+      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (34);
-+      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (35);
-+      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (36);
-+      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (37);
- 
--  mpfr_set_si (x, 1, MPFR_RNDN);
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
-+      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (38);
-+      mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (39);
-+      mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (40);
-+      mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (41);
-+      mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (42);
-+      mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (43);
- 
--  /* Check negative value */
--  mpfr_set_si (x, -1, MPFR_RNDN);
--  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
--    ERROR2;
--  if (mpfr_fits_uint_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
--    ERROR1;
-+      mpfr_set_si (x, 1, MPFR_RNDN);
-+      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (44);
-+      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (45);
-+
-+      /* Check negative op */
-+      for (i = 1; i <= 4; i++)
-+        {
-+          int inv;
-+
-+          mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
-+          mpfr_rint (y, x, (mpfr_rnd_t) r);
-+          inv = MPFR_NOTZERO (y);
-+          if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv)
-+            ERROR1 (46);
-+          if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+            ERROR1 (47);
-+          if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv)
-+            ERROR1 (48);
-+          if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+            ERROR1 (49);
-+          if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv)
-+            ERROR1 (50);
-+          if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+            ERROR1 (51);
-+        }
-+    }
- 
-   mpfr_clear (x);
-+  mpfr_clear (y);
- 
-   check_intmax ();
- 
-@@ -189,85 +210,98 @@
-   return 0;
- }
- 
--static void check_intmax (void)
-+static void
-+check_intmax (void)
- {
- #ifdef _MPFR_H_HAVE_INTMAX_T
--  mpfr_t x;
-+  mpfr_t x, y;
-+  int i, r;
- 
--  mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT);
-+  mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT);
-+  mpfr_init2 (y, 8);
- 
--  /* Check NAN */
--  mpfr_set_nan (x);
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
-+  RND_LOOP (r)
-+    {
-+      /* Check NAN */
-+      mpfr_set_nan (x);
-+      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (52);
-+      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (53);
- 
--  /* Check INF */
--  mpfr_set_inf (x, 1);
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
-+      /* Check INF */
-+      mpfr_set_inf (x, 1);
-+      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (54);
-+      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (55);
- 
--  /* Check Zero */
--  MPFR_SET_ZERO (x);
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
-+      /* Check Zero */
-+      MPFR_SET_ZERO (x);
-+      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (56);
-+      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (57);
- 
--  /* Check small op */
--  mpfr_set_str1 (x, "1@-1");
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
-+      /* Check positive small op */
-+      mpfr_set_str1 (x, "1@-1");
-+      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (58);
-+      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (59);
- 
--  /* Check 17 */
--  mpfr_set_ui (x, 17, MPFR_RNDN);
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
-+      /* Check 17 */
-+      mpfr_set_ui (x, 17, MPFR_RNDN);
-+      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (60);
-+      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (61);
- 
--  /* Check hugest */
--  mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
-+      /* Check hugest */
-+      mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
-+      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (62);
-+      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (63);
- 
--  /* Check all other values */
--  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
--  mpfr_add_ui (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
--  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
--  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
--  mpfr_add_ui (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
--  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
--  mpfr_sub_ui (x, x, 1, MPFR_RNDN);
--  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR1;
-+      /* Check all other values */
-+      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
-+      mpfr_add_ui (x, x, 1, MPFR_RNDN);
-+      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (64);
-+      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (65);
-+      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
-+      mpfr_add_ui (x, x, 1, MPFR_RNDN);
-+      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (66);
-+      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
-+      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (67);
-+      mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
-+      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (68);
-+      mpfr_sub_ui (x, x, 1, MPFR_RNDN);
-+      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+        ERROR1 (69);
- 
--  /* Check negative value */
--  mpfr_set_si (x, -1, MPFR_RNDN);
--  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
--    ERROR2;
--  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
--    ERROR1;
-+      /* Check negative op */
-+      for (i = 1; i <= 4; i++)
-+        {
-+          int inv;
-+
-+          mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
-+          mpfr_rint (y, x, (mpfr_rnd_t) r);
-+          inv = MPFR_NOTZERO (y);
-+          if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv)
-+            ERROR1 (70);
-+          if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+            ERROR1 (71);
-+        }
-+    }
- 
-   mpfr_clear (x);
-+  mpfr_clear (y);
- #endif
- }
--
diff --git a/patches/mpfr/3.1.2/130-clang-divby0.patch b/patches/mpfr/3.1.2/130-clang-divby0.patch
deleted file mode 100644
index 8e0cd8e..0000000
--- a/patches/mpfr/3.1.2/130-clang-divby0.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2013-10-09 13:34:21.000000000 +0000
-+++ mpfr-3.1.2-b/PATCHES	2013-10-09 13:34:21.000000000 +0000
-@@ -0,0 +1 @@
-+clang-divby0
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/VERSION	2013-10-09 13:34:21.000000000 +0000
-@@ -1 +1 @@
--3.1.2-p2
-+3.1.2-p3
-diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
---- mpfr-3.1.2-a/src/mpfr-impl.h	2013-03-13 15:37:36.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr-impl.h	2013-10-09 13:34:21.000000000 +0000
-@@ -468,8 +468,16 @@
- #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1)
- 
- /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0
--   at compile time. */
--#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)
-+   at compile time.
-+   Clang with -fsanitize=undefined is a bit similar due to a bug:
-+     http://llvm.org/bugs/show_bug.cgi?id=17381
-+   but even without its sanitizer, it may be better to use the
-+   double_zero version until IEEE 754 division by zero is properly
-+   supported:
-+     http://llvm.org/bugs/show_bug.cgi?id=17000
-+*/
-+#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \
-+    defined(__clang__)
- static double double_zero = 0.0;
- # define DBL_NAN (double_zero/double_zero)
- # define DBL_POS_INF ((double) 1.0/double_zero)
-@@ -501,6 +509,8 @@
-    (with Xcode 2.4.1, i.e. the latest one). */
- #define LVALUE(x) (&(x) == &(x) || &(x) != &(x))
- #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX))
-+/* The DOUBLE_ISNAN(x) macro is also valid on long double x
-+   (assuming that the compiler isn't too broken). */
- #ifdef MPFR_NANISNAN
- /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations.
-    The + must not be replaced by a ||. With gcc -ffast-math, NaN is
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2013-10-09 13:34:21.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p2"
-+#define MPFR_VERSION_STRING "3.1.2-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/version.c	2013-10-09 13:34:21.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p2";
-+  return "3.1.2-p3";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c
---- mpfr-3.1.2-a/tests/tget_flt.c	2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tget_flt.c	2013-10-09 13:34:21.000000000 +0000
-@@ -28,9 +28,17 @@
- main (void)
- {
-   mpfr_t x, y;
--  float f, g, infp;
-+  float f, g;
-   int i;
-+#if !defined(MPFR_ERRDIVZERO)
-+  float infp;
-+#endif
-+
-+  tests_start_mpfr ();
- 
-+#if !defined(MPFR_ERRDIVZERO)
-+  /* The definition of DBL_POS_INF involves a division by 0. This makes
-+     "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */
-   infp = (float) DBL_POS_INF;
-   if (infp * 0.5 != infp)
-     {
-@@ -38,8 +46,7 @@
-       fprintf (stderr, "(this is probably a compiler bug, please report)\n");
-       exit (1);
-     }
--
--  tests_start_mpfr ();
-+#endif
- 
-   mpfr_init2 (x, 24);
-   mpfr_init2 (y, 24);
-@@ -353,6 +360,7 @@
-       printf ("expected %.8e, got %.8e\n", g, f);
-       exit (1);
-     }
-+#if !defined(MPFR_ERRDIVZERO)
-   f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule),
-                                       thus we should get +Inf */
-   g = infp;
-@@ -376,6 +384,7 @@
-       printf ("expected %.8e, got %.8e\n", g, f);
-       exit (1);
-     }
-+#endif
- 
-   mpfr_clear (x);
-   mpfr_clear (y);
-diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c
---- mpfr-3.1.2-a/tests/tset_ld.c	2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tset_ld.c	2013-10-09 13:34:21.000000000 +0000
-@@ -47,8 +47,11 @@
- static int
- Isnan_ld (long double d)
- {
--  double e = (double) d;
--  if (DOUBLE_ISNAN (e))
-+  /* Do not convert d to double as this can give an overflow, which
-+     may confuse compilers without IEEE 754 support (such as clang
-+     -fsanitize=undefined), or trigger a trap if enabled.
-+     The DOUBLE_ISNAN macro should work fine on long double. */
-+  if (DOUBLE_ISNAN (d))
-     return 1;
-   LONGDOUBLE_NAN_ACTION (d, goto yes);
-   return 0;
diff --git a/patches/mpfr/3.1.2/140-printf-alt0.patch b/patches/mpfr/3.1.2/140-printf-alt0.patch
deleted file mode 100644
index 2451f36..0000000
--- a/patches/mpfr/3.1.2/140-printf-alt0.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/PATCHES	2013-11-15 00:51:49.323334999 +0000
-@@ -0,0 +1 @@
-+printf-alt0
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/VERSION	2013-11-15 00:51:49.323334999 +0000
-@@ -1 +1 @@
--3.1.2-p3
-+3.1.2-p4
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2013-11-15 00:51:49.323334999 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p3"
-+#define MPFR_VERSION_STRING "3.1.2-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
---- mpfr-3.1.2-a/src/vasprintf.c	2013-03-13 15:37:37.000000000 +0000
-+++ mpfr-3.1.2-b/src/vasprintf.c	2013-11-15 00:51:49.267334408 +0000
-@@ -1040,7 +1040,7 @@
- }
- 
- /* Determine the different parts of the string representation of the regular
--   number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'.
-+   number P when spec.spec is 'e', 'E', 'g', or 'G'.
-    DEC_INFO contains the previously computed exponent and string or is NULL.
- 
-    return -1 if some field > INT_MAX */
-@@ -1167,7 +1167,7 @@
- }
- 
- /* Determine the different parts of the string representation of the regular
--   number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'.
-+   number P when spec.spec is 'f', 'F', 'g', or 'G'.
-    DEC_INFO contains the previously computed exponent and string or is NULL.
- 
-    return -1 if some field of number_parts is greater than INT_MAX */
-@@ -1559,7 +1559,7 @@
-             /* fractional part */
-             {
-               np->point = MPFR_DECIMAL_POINT;
--              np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ?
-+              np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ?
-                 spec.prec - 1 : spec.prec;
-             }
-           else if (spec.alt)
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/src/version.c	2013-11-15 00:51:49.323334999 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p3";
-+  return "3.1.2-p4";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
---- mpfr-3.1.2-a/tests/tsprintf.c	2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tsprintf.c	2013-11-15 00:51:49.267334408 +0000
-@@ -456,10 +456,16 @@
-   check_sprintf ("1.999900  ", "%-#10.7RG", x);
-   check_sprintf ("1.9999    ", "%-10.7RG", x);
-   mpfr_set_ui (x, 1, MPFR_RNDN);
-+  check_sprintf ("1.", "%#.1Rg", x);
-+  check_sprintf ("1.   ", "%-#5.1Rg", x);
-+  check_sprintf ("  1.0", "%#5.2Rg", x);
-   check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x);
-   check_sprintf ("1", "%.30Rg", x);
-   mpfr_set_ui (x, 0, MPFR_RNDN);
--  check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x);
-+  check_sprintf ("0.", "%#.1Rg", x);
-+  check_sprintf ("0.   ", "%-#5.1Rg", x);
-+  check_sprintf ("  0.0", "%#5.2Rg", x);
-+  check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x);
-   check_sprintf ("0", "%.30Rg", x);
- 
-   /* following tests with precision 53 bits */
diff --git a/patches/mpfr/3.1.2/150-custom_init_set.patch b/patches/mpfr/3.1.2/150-custom_init_set.patch
deleted file mode 100644
index 669b91d..0000000
--- a/patches/mpfr/3.1.2/150-custom_init_set.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2013-12-01 11:07:49.575329762 +0000
-+++ mpfr-3.1.2-b/PATCHES	2013-12-01 11:07:49.751331625 +0000
-@@ -0,0 +1 @@
-+custom_init_set
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2013-12-01 11:07:49.571329714 +0000
-+++ mpfr-3.1.2-b/VERSION	2013-12-01 11:07:49.747331585 +0000
-@@ -1 +1 @@
--3.1.2-p4
-+3.1.2-p5
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2013-12-01 11:07:49.571329714 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2013-12-01 11:07:49.747331585 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p4"
-+#define MPFR_VERSION_STRING "3.1.2-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -861,7 +861,7 @@
-     _t = (mpfr_kind_t) _k;                                     \
-     _s = 1;                                                    \
-   } else {                                                     \
--    _t = (mpfr_kind_t) -k;                                     \
-+    _t = (mpfr_kind_t) - _k;                                   \
-     _s = -1;                                                   \
-   }                                                            \
-   _e = _t == MPFR_REGULAR_KIND ? (e) :                         \
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2013-12-01 11:07:49.575329762 +0000
-+++ mpfr-3.1.2-b/src/version.c	2013-12-01 11:07:49.747331585 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p4";
-+  return "3.1.2-p5";
- }
diff --git a/patches/mpfr/3.1.2/160-li2-return.patch b/patches/mpfr/3.1.2/160-li2-return.patch
deleted file mode 100644
index 50cd04d..0000000
--- a/patches/mpfr/3.1.2/160-li2-return.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/PATCHES	2014-04-15 21:56:49.697059857 +0000
-@@ -0,0 +1 @@
-+li2-return
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/VERSION	2014-04-15 21:56:49.697059857 +0000
-@@ -1 +1 @@
--3.1.2-p5
-+3.1.2-p6
-diff -Naurd mpfr-3.1.2-a/src/li2.c mpfr-3.1.2-b/src/li2.c
---- mpfr-3.1.2-a/src/li2.c	2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/li2.c	2014-04-15 21:56:49.653058661 +0000
-@@ -630,5 +630,5 @@
-       return mpfr_check_range (y, inexact, rnd_mode);
-     }
- 
--  MPFR_ASSERTN (0);             /* should never reach this point */
-+  MPFR_RET_NEVER_GO_HERE ();
- }
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2014-04-15 21:56:49.697059857 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p5"
-+#define MPFR_VERSION_STRING "3.1.2-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/src/version.c	2014-04-15 21:56:49.697059857 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p5";
-+  return "3.1.2-p6";
- }
diff --git a/patches/mpfr/3.1.2/170-exp3.patch b/patches/mpfr/3.1.2/170-exp3.patch
deleted file mode 100644
index 378c3bf..0000000
--- a/patches/mpfr/3.1.2/170-exp3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2014-04-15 22:04:57.090286262 +0000
-+++ mpfr-3.1.2-b/PATCHES	2014-04-15 22:04:57.162288198 +0000
-@@ -0,0 +1 @@
-+exp3
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2014-04-15 22:04:57.086286154 +0000
-+++ mpfr-3.1.2-b/VERSION	2014-04-15 22:04:57.162288198 +0000
-@@ -1 +1 @@
--3.1.2-p6
-+3.1.2-p7
-diff -Naurd mpfr-3.1.2-a/src/exp3.c mpfr-3.1.2-b/src/exp3.c
---- mpfr-3.1.2-a/src/exp3.c	2013-03-13 15:37:34.000000000 +0000
-+++ mpfr-3.1.2-b/src/exp3.c	2014-04-15 22:04:57.126287230 +0000
-@@ -283,7 +283,7 @@
-             }
-         }
- 
--      if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDD, MPFR_RNDZ,
-+      if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDN, MPFR_RNDZ,
-                           MPFR_PREC(y) + (rnd_mode == MPFR_RNDN)))
-         {
-           inexact = mpfr_set (y, shift_x > 0 ? t : tmp, rnd_mode);
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2014-04-15 22:04:57.086286154 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2014-04-15 22:04:57.162288198 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p6"
-+#define MPFR_VERSION_STRING "3.1.2-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2014-04-15 22:04:57.090286262 +0000
-+++ mpfr-3.1.2-b/src/version.c	2014-04-15 22:04:57.162288198 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p6";
-+  return "3.1.2-p7";
- }
-diff -Naurd mpfr-3.1.2-a/tests/texp.c mpfr-3.1.2-b/tests/texp.c
---- mpfr-3.1.2-a/tests/texp.c	2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/texp.c	2014-04-15 22:04:57.126287230 +0000
-@@ -150,6 +150,22 @@
-       exit (1);
-     }
- 
-+  mpfr_set_prec (x, 118);
-+  mpfr_set_str_binary (x, "0.1110010100011101010000111110011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E-86");
-+  mpfr_set_prec (y, 118);
-+  mpfr_exp_2 (y, x, MPFR_RNDU);
-+  mpfr_exp_3 (x, x, MPFR_RNDU);
-+  if (mpfr_cmp (x, y))
-+    {
-+      printf ("mpfr_exp_2 and mpfr_exp_3 differ for prec=118\n");
-+      printf ("mpfr_exp_2 gives ");
-+      mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+      printf ("\nmpfr_exp_3 gives ");
-+      mpfr_out_str (stdout, 2, 0, x, MPFR_RNDN);
-+      printf ("\n");
-+      exit (1);
-+    }
-+
-   mpfr_clear (x);
-   mpfr_clear (y);
-   return 0;
diff --git a/patches/mpfr/3.1.2/180-gmp6-compat.patch b/patches/mpfr/3.1.2/180-gmp6-compat.patch
deleted file mode 100644
index 2245c7c..0000000
--- a/patches/mpfr/3.1.2/180-gmp6-compat.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2014-04-15 22:20:32.243481506 +0000
-+++ mpfr-3.1.2-b/PATCHES	2014-04-15 22:22:32.418722707 +0000
-@@ -0,0 +1 @@
-+gmp6-compat
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2014-04-15 22:20:20.755171478 +0000
-+++ mpfr-3.1.2-b/VERSION	2014-04-15 22:21:45.225450147 +0000
-@@ -1 +1 @@
--3.1.2-p7
-+3.1.2-p8
-diff -Naurd mpfr-3.1.2-a/configure mpfr-3.1.2-b/configure
---- mpfr-3.1.2-a/configure	2013-03-13 15:38:20.000000000 +0000
-+++ mpfr-3.1.2-b/configure	2014-04-15 22:21:38.821277476 +0000
-@@ -14545,26 +14545,30 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
--if test "$use_gmp_build" = yes ; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valid GMP_NUMB_BITS" >&5
--$as_echo_n "checking for valid GMP_NUMB_BITS... " >&6; }
--  if test "$cross_compiling" = yes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency" >&5
-+$as_echo_n "checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency... " >&6; }
-+if test "$cross_compiling" = yes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't test" >&5
- $as_echo "can't test" >&6; }
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#include <stdio.h>
- #include <limits.h>
- #include "gmp.h"
--#include "gmp-impl.h"
- 
- int
- main ()
- {
- 
--  return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
--         && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
-+  if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT)
-+    return 0;
-+  fprintf (stderr, "GMP_NUMB_BITS     = %ld\n", (long) GMP_NUMB_BITS);
-+  fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t));
-+  fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n",
-+           (long) (sizeof(mp_limb_t) * CHAR_BIT));
-+  return 1;
- 
-   ;
-   return 0;
-@@ -14577,14 +14581,14 @@
- 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--       as_fn_error $? "GMP_NUMB_BITS is incorrect.
--You probably need to change some of the GMP or MPFR compile options." "$LINENO" 5
-+       as_fn_error $? "GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent.
-+You probably need to change some of the GMP or MPFR compile options.
-+See 'config.log' for details (search for GMP_NUMB_BITS)." "$LINENO" 5
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--fi
- 
- 
- if test "$dont_link_with_gmp" = yes ; then
-diff -Naurd mpfr-3.1.2-a/configure.ac mpfr-3.1.2-b/configure.ac
---- mpfr-3.1.2-a/configure.ac	2013-03-13 15:37:46.000000000 +0000
-+++ mpfr-3.1.2-b/configure.ac	2013-03-13 15:37:46.000000000 +0000
-@@ -435,23 +435,29 @@
-    ])
- fi
- 
--dnl Check for valid GMP_NUMB_BITS and BYTES_PER_MP_LIMB
-+dnl Check for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency.
-+dnl Problems may occur if gmp.h was generated with some ABI
-+dnl and is used with another ABI (or if nails are used).
- dnl This test doesn't need to link with libgmp (at least it shouldn't).
--if test "$use_gmp_build" = yes ; then
--  AC_MSG_CHECKING(for valid GMP_NUMB_BITS)
--  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+AC_MSG_CHECKING(for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency)
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdio.h>
- #include <limits.h>
- #include "gmp.h"
--#include "gmp-impl.h"
- ]], [[
--  return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
--         && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
-+  if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT)
-+    return 0;
-+  fprintf (stderr, "GMP_NUMB_BITS     = %ld\n", (long) GMP_NUMB_BITS);
-+  fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t));
-+  fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n",
-+           (long) (sizeof(mp_limb_t) * CHAR_BIT));
-+  return 1;
- ]])], [AC_MSG_RESULT(yes)], [
-        AC_MSG_RESULT(no)
--       AC_MSG_ERROR([GMP_NUMB_BITS is incorrect.
--You probably need to change some of the GMP or MPFR compile options.])],
-+       AC_MSG_ERROR([GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent.
-+You probably need to change some of the GMP or MPFR compile options.
-+See 'config.log' for details (search for GMP_NUMB_BITS).])],
-        [AC_MSG_RESULT([can't test])])
--fi
- 
- 
- dnl We really need to link using libtool. But it is impossible with the current
-diff -Naurd mpfr-3.1.2-a/src/init2.c mpfr-3.1.2-b/src/init2.c
---- mpfr-3.1.2-a/src/init2.c	2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/init2.c	2014-04-15 22:21:06.220398489 +0000
-@@ -30,11 +30,11 @@
- 
-   /* Check if we can represent the number of limbs
-    * associated to the maximum of mpfr_prec_t*/
--  MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/BYTES_PER_MP_LIMB) );
-+  MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/MPFR_BYTES_PER_MP_LIMB) );
- 
--  /* Check for correct GMP_NUMB_BITS and BYTES_PER_MP_LIMB */
--  MPFR_ASSERTN( GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
--                && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB );
-+  /* Check for correct GMP_NUMB_BITS and MPFR_BYTES_PER_MP_LIMB */
-+  MPFR_ASSERTN( GMP_NUMB_BITS == MPFR_BYTES_PER_MP_LIMB * CHAR_BIT
-+                && sizeof(mp_limb_t) == MPFR_BYTES_PER_MP_LIMB );
- 
-   MPFR_ASSERTN (mp_bits_per_limb == GMP_NUMB_BITS);
- 
-diff -Naurd mpfr-3.1.2-a/src/mpfr-gmp.h mpfr-3.1.2-b/src/mpfr-gmp.h
---- mpfr-3.1.2-a/src/mpfr-gmp.h	2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr-gmp.h	2014-04-15 22:21:06.220398489 +0000
-@@ -72,7 +72,6 @@
- #endif
- 
- /* Define some macros */
--#define BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT)
- 
- #define MP_LIMB_T_MAX (~(mp_limb_t)0)
- 
-@@ -96,19 +95,19 @@
- #define SHRT_HIGHBIT       SHRT_MIN
- 
- /* MP_LIMB macros */
--#define MPN_ZERO(dst, n) memset((dst), 0, (n)*BYTES_PER_MP_LIMB)
--#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB)
--#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB)
-+#define MPN_ZERO(dst, n) memset((dst), 0, (n)*MPFR_BYTES_PER_MP_LIMB)
-+#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB)
-+#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB)
- #define MPN_COPY(dst,src,n) \
-   do                                                                  \
-     {                                                                 \
-       if ((dst) != (src))                                             \
-         {                                                             \
-           MPFR_ASSERTD ((char *) (dst) >= (char *) (src) +            \
--                                          (n) * BYTES_PER_MP_LIMB ||  \
-+                                     (n) * MPFR_BYTES_PER_MP_LIMB ||  \
-                         (char *) (src) >= (char *) (dst) +            \
--                                          (n) * BYTES_PER_MP_LIMB);   \
--          memcpy ((dst), (src), (n) * BYTES_PER_MP_LIMB);             \
-+                                     (n) * MPFR_BYTES_PER_MP_LIMB);   \
-+          memcpy ((dst), (src), (n) * MPFR_BYTES_PER_MP_LIMB);        \
-         }                                                             \
-     }                                                                 \
-   while (0)
-diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
---- mpfr-3.1.2-a/src/mpfr-impl.h	2013-10-09 13:34:21.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr-impl.h	2014-04-15 22:21:06.220398489 +0000
-@@ -191,7 +191,7 @@
- # endif
- #endif
- 
--
-+#define MPFR_BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT)
- 
- /******************************************************
-  ******************** Check GMP ***********************
-@@ -930,7 +930,7 @@
- #define MPFR_SET_ALLOC_SIZE(x, n) \
-  ( ((mp_size_t*) MPFR_MANT(x))[-1] = n)
- #define MPFR_MALLOC_SIZE(s) \
--  ( sizeof(mpfr_size_limb_t) + BYTES_PER_MP_LIMB * ((size_t) s) )
-+  ( sizeof(mpfr_size_limb_t) + MPFR_BYTES_PER_MP_LIMB * ((size_t) s) )
- #define MPFR_SET_MANT_PTR(x,p) \
-    (MPFR_MANT(x) = (mp_limb_t*) ((mpfr_size_limb_t*) p + 1))
- #define MPFR_GET_REAL_PTR(x) \
-@@ -964,7 +964,7 @@
- #endif
- 
- #define MPFR_TMP_LIMBS_ALLOC(N) \
--  ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * BYTES_PER_MP_LIMB))
-+  ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * MPFR_BYTES_PER_MP_LIMB))
- 
- /* temporary allocate 1 limb at xp, and initialize mpfr variable x */
- /* The temporary var doesn't have any size field, but it doesn't matter
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2014-04-15 22:20:20.755171478 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2014-04-15 22:21:45.225450147 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p7"
-+#define MPFR_VERSION_STRING "3.1.2-p8"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/mul.c mpfr-3.1.2-b/src/mul.c
---- mpfr-3.1.2-a/src/mul.c	2013-03-13 15:37:37.000000000 +0000
-+++ mpfr-3.1.2-b/src/mul.c	2014-04-15 22:21:06.224398597 +0000
-@@ -106,7 +106,7 @@
-   MPFR_ASSERTD(tn <= k);
- 
-   /* Check for no size_t overflow*/
--  MPFR_ASSERTD((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB);
-+  MPFR_ASSERTD((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB);
-   MPFR_TMP_MARK(marker);
-   tmp = MPFR_TMP_LIMBS_ALLOC (k);
- 
-@@ -301,7 +301,7 @@
-   MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
- 
-   /* Check for no size_t overflow*/
--  MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB);
-+  MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB);
-   MPFR_TMP_MARK (marker);
-   tmp = MPFR_TMP_LIMBS_ALLOC (k);
- 
-diff -Naurd mpfr-3.1.2-a/src/stack_interface.c mpfr-3.1.2-b/src/stack_interface.c
---- mpfr-3.1.2-a/src/stack_interface.c	2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/stack_interface.c	2014-04-15 22:21:06.220398489 +0000
-@@ -26,7 +26,7 @@
- size_t
- mpfr_custom_get_size (mpfr_prec_t prec)
- {
--  return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
-+  return MPFR_PREC2LIMBS (prec) * MPFR_BYTES_PER_MP_LIMB;
- }
- 
- #undef mpfr_custom_init
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2014-04-15 22:20:20.755171478 +0000
-+++ mpfr-3.1.2-b/src/version.c	2014-04-15 22:21:45.225450147 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p7";
-+  return "3.1.2-p8";
- }
diff --git a/patches/mpfr/3.1.2/190-div-overflow.patch b/patches/mpfr/3.1.2/190-div-overflow.patch
deleted file mode 100644
index 6ff7c4a..0000000
--- a/patches/mpfr/3.1.2/190-div-overflow.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2014-06-30 15:15:25.533266905 +0000
-+++ mpfr-3.1.2-b/PATCHES	2014-06-30 15:15:25.617269178 +0000
-@@ -0,0 +1 @@
-+div-overflow
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2014-06-30 15:15:25.529266797 +0000
-+++ mpfr-3.1.2-b/VERSION	2014-06-30 15:15:25.617269178 +0000
-@@ -1 +1 @@
--3.1.2-p8
-+3.1.2-p9
-diff -Naurd mpfr-3.1.2-a/src/div.c mpfr-3.1.2-b/src/div.c
---- mpfr-3.1.2-a/src/div.c	2013-03-13 15:37:33.000000000 +0000
-+++ mpfr-3.1.2-b/src/div.c	2014-06-30 15:15:25.585268312 +0000
-@@ -750,7 +750,9 @@
-  truncate_check_qh:
-   if (qh)
-     {
--      qexp ++;
-+      if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
-+        qexp ++;
-+      /* else qexp is now incorrect, but one will still get an overflow */
-       q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
-     }
-   goto truncate;
-@@ -765,7 +767,9 @@
-   inex = 1; /* always here */
-   if (mpn_add_1 (q0p, q0p, q0size, MPFR_LIMB_ONE << sh))
-     {
--      qexp ++;
-+      if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
-+        qexp ++;
-+      /* else qexp is now incorrect, but one will still get an overflow */
-       q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
-     }
- 
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2014-06-30 15:15:25.533266905 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2014-06-30 15:15:25.613269070 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p8"
-+#define MPFR_VERSION_STRING "3.1.2-p9"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2014-06-30 15:15:25.533266905 +0000
-+++ mpfr-3.1.2-b/src/version.c	2014-06-30 15:15:25.613269070 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p8";
-+  return "3.1.2-p9";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tdiv.c mpfr-3.1.2-b/tests/tdiv.c
---- mpfr-3.1.2-a/tests/tdiv.c	2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tdiv.c	2014-06-30 15:15:25.585268312 +0000
-@@ -1104,6 +1104,96 @@
- #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
- #include "tgeneric.c"
- 
-+static void
-+test_extreme (void)
-+{
-+  mpfr_t x, y, z;
-+  mpfr_exp_t emin, emax;
-+  mpfr_prec_t p[4] = { 8, 32, 64, 256 };
-+  int xi, yi, zi, j, r;
-+  unsigned int flags, ex_flags;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_set_emin (MPFR_EMIN_MIN);
-+  mpfr_set_emax (MPFR_EMAX_MAX);
-+
-+  for (xi = 0; xi < 4; xi++)
-+    {
-+      mpfr_init2 (x, p[xi]);
-+      mpfr_setmax (x, MPFR_EMAX_MAX);
-+      MPFR_ASSERTN (mpfr_check (x));
-+      for (yi = 0; yi < 4; yi++)
-+        {
-+          mpfr_init2 (y, p[yi]);
-+          mpfr_setmin (y, MPFR_EMIN_MIN);
-+          for (j = 0; j < 2; j++)
-+            {
-+              MPFR_ASSERTN (mpfr_check (y));
-+              for (zi = 0; zi < 4; zi++)
-+                {
-+                  mpfr_init2 (z, p[zi]);
-+                  RND_LOOP (r)
-+                    {
-+                      mpfr_clear_flags ();
-+                      mpfr_div (z, x, y, (mpfr_rnd_t) r);
-+                      flags = __gmpfr_flags;
-+                      MPFR_ASSERTN (mpfr_check (z));
-+                      ex_flags = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT;
-+                      if (flags != ex_flags)
-+                        {
-+                          printf ("Bad flags in test_extreme on z = a/b"
-+                                  " with %s and\n",
-+                                  mpfr_print_rnd_mode ((mpfr_rnd_t) r));
-+                          printf ("a = ");
-+                          mpfr_dump (x);
-+                          printf ("b = ");
-+                          mpfr_dump (y);
-+                          printf ("Expected flags:");
-+                          flags_out (ex_flags);
-+                          printf ("Got flags:     ");
-+                          flags_out (flags);
-+                          printf ("z = ");
-+                          mpfr_dump (z);
-+                          exit (1);
-+                        }
-+                      mpfr_clear_flags ();
-+                      mpfr_div (z, y, x, (mpfr_rnd_t) r);
-+                      flags = __gmpfr_flags;
-+                      MPFR_ASSERTN (mpfr_check (z));
-+                      ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT;
-+                      if (flags != ex_flags)
-+                        {
-+                          printf ("Bad flags in test_extreme on z = a/b"
-+                                  " with %s and\n",
-+                                  mpfr_print_rnd_mode ((mpfr_rnd_t) r));
-+                          printf ("a = ");
-+                          mpfr_dump (y);
-+                          printf ("b = ");
-+                          mpfr_dump (x);
-+                          printf ("Expected flags:");
-+                          flags_out (ex_flags);
-+                          printf ("Got flags:     ");
-+                          flags_out (flags);
-+                          printf ("z = ");
-+                          mpfr_dump (z);
-+                          exit (1);
-+                        }
-+                    }
-+                  mpfr_clear (z);
-+                }  /* zi */
-+              mpfr_nextabove (y);
-+            }  /* j */
-+          mpfr_clear (y);
-+        }  /* yi */
-+      mpfr_clear (x);
-+    }  /* xi */
-+
-+  set_emin (emin);
-+  set_emax (emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1130,6 +1220,7 @@
-   test_20070603 ();
-   test_20070628 ();
-   test_generic (2, 800, 50);
-+  test_extreme ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/patches/mpfr/3.1.2/200-vasprintf.patch b/patches/mpfr/3.1.2/200-vasprintf.patch
deleted file mode 100644
index 43848f7..0000000
--- a/patches/mpfr/3.1.2/200-vasprintf.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/PATCHES	2014-06-30 15:17:53.417270314 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/VERSION	2014-06-30 15:17:53.413270206 +0000
-@@ -1 +1 @@
--3.1.2-p9
-+3.1.2-p10
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2014-06-30 15:17:53.413270206 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p9"
-+#define MPFR_VERSION_STRING "3.1.2-p10"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
---- mpfr-3.1.2-a/src/vasprintf.c	2013-11-15 00:51:49.267334408 +0000
-+++ mpfr-3.1.2-b/src/vasprintf.c	2014-06-30 15:17:53.377269231 +0000
-@@ -884,14 +884,18 @@
-            first digit, we want the exponent for radix two and the decimal
-            point AFTER the first digit. */
-         {
--          MPFR_ASSERTN (exp > MPFR_EMIN_MIN /4); /* possible overflow */
-+          /* An integer overflow is normally not possible since MPFR_EXP_MIN
-+             is twice as large as MPFR_EMIN_MIN. */
-+          MPFR_ASSERTN (exp > (MPFR_EXP_MIN + 3) / 4);
-           exp = (exp - 1) * 4;
-         }
-       else
-         /* EXP is the exponent for decimal point BEFORE the first digit, we
-            want the exponent for decimal point AFTER the first digit. */
-         {
--          MPFR_ASSERTN (exp > MPFR_EMIN_MIN); /* possible overflow */
-+          /* An integer overflow is normally not possible since MPFR_EXP_MIN
-+             is twice as large as MPFR_EMIN_MIN. */
-+          MPFR_ASSERTN (exp > MPFR_EXP_MIN);
-           --exp;
-         }
-     }
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/src/version.c	2014-06-30 15:17:53.413270206 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p9";
-+  return "3.1.2-p10";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
---- mpfr-3.1.2-a/tests/tsprintf.c	2013-11-15 00:51:49.267334408 +0000
-+++ mpfr-3.1.2-b/tests/tsprintf.c	2014-06-30 15:17:53.377269231 +0000
-@@ -1184,6 +1184,69 @@
-   check_emax_aux (MPFR_EMAX_MAX);
- }
- 
-+static void
-+check_emin_aux (mpfr_exp_t e)
-+{
-+  mpfr_t x;
-+  char *s1, s2[256];
-+  int i;
-+  mpfr_exp_t emin;
-+  mpz_t ee;
-+
-+  MPFR_ASSERTN (e >= LONG_MIN);
-+  emin = mpfr_get_emin ();
-+  set_emin (e);
-+
-+  mpfr_init2 (x, 16);
-+  mpz_init (ee);
-+
-+  mpfr_setmin (x, e);
-+  mpz_set_si (ee, e);
-+  mpz_sub_ui (ee, ee, 1);
-+
-+  i = mpfr_asprintf (&s1, "%Ra", x);
-+  MPFR_ASSERTN (i > 0);
-+
-+  gmp_snprintf (s2, 256, "0x1p%Zd", ee);
-+
-+  if (strcmp (s1, s2) != 0)
-+    {
-+      printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
-+      printf ("Expected %s\n", s2);
-+      printf ("Got      %s\n", s1);
-+      exit (1);
-+    }
-+
-+  mpfr_free_str (s1);
-+
-+  i = mpfr_asprintf (&s1, "%Rb", x);
-+  MPFR_ASSERTN (i > 0);
-+
-+  gmp_snprintf (s2, 256, "1p%Zd", ee);
-+
-+  if (strcmp (s1, s2) != 0)
-+    {
-+      printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
-+      printf ("Expected %s\n", s2);
-+      printf ("Got      %s\n", s1);
-+      exit (1);
-+    }
-+
-+  mpfr_free_str (s1);
-+
-+  mpfr_clear (x);
-+  mpz_clear (ee);
-+  set_emin (emin);
-+}
-+
-+static void
-+check_emin (void)
-+{
-+  check_emin_aux (-15);
-+  check_emin_aux (mpfr_get_emin ());
-+  check_emin_aux (MPFR_EMIN_MIN);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -1203,6 +1266,7 @@
-   decimal ();
-   mixed ();
-   check_emax ();
-+  check_emin ();
- 
- #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
-   locale_da_DK ();
diff --git a/patches/mpfr/3.1.2/210-strtofr.patch b/patches/mpfr/3.1.2/210-strtofr.patch
deleted file mode 100644
index 462162e..0000000
--- a/patches/mpfr/3.1.2/210-strtofr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES	2014-12-04 01:41:57.131789485 +0000
-+++ mpfr-3.1.2-b/PATCHES	2014-12-04 01:41:57.339791833 +0000
-@@ -0,0 +1 @@
-+strtofr
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION	2014-12-04 01:41:57.127789443 +0000
-+++ mpfr-3.1.2-b/VERSION	2014-12-04 01:41:57.339791833 +0000
-@@ -1 +1 @@
--3.1.2-p10
-+3.1.2-p11
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h	2014-12-04 01:41:57.127789443 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h	2014-12-04 01:41:57.335791790 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p10"
-+#define MPFR_VERSION_STRING "3.1.2-p11"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/strtofr.c mpfr-3.1.2-b/src/strtofr.c
---- mpfr-3.1.2-a/src/strtofr.c	2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/strtofr.c	2014-12-04 01:41:57.287791246 +0000
-@@ -473,8 +473,10 @@
-       /* prec bits corresponds to ysize limbs */
-       ysize_bits = ysize * GMP_NUMB_BITS;
-       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
--      y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 1);
--      y += ysize; /* y has (ysize+1) allocated limbs */
-+      /* we need to allocate one more limb to work around bug
-+         https://gmplib.org/list-archives/gmp-bugs/2013-December/003267.html */
-+      y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 2);
-+      y += ysize; /* y has (ysize+2) allocated limbs */
- 
-       /* pstr_size is the number of characters we read in pstr->mant
-          to have at least ysize full limbs.
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c	2014-12-04 01:41:57.131789485 +0000
-+++ mpfr-3.1.2-b/src/version.c	2014-12-04 01:41:57.339791833 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.2-p10";
-+  return "3.1.2-p11";
- }
diff --git a/patches/mpfr/3.1.3/110-lngamma-and-doc.patch b/patches/mpfr/3.1.3/110-lngamma-and-doc.patch
deleted file mode 100644
index d7e1cbf..0000000
--- a/patches/mpfr/3.1.3/110-lngamma-and-doc.patch
+++ /dev/null
@@ -1,1117 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2015-07-02 10:49:23.950112879 +0000
-+++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:49:24.042113845 +0000
-@@ -0,0 +1 @@
-+lngamma-and-doc
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/VERSION	2015-07-02 10:49:24.042113845 +0000
-@@ -1 +1 @@
--3.1.3
-+3.1.3-p1
-diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi
---- mpfr-3.1.3-a/doc/mpfr.texi	2015-06-19 19:55:11.000000000 +0000
-+++ mpfr-3.1.3-b/doc/mpfr.texi	2015-07-02 10:49:24.018113593 +0000
-@@ -810,13 +810,17 @@
- When the input point is in the closure of the domain of the mathematical
- function and an input argument is +0 (resp.@: @minus{}0), one considers
- the limit when the corresponding argument approaches 0 from above
--(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on
--@minus{}0), the behavior is specified in the description of the MPFR function.
-+(resp.@: below), if possible. If the limit is not defined (e.g.,
-+@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is
-+specified in the description of the MPFR function, but must be consistent
-+with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0
-+gives @minus{}Inf).
- 
- When the result is equal to 0, its sign is determined by considering the
- limit as if the input point were not in the domain: If one approaches 0
- from above (resp.@: below), the result is +0 (resp.@: @minus{}0);
--for example, @code{mpfr_sin} on +0 gives +0.
-+for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and
-+@code{mpfr_acos} on 1 gives +0 (in all rounding modes).
- In the other cases, the sign is specified in the description of the MPFR
- function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0.
- 
-@@ -832,8 +836,8 @@
- @c that advantages in practice), like for any bug fix.
- Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot}
- on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}),
--since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf)
--gives +Inf.
-+since for any finite or infinite input @var{x}, @code{mpfr_hypot} on
-+(@var{x},+Inf) gives +Inf.
- 
- @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics
- @comment  node-name,  next,  previous,  up
-@@ -1581,7 +1585,8 @@
- @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
- @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
- Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction
--@var{rnd}. For types having no signed zero, it is considered unsigned
-+@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
-+But for types having no signed zeros, 0 is considered unsigned
- (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)).
- The @code{mpfr_add_d} function assumes that the radix of the @code{double} type
- is a power of 2, with a precision at most that declared by the C implementation
-@@ -1599,7 +1604,8 @@
- @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
- @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
- Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction
--@var{rnd}. For types having no signed zero, it is considered unsigned
-+@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
-+But for types having no signed zeros, 0 is considered unsigned
- (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0),
- 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)).
- The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub}
-@@ -1615,7 +1621,7 @@
- Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the
- direction @var{rnd}.
- When a result is zero, its sign is the product of the signs of the operands
--(for types having no signed zero, it is considered positive).
-+(for types having no signed zeros, 0 is considered positive).
- The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}.
- @end deftypefun
- 
-@@ -1635,7 +1641,7 @@
- @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
- Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}.
- When a result is zero, its sign is the product of the signs of the operands
--(for types having no signed zero, it is considered positive).
-+(for types having no signed zeros, 0 is considered positive).
- The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div}
- and @code{mpfr_div_d}.
- @end deftypefun
-@@ -1643,15 +1649,18 @@
- @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
- @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd})
- Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}}
--rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is
--@minus{}0, to be consistent with the IEEE 754 standard).
-+rounded in the direction @var{rnd}.  Set @var{rop} to @minus{}0 if
-+@var{op} is @minus{}0, to be consistent with the IEEE 754 standard.
- Set @var{rop} to NaN if @var{op} is negative.
- @end deftypefun
- 
- @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
- Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}}
--rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is
--@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.
-+rounded in the direction @var{rnd}.  Set @var{rop} to +Inf if @var{op} is
-+@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.  Warning!
-+Therefore the result on @minus{}0 is different from the one of the rSqrt
-+function recommended by the IEEE 754-2008 standard (Section 9.2.1), which
-+is @minus{}Inf instead of +Inf.
- @end deftypefun
- 
- @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
-@@ -1832,7 +1841,9 @@
- @m{\log_2 @var{op}, log2(@var{op})} or
- @m{\log_{10} @var{op}, log10(@var{op})}, respectively,
- rounded in the direction @var{rnd}.
--Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0
-+Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes),
-+for consistency with the ISO C99 and IEEE 754-2008 standards.
-+Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0
- (i.e., the sign of the zero has no influence on the result).
- @end deftypefun
- 
-@@ -2003,8 +2014,11 @@
- @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
- Set @var{rop} to the value of the logarithm of the Gamma function on @var{op},
- rounded in the direction @var{rnd}.
--When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}},
--@var{k} being a non-negative integer, @var{rop} is set to NaN.
-+When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
-+When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf,
-+following the general rules on special values.
-+When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}},
-+@var{k} being a nonnegative integer, set @var{rop} to NaN@.
- See also @code{mpfr_lgamma}.
- @end deftypefun
- 
-@@ -2012,10 +2026,11 @@
- Set @var{rop} to the value of the logarithm of the absolute value of the
- Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign
- (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to
--by @var{signp}. When @var{op} is an infinity or a non-positive integer, set
--@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer,
--*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is
--the sign of the zero.
-+by @var{signp}.
-+When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
-+When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf.
-+When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is
-+undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero.
- @end deftypefun
- 
- @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
-@@ -2064,7 +2079,10 @@
- @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd})
- Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}}
- (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}})
--rounded in the direction @var{rnd}.
-+rounded in the direction @var{rnd}.  Concerning special values (signed zeros,
-+infinities, NaN), these functions behave like a multiplication followed by a
-+separate addition or subtraction.  That is, the fused operation matters only
-+for rounding.
- @end deftypefun
- 
- @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd})
-@@ -2089,8 +2107,8 @@
- i.e., $\sqrt{x^2+y^2}$,
- @end tex
- rounded in the direction @var{rnd}.
--Special values are handled as described in Section F.9.4.3 of
--the ISO C99 and IEEE 754-2008 standards:
-+Special values are handled as described in the ISO C99 (Section F.9.4.3)
-+and IEEE 754-2008 (Section 9.2.1) standards:
- If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop},
- even if the other number is NaN.
- @end deftypefun
-diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info
---- mpfr-3.1.3-a/doc/mpfr.info	2015-06-19 19:55:53.000000000 +0000
-+++ mpfr-3.1.3-b/doc/mpfr.info	2015-07-02 10:49:38.718267817 +0000
-@@ -1,4 +1,4 @@
--This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi.
-+This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi.
- 
- This manual documents how to install and use the Multiple Precision
- Floating-Point Reliable Library, version 3.1.3.
-@@ -55,7 +55,7 @@
- MPFR Copying Conditions
- ***********************
- 
--The GNU MPFR library (or MPFR for short) is "free"; this means that
-+The GNU MPFR library (or MPFR for short) is “free”; this means that
- everyone is free to use it and free to redistribute it on a free basis.
- The library is not in the public domain; it is copyrighted and there are
- restrictions on its distribution, but these restrictions are designed to
-@@ -418,7 +418,7 @@
- 4.2 Nomenclature and Types
- ==========================
- 
--A "floating-point number", or "float" for short, is an arbitrary
-+A “floating-point number”, or “float” for short, is an arbitrary
- precision significand (also called mantissa) with a limited precision
- exponent.  The C data type for such objects is ‘mpfr_t’ (internally
- defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C
-@@ -432,7 +432,7 @@
- to the other functions supported by MPFR. Unless documented otherwise,
- the sign bit of a NaN is unspecified.
- 
--The "precision" is the number of bits used to represent the significand
-+The “precision” is the number of bits used to represent the significand
- of a floating-point number; the corresponding C data type is
- ‘mpfr_prec_t’.  The precision can be any integer between ‘MPFR_PREC_MIN’
- and ‘MPFR_PREC_MAX’.  In the current implementation, ‘MPFR_PREC_MIN’ is
-@@ -446,7 +446,7 @@
- may abort, crash or have undefined behavior (depending on your C
- implementation).
- 
--The "rounding mode" specifies the way to round the result of a
-+The “rounding mode” specifies the way to round the result of a
- floating-point operation, in case the exact result can not be
- represented exactly in the destination significand; the corresponding C
- data type is ‘mpfr_rnd_t’.
-@@ -499,14 +499,14 @@
- representable numbers, it is rounded to the one with the least
- significant bit set to zero.  For example, the number 2.5, which is
- represented by (10.1) in binary, is rounded to (10.0)=2 with a precision
--of two bits, and not to (11.0)=3.  This rule avoids the "drift"
-+of two bits, and not to (11.0)=3.  This rule avoids the “drift”
- phenomenon mentioned by Knuth in volume 2 of The Art of Computer
- Programming (Section 4.2.2).
- 
-    Most MPFR functions take as first argument the destination variable,
- as second and following arguments the input variables, as last argument
- a rounding mode, and have a return value of type ‘int’, called the
--"ternary value".  The value stored in the destination variable is
-+“ternary value”.  The value stored in the destination variable is
- correctly rounded, i.e., MPFR behaves as if it computed the result with
- an infinite precision, then rounded it to the precision of this
- variable.  The input variables are regarded as exact (in particular,
-@@ -572,15 +572,18 @@
-    When the input point is in the closure of the domain of the
- mathematical function and an input argument is +0 (resp. −0), one
- considers the limit when the corresponding argument approaches 0 from
--above (resp. below).  If the limit is not defined (e.g., ‘mpfr_log’ on
--−0), the behavior is specified in the description of the MPFR function.
-+above (resp. below), if possible.  If the limit is not defined (e.g.,
-+‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the
-+description of the MPFR function, but must be consistent with the rule
-+from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf).
- 
-    When the result is equal to 0, its sign is determined by considering
- the limit as if the input point were not in the domain: If one
- approaches 0 from above (resp. below), the result is +0 (resp. −0); for
--example, ‘mpfr_sin’ on +0 gives +0.  In the other cases, the sign is
--specified in the description of the MPFR function; for example
--‘mpfr_max’ on −0 and +0 gives +0.
-+example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all
-+rounding modes).  In the other cases, the sign is specified in the
-+description of the MPFR function; for example ‘mpfr_max’ on −0 and +0
-+gives +0.
- 
-    When the input point is not in the closure of the domain of the
- function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN.
-@@ -590,8 +593,8 @@
- numbers; such a case is always explicitly specified in *note MPFR
- Interface::.  Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but
- ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special
--Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf)
--gives +Inf.
-+Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on
-+(X,+Inf) gives +Inf.
- 
- 
- File: mpfr.info,  Node: Exceptions,  Next: Memory Handling,  Prev: Floating-Point Values on Special Numbers,  Up: MPFR Basics
-@@ -1253,8 +1256,9 @@
-           mpfr_rnd_t RND)
-  -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
-           mpfr_rnd_t RND)
--     Set ROP to OP1 + OP2 rounded in the direction RND.  For types
--     having no signed zero, it is considered unsigned (i.e., (+0) + 0 =
-+     Set ROP to OP1 + OP2 rounded in the direction RND.  The IEEE-754
-+     rules are used, in particular for signed zeros.  But for types
-+     having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 =
-      (+0) and (−0) + 0 = (−0)).  The ‘mpfr_add_d’ function assumes that
-      the radix of the ‘double’ type is a power of 2, with a precision at
-      most that declared by the C implementation (macro
-@@ -1280,8 +1284,9 @@
-           mpfr_rnd_t RND)
-  -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
-           mpfr_rnd_t RND)
--     Set ROP to OP1 - OP2 rounded in the direction RND.  For types
--     having no signed zero, it is considered unsigned (i.e., (+0) − 0 =
-+     Set ROP to OP1 - OP2 rounded in the direction RND.  The IEEE-754
-+     rules are used, in particular for signed zeros.  But for types
-+     having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 =
-      (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)).  The
-      same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and
-      ‘mpfr_sub_d’.
-@@ -1300,7 +1305,7 @@
-           mpfr_rnd_t RND)
-      Set ROP to OP1 times OP2 rounded in the direction RND.  When a
-      result is zero, its sign is the product of the signs of the
--     operands (for types having no signed zero, it is considered
-+     operands (for types having no signed zeros, 0 is considered
-      positive).  The same restrictions than for ‘mpfr_add_d’ apply to
-      ‘mpfr_mul_d’.
- 
-@@ -1327,21 +1332,24 @@
-           mpfr_rnd_t RND)
-      Set ROP to OP1/OP2 rounded in the direction RND.  When a result is
-      zero, its sign is the product of the signs of the operands (for
--     types having no signed zero, it is considered positive).  The same
-+     types having no signed zeros, 0 is considered positive).  The same
-      restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and
-      ‘mpfr_div_d’.
- 
-  -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-  -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP,
-           mpfr_rnd_t RND)
--     Set ROP to the square root of OP rounded in the direction RND (set
--     ROP to −0 if OP is −0, to be consistent with the IEEE 754
--     standard).  Set ROP to NaN if OP is negative.
-+     Set ROP to the square root of OP rounded in the direction RND.  Set
-+     ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard.
-+     Set ROP to NaN if OP is negative.
- 
-  -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-      Set ROP to the reciprocal square root of OP rounded in the
-      direction RND.  Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and
--     NaN if OP is negative.
-+     NaN if OP is negative.  Warning!  Therefore the result on −0 is
-+     different from the one of the rSqrt function recommended by the
-+     IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of
-+     +Inf.
- 
-  -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-  -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K,
-@@ -1515,8 +1523,10 @@
-  -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-  -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-      Set ROP to the natural logarithm of OP, log2(OP) or log10(OP),
--     respectively, rounded in the direction RND.  Set ROP to −Inf if OP
--     is −0 (i.e., the sign of the zero has no influence on the result).
-+     respectively, rounded in the direction RND.  Set ROP to +0 if OP is
-+     1 (in all rounding modes), for consistency with the ISO C99 and
-+     IEEE 754-2008 standards.  Set ROP to −Inf if OP is ±0 (i.e., the
-+     sign of the zero has no influence on the result).
- 
-  -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-  -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-@@ -1649,17 +1659,21 @@
- 
-  -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-      Set ROP to the value of the logarithm of the Gamma function on OP,
--     rounded in the direction RND.  When −2K−1 <= OP <= −2K, K being a
--     non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’.
-+     rounded in the direction RND.  When OP is 1 or 2, set ROP to +0 (in
-+     all rounding modes).  When OP is an infinity or a nonpositive
-+     integer, set ROP to +Inf, following the general rules on special
-+     values.  When −2K−1 < OP < −2K, K being a nonnegative integer, set
-+     ROP to NaN.  See also ‘mpfr_lgamma’.
- 
-  -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP,
-           mpfr_rnd_t RND)
-      Set ROP to the value of the logarithm of the absolute value of the
-      Gamma function on OP, rounded in the direction RND.  The sign (1 or
-      −1) of Gamma(OP) is returned in the object pointed to by SIGNP.
--     When OP is an infinity or a non-positive integer, set ROP to +Inf.
--     When OP is NaN, −Inf or a negative integer, *SIGNP is undefined,
--     and when OP is ±0, *SIGNP is the sign of the zero.
-+     When OP is 1 or 2, set ROP to +0 (in all rounding modes).  When OP
-+     is an infinity or a nonpositive integer, set ROP to +Inf.  When OP
-+     is NaN, −Inf or a negative integer, *SIGNP is undefined, and when
-+     OP is ±0, *SIGNP is the sign of the zero.
- 
-  -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
-      Set ROP to the value of the Digamma (sometimes also called Psi)
-@@ -1703,7 +1717,10 @@
-  -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t
-           OP3, mpfr_rnd_t RND)
-      Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3)
--     rounded in the direction RND.
-+     rounded in the direction RND.  Concerning special values (signed
-+     zeros, infinities, NaN), these functions behave like a
-+     multiplication followed by a separate addition or subtraction.
-+     That is, the fused operation matters only for rounding.
- 
-  -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2,
-           mpfr_rnd_t RND)
-@@ -1717,9 +1734,10 @@
-           RND)
-      Set ROP to the Euclidean norm of X and Y, i.e., the square root of
-      the sum of the squares of X and Y, rounded in the direction RND.
--     Special values are handled as described in Section F.9.4.3 of the
--     ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then
--     +Inf is returned in ROP, even if the other number is NaN.
-+     Special values are handled as described in the ISO C99 (Section
-+     F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is
-+     an infinity, then +Inf is returned in ROP, even if the other number
-+     is NaN.
- 
-  -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND)
-      Set ROP to the value of the Airy function Ai on X, rounded in the
-@@ -2670,7 +2688,7 @@
- 5.16 Internals
- ==============
- 
--A "limb" means the part of a multi-precision number that fits in a
-+A “limb” means the part of a multi-precision number that fits in a
- single word.  Usually a limb contains 32 or 64 bits.  The C data type
- for a limb is ‘mp_limb_t’.
- 
-@@ -3140,7 +3158,7 @@
-   0. PREAMBLE
- 
-      The purpose of this License is to make a manual, textbook, or other
--     functional and useful document "free" in the sense of freedom: to
-+     functional and useful document “free” in the sense of freedom: to
-      assure everyone the effective freedom to copy and redistribute it,
-      with or without modifying it, either commercially or
-      noncommercially.  Secondarily, this License preserves for the
-@@ -3655,9 +3673,9 @@
- * Menu:
- 
- * mpfr_abs:                              Basic Arithmetic Functions.
--                                                              (line 160)
--* mpfr_acos:                             Special Functions.   (line  51)
--* mpfr_acosh:                            Special Functions.   (line 115)
-+                                                              (line 165)
-+* mpfr_acos:                             Special Functions.   (line  53)
-+* mpfr_acosh:                            Special Functions.   (line 117)
- * mpfr_add:                              Basic Arithmetic Functions.
-                                                               (line   6)
- * mpfr_add_d:                            Basic Arithmetic Functions.
-@@ -3670,15 +3688,15 @@
-                                                               (line   8)
- * mpfr_add_z:                            Basic Arithmetic Functions.
-                                                               (line  14)
--* mpfr_agm:                              Special Functions.   (line 210)
--* mpfr_ai:                               Special Functions.   (line 226)
--* mpfr_asin:                             Special Functions.   (line  52)
--* mpfr_asinh:                            Special Functions.   (line 116)
-+* mpfr_agm:                              Special Functions.   (line 219)
-+* mpfr_ai:                               Special Functions.   (line 236)
-+* mpfr_asin:                             Special Functions.   (line  54)
-+* mpfr_asinh:                            Special Functions.   (line 118)
- * mpfr_asprintf:                         Formatted Output Functions.
-                                                               (line 193)
--* mpfr_atan:                             Special Functions.   (line  53)
--* mpfr_atan2:                            Special Functions.   (line  63)
--* mpfr_atanh:                            Special Functions.   (line 117)
-+* mpfr_atan:                             Special Functions.   (line  55)
-+* mpfr_atan2:                            Special Functions.   (line  65)
-+* mpfr_atanh:                            Special Functions.   (line 119)
- * mpfr_buildopt_decimal_p:               Miscellaneous Functions.
-                                                               (line 162)
- * mpfr_buildopt_gmpinternals_p:          Miscellaneous Functions.
-@@ -3690,7 +3708,7 @@
- * mpfr_can_round:                        Rounding Related Functions.
-                                                               (line  39)
- * mpfr_cbrt:                             Basic Arithmetic Functions.
--                                                              (line 108)
-+                                                              (line 113)
- * mpfr_ceil:                             Integer Related Functions.
-                                                               (line   7)
- * mpfr_check_range:                      Exception Related Functions.
-@@ -3735,18 +3753,18 @@
-                                                               (line  27)
- * mpfr_cmp_z:                            Comparison Functions.
-                                                               (line  11)
--* mpfr_const_catalan:                    Special Functions.   (line 237)
--* mpfr_const_euler:                      Special Functions.   (line 236)
--* mpfr_const_log2:                       Special Functions.   (line 234)
--* mpfr_const_pi:                         Special Functions.   (line 235)
-+* mpfr_const_catalan:                    Special Functions.   (line 247)
-+* mpfr_const_euler:                      Special Functions.   (line 246)
-+* mpfr_const_log2:                       Special Functions.   (line 244)
-+* mpfr_const_pi:                         Special Functions.   (line 245)
- * mpfr_copysign:                         Miscellaneous Functions.
-                                                               (line 109)
--* mpfr_cos:                              Special Functions.   (line  29)
--* mpfr_cosh:                             Special Functions.   (line  95)
--* mpfr_cot:                              Special Functions.   (line  47)
--* mpfr_coth:                             Special Functions.   (line 111)
--* mpfr_csc:                              Special Functions.   (line  46)
--* mpfr_csch:                             Special Functions.   (line 110)
-+* mpfr_cos:                              Special Functions.   (line  31)
-+* mpfr_cosh:                             Special Functions.   (line  97)
-+* mpfr_cot:                              Special Functions.   (line  49)
-+* mpfr_coth:                             Special Functions.   (line 113)
-+* mpfr_csc:                              Special Functions.   (line  48)
-+* mpfr_csch:                             Special Functions.   (line 112)
- * mpfr_custom_get_exp:                   Custom Interface.    (line  75)
- * mpfr_custom_get_kind:                  Custom Interface.    (line  65)
- * mpfr_custom_get_significand:           Custom Interface.    (line  70)
-@@ -3756,47 +3774,47 @@
- * mpfr_custom_move:                      Custom Interface.    (line  82)
- * MPFR_DECL_INIT:                        Initialization Functions.
-                                                               (line  74)
--* mpfr_digamma:                          Special Functions.   (line 166)
-+* mpfr_digamma:                          Special Functions.   (line 172)
- * mpfr_dim:                              Basic Arithmetic Functions.
--                                                              (line 166)
-+                                                              (line 171)
- * mpfr_div:                              Basic Arithmetic Functions.
--                                                              (line  72)
-+                                                              (line  74)
- * mpfr_divby0_p:                         Exception Related Functions.
-                                                               (line 134)
- * mpfr_div_2exp:                         Compatibility with MPF.
-                                                               (line  49)
- * mpfr_div_2si:                          Basic Arithmetic Functions.
--                                                              (line 181)
-+                                                              (line 186)
- * mpfr_div_2ui:                          Basic Arithmetic Functions.
--                                                              (line 179)
-+                                                              (line 184)
- * mpfr_div_d:                            Basic Arithmetic Functions.
--                                                              (line  84)
-+                                                              (line  86)
- * mpfr_div_q:                            Basic Arithmetic Functions.
--                                                              (line  88)
-+                                                              (line  90)
- * mpfr_div_si:                           Basic Arithmetic Functions.
--                                                              (line  80)
-+                                                              (line  82)
- * mpfr_div_ui:                           Basic Arithmetic Functions.
--                                                              (line  76)
-+                                                              (line  78)
- * mpfr_div_z:                            Basic Arithmetic Functions.
--                                                              (line  86)
-+                                                              (line  88)
- * mpfr_d_div:                            Basic Arithmetic Functions.
--                                                              (line  82)
-+                                                              (line  84)
- * mpfr_d_sub:                            Basic Arithmetic Functions.
--                                                              (line  35)
--* mpfr_eint:                             Special Functions.   (line 133)
-+                                                              (line  36)
-+* mpfr_eint:                             Special Functions.   (line 135)
- * mpfr_eq:                               Compatibility with MPF.
-                                                               (line  28)
- * mpfr_equal_p:                          Comparison Functions.
-                                                               (line  59)
- * mpfr_erangeflag_p:                     Exception Related Functions.
-                                                               (line 137)
--* mpfr_erf:                              Special Functions.   (line 177)
--* mpfr_erfc:                             Special Functions.   (line 178)
--* mpfr_exp:                              Special Functions.   (line  23)
--* mpfr_exp10:                            Special Functions.   (line  25)
--* mpfr_exp2:                             Special Functions.   (line  24)
--* mpfr_expm1:                            Special Functions.   (line 129)
--* mpfr_fac_ui:                           Special Functions.   (line 121)
-+* mpfr_erf:                              Special Functions.   (line 183)
-+* mpfr_erfc:                             Special Functions.   (line 184)
-+* mpfr_exp:                              Special Functions.   (line  25)
-+* mpfr_exp10:                            Special Functions.   (line  27)
-+* mpfr_exp2:                             Special Functions.   (line  26)
-+* mpfr_expm1:                            Special Functions.   (line 131)
-+* mpfr_fac_ui:                           Special Functions.   (line 123)
- * mpfr_fits_intmax_p:                    Conversion Functions.
-                                                               (line 150)
- * mpfr_fits_sint_p:                      Conversion Functions.
-@@ -3815,20 +3833,20 @@
-                                                               (line 147)
- * mpfr_floor:                            Integer Related Functions.
-                                                               (line   8)
--* mpfr_fma:                              Special Functions.   (line 203)
-+* mpfr_fma:                              Special Functions.   (line 209)
- * mpfr_fmod:                             Integer Related Functions.
-                                                               (line  92)
--* mpfr_fms:                              Special Functions.   (line 205)
-+* mpfr_fms:                              Special Functions.   (line 211)
- * mpfr_fprintf:                          Formatted Output Functions.
-                                                               (line 157)
- * mpfr_frac:                             Integer Related Functions.
-                                                               (line  76)
--* mpfr_free_cache:                       Special Functions.   (line 244)
-+* mpfr_free_cache:                       Special Functions.   (line 254)
- * mpfr_free_str:                         Conversion Functions.
-                                                               (line 137)
- * mpfr_frexp:                            Conversion Functions.
-                                                               (line  45)
--* mpfr_gamma:                            Special Functions.   (line 148)
-+* mpfr_gamma:                            Special Functions.   (line 150)
- * mpfr_get_d:                            Conversion Functions.
-                                                               (line   7)
- * mpfr_get_decimal64:                    Conversion Functions.
-@@ -3887,7 +3905,7 @@
-                                                               (line  56)
- * mpfr_greater_p:                        Comparison Functions.
-                                                               (line  55)
--* mpfr_hypot:                            Special Functions.   (line 218)
-+* mpfr_hypot:                            Special Functions.   (line 227)
- * mpfr_inexflag_p:                       Exception Related Functions.
-                                                               (line 136)
- * mpfr_inf_p:                            Comparison Functions.
-@@ -3922,21 +3940,21 @@
-                                                               (line  31)
- * mpfr_integer_p:                        Integer Related Functions.
-                                                               (line 119)
--* mpfr_j0:                               Special Functions.   (line 182)
--* mpfr_j1:                               Special Functions.   (line 183)
--* mpfr_jn:                               Special Functions.   (line 184)
-+* mpfr_j0:                               Special Functions.   (line 188)
-+* mpfr_j1:                               Special Functions.   (line 189)
-+* mpfr_jn:                               Special Functions.   (line 190)
- * mpfr_lessequal_p:                      Comparison Functions.
-                                                               (line  58)
- * mpfr_lessgreater_p:                    Comparison Functions.
-                                                               (line  64)
- * mpfr_less_p:                           Comparison Functions.
-                                                               (line  57)
--* mpfr_lgamma:                           Special Functions.   (line 157)
--* mpfr_li2:                              Special Functions.   (line 143)
--* mpfr_lngamma:                          Special Functions.   (line 152)
-+* mpfr_lgamma:                           Special Functions.   (line 162)
-+* mpfr_li2:                              Special Functions.   (line 145)
-+* mpfr_lngamma:                          Special Functions.   (line 154)
- * mpfr_log:                              Special Functions.   (line  16)
- * mpfr_log10:                            Special Functions.   (line  18)
--* mpfr_log1p:                            Special Functions.   (line 125)
-+* mpfr_log1p:                            Special Functions.   (line 127)
- * mpfr_log2:                             Special Functions.   (line  17)
- * mpfr_max:                              Miscellaneous Functions.
-                                                               (line  22)
-@@ -3947,29 +3965,29 @@
- * mpfr_modf:                             Integer Related Functions.
-                                                               (line  82)
- * mpfr_mul:                              Basic Arithmetic Functions.
--                                                              (line  51)
-+                                                              (line  53)
- * mpfr_mul_2exp:                         Compatibility with MPF.
-                                                               (line  47)
- * mpfr_mul_2si:                          Basic Arithmetic Functions.
--                                                              (line 174)
-+                                                              (line 179)
- * mpfr_mul_2ui:                          Basic Arithmetic Functions.
--                                                              (line 172)
-+                                                              (line 177)
- * mpfr_mul_d:                            Basic Arithmetic Functions.
--                                                              (line  57)
-+                                                              (line  59)
- * mpfr_mul_q:                            Basic Arithmetic Functions.
--                                                              (line  61)
-+                                                              (line  63)
- * mpfr_mul_si:                           Basic Arithmetic Functions.
--                                                              (line  55)
-+                                                              (line  57)
- * mpfr_mul_ui:                           Basic Arithmetic Functions.
--                                                              (line  53)
-+                                                              (line  55)
- * mpfr_mul_z:                            Basic Arithmetic Functions.
--                                                              (line  59)
-+                                                              (line  61)
- * mpfr_nanflag_p:                        Exception Related Functions.
-                                                               (line 135)
- * mpfr_nan_p:                            Comparison Functions.
-                                                               (line  39)
- * mpfr_neg:                              Basic Arithmetic Functions.
--                                                              (line 159)
-+                                                              (line 164)
- * mpfr_nextabove:                        Miscellaneous Functions.
-                                                               (line  15)
- * mpfr_nextbelow:                        Miscellaneous Functions.
-@@ -3983,13 +4001,13 @@
- * mpfr_overflow_p:                       Exception Related Functions.
-                                                               (line 133)
- * mpfr_pow:                              Basic Arithmetic Functions.
--                                                              (line 116)
-+                                                              (line 121)
- * mpfr_pow_si:                           Basic Arithmetic Functions.
--                                                              (line 120)
-+                                                              (line 125)
- * mpfr_pow_ui:                           Basic Arithmetic Functions.
--                                                              (line 118)
-+                                                              (line 123)
- * mpfr_pow_z:                            Basic Arithmetic Functions.
--                                                              (line 122)
-+                                                              (line 127)
- * mpfr_prec_round:                       Rounding Related Functions.
-                                                               (line  13)
- * ‘mpfr_prec_t’:                         Nomenclature and Types.
-@@ -3999,7 +4017,7 @@
- * mpfr_print_rnd_mode:                   Rounding Related Functions.
-                                                               (line  71)
- * mpfr_rec_sqrt:                         Basic Arithmetic Functions.
--                                                              (line 103)
-+                                                              (line 105)
- * mpfr_regular_p:                        Comparison Functions.
-                                                               (line  43)
- * mpfr_reldiff:                          Compatibility with MPF.
-@@ -4021,11 +4039,11 @@
- * ‘mpfr_rnd_t’:                          Nomenclature and Types.
-                                                               (line  34)
- * mpfr_root:                             Basic Arithmetic Functions.
--                                                              (line 109)
-+                                                              (line 114)
- * mpfr_round:                            Integer Related Functions.
-                                                               (line   9)
--* mpfr_sec:                              Special Functions.   (line  45)
--* mpfr_sech:                             Special Functions.   (line 109)
-+* mpfr_sec:                              Special Functions.   (line  47)
-+* mpfr_sech:                             Special Functions.   (line 111)
- * mpfr_set:                              Assignment Functions.
-                                                               (line   9)
- * mpfr_setsign:                          Miscellaneous Functions.
-@@ -4100,57 +4118,57 @@
-                                                               (line  49)
- * mpfr_signbit:                          Miscellaneous Functions.
-                                                               (line  99)
--* mpfr_sin:                              Special Functions.   (line  30)
--* mpfr_sinh:                             Special Functions.   (line  96)
--* mpfr_sinh_cosh:                        Special Functions.   (line 101)
--* mpfr_sin_cos:                          Special Functions.   (line  35)
-+* mpfr_sin:                              Special Functions.   (line  32)
-+* mpfr_sinh:                             Special Functions.   (line  98)
-+* mpfr_sinh_cosh:                        Special Functions.   (line 103)
-+* mpfr_sin_cos:                          Special Functions.   (line  37)
- * mpfr_si_div:                           Basic Arithmetic Functions.
--                                                              (line  78)
-+                                                              (line  80)
- * mpfr_si_sub:                           Basic Arithmetic Functions.
--                                                              (line  31)
-+                                                              (line  32)
- * mpfr_snprintf:                         Formatted Output Functions.
-                                                               (line 180)
- * mpfr_sprintf:                          Formatted Output Functions.
-                                                               (line 170)
- * mpfr_sqr:                              Basic Arithmetic Functions.
--                                                              (line  69)
-+                                                              (line  71)
- * mpfr_sqrt:                             Basic Arithmetic Functions.
--                                                              (line  96)
-+                                                              (line  98)
- * mpfr_sqrt_ui:                          Basic Arithmetic Functions.
--                                                              (line  97)
-+                                                              (line  99)
- * mpfr_strtofr:                          Assignment Functions.
-                                                               (line  80)
- * mpfr_sub:                              Basic Arithmetic Functions.
--                                                              (line  25)
-+                                                              (line  26)
- * mpfr_subnormalize:                     Exception Related Functions.
-                                                               (line  60)
- * mpfr_sub_d:                            Basic Arithmetic Functions.
--                                                              (line  37)
-+                                                              (line  38)
- * mpfr_sub_q:                            Basic Arithmetic Functions.
--                                                              (line  43)
-+                                                              (line  44)
- * mpfr_sub_si:                           Basic Arithmetic Functions.
--                                                              (line  33)
-+                                                              (line  34)
- * mpfr_sub_ui:                           Basic Arithmetic Functions.
--                                                              (line  29)
-+                                                              (line  30)
- * mpfr_sub_z:                            Basic Arithmetic Functions.
--                                                              (line  41)
--* mpfr_sum:                              Special Functions.   (line 252)
-+                                                              (line  42)
-+* mpfr_sum:                              Special Functions.   (line 262)
- * mpfr_swap:                             Assignment Functions.
-                                                               (line 150)
- * ‘mpfr_t’:                              Nomenclature and Types.
-                                                               (line   6)
--* mpfr_tan:                              Special Functions.   (line  31)
--* mpfr_tanh:                             Special Functions.   (line  97)
-+* mpfr_tan:                              Special Functions.   (line  33)
-+* mpfr_tanh:                             Special Functions.   (line  99)
- * mpfr_trunc:                            Integer Related Functions.
-                                                               (line  10)
- * mpfr_ui_div:                           Basic Arithmetic Functions.
--                                                              (line  74)
-+                                                              (line  76)
- * mpfr_ui_pow:                           Basic Arithmetic Functions.
--                                                              (line 126)
-+                                                              (line 131)
- * mpfr_ui_pow_ui:                        Basic Arithmetic Functions.
--                                                              (line 124)
-+                                                              (line 129)
- * mpfr_ui_sub:                           Basic Arithmetic Functions.
--                                                              (line  27)
-+                                                              (line  28)
- * mpfr_underflow_p:                      Exception Related Functions.
-                                                               (line 132)
- * mpfr_unordered_p:                      Comparison Functions.
-@@ -4181,61 +4199,61 @@
-                                                               (line 182)
- * mpfr_vsprintf:                         Formatted Output Functions.
-                                                               (line 171)
--* mpfr_y0:                               Special Functions.   (line 193)
--* mpfr_y1:                               Special Functions.   (line 194)
--* mpfr_yn:                               Special Functions.   (line 195)
-+* mpfr_y0:                               Special Functions.   (line 199)
-+* mpfr_y1:                               Special Functions.   (line 200)
-+* mpfr_yn:                               Special Functions.   (line 201)
- * mpfr_zero_p:                           Comparison Functions.
-                                                               (line  42)
--* mpfr_zeta:                             Special Functions.   (line 171)
--* mpfr_zeta_ui:                          Special Functions.   (line 172)
-+* mpfr_zeta:                             Special Functions.   (line 177)
-+* mpfr_zeta_ui:                          Special Functions.   (line 178)
- * mpfr_z_sub:                            Basic Arithmetic Functions.
--                                                              (line  39)
-+                                                              (line  40)
- 
- 
- 
- Tag Table:
- Node: Top775
- Node: Copying2007
--Node: Introduction to MPFR3766
--Node: Installing MPFR5880
--Node: Reporting Bugs11323
--Node: MPFR Basics13353
--Node: Headers and Libraries13669
--Node: Nomenclature and Types16828
--Node: MPFR Variable Conventions18874
--Node: Rounding Modes20418
--Ref: ternary value21544
--Node: Floating-Point Values on Special Numbers23526
--Node: Exceptions26572
--Node: Memory Handling29749
--Node: MPFR Interface30894
--Node: Initialization Functions33008
--Node: Assignment Functions40318
--Node: Combined Initialization and Assignment Functions49673
--Node: Conversion Functions50974
--Node: Basic Arithmetic Functions60035
--Node: Comparison Functions69200
--Node: Special Functions72687
--Node: Input and Output Functions86672
--Node: Formatted Output Functions88644
--Node: Integer Related Functions98431
--Node: Rounding Related Functions105051
--Node: Miscellaneous Functions108888
--Node: Exception Related Functions117568
--Node: Compatibility with MPF124386
--Node: Custom Interface127127
--Node: Internals131526
--Node: API Compatibility133066
--Node: Type and Macro Changes134995
--Node: Added Functions137844
--Node: Changed Functions141132
--Node: Removed Functions145545
--Node: Other Changes145973
--Node: Contributors147576
--Node: References150219
--Node: GNU Free Documentation License151973
--Node: Concept Index174562
--Node: Function and Type Index180659
-+Node: Introduction to MPFR3770
-+Node: Installing MPFR5884
-+Node: Reporting Bugs11327
-+Node: MPFR Basics13357
-+Node: Headers and Libraries13673
-+Node: Nomenclature and Types16832
-+Node: MPFR Variable Conventions18894
-+Node: Rounding Modes20438
-+Ref: ternary value21568
-+Node: Floating-Point Values on Special Numbers23554
-+Node: Exceptions26813
-+Node: Memory Handling29990
-+Node: MPFR Interface31135
-+Node: Initialization Functions33249
-+Node: Assignment Functions40559
-+Node: Combined Initialization and Assignment Functions49914
-+Node: Conversion Functions51215
-+Node: Basic Arithmetic Functions60276
-+Node: Comparison Functions69777
-+Node: Special Functions73264
-+Node: Input and Output Functions87862
-+Node: Formatted Output Functions89834
-+Node: Integer Related Functions99621
-+Node: Rounding Related Functions106241
-+Node: Miscellaneous Functions110078
-+Node: Exception Related Functions118758
-+Node: Compatibility with MPF125576
-+Node: Custom Interface128317
-+Node: Internals132716
-+Node: API Compatibility134260
-+Node: Type and Macro Changes136189
-+Node: Added Functions139038
-+Node: Changed Functions142326
-+Node: Removed Functions146739
-+Node: Other Changes147167
-+Node: Contributors148770
-+Node: References151413
-+Node: GNU Free Documentation License153167
-+Node: Concept Index175760
-+Node: Function and Type Index181857
- 
- End Tag Table
- 
-diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c
---- mpfr-3.1.3-a/src/lngamma.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/lngamma.c	2015-07-02 10:49:24.018113593 +0000
-@@ -603,16 +603,17 @@
-       mpfr_get_prec (y), mpfr_log_prec, y, inex));
- 
-   /* special cases */
--  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
-+  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) ||
-+                     (MPFR_IS_NEG (x) && mpfr_integer_p (x))))
-     {
--      if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x))
-+      if (MPFR_IS_NAN (x))
-         {
-           MPFR_SET_NAN (y);
-           MPFR_RET_NAN;
-         }
--      else /* lngamma(+Inf) = lngamma(+0) = +Inf */
-+      else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */
-         {
--          if (MPFR_IS_ZERO (x))
-+          if (!MPFR_IS_INF (x))
-             mpfr_set_divby0 ();
-           MPFR_SET_INF (y);
-           MPFR_SET_POS (y);
-@@ -620,8 +621,8 @@
-         }
-     }
- 
--  /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */
--  if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x)))
-+  /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */
-+  if (MPFR_IS_NEG (x) && unit_bit (x) == 0)
-     {
-       MPFR_SET_NAN (y);
-       MPFR_RET_NAN;
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3"
-+#define MPFR_VERSION_STRING "3.1.3-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:49:24.042113845 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3";
-+  return "3.1.3-p1";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c
---- mpfr-3.1.3-a/tests/tlngamma.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tlngamma.c	2015-07-02 10:49:24.018113593 +0000
-@@ -33,7 +33,7 @@
- special (void)
- {
-   mpfr_t x, y;
--  int inex;
-+  int i, inex;
- 
-   mpfr_init (x);
-   mpfr_init (y);
-@@ -46,25 +46,29 @@
-       exit (1);
-     }
- 
--  mpfr_set_inf (x, -1);
-+  mpfr_set_inf (x, 1);
-+  mpfr_clear_flags ();
-   mpfr_lngamma (y, x, MPFR_RNDN);
--  if (!mpfr_nan_p (y))
-+  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
-     {
--      printf ("Error for lngamma(-Inf)\n");
-+      printf ("Error for lngamma(+Inf)\n");
-       exit (1);
-     }
- 
--  mpfr_set_inf (x, 1);
-+  mpfr_set_inf (x, -1);
-+  mpfr_clear_flags ();
-   mpfr_lngamma (y, x, MPFR_RNDN);
--  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
-+  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
-     {
--      printf ("Error for lngamma(+Inf)\n");
-+      printf ("Error for lngamma(-Inf)\n");
-       exit (1);
-     }
- 
-   mpfr_set_ui (x, 0, MPFR_RNDN);
-+  mpfr_clear_flags ();
-   mpfr_lngamma (y, x, MPFR_RNDN);
--  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
-+  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
-+      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
-     {
-       printf ("Error for lngamma(+0)\n");
-       exit (1);
-@@ -72,32 +76,58 @@
- 
-   mpfr_set_ui (x, 0, MPFR_RNDN);
-   mpfr_neg (x, x, MPFR_RNDN);
-+  mpfr_clear_flags ();
-   mpfr_lngamma (y, x, MPFR_RNDN);
--  if (!mpfr_nan_p (y))
-+  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
-+      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
-     {
-       printf ("Error for lngamma(-0)\n");
-       exit (1);
-     }
- 
-   mpfr_set_ui (x, 1, MPFR_RNDN);
-+  mpfr_clear_flags ();
-   mpfr_lngamma (y, x, MPFR_RNDN);
--  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
-+  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
-     {
-       printf ("Error for lngamma(1)\n");
-       exit (1);
-     }
- 
--  mpfr_set_si (x, -1, MPFR_RNDN);
--  mpfr_lngamma (y, x, MPFR_RNDN);
--  if (!mpfr_nan_p (y))
-+  for (i = 1; i <= 5; i++)
-     {
--      printf ("Error for lngamma(-1)\n");
--      exit (1);
-+      int c;
-+
-+      mpfr_set_si (x, -i, MPFR_RNDN);
-+      mpfr_clear_flags ();
-+      mpfr_lngamma (y, x, MPFR_RNDN);
-+      if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
-+          __gmpfr_flags != MPFR_FLAGS_DIVBY0)
-+        {
-+          printf ("Error for lngamma(-%d)\n", i);
-+          exit (1);
-+        }
-+      if (i & 1)
-+        {
-+          mpfr_nextabove (x);
-+          c = '+';
-+        }
-+      else
-+        {
-+          mpfr_nextbelow (x);
-+          c = '-';
-+        }
-+      mpfr_lngamma (y, x, MPFR_RNDN);
-+      if (!mpfr_nan_p (y))
-+        {
-+          printf ("Error for lngamma(-%d%cepsilon)\n", i, c);
-+          exit (1);
-+        }
-     }
- 
-   mpfr_set_ui (x, 2, MPFR_RNDN);
-   mpfr_lngamma (y, x, MPFR_RNDN);
--  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
-+  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
-     {
-       printf ("Error for lngamma(2)\n");
-       exit (1);
-@@ -127,7 +157,7 @@
-   mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN);
-   mpfr_lngamma (y, x, MPFR_RNDN);
-   mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN);
--  if (MPFR_IS_NAN (y) || mpfr_cmp (y, x))
-+  if (mpfr_cmp0 (y, x))
-     {
-       printf ("mpfr_lngamma("CHECK_X2") is wrong:\n"
-               "expected ");
-@@ -143,7 +173,7 @@
-   mpfr_lngamma (y, x, MPFR_RNDU);
-   mpfr_set_prec (x, 175);
-   mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7");
--  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
-+  if (mpfr_cmp0 (x, y))
-     {
-       printf ("Error in mpfr_lngamma (1)\n");
-       exit (1);
-@@ -155,7 +185,7 @@
-   mpfr_lngamma (x, y, MPFR_RNDZ);
-   mpfr_set_prec (y, 21);
-   mpfr_set_str_binary (y, "0.111000101000001100101E9");
--  if (MPFR_IS_NAN (x) || mpfr_cmp (x, y))
-+  if (mpfr_cmp0 (x, y))
-     {
-       printf ("Error in mpfr_lngamma (120)\n");
-       printf ("Expected "); mpfr_print_binary (y); puts ("");
-@@ -169,7 +199,7 @@
-   inex = mpfr_lngamma (y, x, MPFR_RNDN);
-   mpfr_set_prec (x, 206);
-   mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13");
--  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
-+  if (mpfr_cmp0 (x, y))
-     {
-       printf ("Error in mpfr_lngamma (768)\n");
-       exit (1);
-@@ -185,7 +215,7 @@
-   mpfr_set_str_binary (x, "0.1100E-66");
-   mpfr_lngamma (y, x, MPFR_RNDN);
-   mpfr_set_str_binary (x, "0.1100E6");
--  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
-+  if (mpfr_cmp0 (x, y))
-     {
-       printf ("Error for lngamma(0.1100E-66)\n");
-       exit (1);
-@@ -199,7 +229,7 @@
-   mpfr_lngamma (y, x, MPFR_RNDN);
-   mpfr_set_prec (x, 32);
-   mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207");
--  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
-+  if (mpfr_cmp0 (x, y))
-     {
-       printf ("Error for lngamma(-2^199+0.5)\n");
-       printf ("Got        ");
diff --git a/patches/mpfr/3.1.3/120-muldiv-2exp-overflow.patch b/patches/mpfr/3.1.3/120-muldiv-2exp-overflow.patch
deleted file mode 100644
index df711fd..0000000
--- a/patches/mpfr/3.1.3/120-muldiv-2exp-overflow.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2015-07-02 10:50:08.046573308 +0000
-+++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:50:08.126574142 +0000
-@@ -0,0 +1 @@
-+muldiv-2exp-overflow
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2015-07-02 10:49:24.042113845 +0000
-+++ mpfr-3.1.3-b/VERSION	2015-07-02 10:50:08.126574142 +0000
-@@ -1 +1 @@
--3.1.3-p1
-+3.1.3-p2
-diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
---- mpfr-3.1.3-a/src/div_2si.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
-@@ -49,7 +49,7 @@
-             rnd_mode = MPFR_RNDZ;
-           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
-         }
--      else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
-+      else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
-                                        exp > __gmpfr_emax + n)) )
-         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
- 
-diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
---- mpfr-3.1.3-a/src/div_2ui.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
-@@ -32,7 +32,7 @@
-      rnd_mode),
-     ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact));
- 
--  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
-+  if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x)))
-     return mpfr_set (y, x, rnd_mode);
-   else
-     {
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p1"
-+#define MPFR_VERSION_STRING "3.1.3-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
---- mpfr-3.1.3-a/src/mul_2si.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
-@@ -39,7 +39,7 @@
-     {
-       mpfr_exp_t exp = MPFR_GET_EXP (x);
-       MPFR_SETRAW (inexact, y, x, exp, rnd_mode);
--      if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
-+      if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
-                                    exp > __gmpfr_emax - n)))
-         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
-       else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n ||
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2015-07-02 10:49:24.042113845 +0000
-+++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:50:08.126574142 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p1";
-+  return "3.1.3-p2";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
---- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
-@@ -242,6 +242,76 @@
-   large (MPFR_EMAX_MAX);
- }
- 
-+/* Cases where the function overflows on n = 0 when rounding is like
-+   away from zero. */
-+static void
-+overflow0 (mpfr_exp_t emax)
-+{
-+  mpfr_exp_t old_emax;
-+  mpfr_t x, y1, y2;
-+  int neg, r, op;
-+  static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" };
-+
-+  old_emax = mpfr_get_emax ();
-+  set_emax (emax);
-+
-+  mpfr_init2 (x, 8);
-+  mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0);
-+
-+  mpfr_set_inf (x, 1);
-+  mpfr_nextbelow (x);
-+
-+  for (neg = 0; neg <= 1; neg++)
-+    {
-+      RND_LOOP (r)
-+        {
-+          int inex1, inex2;
-+          unsigned int flags1, flags2;
-+
-+          /* Even if there isn't an overflow (rounding ~ toward zero),
-+             the result is the same as the one of an overflow. */
-+          inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1);
-+          flags1 = MPFR_FLAGS_INEXACT;
-+          if (mpfr_inf_p (y1))
-+            flags1 |= MPFR_FLAGS_OVERFLOW;
-+          for (op = 0; op < 4; op++)
-+            {
-+              mpfr_clear_flags ();
-+              inex2 =
-+                op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) :
-+                op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) :
-+                op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) :
-+                op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) :
-+                (MPFR_ASSERTN (0), 0);
-+              flags2 = __gmpfr_flags;
-+              if (!(mpfr_equal_p (y1, y2) &&
-+                    SAME_SIGN (inex1, inex2) &&
-+                    flags1 == flags2))
-+                {
-+                  printf ("Error in overflow0 for %s, mpfr_%s, emax = %"
-+                          MPFR_EXP_FSPEC "d,\nx = ",
-+                          mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op],
-+                          (mpfr_eexp_t) emax);
-+                  mpfr_dump (x);
-+                  printf ("Expected ");
-+                  mpfr_dump (y1);
-+                  printf ("  with inex = %d, flags =", inex1);
-+                  flags_out (flags1);
-+                  printf ("Got      ");
-+                  mpfr_dump (y2);
-+                  printf ("  with inex = %d, flags =", inex2);
-+                  flags_out (flags2);
-+                  exit (1);
-+                }
-+            }
-+        }
-+      mpfr_neg (x, x, MPFR_RNDN);
-+    }
-+
-+  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
-+  set_emax (old_emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -334,6 +404,11 @@
-   underflow0 ();
-   large0 ();
- 
-+  if (mpfr_get_emax () != MPFR_EMAX_MAX)
-+    overflow0 (mpfr_get_emax ());
-+  overflow0 (MPFR_EMAX_MAX);
-+  overflow0 (-1);
-+
-   tests_end_mpfr ();
-   return 0;
- }
diff --git a/patches/mpfr/3.1.3/130-muldiv-2exp-underflow.patch b/patches/mpfr/3.1.3/130-muldiv-2exp-underflow.patch
deleted file mode 100644
index c7be09f..0000000
--- a/patches/mpfr/3.1.3/130-muldiv-2exp-underflow.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2015-07-17 08:54:48.592799981 +0000
-+++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:54:48.616811495 +0000
-@@ -0,0 +1 @@
-+muldiv-2exp-underflow
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2015-07-02 10:50:08.126574142 +0000
-+++ mpfr-3.1.3-b/VERSION	2015-07-17 08:54:48.616811495 +0000
-@@ -1 +1 @@
--3.1.3-p2
-+3.1.3-p3
-diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
---- mpfr-3.1.3-a/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
-+++ mpfr-3.1.3-b/src/div_2si.c	2015-07-17 08:54:48.608807656 +0000
-@@ -45,7 +45,8 @@
-           if (rnd_mode == MPFR_RNDN &&
-               (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) ||
-                exp < __gmpfr_emin + (n - 1) ||
--               (inexact >= 0 && mpfr_powerof2_raw (y))))
-+               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
-+                mpfr_powerof2_raw (y))))
-             rnd_mode = MPFR_RNDZ;
-           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
-         }
-diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
---- mpfr-3.1.3-a/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
-+++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-17 08:54:48.608807656 +0000
-@@ -44,7 +44,9 @@
-       if (MPFR_UNLIKELY (n >= diffexp))  /* exp - n <= emin - 1 */
-         {
-           if (rnd_mode == MPFR_RNDN &&
--              (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y))))
-+              (n > diffexp ||
-+               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
-+                mpfr_powerof2_raw (y))))
-             rnd_mode = MPFR_RNDZ;
-           return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y));
-         }
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p2"
-+#define MPFR_VERSION_STRING "3.1.3-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
---- mpfr-3.1.3-a/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
-+++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-17 08:54:48.608807656 +0000
-@@ -48,7 +48,8 @@
-           if (rnd_mode == MPFR_RNDN &&
-               (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
-                exp < __gmpfr_emin - (n + 1) ||
--               (inexact >= 0 && mpfr_powerof2_raw (y))))
-+               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
-+                mpfr_powerof2_raw (y))))
-             rnd_mode = MPFR_RNDZ;
-           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
-         }
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2015-07-02 10:50:08.126574142 +0000
-+++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:54:48.616811495 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p2";
-+  return "3.1.3-p3";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
---- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
-+++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-17 08:54:48.608807656 +0000
-@@ -50,77 +50,82 @@
- {
-   mpfr_t x, y, z1, z2;
-   mpfr_exp_t emin;
--  int i, k;
-+  int i, k, s;
-   int prec;
-   int rnd;
-   int div;
-   int inex1, inex2;
-   unsigned int flags1, flags2;
- 
--  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e)
--   * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4,
--   * by comparing the result with the one of a simple division.
-+  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with
-+   * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and
-+   * k = 1 to 4, by comparing the result with the one of a simple division.
-    */
-   emin = mpfr_get_emin ();
-   set_emin (e);
-   mpfr_inits2 (8, x, y, (mpfr_ptr) 0);
-   for (i = 15; i <= 17; i++)
--    {
--      inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN);
--      MPFR_ASSERTN (inex1 == 0);
--      for (prec = 6; prec >= 3; prec -= 3)
--        {
--          mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
--          RND_LOOP (rnd)
--            for (k = 1; k <= 4; k++)
--              {
--                /* The following one is assumed to be correct. */
--                inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
--                MPFR_ASSERTN (inex1 == 0);
--                inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
--                MPFR_ASSERTN (inex1 == 0);
--                mpfr_clear_flags ();
--                /* Do not use mpfr_div_ui to avoid the optimization
--                   by mpfr_div_2si. */
--                inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
--                flags1 = __gmpfr_flags;
--
--              for (div = 0; div <= 2; div++)
-+    for (s = 1; s >= -1; s -= 2)
-+      {
-+        inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN);
-+        MPFR_ASSERTN (inex1 == 0);
-+        for (prec = 6; prec >= 3; prec -= 3)
-+          {
-+            mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
-+            RND_LOOP (rnd)
-+              for (k = 1; k <= 4; k++)
-                 {
-+                  /* The following one is assumed to be correct. */
-+                  inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
-+                  MPFR_ASSERTN (inex1 == 0);
-+                  inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
-+                  MPFR_ASSERTN (inex1 == 0);
-                   mpfr_clear_flags ();
--                  inex2 = div == 0 ?
--                    mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ?
--                    mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
--                    mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
--                  flags2 = __gmpfr_flags;
--                  if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
--                      mpfr_equal_p (z1, z2))
--                    continue;
--                  printf ("Error in underflow(");
--                  if (e == MPFR_EMIN_MIN)
--                    printf ("MPFR_EMIN_MIN");
--                  else if (e == emin)
--                    printf ("default emin");
--                  else if (e >= LONG_MIN)
--                    printf ("%ld", (long) e);
--                  else
--                    printf ("<LONG_MIN");
--                  printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d, "
--                          "%s\n", div == 0 ? "mul_2si" : div == 1 ?
--                          "div_2si" : "div_2ui", i, prec, k,
--                          mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
--                  printf ("Expected ");
--                  mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
--                  printf (", inex = %d, flags = %u\n", SIGN (inex1), flags1);
--                  printf ("Got      ");
--                  mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
--                  printf (", inex = %d, flags = %u\n", SIGN (inex2), flags2);
--                  exit (1);
--                }  /* div */
--              }  /* k */
--          mpfr_clears (z1, z2, (mpfr_ptr) 0);
--        }  /* prec */
--    }  /* i */
-+                  /* Do not use mpfr_div_ui to avoid the optimization
-+                     by mpfr_div_2si. */
-+                  inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
-+                  flags1 = __gmpfr_flags;
-+
-+                  for (div = 0; div <= 2; div++)
-+                    {
-+                      mpfr_clear_flags ();
-+                      inex2 =
-+                        div == 0 ?
-+                        mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) :
-+                        div == 1 ?
-+                        mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
-+                        mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
-+                      flags2 = __gmpfr_flags;
-+                      if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
-+                          mpfr_equal_p (z1, z2))
-+                        continue;
-+                      printf ("Error in underflow(");
-+                      if (e == MPFR_EMIN_MIN)
-+                        printf ("MPFR_EMIN_MIN");
-+                      else if (e == emin)
-+                        printf ("default emin");
-+                      else if (e >= LONG_MIN)
-+                        printf ("%ld", (long) e);
-+                      else
-+                        printf ("<LONG_MIN");
-+                      printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d,"
-+                              " %s\n", div == 0 ? "mul_2si" : div == 1 ?
-+                              "div_2si" : "div_2ui", s * i, prec, k,
-+                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
-+                      printf ("Expected ");
-+                      mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
-+                      printf (", inex = %d, flags = %u\n",
-+                              SIGN (inex1), flags1);
-+                      printf ("Got      ");
-+                      mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
-+                      printf (", inex = %d, flags = %u\n",
-+                              SIGN (inex2), flags2);
-+                      exit (1);
-+                    }  /* div */
-+                }  /* k */
-+            mpfr_clears (z1, z2, (mpfr_ptr) 0);
-+          }  /* prec */
-+      }  /* i */
-   mpfr_clears (x, y, (mpfr_ptr) 0);
-   set_emin (emin);
- }
diff --git a/patches/mpfr/3.1.3/140-frexp.patch b/patches/mpfr/3.1.3/140-frexp.patch
deleted file mode 100644
index e0d5e09..0000000
--- a/patches/mpfr/3.1.3/140-frexp.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2015-07-17 08:58:21.094987384 +0000
-+++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:58:21.118986898 +0000
-@@ -0,0 +1 @@
-+frexp
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2015-07-17 08:54:48.616811495 +0000
-+++ mpfr-3.1.3-b/VERSION	2015-07-17 08:58:21.118986898 +0000
-@@ -1 +1 @@
--3.1.3-p3
-+3.1.3-p4
-diff -Naurd mpfr-3.1.3-a/src/frexp.c mpfr-3.1.3-b/src/frexp.c
---- mpfr-3.1.3-a/src/frexp.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/frexp.c	2015-07-17 08:58:21.106987142 +0000
-@@ -26,6 +26,13 @@
- mpfr_frexp (mpfr_exp_t *exp, mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)
- {
-   int inex;
-+  unsigned int saved_flags = __gmpfr_flags;
-+  MPFR_BLOCK_DECL (flags);
-+
-+  MPFR_LOG_FUNC
-+    (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
-+     ("y[%Pu]=%.*Rg exp=%" MPFR_EXP_FSPEC "d inex=%d", mpfr_get_prec (y),
-+      mpfr_log_prec, y, (mpfr_eexp_t) *exp, inex));
- 
-   if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)))
-     {
-@@ -49,8 +56,32 @@
-         }
-     }
- 
--  inex = mpfr_set (y, x, rnd);
-+  MPFR_BLOCK (flags, inex = mpfr_set (y, x, rnd));
-+  __gmpfr_flags = saved_flags;
-+
-+  /* Possible overflow due to the rounding, no possible underflow. */
-+
-+  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags)))
-+    {
-+      int inex2;
-+
-+      /* An overflow here means that the exponent of y would be larger than
-+         the one of x, thus x would be rounded to the next power of 2, and
-+         the returned y should be 1/2 in absolute value, rounded (i.e. with
-+         possible underflow or overflow). This also implies that x and y are
-+         different objects, so that the exponent of x has not been lost. */
-+      MPFR_LOG_MSG (("Internal overflow\n", 0));
-+      MPFR_ASSERTD (x != y);
-+      *exp = MPFR_GET_EXP (x) + 1;
-+      inex2 = mpfr_set_si_2exp (y, MPFR_INT_SIGN (x), -1, rnd);
-+      MPFR_LOG_MSG (("inex=%d inex2=%d\n", inex, inex2));
-+      if (inex2 != 0)
-+        inex = inex2;
-+      MPFR_RET (inex);
-+    }
-+
-   *exp = MPFR_GET_EXP (y);
--  MPFR_SET_EXP (y, 0);
-+  /* Do not use MPFR_SET_EXP because the range has not been checked yet. */
-+  MPFR_EXP (y) = 0;
-   return mpfr_check_range (y, inex, rnd);
- }
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p3"
-+#define MPFR_VERSION_STRING "3.1.3-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2015-07-17 08:54:48.616811495 +0000
-+++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:58:21.118986898 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p3";
-+  return "3.1.3-p4";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tfrexp.c mpfr-3.1.3-b/tests/tfrexp.c
---- mpfr-3.1.3-a/tests/tfrexp.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tfrexp.c	2015-07-17 08:58:21.106987142 +0000
-@@ -129,12 +129,115 @@
-   mpfr_clear (x);
- }
- 
-+static void check1 (void)
-+{
-+  mpfr_exp_t emin, emax, e;
-+  mpfr_t x, y1, y2;
-+  int r, neg, red;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+  set_emin (MPFR_EMIN_MIN);
-+  set_emax (MPFR_EMAX_MAX);
-+
-+  mpfr_init2 (x, 7);
-+  mpfr_inits2 (4, y1, y2, (mpfr_ptr) 0);
-+
-+  mpfr_set_ui_2exp (x, 1, -2, MPFR_RNDN);
-+  while (mpfr_regular_p (x))
-+    {
-+      /* Test the exponents up to 3 and with the maximum exponent
-+         (to check potential intermediate overflow). */
-+      if (MPFR_GET_EXP (x) == 4)
-+        mpfr_set_exp (x, MPFR_EMAX_MAX);
-+      e = MPFR_GET_EXP (x);
-+      for (neg = 0; neg < 2; neg++)
-+        {
-+          RND_LOOP (r)
-+            {
-+              int inex1, inex2;
-+              mpfr_exp_t e1, e2;
-+              unsigned int flags1, flags2;
-+
-+              for (red = 0; red < 2; red++)
-+                {
-+                  if (red)
-+                    {
-+                      /* e1: exponent of the rounded value of x. */
-+                      MPFR_ASSERTN (e1 == e || e1 == e + 1);
-+                      set_emin (e);
-+                      set_emax (e);
-+                      mpfr_clear_flags ();
-+                      inex1 = e1 < 0 ?
-+                        mpfr_mul_2ui (y1, x, -e1, (mpfr_rnd_t) r) :
-+                        mpfr_div_2ui (y1, x, e1, (mpfr_rnd_t) r);
-+                      flags1 = __gmpfr_flags;
-+                    }
-+                  else
-+                    {
-+                      inex1 = mpfr_set (y1, x, (mpfr_rnd_t) r);
-+                      e1 = MPFR_IS_INF (y1) ? e + 1 : MPFR_GET_EXP (y1);
-+                      flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
-+                    }
-+                  mpfr_clear_flags ();
-+                  inex2 = mpfr_frexp (&e2, y2, x, (mpfr_rnd_t) r);
-+                  flags2 = __gmpfr_flags;
-+                  set_emin (MPFR_EMIN_MIN);
-+                  set_emax (MPFR_EMAX_MAX);
-+                  if ((!red || e == 0) &&
-+                      (! mpfr_regular_p (y2) || MPFR_GET_EXP (y2) != 0))
-+                    {
-+                      printf ("Error in check1 for %s, red = %d, x = ",
-+                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
-+                      mpfr_dump (x);
-+                      printf ("Expected 1/2 <= |y| < 1, got y = ");
-+                      mpfr_dump (y2);
-+                      exit (1);
-+                    }
-+                  if (!red)
-+                    {
-+                      if (e2 > 0)
-+                        mpfr_mul_2ui (y2, y2, e2, MPFR_RNDN);
-+                      else if (e2 < 0)
-+                        mpfr_div_2ui (y2, y2, -e2, MPFR_RNDN);
-+                    }
-+                  if (! (SAME_SIGN (inex1, inex2) &&
-+                         mpfr_equal_p (y1, y2) &&
-+                         flags1 == flags2))
-+                    {
-+                      printf ("Error in check1 for %s, red = %d, x = ",
-+                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
-+                      mpfr_dump (x);
-+                      printf ("Expected y1 = ");
-+                      mpfr_dump (y1);
-+                      printf ("Got      y2 = ");
-+                      mpfr_dump (y2);
-+                      printf ("Expected inex ~= %d, got %d\n", inex1, inex2);
-+                      printf ("Expected flags:");
-+                      flags_out (flags1);
-+                      printf ("Got flags:     ");
-+                      flags_out (flags2);
-+                      exit (1);
-+                    }
-+                }
-+            }
-+          mpfr_neg (x, x, MPFR_RNDN);
-+        }
-+      mpfr_nextabove (x);
-+    }
-+
-+  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
-+  set_emin (emin);
-+  set_emax (emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-   tests_start_mpfr ();
- 
-   check_special ();
-+  check1 ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/patches/mpfr/3.1.3/150-divhigh-basecase.patch b/patches/mpfr/3.1.3/150-divhigh-basecase.patch
deleted file mode 100644
index ef8d891..0000000
--- a/patches/mpfr/3.1.3/150-divhigh-basecase.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2015-10-29 13:47:46.735901185 +0000
-+++ mpfr-3.1.3-b/PATCHES	2015-10-29 13:47:46.763900609 +0000
-@@ -0,0 +1 @@
-+divhigh-basecase
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2015-07-17 08:58:21.118986898 +0000
-+++ mpfr-3.1.3-b/VERSION	2015-10-29 13:47:46.763900609 +0000
-@@ -1 +1 @@
--3.1.3-p4
-+3.1.3-p5
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2015-10-29 13:47:46.759900692 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p4"
-+#define MPFR_VERSION_STRING "3.1.3-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/mulders.c mpfr-3.1.3-b/src/mulders.c
---- mpfr-3.1.3-a/src/mulders.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/mulders.c	2015-10-29 13:47:46.751900855 +0000
-@@ -236,9 +236,10 @@
-          that in addition to the limb np[n-1] to reduce, we have at least 2
-          extra limbs, thus accessing np[n-3] is valid. */
- 
--      /* warning: we can have np[n-1]=d1 and np[n-2]=d0, but since {np,n} < D,
--         the largest possible partial quotient is B-1 */
--      if (MPFR_UNLIKELY(np[n - 1] == d1 && np[n - 2] == d0))
-+      /* Warning: we can have np[n-1]>d1 or (np[n-1]=d1 and np[n-2]>=d0) here,
-+         since we truncate the divisor at each step, but since {np,n} < D
-+         originally, the largest possible partial quotient is B-1. */
-+      if (MPFR_UNLIKELY(np[n-1] > d1 || (np[n-1] == d1 && np[n-2] >= d0)))
-         q2 = ~ (mp_limb_t) 0;
-       else
-         udiv_qr_3by2 (q2, q1, q0, np[n - 1], np[n - 2], np[n - 3],
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2015-07-17 08:58:21.118986898 +0000
-+++ mpfr-3.1.3-b/src/version.c	2015-10-29 13:47:46.763900609 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p4";
-+  return "3.1.3-p5";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tdiv.c mpfr-3.1.3-b/tests/tdiv.c
---- mpfr-3.1.3-a/tests/tdiv.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tdiv.c	2015-10-29 13:47:46.751900855 +0000
-@@ -1099,6 +1099,69 @@
-   mpfr_set_emax (old_emax);
- }
- 
-+/* Bug in mpfr_divhigh_n_basecase when all limbs of q (except the most
-+   significant one) are B-1 where B=2^GMP_NUMB_BITS. Since we truncate
-+   the divisor at each step, it might happen at some point that
-+   (np[n-1],np[n-2]) > (d1,d0), and not only the equality.
-+   Reported by Ricky Farr
-+   <https://sympa.inria.fr/sympa/arc/mpfr/2015-10/msg00023.html>
-+   To get a failure, a MPFR_DIVHIGH_TAB entry below the MPFR_DIV_THRESHOLD
-+   limit must have a value 0. With most mparam.h files, this cannot occur. */
-+static void
-+test_20151023 (void)
-+{
-+  mpfr_prec_t p;
-+  mpfr_t n, d, q, q0;
-+  int inex, i;
-+
-+  for (p = GMP_NUMB_BITS; p <= 2000; p++)
-+    {
-+      mpfr_init2 (n, 2*p);
-+      mpfr_init2 (d, p);
-+      mpfr_init2 (q, p);
-+      mpfr_init2 (q0, GMP_NUMB_BITS);
-+
-+      /* generate a random divisor of p bits */
-+      mpfr_urandomb (d, RANDS);
-+      /* generate a random quotient of GMP_NUMB_BITS bits */
-+      mpfr_urandomb (q0, RANDS);
-+      /* zero-pad the quotient to p bits */
-+      inex = mpfr_prec_round (q0, p, MPFR_RNDN);
-+      MPFR_ASSERTN(inex == 0);
-+
-+      for (i = 0; i < 3; i++)
-+        {
-+          /* i=0: try with the original quotient xxx000...000
-+             i=1: try with the original quotient minus one ulp
-+             i=2: try with the original quotient plus one ulp */
-+          if (i == 1)
-+            mpfr_nextbelow (q0);
-+          else if (i == 2)
-+            {
-+              mpfr_nextabove (q0);
-+              mpfr_nextabove (q0);
-+            }
-+
-+          inex = mpfr_mul (n, d, q0, MPFR_RNDN);
-+          MPFR_ASSERTN(inex == 0);
-+          mpfr_nextabove (n);
-+          mpfr_div (q, n, d, MPFR_RNDN);
-+          MPFR_ASSERTN(mpfr_cmp (q, q0) == 0);
-+
-+          inex = mpfr_mul (n, d, q0, MPFR_RNDN);
-+          MPFR_ASSERTN(inex == 0);
-+          mpfr_nextbelow (n);
-+          mpfr_div (q, n, d, MPFR_RNDN);
-+          MPFR_ASSERTN(mpfr_cmp (q, q0) == 0);
-+        }
-+
-+      mpfr_clear (n);
-+      mpfr_clear (d);
-+      mpfr_clear (q);
-+      mpfr_clear (q0);
-+    }
-+}
-+
- #define TEST_FUNCTION test_div
- #define TWO_ARGS
- #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
-@@ -1219,6 +1282,7 @@
-   consistency ();
-   test_20070603 ();
-   test_20070628 ();
-+  test_20151023 ();
-   test_generic (2, 800, 50);
-   test_extreme ();
- 
diff --git a/patches/mpfr/3.1.3/160-jn.patch b/patches/mpfr/3.1.3/160-jn.patch
deleted file mode 100644
index e7d04fa..0000000
--- a/patches/mpfr/3.1.3/160-jn.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-15 15:10:03.358066124 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-15 15:10:03.414066216 +0000
-@@ -0,0 +1 @@
-+jn
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2015-10-29 13:47:46.763900609 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-15 15:10:03.414066216 +0000
-@@ -1 +1 @@
--3.1.3-p5
-+3.1.3-p6
-diff -Naurd mpfr-3.1.3-a/src/jyn_asympt.c mpfr-3.1.3-b/src/jyn_asympt.c
---- mpfr-3.1.3-a/src/jyn_asympt.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/jyn_asympt.c	2016-02-15 15:10:03.394066183 +0000
-@@ -253,9 +253,9 @@
-         break;
-       if (diverge != 0)
-         {
--          mpfr_set (c, z, r); /* will force inex=0 below, which means the
--                               asymptotic expansion failed */
--          break;
-+          MPFR_ZIV_FREE (loop);
-+          mpfr_clear (c);
-+          return 0; /* means that the asymptotic expansion failed */
-         }
-       MPFR_ZIV_NEXT (loop, w);
-     }
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2015-10-29 13:47:46.759900692 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-15 15:10:03.410066210 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p5"
-+#define MPFR_VERSION_STRING "3.1.3-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2015-10-29 13:47:46.763900609 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-15 15:10:03.414066216 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p5";
-+  return "3.1.3-p6";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tj0.c mpfr-3.1.3-b/tests/tj0.c
---- mpfr-3.1.3-a/tests/tj0.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tj0.c	2016-02-15 15:10:03.394066183 +0000
-@@ -99,6 +99,18 @@
-   mpfr_j0 (y, x, MPFR_RNDN);
-   MPFR_ASSERTN (! mpfr_nan_p (y) && mpfr_cmp_ui_2exp (y, 41, -11) == 0);
- 
-+  /* Bug reported by Fredrik Johansson on 19 Jan 2016 */
-+  mpfr_set_prec (x, 53);
-+  mpfr_set_str (x, "0x4.3328p+0", 0, MPFR_RNDN);
-+  mpfr_set_prec (y, 2);
-+  mpfr_j0 (y, x, MPFR_RNDD);
-+  /* y should be -0.5 */
-+  MPFR_ASSERTN (! mpfr_nan_p (y) && mpfr_cmp_si_2exp (y, -1, -1) == 0);
-+  mpfr_set_prec (y, 3);
-+  mpfr_j0 (y, x, MPFR_RNDD);
-+  /* y should be -0.4375 */
-+  MPFR_ASSERTN (! mpfr_nan_p (y) && mpfr_cmp_si_2exp (y, -7, -4) == 0);
-+
-   /* Case for which s = 0 in mpfr_jn */
-   mpfr_set_prec (x, 44);
-   mpfr_set_prec (y, 44);
diff --git a/patches/mpfr/3.1.3/170-zeta.patch b/patches/mpfr/3.1.3/170-zeta.patch
deleted file mode 100644
index 12faf1d..0000000
--- a/patches/mpfr/3.1.3/170-zeta.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-15 15:11:00.898156344 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-15 15:11:00.966156445 +0000
-@@ -0,0 +1 @@
-+zeta
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-15 15:10:03.414066216 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-15 15:11:00.966156445 +0000
-@@ -1 +1 @@
--3.1.3-p6
-+3.1.3-p7
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-15 15:10:03.410066210 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-15 15:11:00.962156439 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p6"
-+#define MPFR_VERSION_STRING "3.1.3-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-15 15:10:03.414066216 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-15 15:11:00.966156445 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p6";
-+  return "3.1.3-p7";
- }
-diff -Naurd mpfr-3.1.3-a/src/zeta.c mpfr-3.1.3-b/src/zeta.c
---- mpfr-3.1.3-a/src/zeta.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/zeta.c	2016-02-15 15:11:00.942156410 +0000
-@@ -377,8 +377,8 @@
-         }
-     }
- 
--  /* Check for case s= 1 before changing the exponent range */
--  if (mpfr_cmp (s, __gmpfr_one) ==0)
-+  /* Check for case s=1 before changing the exponent range */
-+  if (mpfr_cmp (s, __gmpfr_one) == 0)
-     {
-       MPFR_SET_INF (z);
-       MPFR_SET_POS (z);
-@@ -420,7 +420,7 @@
-       MPFR_ZIV_INIT (loop, prec1);
-       for (;;)
-         {
--          mpfr_sub (s1, __gmpfr_one, s, MPFR_RNDN);/* s1 = 1-s */
-+          mpfr_sub (s1, __gmpfr_one, s, MPFR_RNDN); /* s1 = 1-s */
-           mpfr_zeta_pos (z_pre, s1, MPFR_RNDN);   /* zeta(1-s)  */
-           mpfr_gamma (y, s1, MPFR_RNDN);          /* gamma(1-s) */
-           if (MPFR_IS_INF (y)) /* Zeta(s) < 0 for -4k-2 < s < -4k,
-@@ -432,17 +432,32 @@
-               break;
-             }
-           mpfr_mul (z_pre, z_pre, y, MPFR_RNDN);  /* gamma(1-s)*zeta(1-s) */
--          mpfr_const_pi (p, MPFR_RNDD);
--          mpfr_mul (y, s, p, MPFR_RNDN);
--          mpfr_div_2ui (y, y, 1, MPFR_RNDN);      /* s*Pi/2 */
--          mpfr_sin (y, y, MPFR_RNDN);             /* sin(Pi*s/2) */
--          mpfr_mul (z_pre, z_pre, y, MPFR_RNDN);
-+
-+          mpfr_const_pi (p, MPFR_RNDD); /* p is Pi */
-+
-+          /* multiply z_pre by 2^s*Pi^(s-1) where p=Pi, s1=1-s */
-           mpfr_mul_2ui (y, p, 1, MPFR_RNDN);      /* 2*Pi */
-           mpfr_neg (s1, s1, MPFR_RNDN);           /* s-1 */
-           mpfr_pow (y, y, s1, MPFR_RNDN);         /* (2*Pi)^(s-1) */
-           mpfr_mul (z_pre, z_pre, y, MPFR_RNDN);
-           mpfr_mul_2ui (z_pre, z_pre, 1, MPFR_RNDN);
- 
-+          /* multiply z_pre by sin(Pi*s/2) */
-+          mpfr_mul (y, s, p, MPFR_RNDN);
-+          mpfr_div_2ui (p, y, 1, MPFR_RNDN);      /* p = s*Pi/2 */
-+          mpfr_sin (y, p, MPFR_RNDN);             /* y = sin(Pi*s/2) */
-+          if (MPFR_GET_EXP(y) < 0) /* take account of cancellation in sin(p) */
-+            {
-+              mpfr_t t;
-+              mpfr_init2 (t, prec1 - MPFR_GET_EXP(y));
-+              mpfr_const_pi (t, MPFR_RNDD);
-+              mpfr_mul (t, s, t, MPFR_RNDN);
-+              mpfr_div_2ui (t, t, 1, MPFR_RNDN);
-+              mpfr_sin (y, t, MPFR_RNDN);
-+              mpfr_clear (t);
-+            }
-+          mpfr_mul (z_pre, z_pre, y, MPFR_RNDN);
-+
-           if (MPFR_LIKELY (MPFR_CAN_ROUND (z_pre, prec1 - add, precz,
-                                            rnd_mode)))
-             break;
-diff -Naurd mpfr-3.1.3-a/tests/tzeta.c mpfr-3.1.3-b/tests/tzeta.c
---- mpfr-3.1.3-a/tests/tzeta.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tzeta.c	2016-02-15 15:11:00.942156410 +0000
-@@ -394,6 +394,27 @@
-   mpfr_nextabove (s);
-   MPFR_ASSERTN (mpfr_equal_p (z, s) && inex > 0);
- 
-+  /* bug reported by Fredrik Johansson on 19 Jan 2016 */
-+  mpfr_set_prec (s, 536);
-+  mpfr_set_ui_2exp (s, 1, -424, MPFR_RNDN);
-+  mpfr_sub_ui (s, s, 128, MPFR_RNDN);  /* -128 + 2^(-424) */
-+  for (prec = 6; prec <= 536; prec += 8) /* should go through 318 */
-+    {
-+      mpfr_set_prec (z, prec);
-+      mpfr_zeta (z, s, MPFR_RNDD);
-+      mpfr_set_prec (y, prec + 10);
-+      mpfr_zeta (y, s, MPFR_RNDD);
-+      mpfr_prec_round (y, prec, MPFR_RNDD);
-+      if (! mpfr_equal_p (z, y))
-+        {
-+          printf ("mpfr_zeta fails near -128 for inprec=%lu outprec=%lu\n",
-+                  (unsigned long) mpfr_get_prec (s), (unsigned long) prec);
-+          printf ("expected "); mpfr_dump (y);
-+          printf ("got      "); mpfr_dump (z);
-+          exit (1);
-+        }
-+    }
-+
-   mpfr_clear (s);
-   mpfr_clear (y);
-   mpfr_clear (z);
diff --git a/patches/mpfr/3.1.3/180-sqrt.patch b/patches/mpfr/3.1.3/180-sqrt.patch
deleted file mode 100644
index 4887009..0000000
--- a/patches/mpfr/3.1.3/180-sqrt.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-15 15:12:59.450314624 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-15 15:12:59.510314695 +0000
-@@ -0,0 +1 @@
-+sqrt
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-15 15:11:00.966156445 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-15 15:12:59.510314695 +0000
-@@ -1 +1 @@
--3.1.3-p7
-+3.1.3-p8
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-15 15:11:00.962156439 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-15 15:12:59.510314695 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p7"
-+#define MPFR_VERSION_STRING "3.1.3-p8"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/sqrt.c mpfr-3.1.3-b/src/sqrt.c
---- mpfr-3.1.3-a/src/sqrt.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/sqrt.c	2016-02-15 15:12:59.490314671 +0000
-@@ -211,10 +211,11 @@
-       rsize --;
-       sh = 0;
-     }
-+  /* now rsize = MPFR_LIMB_SIZE(r) */
-   if (mpn_add_1 (rp0, rp, rsize, MPFR_LIMB_ONE << sh))
-     {
-       expr ++;
--      rp[rsize - 1] = MPFR_LIMB_HIGHBIT;
-+      rp0[rsize - 1] = MPFR_LIMB_HIGHBIT;
-     }
-   goto end;
- 
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-15 15:11:00.966156445 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-15 15:12:59.510314695 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p7";
-+  return "3.1.3-p8";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tsqrt.c mpfr-3.1.3-b/tests/tsqrt.c
---- mpfr-3.1.3-a/tests/tsqrt.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tsqrt.c	2016-02-15 15:12:59.490314671 +0000
-@@ -569,6 +569,35 @@
-   mpfr_clear (y);
- }
- 
-+/* Bug reported by Fredrik Johansson, occurring when:
-+   - the precision of the result is a multiple of the number of bits
-+     per word (GMP_NUMB_BITS),
-+   - the rounding mode is to nearest (MPFR_RNDN),
-+   - internally, the result has to be rounded up to a power of 2.
-+*/
-+static void
-+bug20160120 (void)
-+{
-+  mpfr_t x, y;
-+
-+  mpfr_init2 (x, 4 * GMP_NUMB_BITS);
-+  mpfr_init2 (y, GMP_NUMB_BITS);
-+
-+  mpfr_set_ui (x, 1, MPFR_RNDN);
-+  mpfr_nextbelow (x);
-+  mpfr_sqrt (y, x, MPFR_RNDN);
-+  MPFR_ASSERTN(mpfr_check (y));
-+  MPFR_ASSERTN(mpfr_cmp_ui (y, 1) == 0);
-+
-+  mpfr_set_prec (y, 2 * GMP_NUMB_BITS);
-+  mpfr_sqrt (y, x, MPFR_RNDN);
-+  MPFR_ASSERTN(mpfr_check (y));
-+  MPFR_ASSERTN(mpfr_cmp_ui (y, 1) == 0);
-+
-+  mpfr_clear(x);
-+  mpfr_clear(y);
-+}
-+
- #define TEST_FUNCTION test_sqrt
- #define TEST_RANDOM_POS 8
- #include "tgeneric.c"
-@@ -704,6 +733,8 @@
-   data_check ("data/sqrt", mpfr_sqrt, "mpfr_sqrt");
-   bad_cases (mpfr_sqrt, mpfr_sqr, "mpfr_sqrt", 8, -256, 255, 4, 128, 800, 50);
- 
-+  bug20160120 ();
-+
-   tests_end_mpfr ();
-   return 0;
- }
diff --git a/patches/mpfr/3.1.3/190-si-ops.patch b/patches/mpfr/3.1.3/190-si-ops.patch
deleted file mode 100644
index e4df233..0000000
--- a/patches/mpfr/3.1.3/190-si-ops.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-15 15:17:39.214577503 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-15 15:17:39.282577552 +0000
-@@ -0,0 +1 @@
-+si-ops
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-15 15:12:59.510314695 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-15 15:17:39.282577552 +0000
-@@ -1 +1 @@
--3.1.3-p8
-+3.1.3-p9
-diff -Naurd mpfr-3.1.3-a/src/div_ui.c mpfr-3.1.3-b/src/div_ui.c
---- mpfr-3.1.3-a/src/div_ui.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/div_ui.c	2016-02-15 15:17:39.258577534 +0000
-@@ -274,7 +274,8 @@
-     res = mpfr_div_ui (y, x, u, rnd_mode);
-   else
-     {
--      res = -mpfr_div_ui (y, x, -u, MPFR_INVERT_RND (rnd_mode));
-+      res = - mpfr_div_ui (y, x, - (unsigned long) u,
-+                           MPFR_INVERT_RND (rnd_mode));
-       MPFR_CHANGE_SIGN (y);
-     }
-   return res;
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-15 15:12:59.510314695 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-15 15:17:39.282577552 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p8"
-+#define MPFR_VERSION_STRING "3.1.3-p9"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/mul_ui.c mpfr-3.1.3-b/src/mul_ui.c
---- mpfr-3.1.3-a/src/mul_ui.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/mul_ui.c	2016-02-15 15:17:39.258577534 +0000
-@@ -126,7 +126,8 @@
-     res = mpfr_mul_ui (y, x, u, rnd_mode);
-   else
-     {
--      res = -mpfr_mul_ui (y, x, -u, MPFR_INVERT_RND (rnd_mode));
-+      res = - mpfr_mul_ui (y, x, - (unsigned long) u,
-+                           MPFR_INVERT_RND (rnd_mode));
-       MPFR_CHANGE_SIGN (y);
-     }
-   return res;
-diff -Naurd mpfr-3.1.3-a/src/si_op.c mpfr-3.1.3-b/src/si_op.c
---- mpfr-3.1.3-a/src/si_op.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/si_op.c	2016-02-15 15:17:39.258577534 +0000
-@@ -30,7 +30,7 @@
-   if (u >= 0)
-     return mpfr_add_ui (y, x, u, rnd_mode);
-   else
--    return mpfr_sub_ui (y, x, -u, rnd_mode);
-+    return mpfr_sub_ui (y, x, - (unsigned long) u, rnd_mode);
- }
- 
- int
-@@ -39,7 +39,7 @@
-   if (u >= 0)
-     return mpfr_sub_ui (y, x, u, rnd_mode);
-   else
--    return mpfr_add_ui (y, x, -u, rnd_mode);
-+    return mpfr_add_ui (y, x, - (unsigned long) u, rnd_mode);
- }
- 
- int
-@@ -49,9 +49,9 @@
-     return mpfr_ui_sub (y, u, x, rnd_mode);
-   else
-     {
--    int res = -mpfr_add_ui (y, x, -u, MPFR_INVERT_RND (rnd_mode));
--    MPFR_CHANGE_SIGN (y);
--    return res;
-+      int res = - mpfr_add_ui (y, x, - (unsigned long) u,
-+                               MPFR_INVERT_RND (rnd_mode));
-+      MPFR_CHANGE_SIGN (y);
-+      return res;
-     }
- }
--
-diff -Naurd mpfr-3.1.3-a/src/ui_div.c mpfr-3.1.3-b/src/ui_div.c
---- mpfr-3.1.3-a/src/ui_div.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/ui_div.c	2016-02-15 15:17:39.258577534 +0000
-@@ -106,7 +106,8 @@
-     res = mpfr_ui_div (y, u, x, rnd_mode);
-   else
-     {
--      res = -mpfr_ui_div (y, -u, x, MPFR_INVERT_RND(rnd_mode));
-+      res = - mpfr_ui_div (y, - (unsigned long) u, x,
-+                           MPFR_INVERT_RND(rnd_mode));
-       MPFR_CHANGE_SIGN (y);
-     }
-   return res;
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-15 15:12:59.510314695 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-15 15:17:39.282577552 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p8";
-+  return "3.1.3-p9";
- }
diff --git a/patches/mpfr/3.1.3/200-can_round.patch b/patches/mpfr/3.1.3/200-can_round.patch
deleted file mode 100644
index 6c0f79a..0000000
--- a/patches/mpfr/3.1.3/200-can_round.patch
+++ /dev/null
@@ -1,413 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-15 15:19:24.210647274 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-15 15:19:24.274647313 +0000
-@@ -0,0 +1 @@
-+can_round
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-15 15:17:39.282577552 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-15 15:19:24.274647313 +0000
-@@ -1 +1 @@
--3.1.3-p9
-+3.1.3-p10
-diff -Naurd mpfr-3.1.3-a/src/div.c mpfr-3.1.3-b/src/div.c
---- mpfr-3.1.3-a/src/div.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/div.c	2016-02-15 15:19:24.250647299 +0000
-@@ -310,24 +310,23 @@
- 
-       qp = MPFR_TMP_LIMBS_ALLOC (n);
-       qh = mpfr_divhigh_n (qp, ap, bp, n);
-+      MPFR_ASSERTD (qh == 0 || qh == 1);
-       /* in all cases, the error is at most (2n+2) ulps on qh*B^n+{qp,n},
-          cf algorithms.tex */
- 
-       p = n * GMP_NUMB_BITS - MPFR_INT_CEIL_LOG2 (2 * n + 2);
--      /* if qh is 1, then we need only PREC(q)-1 bits of {qp,n},
--         if rnd=RNDN, we need to be able to round with a directed rounding
--            and one more bit */
-+      /* If rnd=RNDN, we need to be able to round with a directed rounding
-+         and one more bit. */
-+      if (qh == 1)
-+        {
-+          mpn_rshift (qp, qp, n, 1);
-+          qp[n - 1] |= MPFR_LIMB_HIGHBIT;
-+        }
-       if (MPFR_LIKELY (mpfr_round_p (qp, n, p,
--                                 MPFR_PREC(q) + (rnd_mode == MPFR_RNDN) - qh)))
-+                                     MPFR_PREC(q) + (rnd_mode == MPFR_RNDN))))
-         {
-           /* we can round correctly whatever the rounding mode */
--          if (qh == 0)
--            MPN_COPY (q0p, qp + 1, q0size);
--          else
--            {
--              mpn_rshift (q0p, qp + 1, q0size, 1);
--              q0p[q0size - 1] ^= MPFR_LIMB_HIGHBIT;
--            }
-+          MPN_COPY (q0p, qp + 1, q0size);
-           q0p[0] &= ~MPFR_LIMB_MASK(sh); /* put to zero low sh bits */
- 
-           if (rnd_mode == MPFR_RNDN) /* round to nearest */
-@@ -335,15 +334,10 @@
-               /* we know we can round, thus we are never in the even rule case:
-                  if the round bit is 0, we truncate
-                  if the round bit is 1, we add 1 */
--              if (qh == 0)
--                {
--                  if (sh > 0)
--                    round_bit = (qp[1] >> (sh - 1)) & 1;
--                  else
--                    round_bit = qp[0] >> (GMP_NUMB_BITS - 1);
--                }
--              else /* qh = 1 */
--                round_bit = (qp[1] >> sh) & 1;
-+              if (sh > 0)
-+                round_bit = (qp[1] >> (sh - 1)) & 1;
-+              else
-+                round_bit = qp[0] >> (GMP_NUMB_BITS - 1);
-               if (round_bit == 0)
-                 {
-                   inex = -1;
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-15 15:17:39.282577552 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-15 15:19:24.270647311 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p9"
-+#define MPFR_VERSION_STRING "3.1.3-p10"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/round_p.c mpfr-3.1.3-b/src/round_p.c
---- mpfr-3.1.3-a/src/round_p.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/round_p.c	2016-02-15 15:19:24.250647299 +0000
-@@ -31,7 +31,11 @@
- {
-   int i1, i2;
- 
-+  MPFR_ASSERTN(bp[bn - 1] & MPFR_LIMB_HIGHBIT);
-+
-   i1 = mpfr_round_p_2 (bp, bn, err0, prec);
-+
-+  /* compare with mpfr_can_round_raw */
-   i2 = mpfr_can_round_raw (bp, bn, MPFR_SIGN_POS, err0,
-                            MPFR_RNDN, MPFR_RNDZ, prec);
-   if (i1 != i2)
-@@ -42,6 +46,7 @@
-       gmp_fprintf (stderr, "%NX\n", bp, bn);
-       MPFR_ASSERTN (0);
-     }
-+
-   return i1;
- }
- # define mpfr_round_p mpfr_round_p_2
-@@ -62,6 +67,8 @@
-   mp_limb_t tmp, mask;
-   int s;
- 
-+  MPFR_ASSERTD(bp[bn - 1] & MPFR_LIMB_HIGHBIT);
-+
-   err = (mpfr_prec_t) bn * GMP_NUMB_BITS;
-   if (MPFR_UNLIKELY (err0 <= 0 || (mpfr_uexp_t) err0 <= prec || prec >= err))
-     return 0;  /* can't round */
-diff -Naurd mpfr-3.1.3-a/src/round_prec.c mpfr-3.1.3-b/src/round_prec.c
---- mpfr-3.1.3-a/src/round_prec.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/round_prec.c	2016-02-15 15:19:24.250647299 +0000
-@@ -141,24 +141,40 @@
- mpfr_can_round_raw (const mp_limb_t *bp, mp_size_t bn, int neg, mpfr_exp_t err0,
-                     mpfr_rnd_t rnd1, mpfr_rnd_t rnd2, mpfr_prec_t prec)
- {
--  mpfr_prec_t err;
-+  mpfr_prec_t err, prec0 = prec;
-   mp_size_t k, k1, tn;
-   int s, s1;
-   mp_limb_t cc, cc2;
-   mp_limb_t *tmp;
-   MPFR_TMP_DECL(marker);
- 
-+  MPFR_ASSERTD(bp[bn - 1] & MPFR_LIMB_HIGHBIT);
-+
-   if (MPFR_UNLIKELY(err0 < 0 || (mpfr_uexp_t) err0 <= prec))
-     return 0;  /* can't round */
--  else if (MPFR_UNLIKELY (prec > (mpfr_prec_t) bn * GMP_NUMB_BITS))
--    { /* then ulp(b) < precision < error */
--      return rnd2 == MPFR_RNDN && (mpfr_uexp_t) err0 - 2 >= prec;
--      /* can round only in rounding to the nearest and err0 >= prec + 2 */
--    }
- 
-   MPFR_ASSERT_SIGN(neg);
-   neg = MPFR_IS_NEG_SIGN(neg);
- 
-+  /* Transform RNDD and RNDU to Zero / Away */
-+  MPFR_ASSERTD((neg == 0) || (neg == 1));
-+  if (rnd1 != MPFR_RNDN)
-+    rnd1 = MPFR_IS_LIKE_RNDZ(rnd1, neg) ? MPFR_RNDZ : MPFR_RNDA;
-+  if (rnd2 != MPFR_RNDN)
-+    rnd2 = MPFR_IS_LIKE_RNDZ(rnd2, neg) ? MPFR_RNDZ : MPFR_RNDA;
-+
-+  if (MPFR_UNLIKELY (prec > (mpfr_prec_t) bn * GMP_NUMB_BITS))
-+    { /* Then prec < PREC(b): we can round:
-+         (i) in rounding to the nearest iff err0 >= prec + 2
-+         (ii) in directed rounding mode iff rnd1 is compatible with rnd2
-+              and err0 >= prec + 1, unless b = 2^k and rnd1=rnd2=RNDA in
-+              which case we need err0 >= prec + 2. */
-+      if (rnd2 == MPFR_RNDN)
-+        return (mpfr_uexp_t) err0 - 2 >= prec;
-+      else
-+        return (rnd1 == rnd2) && (mpfr_uexp_t) err0 - 2 >= prec;
-+    }
-+
-   /* if the error is smaller than ulp(b), then anyway it will propagate
-      up to ulp(b) */
-   err = ((mpfr_uexp_t) err0 > (mpfr_prec_t) bn * GMP_NUMB_BITS) ?
-@@ -168,19 +184,25 @@
-   k = (err - 1) / GMP_NUMB_BITS;
-   MPFR_UNSIGNED_MINUS_MODULO(s, err);
-   /* the error corresponds to bit s in limb k, the most significant limb
--     being limb 0 */
-+     being limb 0; in memory, limb k is bp[bn-1-k]. */
- 
-   k1 = (prec - 1) / GMP_NUMB_BITS;
-   MPFR_UNSIGNED_MINUS_MODULO(s1, prec);
--  /* the last significant bit is bit s1 in limb k1 */
-+  /* the least significant bit is bit s1 in limb k1 */
- 
--  /* don't need to consider the k1 most significant limbs */
-+  /* We don't need to consider the k1 most significant limbs.
-+     They will be considered later only to detect when subtracting
-+     the error bound yields a change of binade.
-+     Warning! The number with updated bn may no longer be normalized. */
-   k -= k1;
-   bn -= k1;
-   prec -= (mpfr_prec_t) k1 * GMP_NUMB_BITS;
- 
--  /* if when adding or subtracting (1 << s) in bp[bn-1-k], it does not
--     change bp[bn-1] >> s1, then we can round */
-+  /* We can decide of the correct rounding if rnd2(b-eps) and rnd2(b+eps)
-+     give the same result to the target precision 'prec', i.e., if when
-+     adding or subtracting (1 << s) in bp[bn-1-k], it does not change the
-+     rounding in direction 'rnd2' at ulp-position bp[bn-1] >> s1, taking also
-+     into account the possible change of binade. */
-   MPFR_TMP_MARK(marker);
-   tn = bn;
-   k++; /* since we work with k+1 everywhere */
-@@ -190,11 +212,6 @@
- 
-   MPFR_ASSERTD (k > 0);
- 
--  /* Transform RNDD and RNDU to Zero / Away */
--  MPFR_ASSERTD((neg == 0) || (neg ==1));
--  if (MPFR_IS_RNDUTEST_OR_RNDDNOTTEST(rnd1, neg))
--    rnd1 = MPFR_RNDZ;
--
-   switch (rnd1)
-     {
-     case MPFR_RNDZ:
-@@ -203,33 +220,54 @@
-       /* mpfr_round_raw2 returns 1 if one should add 1 at ulp(b,prec),
-          and 0 otherwise */
-       cc ^= mpfr_round_raw2 (bp, bn, neg, rnd2, prec);
--      /* cc is the new value of bit s1 in bp[bn-1] */
-+      /* cc is the new value of bit s1 in bp[bn-1] after rounding 'rnd2' */
-+
-       /* now round b + 2^(MPFR_EXP(b)-err) */
--      cc2 = mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
-+      mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
-+      /* if there was a carry here, then necessarily bit s1 of bp[bn-1]
-+         changed, thus we surely cannot round for directed rounding, but this
-+         will be detected below, with cc2 != cc */
-       break;
-     case MPFR_RNDN:
-       /* Round to nearest */
--       /* first round b+2^(MPFR_EXP(b)-err) */
--      cc = mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
-+
-+      /* first round b+2^(MPFR_EXP(b)-err) */
-+      mpn_add_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
-+      /* same remark as above in case a carry occurs in mpn_add_1() */
-       cc = (tmp[bn - 1] >> s1) & 1; /* gives 0 when cc=1 */
-       cc ^= mpfr_round_raw2 (tmp, bn, neg, rnd2, prec);
-+      /* cc is the new value of bit s1 in bp[bn-1]+eps after rounding 'rnd2' */
-+
-+    subtract_eps:
-       /* now round b-2^(MPFR_EXP(b)-err) */
-       cc2 = mpn_sub_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
-+      /* propagate the potential borrow up to the most significant limb
-+         (it cannot propagate further since the most significant limb is
-+         at least MPFR_LIMB_HIGHBIT) */
-+      for (tn = 0; tn + 1 < k1 && (cc2 != 0); tn ++)
-+        cc2 = bp[bn + tn] == 0;
-+      /* We have an exponent decrease when either:
-+           (i) k1 = 0 and tmp[bn-1] < MPFR_LIMB_HIGHBIT
-+           (ii) k1 > 0 and cc <> 0 and bp[bn + tn] = MPFR_LIMB_HIGHBIT
-+                (then necessarily tn = k1-1).
-+         Then for directed rounding we cannot round,
-+         and for rounding to nearest we cannot round when err = prec + 1.
-+      */
-+      if (((k1 == 0 && tmp[bn - 1] < MPFR_LIMB_HIGHBIT) ||
-+           (k1 != 0 && cc2 != 0 && bp[bn + tn] == MPFR_LIMB_HIGHBIT)) &&
-+          (rnd2 != MPFR_RNDN || err0 == prec0 + 1))
-+        {
-+          MPFR_TMP_FREE(marker);
-+          return 0;
-+        }
-       break;
-     default:
-       /* Round away */
-       cc = (bp[bn - 1] >> s1) & 1;
-       cc ^= mpfr_round_raw2 (bp, bn, neg, rnd2, prec);
--      /* now round b +/- 2^(MPFR_EXP(b)-err) */
--      cc2 = mpn_sub_1 (tmp + bn - k, bp + bn - k, k, MPFR_LIMB_ONE << s);
--      break;
--    }
-+      /* cc is the new value of bit s1 in bp[bn-1]+eps after rounding 'rnd2' */
- 
--  /* if cc2 is 1, then a carry or borrow propagates to the next limb */
--  if (cc2 && cc)
--    {
--      MPFR_TMP_FREE(marker);
--      return 0;
-+      goto subtract_eps;
-     }
- 
-   cc2 = (tmp[bn - 1] >> s1) & 1;
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-15 15:17:39.282577552 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-15 15:19:24.274647313 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p9";
-+  return "3.1.3-p10";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tcan_round.c mpfr-3.1.3-b/tests/tcan_round.c
---- mpfr-3.1.3-a/tests/tcan_round.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tcan_round.c	2016-02-15 15:19:24.250647299 +0000
-@@ -1,4 +1,4 @@
--/* Test file for mpfr_can_round.
-+/* Test file for mpfr_can_round and mpfr_round_p.
- 
- Copyright 1999, 2001-2015 Free Software Foundation, Inc.
- Contributed by the AriC and Caramel projects, INRIA.
-@@ -41,6 +41,8 @@
-       /* avoid mpn_random which leaks memory */
-       for (i = 0; i < n; i++)
-         buf[i] = randlimb ();
-+      /* force the number to be normalized */
-+      buf[n - 1] |= MPFR_LIMB_HIGHBIT;
-       p = randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN;
-       err = p + randlimb () % GMP_NUMB_BITS;
-       r1 = mpfr_round_p (buf, n, err, p);
-@@ -57,11 +59,72 @@
-     }
- }
- 
-+/* check x=2^i with precision px, error at most 1, and target precision prec */
-+static void
-+test_pow2 (mpfr_exp_t i, mpfr_prec_t px, mpfr_rnd_t r1, mpfr_rnd_t r2,
-+           mpfr_prec_t prec)
-+{
-+  mpfr_t x;
-+  int b, expected_b, b2;
-+
-+  mpfr_init2 (x, px);
-+  mpfr_set_ui_2exp (x, 1, i, MPFR_RNDN);
-+  b = !!mpfr_can_round (x, i+1, r1, r2, prec);
-+  /* Note: If mpfr_can_round succeeds for both
-+     (r1,r2) = (MPFR_RNDD,MPFR_RNDN) and
-+     (r1,r2) = (MPFR_RNDU,MPFR_RNDN), then it should succeed for
-+     (r1,r2) = (MPFR_RNDN,MPFR_RNDN). So, the condition on prec below
-+     for r1 = MPFR_RNDN should be the most restrictive between those
-+     for r1 = any directed rounding mode.
-+     For r1 like MPFR_RNDA, the unrounded, unknown number may be anyone
-+     in [2^i-1,i]. As both 2^i-1 and 2^i fit on i bits, one cannot round
-+     in any precision >= i bits, hence the condition prec < i; prec = i-1
-+     will work here for r2 = MPFR_RNDN thanks to the even-rounding rule
-+     (and also with rounding ties away from zero). */
-+  expected_b =
-+    MPFR_IS_LIKE_RNDD (r1, MPFR_SIGN_POS) ?
-+    (MPFR_IS_LIKE_RNDU (r2, MPFR_SIGN_POS) ? 0 : prec <= i) :
-+    MPFR_IS_LIKE_RNDU (r1, MPFR_SIGN_POS) ?
-+    (MPFR_IS_LIKE_RNDD (r2, MPFR_SIGN_POS) ? 0 : prec < i) :
-+    (r2 != MPFR_RNDN ? 0 : prec < i);
-+  /* We only require mpfr_can_round to return 1 when we can really
-+     round, it is allowed to return 0 in some rare boundary cases,
-+     for example when x = 2^k and the error is 0.25 ulp.
-+     Note: if this changes in the future, the test could be improved by
-+     removing the "&& expected_b == 0" below. */
-+  if (b != expected_b && expected_b == 0)
-+    {
-+      printf ("Error for x=2^%d, px=%lu, err=%d, r1=%s, r2=%s, prec=%d\n",
-+              (int) i, (unsigned long) px, (int) i + 1,
-+              mpfr_print_rnd_mode (r1), mpfr_print_rnd_mode (r2), (int) prec);
-+      printf ("Expected %d, got %d\n", expected_b, b);
-+      exit (1);
-+    }
-+
-+  if (r1 == MPFR_RNDN && r2 == MPFR_RNDZ)
-+    {
-+      /* Similar test to the one done in src/round_p.c
-+         for MPFR_WANT_ASSERT >= 2. */
-+      b2 = !!mpfr_round_p (MPFR_MANT(x), MPFR_LIMB_SIZE(x), i+1, prec);
-+      if (b2 != b)
-+        {
-+          printf ("Error for x=2^%d, px=%lu, err=%d, prec=%d\n",
-+                  (int) i, (unsigned long) px, (int) i + 1, (int) prec);
-+          printf ("mpfr_can_round gave %d, mpfr_round_p gave %d\n", b, b2);
-+          exit (1);
-+        }
-+    }
-+
-+  mpfr_clear (x);
-+}
-+
- int
- main (void)
- {
-   mpfr_t x;
--  mpfr_prec_t i, j;
-+  mpfr_prec_t i, j, k;
-+  int r1, r2;
-+  int n;
- 
-   tests_start_mpfr ();
- 
-@@ -111,12 +174,30 @@
-   mpfr_set_str (x, "0.ff4ca619c76ba69", 16, MPFR_RNDZ);
-   for (i = 30; i < 99; i++)
-     for (j = 30; j < 99; j++)
--      {
--        int r1, r2;
--        for (r1 = 0; r1 < MPFR_RND_MAX ; r1++)
--          for (r2 = 0; r2 < MPFR_RND_MAX ; r2++)
--            mpfr_can_round (x, i, (mpfr_rnd_t) r1, (mpfr_rnd_t) r2, j); /* test for assertions */
--      }
-+      for (r1 = 0; r1 < MPFR_RND_MAX; r1++)
-+        for (r2 = 0; r2 < MPFR_RND_MAX; r2++)
-+          {
-+            /* test for assertions */
-+            mpfr_can_round (x, i, (mpfr_rnd_t) r1, (mpfr_rnd_t) r2, j);
-+          }
-+
-+  test_pow2 (32, 32, MPFR_RNDN, MPFR_RNDN, 32);
-+  test_pow2 (174, 174, MPFR_RNDN, MPFR_RNDN, 174);
-+  test_pow2 (174, 174, MPFR_RNDU, MPFR_RNDN, 174);
-+  test_pow2 (176, 129, MPFR_RNDU, MPFR_RNDU, 174);
-+  test_pow2 (176, 2, MPFR_RNDZ, MPFR_RNDZ, 174);
-+  test_pow2 (176, 2, MPFR_RNDU, MPFR_RNDU, 176);
-+
-+  /* Tests for x = 2^i (E(x) = i+1) with error at most 1 = 2^0. */
-+  for (n = 0; n < 100; n++)
-+    {
-+      i = (randlimb() % 200) + 4;
-+      for (j = i - 2; j < i + 2; j++)
-+        for (r1 = 0; r1 < MPFR_RND_MAX; r1++)
-+          for (r2 = 0; r2 < MPFR_RND_MAX; r2++)
-+            for (k = MPFR_PREC_MIN; k <= i + 2; k++)
-+              test_pow2 (i, k, (mpfr_rnd_t) r1, (mpfr_rnd_t) r2, j);
-+    }
- 
-   mpfr_clear (x);
- 
diff --git a/patches/mpfr/3.1.3/210-fits.patch b/patches/mpfr/3.1.3/210-fits.patch
deleted file mode 100644
index 888389c..0000000
--- a/patches/mpfr/3.1.3/210-fits.patch
+++ /dev/null
@@ -1,584 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-15 15:20:16.854677843 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-15 15:20:16.922677881 +0000
-@@ -0,0 +1 @@
-+fits
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-15 15:19:24.274647313 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-15 15:20:16.922677881 +0000
-@@ -1 +1 @@
--3.1.3-p10
-+3.1.3-p11
-diff -Naurd mpfr-3.1.3-a/src/fits_intmax.c mpfr-3.1.3-b/src/fits_intmax.c
---- mpfr-3.1.3-a/src/fits_intmax.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/fits_intmax.c	2016-02-15 15:20:16.898677867 +0000
-@@ -33,6 +33,7 @@
- int
- mpfr_fits_intmax_p (mpfr_srcptr f, mpfr_rnd_t rnd)
- {
-+  unsigned int saved_flags;
-   mpfr_exp_t e;
-   int prec;
-   mpfr_t x, y;
-@@ -85,6 +86,7 @@
-   MPFR_ASSERTD (e == prec);
- 
-   /* hard case: first round to prec bits, then check */
-+  saved_flags = __gmpfr_flags;
-   mpfr_init2 (x, prec);
-   mpfr_set (x, f, rnd);
- 
-@@ -97,10 +99,16 @@
-     }
-   else
-     {
--      res = MPFR_GET_EXP (x) == e;
-+      /* Warning! Due to the rounding, x can be an infinity. Here we use
-+         the fact that singular numbers have a special exponent field,
-+         thus well-defined and different from e, in which case this means
-+         that the number does not fit. That's why we use MPFR_EXP, not
-+         MPFR_GET_EXP. */
-+      res = MPFR_EXP (x) == e;
-     }
- 
-   mpfr_clear (x);
-+  __gmpfr_flags = saved_flags;
-   return res;
- }
- 
-diff -Naurd mpfr-3.1.3-a/src/fits_s.h mpfr-3.1.3-b/src/fits_s.h
---- mpfr-3.1.3-a/src/fits_s.h	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/fits_s.h	2016-02-15 15:20:16.898677867 +0000
-@@ -29,6 +29,7 @@
- int
- FUNCTION (mpfr_srcptr f, mpfr_rnd_t rnd)
- {
-+  unsigned int saved_flags;
-   mpfr_exp_t e;
-   int prec;
-   mpfr_t x;
-@@ -81,9 +82,16 @@
-   MPFR_ASSERTD (e == prec);
- 
-   /* hard case: first round to prec bits, then check */
-+  saved_flags = __gmpfr_flags;
-   mpfr_init2 (x, prec);
-   mpfr_set (x, f, rnd);
--  res = neg ? (mpfr_cmp_si (x, MINIMUM) >= 0) : (MPFR_GET_EXP (x) == e);
-+  /* Warning! Due to the rounding, x can be an infinity. Here we use
-+     the fact that singular numbers have a special exponent field,
-+     thus well-defined and different from e, in which case this means
-+     that the number does not fit. That's why we use MPFR_EXP, not
-+     MPFR_GET_EXP. */
-+  res = neg ? (mpfr_cmp_si (x, MINIMUM) >= 0) : (MPFR_EXP (x) == e);
-   mpfr_clear (x);
-+  __gmpfr_flags = saved_flags;
-   return res;
- }
-diff -Naurd mpfr-3.1.3-a/src/fits_u.h mpfr-3.1.3-b/src/fits_u.h
---- mpfr-3.1.3-a/src/fits_u.h	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/fits_u.h	2016-02-15 15:20:16.898677867 +0000
-@@ -25,6 +25,7 @@
- int
- FUNCTION (mpfr_srcptr f, mpfr_rnd_t rnd)
- {
-+  unsigned int saved_flags;
-   mpfr_exp_t e;
-   int prec;
-   TYPE s;
-@@ -62,9 +63,16 @@
-   MPFR_ASSERTD (e == prec);
- 
-   /* hard case: first round to prec bits, then check */
-+  saved_flags = __gmpfr_flags;
-   mpfr_init2 (x, prec);
-   mpfr_set (x, f, rnd);
--  res = MPFR_GET_EXP (x) == e;
-+  /* Warning! Due to the rounding, x can be an infinity. Here we use
-+     the fact that singular numbers have a special exponent field,
-+     thus well-defined and different from e, in which case this means
-+     that the number does not fit. That's why we use MPFR_EXP, not
-+     MPFR_GET_EXP. */
-+  res = MPFR_EXP (x) == e;
-   mpfr_clear (x);
-+  __gmpfr_flags = saved_flags;
-   return res;
- }
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-15 15:19:24.270647311 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-15 15:20:16.922677881 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p10"
-+#define MPFR_VERSION_STRING "3.1.3-p11"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-15 15:19:24.274647313 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-15 15:20:16.922677881 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p10";
-+  return "3.1.3-p11";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tfits.c mpfr-3.1.3-b/tests/tfits.c
---- mpfr-3.1.3-a/tests/tfits.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tfits.c	2016-02-15 15:20:16.898677867 +0000
-@@ -33,258 +33,225 @@
- #include "mpfr-intmax.h"
- #include "mpfr-test.h"
- 
--#define ERROR1(N)                                               \
-+#define FTEST_AUX(N,NOT,FCT)                                    \
-   do                                                            \
-     {                                                           \
--      printf("Error %d for rnd = %s and x = ", N,               \
--             mpfr_print_rnd_mode ((mpfr_rnd_t) r));             \
--      mpfr_dump(x);                                             \
--      exit(1);                                                  \
-+      __gmpfr_flags = ex_flags;                                 \
-+      if (NOT FCT (x, (mpfr_rnd_t) r))                          \
-+        {                                                       \
-+          printf ("Error %d for %s, rnd = %s and x = ",         \
-+                  N, #FCT,                                      \
-+                  mpfr_print_rnd_mode ((mpfr_rnd_t) r));        \
-+          mpfr_dump (x);                                        \
-+          exit (1);                                             \
-+        }                                                       \
-+      if (__gmpfr_flags != ex_flags)                            \
-+        {                                                       \
-+          unsigned int flags = __gmpfr_flags;                   \
-+          printf ("Flags error %d for %s, rnd = %s and x = ",   \
-+                  N, #FCT,                                      \
-+                  mpfr_print_rnd_mode ((mpfr_rnd_t) r));        \
-+          mpfr_dump(x);                                         \
-+          printf ("Expected flags:");                           \
-+          flags_out (ex_flags);                                 \
-+          printf ("Got flags:     ");                           \
-+          flags_out (flags);                                    \
-+          exit (1);                                             \
-+        }                                                       \
-     }                                                           \
-   while (0)
- 
--static void check_intmax (void);
-+#define FTEST(N,NOT,FCT)                                        \
-+  do                                                            \
-+    {                                                           \
-+      mpfr_exp_t e;                                             \
-+      FTEST_AUX (N,NOT,FCT);                                    \
-+      if (MPFR_IS_SINGULAR (x))                                 \
-+        break;                                                  \
-+      e = mpfr_get_exp (x);                                     \
-+      set_emin (e);                                             \
-+      set_emax (e);                                             \
-+      FTEST_AUX (N,NOT,FCT);                                    \
-+      set_emin (emin);                                          \
-+      set_emax (emax);                                          \
-+    }                                                           \
-+  while (0)
-+
-+#define CHECK_ALL(N,NOT)                                        \
-+  do                                                            \
-+    {                                                           \
-+      FTEST (N, NOT, mpfr_fits_ulong_p);                        \
-+      FTEST (N, NOT, mpfr_fits_slong_p);                        \
-+      FTEST (N, NOT, mpfr_fits_uint_p);                         \
-+      FTEST (N, NOT, mpfr_fits_sint_p);                         \
-+      FTEST (N, NOT, mpfr_fits_ushort_p);                       \
-+      FTEST (N, NOT, mpfr_fits_sshort_p);                       \
-+    }                                                           \
-+  while (0)
-+
-+#define CHECK_MAX(N,NOT)                                        \
-+  do                                                            \
-+    {                                                           \
-+      FTEST (N, NOT, mpfr_fits_uintmax_p);                      \
-+      FTEST (N, NOT, mpfr_fits_intmax_p);                       \
-+    }                                                           \
-+  while (0)
-+
-+/* V is a non-zero limit for the type (*_MIN for a signed type or *_MAX).
-+ * If V is positive, then test V, V + 1/4, V + 3/4 and V + 1.
-+ * If V is negative, then test V, V - 1/4, V - 3/4 and V - 1.
-+ */
-+#define CHECK_LIM(N,V,SET,FCT)                                  \
-+  do                                                            \
-+    {                                                           \
-+      SET (x, V, MPFR_RNDN);                                    \
-+      FTEST (N, !, FCT);                                        \
-+      mpfr_set_si_2exp (y, (V) < 0 ? -1 : 1, -2, MPFR_RNDN);    \
-+      mpfr_add (x, x, y, MPFR_RNDN);                            \
-+      FTEST (N+1, (r == MPFR_RNDN ||                            \
-+                   MPFR_IS_LIKE_RNDZ (r, (V) < 0)) ^ !!, FCT);  \
-+      mpfr_add (x, x, y, MPFR_RNDN);                            \
-+      mpfr_add (x, x, y, MPFR_RNDN);                            \
-+      FTEST (N+3, MPFR_IS_LIKE_RNDZ (r, (V) < 0) ^ !!, FCT);    \
-+      mpfr_add (x, x, y, MPFR_RNDN);                            \
-+      FTEST (N+4, !!, FCT);                                     \
-+    }                                                           \
-+  while (0)
- 
- int
- main (void)
- {
-+  mpfr_exp_t emin, emax;
-   mpfr_t x, y;
--  int i, r;
-+  unsigned int flags[2] = { 0, MPFR_FLAGS_ALL }, ex_flags;
-+  int i, r, fi;
- 
-   tests_start_mpfr ();
- 
--  mpfr_init2 (x, 256);
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  mpfr_init2 (x, sizeof (unsigned long) * CHAR_BIT + 2);
-   mpfr_init2 (y, 8);
- 
-   RND_LOOP (r)
--    {
--
--      /* Check NAN */
--      mpfr_set_nan (x);
--      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (1);
--      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (2);
--      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (3);
--      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (4);
--      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (5);
--      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (6);
-+    for (fi = 0; fi < numberof (flags); fi++)
-+      {
-+        ex_flags = flags[fi];
- 
--      /* Check INF */
--      mpfr_set_inf (x, 1);
--      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (7);
--      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (8);
--      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (9);
--      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (10);
--      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (11);
--      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (12);
-+        /* Check NaN */
-+        mpfr_set_nan (x);
-+        CHECK_ALL (1, !!);
- 
--      /* Check Zero */
--      MPFR_SET_ZERO (x);
--      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (13);
--      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (14);
--      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (15);
--      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (16);
--      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (17);
--      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (18);
-+        /* Check +Inf */
-+        mpfr_set_inf (x, 1);
-+        CHECK_ALL (2, !!);
- 
--      /* Check small positive op */
--      mpfr_set_str1 (x, "1@-1");
--      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (19);
--      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (20);
--      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (21);
--      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (22);
--      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (23);
--      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (24);
-+        /* Check -Inf */
-+        mpfr_set_inf (x, -1);
-+        CHECK_ALL (3, !!);
- 
--      /* Check 17 */
--      mpfr_set_ui (x, 17, MPFR_RNDN);
--      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (25);
--      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (26);
--      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (27);
--      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (28);
--      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (29);
--      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (30);
-+        /* Check +0 */
-+        mpfr_set_zero (x, 1);
-+        CHECK_ALL (4, !);
- 
--      /* Check all other values */
--      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
--      mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
--      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (31);
--      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (32);
--      mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
--      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (33);
--      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (34);
--      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (35);
--      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (36);
--      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (37);
-+        /* Check -0 */
-+        mpfr_set_zero (x, -1);
-+        CHECK_ALL (5, !);
- 
--      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
--      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (38);
--      mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
--      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--        ERROR1 (39);
--      mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
--      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (40);
--      mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
--      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (41);
--      mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
--      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (42);
--      mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
--      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (43);
-+        /* Check small positive op */
-+        mpfr_set_str1 (x, "1@-1");
-+        CHECK_ALL (6, !);
- 
--      mpfr_set_si (x, 1, MPFR_RNDN);
--      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--        ERROR1 (44);
--      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--        ERROR1 (45);
-+        /* Check 17 */
-+        mpfr_set_ui (x, 17, MPFR_RNDN);
-+        CHECK_ALL (7, !);
- 
--      /* Check negative op */
--      for (i = 1; i <= 4; i++)
--        {
--          int inv;
-+        /* Check large values (no fit) */
-+        mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
-+        mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
-+        CHECK_ALL (8, !!);
-+        mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
-+        CHECK_ALL (9, !!);
- 
--          mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
--          mpfr_rint (y, x, (mpfr_rnd_t) r);
--          inv = MPFR_NOTZERO (y);
--          if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv)
--            ERROR1 (46);
--          if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
--            ERROR1 (47);
--          if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv)
--            ERROR1 (48);
--          if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
--            ERROR1 (49);
--          if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv)
--            ERROR1 (50);
--          if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
--            ERROR1 (51);
--        }
--    }
-+        /* Check a non-integer number just below a power of two. */
-+        mpfr_set_ui_2exp (x, 255, -2, MPFR_RNDN);
-+        CHECK_ALL (10, !);
- 
--  mpfr_clear (x);
--  mpfr_clear (y);
-+        /* Check the limits of the types (except 0 for unsigned types) */
-+        CHECK_LIM (20, ULONG_MAX, mpfr_set_ui, mpfr_fits_ulong_p);
-+        CHECK_LIM (30, LONG_MAX, mpfr_set_si, mpfr_fits_slong_p);
-+        CHECK_LIM (35, LONG_MIN, mpfr_set_si, mpfr_fits_slong_p);
-+        CHECK_LIM (40, UINT_MAX, mpfr_set_ui, mpfr_fits_uint_p);
-+        CHECK_LIM (50, INT_MAX, mpfr_set_si, mpfr_fits_sint_p);
-+        CHECK_LIM (55, INT_MIN, mpfr_set_si, mpfr_fits_sint_p);
-+        CHECK_LIM (60, USHRT_MAX, mpfr_set_ui, mpfr_fits_ushort_p);
-+        CHECK_LIM (70, SHRT_MAX, mpfr_set_si, mpfr_fits_sshort_p);
-+        CHECK_LIM (75, SHRT_MIN, mpfr_set_si, mpfr_fits_sshort_p);
- 
--  check_intmax ();
-+        /* Check negative op */
-+        for (i = 1; i <= 4; i++)
-+          {
-+            int inv;
- 
--  tests_end_mpfr ();
--  return 0;
--}
-+            mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
-+            mpfr_rint (y, x, (mpfr_rnd_t) r);
-+            inv = MPFR_NOTZERO (y);
-+            FTEST (80, inv ^ !, mpfr_fits_ulong_p);
-+            FTEST (81,       !, mpfr_fits_slong_p);
-+            FTEST (82, inv ^ !, mpfr_fits_uint_p);
-+            FTEST (83,       !, mpfr_fits_sint_p);
-+            FTEST (84, inv ^ !, mpfr_fits_ushort_p);
-+            FTEST (85,       !, mpfr_fits_sshort_p);
-+          }
-+      }
- 
--static void
--check_intmax (void)
--{
- #ifdef _MPFR_H_HAVE_INTMAX_T
--  mpfr_t x, y;
--  int i, r;
- 
--  mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT);
--  mpfr_init2 (y, 8);
-+  mpfr_set_prec (x, sizeof (uintmax_t) * CHAR_BIT + 2);
- 
-   RND_LOOP (r)
-     {
--      /* Check NAN */
-+      /* Check NaN */
-       mpfr_set_nan (x);
--      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (52);
--      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (53);
-+      CHECK_MAX (1, !!);
- 
--      /* Check INF */
-+      /* Check +Inf */
-       mpfr_set_inf (x, 1);
--      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (54);
--      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (55);
-+      CHECK_MAX (2, !!);
- 
--      /* Check Zero */
--      MPFR_SET_ZERO (x);
--      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (56);
--      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (57);
-+      /* Check -Inf */
-+      mpfr_set_inf (x, -1);
-+      CHECK_MAX (3, !!);
- 
--      /* Check positive small op */
-+      /* Check +0 */
-+      mpfr_set_zero (x, 1);
-+      CHECK_MAX (4, !);
-+
-+      /* Check -0 */
-+      mpfr_set_zero (x, -1);
-+      CHECK_MAX (5, !);
-+
-+      /* Check small positive op */
-       mpfr_set_str1 (x, "1@-1");
--      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (58);
--      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (59);
-+      CHECK_MAX (6, !);
- 
-       /* Check 17 */
-       mpfr_set_ui (x, 17, MPFR_RNDN);
--      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (60);
--      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (61);
-+      CHECK_MAX (7, !);
- 
-       /* Check hugest */
-       mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
--      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (62);
--      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (63);
-+      CHECK_MAX (8, !!);
- 
--      /* Check all other values */
--      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
--      mpfr_add_ui (x, x, 1, MPFR_RNDN);
--      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (64);
--      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
--      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (65);
--      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
--      mpfr_add_ui (x, x, 1, MPFR_RNDN);
--      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (66);
--      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
--      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (67);
--      mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
--      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (68);
--      mpfr_sub_ui (x, x, 1, MPFR_RNDN);
--      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--        ERROR1 (69);
-+      /* Check a non-integer number just below a power of two. */
-+      mpfr_set_ui_2exp (x, 255, -2, MPFR_RNDN);
-+      CHECK_MAX (10, !);
-+
-+      /* Check the limits of the types (except 0 for uintmax_t) */
-+      CHECK_LIM (20, MPFR_UINTMAX_MAX, mpfr_set_uj, mpfr_fits_uintmax_p);
-+      CHECK_LIM (30, MPFR_INTMAX_MAX, mpfr_set_sj, mpfr_fits_intmax_p);
-+      CHECK_LIM (35, MPFR_INTMAX_MIN, mpfr_set_sj, mpfr_fits_intmax_p);
- 
-       /* Check negative op */
-       for (i = 1; i <= 4; i++)
-@@ -294,14 +261,16 @@
-           mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
-           mpfr_rint (y, x, (mpfr_rnd_t) r);
-           inv = MPFR_NOTZERO (y);
--          if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv)
--            ERROR1 (70);
--          if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
--            ERROR1 (71);
-+          FTEST (80, inv ^ !, mpfr_fits_uintmax_p);
-+          FTEST (81,       !, mpfr_fits_intmax_p);
-         }
-     }
- 
-+#endif  /* _MPFR_H_HAVE_INTMAX_T */
-+
-   mpfr_clear (x);
-   mpfr_clear (y);
--#endif
-+
-+  tests_end_mpfr ();
-+  return 0;
- }
diff --git a/patches/mpfr/3.1.3/220-root.patch b/patches/mpfr/3.1.3/220-root.patch
deleted file mode 100644
index 9cd62a7..0000000
--- a/patches/mpfr/3.1.3/220-root.patch
+++ /dev/null
@@ -1,621 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-15 15:20:51.242696408 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-15 15:20:51.306696441 +0000
-@@ -0,0 +1 @@
-+root
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-15 15:20:16.922677881 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-15 15:20:51.306696441 +0000
-@@ -1 +1 @@
--3.1.3-p11
-+3.1.3-p12
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-15 15:20:16.922677881 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-15 15:20:51.302696439 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p11"
-+#define MPFR_VERSION_STRING "3.1.3-p12"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/root.c mpfr-3.1.3-b/src/root.c
---- mpfr-3.1.3-a/src/root.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/root.c	2016-02-15 15:20:51.282696429 +0000
-@@ -23,13 +23,15 @@
- #define MPFR_NEED_LONGLONG_H
- #include "mpfr-impl.h"
- 
-- /* The computation of y = x^(1/k) is done as follows:
-+ /* The computation of y = x^(1/k) is done as follows, except for large
-+    values of k, for which this would be inefficient or yield internal
-+    integer overflows:
- 
-     Let x = sign * m * 2^(k*e) where m is an integer
- 
-     with 2^(k*(n-1)) <= m < 2^(k*n) where n = PREC(y)
- 
--    and m = s^k + r where 0 <= r and m < (s+1)^k
-+    and m = s^k + t where 0 <= t and m < (s+1)^k
- 
-     we want that s has n bits i.e. s >= 2^(n-1), or m >= 2^(k*(n-1))
-     i.e. m must have at least k*(n-1)+1 bits
-@@ -38,11 +40,15 @@
-     x^(1/k) = s * 2^e or (s+1) * 2^e according to the rounding mode.
-  */
- 
-+static int
-+mpfr_root_aux (mpfr_ptr y, mpfr_srcptr x, unsigned long k,
-+               mpfr_rnd_t rnd_mode);
-+
- int
- mpfr_root (mpfr_ptr y, mpfr_srcptr x, unsigned long k, mpfr_rnd_t rnd_mode)
- {
-   mpz_t m;
--  mpfr_exp_t e, r, sh;
-+  mpfr_exp_t e, r, sh, f;
-   mpfr_prec_t n, size_m, tmp;
-   int inexact, negative;
-   MPFR_SAVE_EXPO_DECL (expo);
-@@ -55,50 +61,27 @@
- 
-   if (MPFR_UNLIKELY (k <= 1))
-     {
--      if (k < 1) /* k==0 => y=x^(1/0)=x^(+Inf) */
--#if 0
--        /* For 0 <= x < 1 => +0.
--           For x = 1      => 1.
--           For x > 1,     => +Inf.
--           For x < 0      => NaN.
--        */
-+      if (k == 0)
-         {
--          if (MPFR_IS_NEG (x) && !MPFR_IS_ZERO (x))
--            {
--              MPFR_SET_NAN (y);
--              MPFR_RET_NAN;
--            }
--          inexact = mpfr_cmp (x, __gmpfr_one);
--          if (inexact == 0)
--            return mpfr_set_ui (y, 1, rnd_mode); /* 1 may be Out of Range */
--          else if (inexact < 0)
--            return mpfr_set_ui (y, 0, rnd_mode); /* 0+ */
--          else
--            {
--              mpfr_set_inf (y, 1);
--              return 0;
--            }
-+          MPFR_SET_NAN (y);
-+          MPFR_RET_NAN;
-         }
--#endif
--      {
--        MPFR_SET_NAN (y);
--        MPFR_RET_NAN;
--      }
--      else /* y =x^(1/1)=x */
-+      else /* y = x^(1/1) = x */
-         return mpfr_set (y, x, rnd_mode);
-     }
- 
-   /* Singular values */
--  else if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
-+  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
-     {
-       if (MPFR_IS_NAN (x))
-         {
-           MPFR_SET_NAN (y); /* NaN^(1/k) = NaN */
-           MPFR_RET_NAN;
-         }
--      else if (MPFR_IS_INF (x)) /* +Inf^(1/k) = +Inf
--                                   -Inf^(1/k) = -Inf if k odd
--                                   -Inf^(1/k) = NaN if k even */
-+
-+      if (MPFR_IS_INF (x)) /* +Inf^(1/k) = +Inf
-+                              -Inf^(1/k) = -Inf if k odd
-+                              -Inf^(1/k) = NaN if k even */
-         {
-           if (MPFR_IS_NEG(x) && (k % 2 == 0))
-             {
-@@ -106,27 +89,31 @@
-               MPFR_RET_NAN;
-             }
-           MPFR_SET_INF (y);
--          MPFR_SET_SAME_SIGN (y, x);
--          MPFR_RET (0);
-         }
-       else /* x is necessarily 0: (+0)^(1/k) = +0
-                                   (-0)^(1/k) = -0 */
-         {
-           MPFR_ASSERTD (MPFR_IS_ZERO (x));
-           MPFR_SET_ZERO (y);
--          MPFR_SET_SAME_SIGN (y, x);
--          MPFR_RET (0);
-         }
-+      MPFR_SET_SAME_SIGN (y, x);
-+      MPFR_RET (0);
-     }
- 
-   /* Returns NAN for x < 0 and k even */
--  else if (MPFR_IS_NEG (x) && (k % 2 == 0))
-+  if (MPFR_UNLIKELY (MPFR_IS_NEG (x) && (k % 2 == 0)))
-     {
-       MPFR_SET_NAN (y);
-       MPFR_RET_NAN;
-     }
- 
-   /* General case */
-+
-+  /* For large k, use exp(log(x)/k). The threshold of 100 seems to be quite
-+     good when the precision goes to infinity. */
-+  if (k > 100)
-+    return mpfr_root_aux (y, x, k, rnd_mode);
-+
-   MPFR_SAVE_EXPO_MARK (expo);
-   mpz_init (m);
- 
-@@ -135,31 +122,24 @@
-     mpz_neg (m, m);
-   r = e % (mpfr_exp_t) k;
-   if (r < 0)
--    r += k; /* now r = e (mod k) with 0 <= e < r */
-+    r += k; /* now r = e (mod k) with 0 <= r < k */
-+  MPFR_ASSERTD (0 <= r && r < k);
-   /* x = (m*2^r) * 2^(e-r) where e-r is a multiple of k */
- 
-   MPFR_MPZ_SIZEINBASE2 (size_m, m);
-   /* for rounding to nearest, we want the round bit to be in the root */
-   n = MPFR_PREC (y) + (rnd_mode == MPFR_RNDN);
- 
--  /* we now multiply m by 2^(r+k*sh) so that root(m,k) will give
--     exactly n bits: we want k*(n-1)+1 <= size_m + k*sh + r <= k*n
--     i.e. sh = floor ((kn-size_m-r)/k) */
--  if ((mpfr_exp_t) size_m + r > k * (mpfr_exp_t) n)
--    sh = 0; /* we already have too many bits */
-+  /* we now multiply m by 2^sh so that root(m,k) will give
-+     exactly n bits: we want k*(n-1)+1 <= size_m + sh <= k*n
-+     i.e. sh = k*f + r with f = max(floor((k*n-size_m-r)/k),0) */
-+  if ((mpfr_exp_t) size_m + r >= k * (mpfr_exp_t) n)
-+    f = 0; /* we already have too many bits */
-   else
--    sh = (k * (mpfr_exp_t) n - (mpfr_exp_t) size_m - r) / k;
--  sh = k * sh + r;
--  if (sh >= 0)
--    {
--      mpz_mul_2exp (m, m, sh);
--      e = e - sh;
--    }
--  else if (r > 0)
--    {
--      mpz_mul_2exp (m, m, r);
--      e = e - r;
--    }
-+    f = (k * (mpfr_exp_t) n - (mpfr_exp_t) size_m - r) / k;
-+  sh = k * f + r;
-+  mpz_mul_2exp (m, m, sh);
-+  e = e - sh;
- 
-   /* invariant: x = m*2^e, with e divisible by k */
- 
-@@ -203,3 +183,97 @@
-   MPFR_SAVE_EXPO_FREE (expo);
-   return mpfr_check_range (y, inexact, rnd_mode);
- }
-+
-+/* Compute y <- x^(1/k) using exp(log(x)/k).
-+   Assume all special cases have been eliminated before.
-+   In the extended exponent range, overflows/underflows are not possible.
-+   Assume x > 0, or x < 0 and k odd.
-+*/
-+static int
-+mpfr_root_aux (mpfr_ptr y, mpfr_srcptr x, unsigned long k, mpfr_rnd_t rnd_mode)
-+{
-+  int inexact, exact_root = 0;
-+  mpfr_prec_t w; /* working precision */
-+  mpfr_t absx, t;
-+  MPFR_GROUP_DECL(group);
-+  MPFR_TMP_DECL(marker);
-+  MPFR_ZIV_DECL(loop);
-+  MPFR_SAVE_EXPO_DECL (expo);
-+
-+  MPFR_TMP_INIT_ABS (absx, x);
-+
-+  MPFR_TMP_MARK(marker);
-+  w = MPFR_PREC(y) + 10;
-+  /* Take some guard bits to prepare for the 'expt' lost bits below.
-+     If |x| < 2^k, then log|x| < k, thus taking log2(k) bits should be fine. */
-+  if (MPFR_GET_EXP(x) > 0)
-+    w += MPFR_INT_CEIL_LOG2 (MPFR_GET_EXP(x));
-+  MPFR_GROUP_INIT_1(group, w, t);
-+  MPFR_SAVE_EXPO_MARK (expo);
-+  MPFR_ZIV_INIT (loop, w);
-+  for (;;)
-+    {
-+      mpfr_exp_t expt;
-+      unsigned int err;
-+
-+      mpfr_log (t, absx, MPFR_RNDN);
-+      /* t = log|x| * (1 + theta) with |theta| <= 2^(-w) */
-+      mpfr_div_ui (t, t, k, MPFR_RNDN);
-+      expt = MPFR_GET_EXP (t);
-+      /* t = log|x|/k * (1 + theta) + eps with |theta| <= 2^(-w)
-+         and |eps| <= 1/2 ulp(t), thus the total error is bounded
-+         by 1.5 * 2^(expt - w) */
-+      mpfr_exp (t, t, MPFR_RNDN);
-+      /* t = |x|^(1/k) * exp(tau) * (1 + theta1) with
-+         |tau| <= 1.5 * 2^(expt - w) and |theta1| <= 2^(-w).
-+         For |tau| <= 0.5 we have |exp(tau)-1| < 4/3*tau, thus
-+         for w >= expt + 2 we have:
-+         t = |x|^(1/k) * (1 + 2^(expt+2)*theta2) * (1 + theta1) with
-+         |theta1|, |theta2| <= 2^(-w).
-+         If expt+2 > 0, as long as w >= 1, we have:
-+         t = |x|^(1/k) * (1 + 2^(expt+3)*theta3) with |theta3| < 2^(-w).
-+         For expt+2 = 0, we have:
-+         t = |x|^(1/k) * (1 + 2^2*theta3) with |theta3| < 2^(-w).
-+         Finally for expt+2 < 0 we have:
-+         t = |x|^(1/k) * (1 + 2*theta3) with |theta3| < 2^(-w).
-+      */
-+      err = (expt + 2 > 0) ? expt + 3
-+        : (expt + 2 == 0) ? 2 : 1;
-+      /* now t = |x|^(1/k) * (1 + 2^(err-w)) thus the error is at most
-+         2^(EXP(t) - w + err) */
-+      if (MPFR_LIKELY (MPFR_CAN_ROUND(t, w - err, MPFR_PREC(y), rnd_mode)))
-+        break;
-+
-+      /* If we fail to round correctly, check for an exact result or a
-+         midpoint result with MPFR_RNDN (regarded as hard-to-round in
-+         all precisions in order to determine the ternary value). */
-+      {
-+        mpfr_t z, zk;
-+
-+        mpfr_init2 (z, MPFR_PREC(y) + (rnd_mode == MPFR_RNDN));
-+        mpfr_init2 (zk, MPFR_PREC(x));
-+        mpfr_set (z, t, MPFR_RNDN);
-+        inexact = mpfr_pow_ui (zk, z, k, MPFR_RNDN);
-+        exact_root = !inexact && mpfr_equal_p (zk, absx);
-+        if (exact_root) /* z is the exact root, thus round z directly */
-+          inexact = mpfr_set4 (y, z, rnd_mode, MPFR_SIGN (x));
-+        mpfr_clear (zk);
-+        mpfr_clear (z);
-+        if (exact_root)
-+          break;
-+      }
-+
-+      MPFR_ZIV_NEXT (loop, w);
-+      MPFR_GROUP_REPREC_1(group, w, t);
-+    }
-+  MPFR_ZIV_FREE (loop);
-+
-+  if (!exact_root)
-+    inexact = mpfr_set4 (y, t, rnd_mode, MPFR_SIGN (x));
-+
-+  MPFR_GROUP_CLEAR(group);
-+  MPFR_TMP_FREE(marker);
-+  MPFR_SAVE_EXPO_FREE (expo);
-+
-+  return mpfr_check_range (y, inexact, rnd_mode);
-+}
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-15 15:20:16.922677881 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-15 15:20:51.306696441 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p11";
-+  return "3.1.3-p12";
- }
-diff -Naurd mpfr-3.1.3-a/tests/troot.c mpfr-3.1.3-b/tests/troot.c
---- mpfr-3.1.3-a/tests/troot.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/troot.c	2016-02-15 15:20:51.282696429 +0000
-@@ -25,6 +25,19 @@
- 
- #include "mpfr-test.h"
- 
-+#define DEFN(N)                                                         \
-+  static int root##N (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)        \
-+  { return mpfr_root (y, x, N, rnd); }                                  \
-+  static int pow##N (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)         \
-+  { return mpfr_pow_ui (y, x, N, rnd); }
-+
-+DEFN(2)
-+DEFN(3)
-+DEFN(4)
-+DEFN(5)
-+DEFN(17)
-+DEFN(120)
-+
- static void
- special (void)
- {
-@@ -52,7 +65,7 @@
-       exit (1);
-     }
- 
--  /* root(-Inf, 17) =  -Inf */
-+  /* root(-Inf, 17) = -Inf */
-   mpfr_set_inf (x, -1);
-   mpfr_root (y, x, 17, MPFR_RNDN);
-   if (!mpfr_inf_p (y) || mpfr_sgn (y) > 0)
-@@ -69,7 +82,7 @@
-       exit (1);
-     }
- 
--  /* root(+/-0) =  +/-0 */
-+  /* root(+/-0, k) = +/-0 for k > 0 */
-   mpfr_set_ui (x, 0, MPFR_RNDN);
-   mpfr_root (y, x, 17, MPFR_RNDN);
-   if (mpfr_cmp_ui (y, 0) || mpfr_sgn (y) < 0)
-@@ -190,64 +203,39 @@
-   i = mpfr_root (y, x, 1, MPFR_RNDN);
-   if (mpfr_cmp_ui (x, 17) || i != 0)
-     {
--      printf ("Error in root (17^(1/1))\n");
-+      printf ("Error in root for 17^(1/1)\n");
-       exit (1);
-     }
- 
--#if 0
--  /* Check for k == 0:
--     For 0 <= x < 1 => +0.
--     For x = 1      => 1.
--     For x > 1,     => +Inf.
--     For x < 0      => NaN.   */
--  i = mpfr_root (y, x, 0, MPFR_RNDN);
--  if (!MPFR_IS_INF (y) || !MPFR_IS_POS (y) || i != 0)
--    {
--      printf ("Error in root 17^(1/0)\n");
--      exit (1);
--    }
--  mpfr_set_ui (x, 1, MPFR_RNDN);
--  i = mpfr_root (y, x, 0, MPFR_RNDN);
--  if (mpfr_cmp_ui (y, 1) || i != 0)
--    {
--      printf ("Error in root 1^(1/0)\n");
--      exit (1);
--    }
-   mpfr_set_ui (x, 0, MPFR_RNDN);
-   i = mpfr_root (y, x, 0, MPFR_RNDN);
--  if (!MPFR_IS_ZERO (y) || !MPFR_IS_POS (y) || i != 0)
--    {
--      printf ("Error in root 0+^(1/0)\n");
--      exit (1);
--    }
--  MPFR_CHANGE_SIGN (x);
--  i = mpfr_root (y, x, 0, MPFR_RNDN);
--  if (!MPFR_IS_ZERO (y) || !MPFR_IS_POS (y) || i != 0)
-+  if (!MPFR_IS_NAN (y) || i != 0)
-     {
--      printf ("Error in root 0-^(1/0)\n");
-+      printf ("Error in root for (+0)^(1/0)\n");
-       exit (1);
-     }
--  mpfr_set_ui_2exp (x, 17, -5, MPFR_RNDD);
-+  mpfr_neg (x, x, MPFR_RNDN);
-   i = mpfr_root (y, x, 0, MPFR_RNDN);
--  if (!MPFR_IS_ZERO (y) || !MPFR_IS_POS (y) || i != 0)
-+  if (!MPFR_IS_NAN (y) || i != 0)
-     {
--      printf ("Error in root (17/2^5)^(1/0)\n");
-+      printf ("Error in root for (-0)^(1/0)\n");
-       exit (1);
-     }
--#endif
--  mpfr_set_ui (x, 0, MPFR_RNDN);
-+
-+  mpfr_set_ui (x, 1, MPFR_RNDN);
-   i = mpfr_root (y, x, 0, MPFR_RNDN);
-   if (!MPFR_IS_NAN (y) || i != 0)
-     {
--      printf ("Error in root 0+^(1/0)\n");
-+      printf ("Error in root for 1^(1/0)\n");
-       exit (1);
-     }
-+
-   /* Check for k==2 */
-   mpfr_set_si (x, -17, MPFR_RNDD);
-   i = mpfr_root (y, x, 2, MPFR_RNDN);
-   if (!MPFR_IS_NAN (y) || i != 0)
-     {
--      printf ("Error in root (-17)^(1/2)\n");
-+      printf ("Error in root for (-17)^(1/2)\n");
-       exit (1);
-     }
- 
-@@ -255,11 +243,168 @@
-   mpfr_clear (y);
- }
- 
-+/* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812779
-+ * https://bugzilla.gnome.org/show_bug.cgi?id=756960
-+ * is a GNOME Calculator bug (mpfr_root applied on a negative integer,
-+ * which is converted to an unsigned integer), but the strange result
-+ * is also due to a bug in MPFR.
-+ */
-+static void
-+bigint (void)
-+{
-+  mpfr_t x, y;
-+
-+  mpfr_inits2 (64, x, y, (mpfr_ptr) 0);
-+
-+  mpfr_set_ui (x, 10, MPFR_RNDN);
-+  if (sizeof (unsigned long) * CHAR_BIT == 64)
-+    {
-+      mpfr_root (x, x, ULONG_MAX, MPFR_RNDN);
-+      mpfr_set_ui_2exp (y, 1, -63, MPFR_RNDN);
-+      mpfr_add_ui (y, y, 1, MPFR_RNDN);
-+      if (! mpfr_equal_p (x, y))
-+        {
-+          printf ("Error in bigint for ULONG_MAX\n");
-+          printf ("Expected ");
-+          mpfr_dump (y);
-+          printf ("Got      ");
-+          mpfr_dump (x);
-+          exit (1);
-+        }
-+    }
-+
-+  mpfr_set_ui (x, 10, MPFR_RNDN);
-+  mpfr_root (x, x, 1234567890, MPFR_RNDN);
-+  mpfr_set_str_binary (y,
-+    "1.00000000000000000000000000001000000000101011000101000110010001");
-+  if (! mpfr_equal_p (x, y))
-+    {
-+      printf ("Error in bigint for 1234567890\n");
-+      printf ("Expected ");
-+      mpfr_dump (y);
-+      printf ("Got      ");
-+      mpfr_dump (x);
-+      exit (1);
-+    }
-+
-+  mpfr_clears (x, y, (mpfr_ptr) 0);
-+}
-+
- #define TEST_FUNCTION mpfr_root
- #define INTEGER_TYPE unsigned long
--#define INT_RAND_FUNCTION() (INTEGER_TYPE) (randlimb () % 3 +2)
-+#define INT_RAND_FUNCTION() \
-+  (INTEGER_TYPE) (randlimb () & 1 ? randlimb () : randlimb () % 3 + 2)
- #include "tgeneric_ui.c"
- 
-+static void
-+exact_powers (unsigned long bmax, unsigned long kmax)
-+{
-+  long b, k;
-+  mpz_t z;
-+  mpfr_t x, y;
-+  int inex, neg;
-+
-+  mpz_init (z);
-+  for (b = 2; b <= bmax; b++)
-+    for (k = 1; k <= kmax; k++)
-+      {
-+        mpz_ui_pow_ui (z, b, k);
-+        mpfr_init2 (x, mpz_sizeinbase (z, 2));
-+        mpfr_set_ui (x, b, MPFR_RNDN);
-+        mpfr_pow_ui (x, x, k, MPFR_RNDN);
-+        mpz_set_ui (z, b);
-+        mpfr_init2 (y, mpz_sizeinbase (z, 2));
-+        for (neg = 0; neg <= 1; neg++)
-+          {
-+            inex = mpfr_root (y, x, k, MPFR_RNDN);
-+            if (inex != 0)
-+              {
-+                printf ("Error in exact_powers, b=%ld, k=%ld\n", b, k);
-+                printf ("Expected inex=0, got %d\n", inex);
-+                exit (1);
-+              }
-+            if (neg && (k & 1) == 0)
-+              {
-+                if (!MPFR_IS_NAN (y))
-+                  {
-+                    printf ("Error in exact_powers, b=%ld, k=%ld\n", b, k);
-+                    printf ("Expected y=NaN\n");
-+                    printf ("Got      ");
-+                    mpfr_out_str (stdout, 10, 0, y, MPFR_RNDN);
-+                    printf ("\n");
-+                    exit (1);
-+                  }
-+              }
-+            else if (MPFR_IS_NAN (y) || mpfr_cmp_si (y, b) != 0)
-+              {
-+                printf ("Error in exact_powers, b=%ld, k=%ld\n", b, k);
-+                printf ("Expected y=%ld\n", b);
-+                printf ("Got      ");
-+                mpfr_out_str (stdout, 10, 0, y, MPFR_RNDN);
-+                printf ("\n");
-+                exit (1);
-+              }
-+            mpfr_neg (x, x, MPFR_RNDN);
-+            b = -b;
-+          }
-+        mpfr_clear (x);
-+        mpfr_clear (y);
-+      }
-+  mpz_clear (z);
-+}
-+
-+/* Compare root(x,2^h) with pow(x,2^(-h)). */
-+static void
-+cmp_pow (void)
-+{
-+  mpfr_t x, y1, y2;
-+  int h;
-+
-+  mpfr_inits2 (128, x, y1, y2, (mpfr_ptr) 0);
-+
-+  for (h = 1; h < sizeof (unsigned long) * CHAR_BIT; h++)
-+    {
-+      unsigned long k = (unsigned long) 1 << h;
-+      int i;
-+
-+      for (i = 0; i < 10; i++)
-+        {
-+          mpfr_rnd_t rnd;
-+          unsigned int flags1, flags2;
-+          int inex1, inex2;
-+
-+          tests_default_random (x, 0, __gmpfr_emin, __gmpfr_emax, 1);
-+          rnd = RND_RAND ();
-+          mpfr_set_ui_2exp (y1, 1, -h, MPFR_RNDN);
-+          mpfr_clear_flags ();
-+          inex1 = mpfr_pow (y1, x, y1, rnd);
-+          flags1 = __gmpfr_flags;
-+          mpfr_clear_flags ();
-+          inex2 = mpfr_root (y2, x, k, rnd);
-+          flags2 = __gmpfr_flags;
-+          if (!(mpfr_equal_p (y1, y2) && SAME_SIGN (inex1, inex2) &&
-+                flags1 == flags2))
-+            {
-+              printf ("Error in cmp_pow on h=%d, i=%d, rnd=%s\n",
-+                      h, i, mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
-+              printf ("x = ");
-+              mpfr_dump (x);
-+              printf ("pow  = ");
-+              mpfr_dump (y1);
-+              printf ("with inex = %d, flags =", inex1);
-+              flags_out (flags1);
-+              printf ("root = ");
-+              mpfr_dump (y2);
-+              printf ("with inex = %d, flags =", inex2);
-+              flags_out (flags2);
-+              exit (1);
-+            }
-+        }
-+    }
-+
-+  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
-+}
-+
- int
- main (void)
- {
-@@ -270,7 +415,10 @@
- 
-   tests_start_mpfr ();
- 
-+  exact_powers (3, 1000);
-   special ();
-+  bigint ();
-+  cmp_pow ();
- 
-   mpfr_init (x);
- 
-@@ -329,6 +477,13 @@
- 
-   test_generic_ui (2, 200, 30);
- 
-+  bad_cases (root2, pow2, "mpfr_root[2]", 8, -256, 255, 4, 128, 800, 40);
-+  bad_cases (root3, pow3, "mpfr_root[3]", 8, -256, 255, 4, 128, 800, 40);
-+  bad_cases (root4, pow4, "mpfr_root[4]", 8, -256, 255, 4, 128, 800, 40);
-+  bad_cases (root5, pow5, "mpfr_root[5]", 8, -256, 255, 4, 128, 800, 40);
-+  bad_cases (root17, pow17, "mpfr_root[17]", 8, -256, 255, 4, 128, 800, 40);
-+  bad_cases (root120, pow120, "mpfr_root[120]", 8, -256, 255, 4, 128, 800, 40);
-+
-   tests_end_mpfr ();
-   return 0;
- }
diff --git a/patches/mpfr/3.1.3/230-gamma.patch b/patches/mpfr/3.1.3/230-gamma.patch
deleted file mode 100644
index 47d4e41..0000000
--- a/patches/mpfr/3.1.3/230-gamma.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-23 07:43:23.702095604 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-23 07:43:23.726095285 +0000
-@@ -0,0 +1 @@
-+gamma
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-15 15:20:51.306696441 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-23 07:43:23.726095285 +0000
-@@ -1 +1 @@
--3.1.3-p12
-+3.1.3-p13
-diff -Naurd mpfr-3.1.3-a/src/gamma.c mpfr-3.1.3-b/src/gamma.c
---- mpfr-3.1.3-a/src/gamma.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/gamma.c	2016-02-23 07:43:23.718095391 +0000
-@@ -70,6 +70,9 @@
- {
-   mpfr_t x, y;
-   unsigned long r, k;
-+  MPFR_SAVE_EXPO_DECL (expo);
-+
-+  MPFR_SAVE_EXPO_MARK (expo);
-   mpfr_init2 (x, 38);
-   mpfr_init2 (y, 38);
-   mpfr_set_ui (x, n, MPFR_RNDZ);
-@@ -86,6 +89,8 @@
-     r -= n / k;
-   mpfr_clear (x);
-   mpfr_clear (y);
-+  MPFR_SAVE_EXPO_FREE (expo);
-+
-   return r;
- }
- 
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-15 15:20:51.302696439 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-23 07:43:23.726095285 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p12"
-+#define MPFR_VERSION_STRING "3.1.3-p13"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-15 15:20:51.306696441 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-23 07:43:23.726095285 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p12";
-+  return "3.1.3-p13";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tgamma.c mpfr-3.1.3-b/tests/tgamma.c
---- mpfr-3.1.3-a/tests/tgamma.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tgamma.c	2016-02-23 07:43:23.718095391 +0000
-@@ -192,6 +192,18 @@
-       exit (1);
-     }
- 
-+  mpfr_set_prec (x, 2);
-+  mpfr_set_prec (y, 2);
-+  mpfr_set_ui (x, 2, MPFR_RNDN);
-+  mpfr_clear_inexflag ();
-+  mpfr_gamma (y, x, MPFR_RNDN);
-+  if (mpfr_inexflag_p ())
-+    {
-+      printf ("Wrong inexact flag for gamma(2)\n");
-+      printf ("expected 0, got 1\n");
-+      exit (1);
-+    }
-+
-   mpfr_clear (x);
-   mpfr_clear (y);
- }
diff --git a/patches/mpfr/3.1.3/240-rem1.patch b/patches/mpfr/3.1.3/240-rem1.patch
deleted file mode 100644
index 9d5e3c1..0000000
--- a/patches/mpfr/3.1.3/240-rem1.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-23 07:54:06.617533218 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-23 07:54:06.641532898 +0000
-@@ -0,0 +1 @@
-+rem1
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-23 07:43:23.726095285 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-23 07:54:06.641532898 +0000
-@@ -1 +1 @@
--3.1.3-p13
-+3.1.3-p14
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-23 07:43:23.726095285 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-23 07:54:06.641532898 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p13"
-+#define MPFR_VERSION_STRING "3.1.3-p14"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/rem1.c mpfr-3.1.3-b/src/rem1.c
---- mpfr-3.1.3-a/src/rem1.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/rem1.c	2016-02-23 07:54:06.633533004 +0000
-@@ -59,6 +59,7 @@
-   mpfr_exp_t ex, ey;
-   int compare, inex, q_is_odd, sign, signx = MPFR_SIGN (x);
-   mpz_t mx, my, r;
-+  int tiny = 0;
- 
-   MPFR_ASSERTD (rnd_q == MPFR_RNDN || rnd_q == MPFR_RNDZ);
- 
-@@ -109,13 +110,27 @@
-   if (ex <= ey)
-     {
-       /* q = x/y = mx/(my*2^(ey-ex)) */
--      mpz_mul_2exp (my, my, ey - ex);   /* divide mx by my*2^(ey-ex) */
--      if (rnd_q == MPFR_RNDZ)
--        /* 0 <= |r| <= |my|, r has the same sign as mx */
--        mpz_tdiv_qr (mx, r, mx, my);
-+
-+      /* First detect cases where q=0, to avoid creating a huge number
-+         my*2^(ey-ex): if sx = mpz_sizeinbase (mx, 2) and sy =
-+         mpz_sizeinbase (my, 2), we have x < 2^(ex + sx) and
-+         y >= 2^(ey + sy - 1), thus if ex + sx <= ey + sy - 1
-+         the quotient is 0 */
-+      if (ex + (mpfr_exp_t) mpz_sizeinbase (mx, 2) <
-+          ey + (mpfr_exp_t) mpz_sizeinbase (my, 2))
-+        {
-+          tiny = 1;
-+          mpz_set (r, mx);
-+          mpz_set_ui (mx, 0);
-+        }
-       else
--        /* 0 <= |r| <= |my|, r has the same sign as my */
--        mpz_fdiv_qr (mx, r, mx, my);
-+        {
-+          mpz_mul_2exp (my, my, ey - ex);   /* divide mx by my*2^(ey-ex) */
-+
-+          /* since mx > 0 and my > 0, we can use mpz_tdiv_qr in all cases */
-+          mpz_tdiv_qr (mx, r, mx, my);
-+          /* 0 <= |r| <= |my|, r has the same sign as mx */
-+        }
- 
-       if (rnd_q == MPFR_RNDN)
-         q_is_odd = mpz_tstbit (mx, 0);
-@@ -181,7 +196,20 @@
-           /* FIXME: the comparison 2*r < my could be done more efficiently
-              at the mpn level */
-           mpz_mul_2exp (r, r, 1);
--          compare = mpz_cmpabs (r, my);
-+          /* if tiny=1, we should compare r with my*2^(ey-ex) */
-+          if (tiny)
-+            {
-+              if (ex + (mpfr_exp_t) mpz_sizeinbase (r, 2) <
-+                  ey + (mpfr_exp_t) mpz_sizeinbase (my, 2))
-+                compare = 0; /* r*2^ex < my*2^ey */
-+              else
-+                {
-+                  mpz_mul_2exp (my, my, ey - ex);
-+                  compare = mpz_cmpabs (r, my);
-+                }
-+            }
-+          else
-+            compare = mpz_cmpabs (r, my);
-           mpz_fdiv_q_2exp (r, r, 1);
-           compare = ((compare > 0) ||
-                      ((rnd_q == MPFR_RNDN) && (compare == 0) && q_is_odd));
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-23 07:43:23.726095285 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-23 07:54:06.641532898 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p13";
-+  return "3.1.3-p14";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tfmod.c mpfr-3.1.3-b/tests/tfmod.c
---- mpfr-3.1.3-a/tests/tfmod.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tfmod.c	2016-02-23 07:54:06.633533004 +0000
-@@ -137,89 +137,90 @@
- special (void)
- {
-   int inexact;
--  mpfr_t x, y, r, nan;
--  mpfr_inits (x, y, r, nan, (mpfr_ptr) 0);
-+  mpfr_t x, y, r, t;
- 
--  mpfr_set_nan (nan);
-+  mpfr_inits (x, y, r, t, (mpfr_ptr) 0);
-+
-+  mpfr_set_nan (t);
- 
-   /* fmod (NaN, NaN) is NaN */
-   mpfr_set_nan (x);
-   mpfr_set_nan (y);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (NaN, +0) is NaN */
-   mpfr_set_ui (y, 0, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (+1, 0) is NaN */
-   mpfr_set_ui (x, 1, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (0, 0) is NaN */
-   mpfr_set_ui (x, 0, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (+inf, +0) is NaN */
-   mpfr_set_inf (x, +1);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (-inf, +0) is NaN */
-   mpfr_set_inf (x, -1);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (-inf, -0) is NaN */
-   mpfr_neg (x, x, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (-inf, +1) is NaN */
-   mpfr_set_ui (y, +1, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (+inf, +1) is NaN */
-   mpfr_neg (x, x, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (+inf, -inf) is NaN */
-   mpfr_set_inf (y, -1);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (-inf, -inf) is NaN */
-   mpfr_neg (x, x, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (-inf, +inf) is NaN */
-   mpfr_neg (y, y, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (+inf, +inf) is NaN */
-   mpfr_neg (x, x, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (x, +inf) = x, if x is finite */
-   mpfr_set_ui (x, 1, MPFR_RNDN);
-@@ -271,13 +272,13 @@
-   mpfr_set_ui (y, 0, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (+0, -0) is NaN */
-   mpfr_neg (y, y, MPFR_RNDN);
-   inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-   if (!mpfr_nan_p (r) || inexact != 0)
--    test_failed (r, nan, 0, inexact, x, y, MPFR_RNDN);
-+    test_failed (r, t, 0, inexact, x, y, MPFR_RNDN);
- 
-   /* fmod (+0, +1) = +0 */
-   mpfr_set_ui (y, 1, MPFR_RNDN);
-@@ -303,7 +304,18 @@
-   if (!mpfr_equal_p (r, x) || inexact != 0)
-     test_failed (r, x, 0, inexact, x, y, MPFR_RNDN);
- 
--  mpfr_clears (x, y, r, nan, (mpfr_ptr) 0);
-+  mpfr_set_prec (x, 380);
-+  mpfr_set_prec (y, 385);
-+  mpfr_set_str_binary (x, "0.11011010010110011101011000100100101100101011010001011100110001100101111001010100001011111110111100101110101010110011010101000100000100011101101100001011101110100111101111111010001001000010000110010110011100111000001110111010000100101001010111100100010001101001110100011110010000000001110001111001101100111011001000110110011100100011111110010100011001000001001011010111010000000000E0");
-+  mpfr_set_str_binary (y, "0.1100011000011101011010001100010111001110110111001101010010111100111100011010010011011101111101111001010111111110001001100001111101001000000010100101111001001110010110000111001000101010111001001000100101011111000010100110001111000110011011010101111101100110010101011010011101100001011101001000101111110110110110000001001101110111110110111110111111001001011110001110011111100000000000000E-1");
-+  mpfr_set_prec (r, 2);
-+  inexact = mpfr_fmod (r, x, y, MPFR_RNDA);
-+  mpfr_set_prec (t, 2);
-+  mpfr_set_ui_2exp (t, 3, -5, MPFR_RNDN);
-+  if (mpfr_cmp_ui_2exp (r, 3, -5) || inexact <= 0)
-+    test_failed (r, t, 1, inexact, x, y, MPFR_RNDA);
-+
-+  mpfr_clears (x, y, r, t, (mpfr_ptr) 0);
-   return;
- }
- 
-@@ -313,6 +325,7 @@
- {
-   mpfr_t x, y, r;
-   int inexact;
-+
-   mpfr_inits2 (100, x, y, r, (mpfr_ptr) 0);
- 
-   mpfr_set_prec (x, 3);
-@@ -353,7 +366,46 @@
-   mpfr_sin (y, y, MPFR_RNDN);
-   check (r, x, y, MPFR_RNDN);
- 
--  mpfr_clears(r, x, y, (mpfr_ptr) 0);
-+  mpfr_clears (x, y, r, (mpfr_ptr) 0);
-+}
-+
-+static void
-+bug20160217 (void)
-+{
-+  mpfr_t x, y, r;
-+  int inexact, i;
-+  mpfr_exp_t emin, emax;
-+
-+  mpfr_inits2 (53, x, y, r, (mpfr_ptr) 0);
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-+  for (i = 0; i <= 1; i++)
-+    {
-+      mpfr_set_zero (x, 1);
-+      mpfr_nextabove (x);
-+      mpfr_set_inf (y, 1);
-+      mpfr_nextbelow (y);
-+      inexact = mpfr_fmod (r, x, y, MPFR_RNDN);
-+      if (!mpfr_equal_p (r, x) || inexact != 0)
-+        {
-+          printf ("Error for mpfr_fmod (r, nextabove(0), nextbelow(+inf),"
-+                  " MPFR_RNDN)%s\n", i ? "extended exponent range" : "");
-+          printf ("Expected inex = 0, r = ");
-+          mpfr_dump (x);
-+          printf ("Got      inex = %d, r = ", inexact);
-+          mpfr_dump (r);
-+          exit (1);
-+        }
-+      set_emin (MPFR_EMIN_MIN);
-+      set_emax (MPFR_EMAX_MAX);
-+    }
-+
-+  set_emin (emin);
-+  set_emax (emax);
-+
-+  mpfr_clears (x, y, r, (mpfr_ptr) 0);
- }
- 
- int
-@@ -362,6 +414,7 @@
-   tests_start_mpfr ();
- 
-   bug20090519 ();
-+  bug20160217 ();
- 
-   test_generic (2, 100, 100);
- 
-diff -Naurd mpfr-3.1.3-a/tests/tremquo.c mpfr-3.1.3-b/tests/tremquo.c
---- mpfr-3.1.3-a/tests/tremquo.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tremquo.c	2016-02-23 07:54:06.633533004 +0000
-@@ -59,6 +59,7 @@
- {
-   mpfr_t x, y, r;
-   long q[1];
-+  int inex;
- 
-   if (argc == 3) /* usage: tremquo x y (rnd=MPFR_RNDN implicit) */
-     {
-@@ -281,6 +282,15 @@
-   MPFR_ASSERTN (mpfr_zero_p (r) && MPFR_SIGN (r) > 0);
-   MPFR_ASSERTN (q[0] == 0);
- 
-+  mpfr_set_prec (x, 380);
-+  mpfr_set_prec (y, 385);
-+  mpfr_set_str_binary (x, "0.11011010010110011101011000100100101100101011010001011100110001100101111001010100001011111110111100101110101010110011010101000100000100011101101100001011101110100111101111111010001001000010000110010110011100111000001110111010000100101001010111100100010001101001110100011110010000000001110001111001101100111011001000110110011100100011111110010100011001000001001011010111010000000000E-2");
-+  mpfr_set_str_binary (y, "0.1100011000011101011010001100010111001110110111001101010010111100111100011010010011011101111101111001010111111110001001100001111101001000000010100101111001001110010110000111001000101010111001001000100101011111000010100110001111000110011011010101111101100110010101011010011101100001011101001000101111110110110110000001001101110111110110111110111111001001011110001110011111100000000000000E-1");
-+  mpfr_set_prec (r, 2);
-+  inex = mpfr_remainder (r, x, y, MPFR_RNDA);
-+  MPFR_ASSERTN(mpfr_cmp_si_2exp (r, -3, -4) == 0);
-+  MPFR_ASSERTN(inex < 0);
-+
-   mpfr_clear (x);
-   mpfr_clear (y);
-   mpfr_clear (r);
diff --git a/patches/mpfr/3.1.3/250-agm-eq.patch b/patches/mpfr/3.1.3/250-agm-eq.patch
deleted file mode 100644
index e59e914..0000000
--- a/patches/mpfr/3.1.3/250-agm-eq.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-23 07:55:17.208593082 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-23 07:55:17.232592762 +0000
-@@ -0,0 +1 @@
-+agm-eq
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-23 07:54:06.641532898 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-23 07:55:17.232592762 +0000
-@@ -1 +1 @@
--3.1.3-p14
-+3.1.3-p15
-diff -Naurd mpfr-3.1.3-a/src/agm.c mpfr-3.1.3-b/src/agm.c
---- mpfr-3.1.3-a/src/agm.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/agm.c	2016-02-23 07:55:17.224592868 +0000
-@@ -96,10 +96,7 @@
-   /* b (op2) and a (op1) are the 2 operands but we want b >= a */
-   compare = mpfr_cmp (op1, op2);
-   if (MPFR_UNLIKELY( compare == 0 ))
--    {
--      mpfr_set (r, op1, rnd_mode);
--      MPFR_RET (0); /* exact */
--    }
-+    return mpfr_set (r, op1, rnd_mode);
-   else if (compare > 0)
-     {
-       mpfr_srcptr t = op1;
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-23 07:54:06.641532898 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-23 07:55:17.232592762 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p14"
-+#define MPFR_VERSION_STRING "3.1.3-p15"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-23 07:54:06.641532898 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-23 07:55:17.232592762 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p14";
-+  return "3.1.3-p15";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tagm.c mpfr-3.1.3-b/tests/tagm.c
---- mpfr-3.1.3-a/tests/tagm.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tagm.c	2016-02-23 07:55:17.224592868 +0000
-@@ -169,6 +169,45 @@
- }
- 
- static void
-+check_eq (void)
-+{
-+  mpfr_t a, b, agm;
-+  int p;
-+
-+  mpfr_init2 (a, 17);
-+  mpfr_init2 (b, 9);
-+
-+  mpfr_set_str_binary (b, "0.101000000E-3");
-+  mpfr_set (a, b, MPFR_RNDN);
-+
-+  for (p = MPFR_PREC_MIN; p <= 2; p++)
-+    {
-+      int inex;
-+
-+      mpfr_init2 (agm, p);
-+      inex = mpfr_agm (agm, a, b, MPFR_RNDU);
-+      if (mpfr_cmp_ui_2exp (agm, 5 - p, -5) != 0)
-+        {
-+          printf ("Error in check_eq for p = %d: expected %d*2^(-5), got ",
-+                  p, 5 - p);
-+          mpfr_dump (agm);
-+          exit (1);
-+        }
-+      if (inex <= 0)
-+        {
-+          printf ("Wrong ternary value in check_eq for p = %d\n", p);
-+          printf ("expected 1\n");
-+          printf ("got      %d\n", inex);
-+          exit (1);
-+        }
-+      mpfr_clear (agm);
-+    }
-+
-+  mpfr_clear (a);
-+  mpfr_clear (b);
-+}
-+
-+static void
- check_nans (void)
- {
-   mpfr_t  x, y, m;
-@@ -260,6 +299,7 @@
-   check_nans ();
- 
-   check_large ();
-+  check_eq ();
-   check4 ("2.0", "1.0", MPFR_RNDN, "1.456791031046906869", -1);
-   check4 ("6.0", "4.0", MPFR_RNDN, "4.949360872472608925", 1);
-   check4 ("62.0", "61.0", MPFR_RNDN, "61.498983718845075902", -1);
diff --git a/patches/mpfr/3.1.3/260-sum.patch b/patches/mpfr/3.1.3/260-sum.patch
deleted file mode 100644
index 6fae047..0000000
--- a/patches/mpfr/3.1.3/260-sum.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-23 07:55:54.028346753 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-23 07:55:54.052346433 +0000
-@@ -0,0 +1 @@
-+sum
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-23 07:55:17.232592762 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-23 07:55:54.052346433 +0000
-@@ -1 +1 @@
--3.1.3-p15
-+3.1.3-p16
-diff -Naurd mpfr-3.1.3-a/src/mpfr-impl.h mpfr-3.1.3-b/src/mpfr-impl.h
---- mpfr-3.1.3-a/src/mpfr-impl.h	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/mpfr-impl.h	2016-02-23 07:55:54.040346593 +0000
-@@ -1876,7 +1876,8 @@
- __MPFR_DECLSPEC int mpfr_check _MPFR_PROTO ((mpfr_srcptr));
- 
- __MPFR_DECLSPEC int mpfr_sum_sort _MPFR_PROTO ((mpfr_srcptr *const,
--                                                unsigned long, mpfr_srcptr *));
-+                                                unsigned long, mpfr_srcptr *,
-+                                                mpfr_prec_t *));
- 
- __MPFR_DECLSPEC int mpfr_get_cputime _MPFR_PROTO ((void));
- 
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-23 07:55:17.232592762 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-23 07:55:54.052346433 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p15"
-+#define MPFR_VERSION_STRING "3.1.3-p16"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/sum.c mpfr-3.1.3-b/src/sum.c
---- mpfr-3.1.3-a/src/sum.c	2015-06-19 19:55:09.000000000 +0000
-+++ mpfr-3.1.3-b/src/sum.c	2016-02-23 07:55:54.040346593 +0000
-@@ -45,9 +45,13 @@
-                         mpfr_exp_t, mpfr_uexp_t);
- 
- /* Either sort the tab in perm and returns 0
--   Or returns 1 for +INF, -1 for -INF and 2 for NAN */
-+   Or returns 1 for +INF, -1 for -INF and 2 for NAN.
-+   Also set *maxprec to the maximal precision of tab[0..n-1] and of the
-+   initial value of *maxprec.
-+*/
- int
--mpfr_sum_sort (mpfr_srcptr *const tab, unsigned long n, mpfr_srcptr *perm)
-+mpfr_sum_sort (mpfr_srcptr *const tab, unsigned long n, mpfr_srcptr *perm,
-+               mpfr_prec_t *maxprec)
- {
-   mpfr_exp_t min, max;
-   mpfr_uexp_t exp_num;
-@@ -79,6 +83,8 @@
-           if (MPFR_GET_EXP (tab[i]) > max)
-             max = MPFR_GET_EXP(tab[i]);
-         }
-+      if (MPFR_PREC (tab[i]) > *maxprec)
-+        *maxprec = MPFR_PREC (tab[i]);
-     }
-   if (MPFR_UNLIKELY (sign_inf != 0))
-     return sign_inf;
-@@ -213,7 +219,8 @@
- 
- 
- /* Sum a list of float with order given by permutation perm,
-- * intermediate size set to F.
-+ * intermediate size set to F. Return non-zero if at least one of
-+ * the operations is inexact (thus 0 implies that the sum is exact).
-  * Internal use function.
-  */
- static int
-@@ -230,16 +237,19 @@
-   for (i = 1; i < n - 1; i++)
-     {
-       MPFR_ASSERTD (!MPFR_IS_NAN (sum) && !MPFR_IS_INF (sum));
--      error_trap |= mpfr_add (sum, sum, tab[i], MPFR_RNDN);
-+      if (mpfr_add (sum, sum, tab[i], MPFR_RNDN))
-+        error_trap = 1;
-     }
--  error_trap |= mpfr_add (ret, sum, tab[n - 1], MPFR_RNDN);
-+  if (mpfr_add (ret, sum, tab[n - 1], MPFR_RNDN))
-+    error_trap = 1;
-   mpfr_clear (sum);
-   return error_trap;
- }
- 
- /* Sum a list of floating-point numbers.
-+ * If the return value is 0, then the sum is exact.
-+ * Otherwise the return value gives no information.
-  */
--
- int
- mpfr_sum (mpfr_ptr ret, mpfr_ptr *const tab_p, unsigned long n, mpfr_rnd_t rnd)
- {
-@@ -266,7 +276,8 @@
-   /* Sort and treat special cases */
-   MPFR_TMP_MARK (marker);
-   perm = (mpfr_srcptr *) MPFR_TMP_ALLOC (n * sizeof *perm);
--  error_trap = mpfr_sum_sort (tab, n, perm);
-+  prec = MPFR_PREC (ret);
-+  error_trap = mpfr_sum_sort (tab, n, perm, &prec);
-   /* Check if there was a NAN or a INF */
-   if (MPFR_UNLIKELY (error_trap != 0))
-     {
-@@ -281,8 +292,7 @@
-       MPFR_RET (0);
-     }
- 
--  /* Initial precision */
--  prec = MAX (MPFR_PREC (tab[0]), MPFR_PREC (ret));
-+  /* Initial precision is max(prec(ret),prec(tab[0]),...,prec(tab[n-1])) */
-   k = MPFR_INT_CEIL_LOG2 (n) + 1;
-   prec += k + 2;
-   mpfr_init2 (cur_sum, prec);
-@@ -295,8 +305,7 @@
-       error_trap = sum_once (cur_sum, perm, n, prec + k);
-       if (MPFR_LIKELY (error_trap == 0 ||
-                        (!MPFR_IS_ZERO (cur_sum) &&
--                        mpfr_can_round (cur_sum,
--                                        MPFR_GET_EXP (cur_sum) - prec + 2,
-+                        mpfr_can_round (cur_sum, prec - 2,
-                                         MPFR_RNDN, rnd, MPFR_PREC (ret)))))
-         break;
-       MPFR_ZIV_NEXT (loop, prec);
-@@ -305,11 +314,13 @@
-   MPFR_ZIV_FREE (loop);
-   MPFR_TMP_FREE (marker);
- 
--  error_trap |= mpfr_set (ret, cur_sum, rnd);
-+  if (mpfr_set (ret, cur_sum, rnd))
-+    error_trap = 1;
-   mpfr_clear (cur_sum);
- 
-   MPFR_SAVE_EXPO_FREE (expo);
--  error_trap |= mpfr_check_range (ret, 0, rnd);
-+  if (mpfr_check_range (ret, 0, rnd))
-+    error_trap = 1;
-   return error_trap; /* It doesn't return the ternary value */
- }
- 
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-23 07:55:17.232592762 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-23 07:55:54.052346433 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p15";
-+  return "3.1.3-p16";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tsum.c mpfr-3.1.3-b/tests/tsum.c
---- mpfr-3.1.3-a/tests/tsum.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tsum.c	2016-02-23 07:55:54.040346593 +0000
-@@ -126,6 +126,7 @@
-   mpfr_ptr *tabtmp;
-   mpfr_srcptr *perm;
-   unsigned long i;
-+  mpfr_prec_t prec = MPFR_PREC_MIN;
- 
-   /* Init stuff */
-   tab = (mpfr_t *) (*__gmp_allocate_func) (n * sizeof (mpfr_t));
-@@ -140,7 +141,7 @@
-       tabtmp[i] = tab[i];
-     }
- 
--  mpfr_sum_sort ((mpfr_srcptr *)tabtmp, n, perm);
-+  mpfr_sum_sort ((mpfr_srcptr *)tabtmp, n, perm, &prec);
- 
-   if (check_is_sorted (n, perm) == 0)
-     {
-@@ -300,6 +301,41 @@
-   mpfr_clears (tab[0], tab[1], tab[2], r, (mpfr_ptr) 0);
- }
- 
-+/* bug reported by Joseph S. Myers on 2013-10-27
-+   https://sympa.inria.fr/sympa/arc/mpfr/2013-10/msg00015.html */
-+static void
-+bug20131027 (void)
-+{
-+  mpfr_t r, t[4];
-+  mpfr_ptr p[4];
-+  char *s[4] = {
-+    "0x1p1000",
-+    "-0x0.fffffffffffff80000000000000001p1000",
-+    "-0x1p947",
-+    "0x1p880"
-+  };
-+  int i;
-+
-+  mpfr_init2 (r, 53);
-+  for (i = 0; i < 4; i++)
-+    {
-+      mpfr_init2 (t[i], i == 0 ? 53 : 1000);
-+      mpfr_set_str (t[i], s[i], 0, MPFR_RNDN);
-+      p[i] = t[i];
-+    }
-+  mpfr_sum (r, p, 4, MPFR_RNDN);
-+
-+  if (MPFR_NOTZERO (r))
-+    {
-+      printf ("mpfr_sum incorrect in bug20131027: expected 0, got\n");
-+      mpfr_dump (r);
-+      exit (1);
-+    }
-+
-+  for (i = 0; i < 4; i++)
-+    mpfr_clear (t[i]);
-+  mpfr_clear (r);
-+}
- 
- int
- main (void)
-@@ -310,6 +346,7 @@
-   tests_start_mpfr ();
- 
-   check_special ();
-+  bug20131027 ();
-   test_sort (1764, 1026);
-   for (p = 2 ; p < 444 ; p += 17)
-     for (n = 2 ; n < 1026 ; n += 42 + p)
diff --git a/patches/mpfr/3.1.3/270-cmp_d.patch b/patches/mpfr/3.1.3/270-cmp_d.patch
deleted file mode 100644
index f22e27a..0000000
--- a/patches/mpfr/3.1.3/270-cmp_d.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
---- mpfr-3.1.3-a/PATCHES	2016-02-23 12:28:35.578442642 +0000
-+++ mpfr-3.1.3-b/PATCHES	2016-02-23 12:28:35.602442321 +0000
-@@ -0,0 +1 @@
-+cmp_d
-diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
---- mpfr-3.1.3-a/VERSION	2016-02-23 07:55:54.052346433 +0000
-+++ mpfr-3.1.3-b/VERSION	2016-02-23 12:28:35.602442321 +0000
-@@ -1 +1 @@
--3.1.3-p16
-+3.1.3-p17
-diff -Naurd mpfr-3.1.3-a/src/cmp_d.c mpfr-3.1.3-b/src/cmp_d.c
---- mpfr-3.1.3-a/src/cmp_d.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/cmp_d.c	2016-02-23 12:28:35.590442481 +0000
-@@ -27,12 +27,19 @@
- {
-   mpfr_t tmp;
-   int res;
-+  MPFR_SAVE_EXPO_DECL (expo);
-+
-+  MPFR_SAVE_EXPO_MARK (expo);
- 
-   mpfr_init2 (tmp, IEEE_DBL_MANT_DIG);
-   res = mpfr_set_d (tmp, d, MPFR_RNDN);
-   MPFR_ASSERTD (res == 0);
-+
-+  mpfr_clear_flags ();
-   res = mpfr_cmp (b, tmp);
--  mpfr_clear (tmp);
-+  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
- 
-+  mpfr_clear (tmp);
-+  MPFR_SAVE_EXPO_FREE (expo);
-   return res;
- }
-diff -Naurd mpfr-3.1.3-a/src/cmp_ld.c mpfr-3.1.3-b/src/cmp_ld.c
---- mpfr-3.1.3-a/src/cmp_ld.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/src/cmp_ld.c	2016-02-23 12:28:35.590442481 +0000
-@@ -27,12 +27,19 @@
- {
-   mpfr_t tmp;
-   int res;
-+  MPFR_SAVE_EXPO_DECL (expo);
-+
-+  MPFR_SAVE_EXPO_MARK (expo);
- 
-   mpfr_init2 (tmp, MPFR_LDBL_MANT_DIG);
-   res = mpfr_set_ld (tmp, d, MPFR_RNDN);
-   MPFR_ASSERTD (res == 0);
-+
-+  mpfr_clear_flags ();
-   res = mpfr_cmp (b, tmp);
--  mpfr_clear (tmp);
-+  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
- 
-+  mpfr_clear (tmp);
-+  MPFR_SAVE_EXPO_FREE (expo);
-   return res;
- }
-diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
---- mpfr-3.1.3-a/src/mpfr.h	2016-02-23 07:55:54.052346433 +0000
-+++ mpfr-3.1.3-b/src/mpfr.h	2016-02-23 12:28:35.598442376 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 3
--#define MPFR_VERSION_STRING "3.1.3-p16"
-+#define MPFR_VERSION_STRING "3.1.3-p17"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
---- mpfr-3.1.3-a/src/version.c	2016-02-23 07:55:54.052346433 +0000
-+++ mpfr-3.1.3-b/src/version.c	2016-02-23 12:28:35.598442376 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.3-p16";
-+  return "3.1.3-p17";
- }
-diff -Naurd mpfr-3.1.3-a/tests/tcmp_d.c mpfr-3.1.3-b/tests/tcmp_d.c
---- mpfr-3.1.3-a/tests/tcmp_d.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tcmp_d.c	2016-02-23 12:28:35.590442481 +0000
-@@ -29,8 +29,10 @@
- main (void)
- {
-   mpfr_t x;
-+  mpfr_exp_t emin;
- 
-   tests_start_mpfr ();
-+  emin = mpfr_get_emin ();
- 
-   mpfr_init2(x, IEEE_DBL_MANT_DIG);
- 
-@@ -67,16 +69,31 @@
-       exit (1);
-     }
- 
-+  /* Test in reduced exponent range. */
-+  set_emin (1);
-+  mpfr_set_ui (x, 1, MPFR_RNDN);
-+  if (mpfr_cmp_d (x, 0.9) <= 0)
-+    {
-+      printf ("Error in reduced exponent range.\n");
-+      exit (1);
-+    }
-+  set_emin (emin);
-+
- #if !defined(MPFR_ERRDIVZERO)
-   /* Check NAN */
-   {
-     int c;
- 
--    mpfr_clear_erangeflag ();
-+    mpfr_clear_flags ();
-     c = mpfr_cmp_d (x, DBL_NAN);
--    if (c != 0 || !mpfr_erangeflag_p ())
-+    if (c != 0 || __gmpfr_flags != MPFR_FLAGS_ERANGE)
-       {
-         printf ("ERROR for NAN (1)\n");
-+        printf ("Expected 0, got %d\n", c);
-+        printf ("Expected flags:");
-+        flags_out (MPFR_FLAGS_ERANGE);
-+        printf ("Got flags:     ");
-+        flags_out (__gmpfr_flags);
- #ifdef MPFR_NANISNAN
-         printf ("The reason is that NAN == NAN. Please look at the configure "
-                 "output\nand Section \"In case of problem\" of the INSTALL "
-@@ -84,12 +101,18 @@
- #endif
-         exit (1);
-       }
-+
-     mpfr_set_nan (x);
--    mpfr_clear_erangeflag ();
-+    mpfr_clear_flags ();
-     c = mpfr_cmp_d (x, 2.0);
--    if (c != 0 || !mpfr_erangeflag_p ())
-+    if (c != 0 || __gmpfr_flags != MPFR_FLAGS_ERANGE)
-       {
-         printf ("ERROR for NAN (2)\n");
-+        printf ("Expected 0, got %d\n", c);
-+        printf ("Expected flags:");
-+        flags_out (MPFR_FLAGS_ERANGE);
-+        printf ("Got flags:     ");
-+        flags_out (__gmpfr_flags);
- #ifdef MPFR_NANISNAN
-         printf ("The reason is that NAN == NAN. Please look at the configure "
-                 "output\nand Section \"In case of problem\" of the INSTALL "
-diff -Naurd mpfr-3.1.3-a/tests/tcmp_ld.c mpfr-3.1.3-b/tests/tcmp_ld.c
---- mpfr-3.1.3-a/tests/tcmp_ld.c	2015-06-19 19:55:10.000000000 +0000
-+++ mpfr-3.1.3-b/tests/tcmp_ld.c	2016-02-23 12:28:35.590442481 +0000
-@@ -28,8 +28,10 @@
- main (void)
- {
-   mpfr_t x;
-+  mpfr_exp_t emin;
- 
-   tests_start_mpfr ();
-+  emin = mpfr_get_emin ();
- 
-   mpfr_init2(x, MPFR_LDBL_MANT_DIG);
- 
-@@ -66,16 +68,31 @@
-       exit (1);
-     }
- 
-+  /* Test in reduced exponent range. */
-+  set_emin (1);
-+  mpfr_set_ui (x, 1, MPFR_RNDN);
-+  if (mpfr_cmp_ld (x, 0.9) <= 0)
-+    {
-+      printf ("Error in reduced exponent range.\n");
-+      exit (1);
-+    }
-+  set_emin (emin);
-+
- #if !defined(MPFR_ERRDIVZERO)
-   /* Check NAN */
-   {
-     int c;
- 
--    mpfr_clear_erangeflag ();
-+    mpfr_clear_flags ();
-     c = mpfr_cmp_ld (x, DBL_NAN);
--    if (c != 0 || !mpfr_erangeflag_p ())
-+    if (c != 0 || __gmpfr_flags != MPFR_FLAGS_ERANGE)
-       {
-         printf ("ERROR for NAN (1)\n");
-+        printf ("Expected 0, got %d\n", c);
-+        printf ("Expected flags:");
-+        flags_out (MPFR_FLAGS_ERANGE);
-+        printf ("Got flags:     ");
-+        flags_out (__gmpfr_flags);
- #ifdef MPFR_NANISNAN
-         printf ("The reason is that NAN == NAN. Please look at the configure "
-                 "output\nand Section \"In case of problem\" of the INSTALL "
-@@ -83,12 +100,18 @@
- #endif
-         exit (1);
-       }
-+
-     mpfr_set_nan (x);
--    mpfr_clear_erangeflag ();
-+    mpfr_clear_flags ();
-     c = mpfr_cmp_ld (x, 2.0);
--    if (c != 0 || !mpfr_erangeflag_p ())
-+    if (c != 0 || __gmpfr_flags != MPFR_FLAGS_ERANGE)
-       {
-         printf ("ERROR for NAN (2)\n");
-+        printf ("Expected 0, got %d\n", c);
-+        printf ("Expected flags:");
-+        flags_out (MPFR_FLAGS_ERANGE);
-+        printf ("Got flags:     ");
-+        flags_out (__gmpfr_flags);
- #ifdef MPFR_NANISNAN
-         printf ("The reason is that NAN == NAN. Please look at the configure "
-                 "output\nand Section \"In case of problem\" of the INSTALL "
diff --git a/patches/ncurses/6.0/100-ncurses-6.0-20150810.patch b/patches/ncurses/6.0/100-ncurses-6.0-20150810.patch
deleted file mode 100644
index 76f238f..0000000
--- a/patches/ncurses/6.0/100-ncurses-6.0-20150810.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-# ncurses 6.0 - patch 20150810 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/5.9/ncurses-6.0-20150810.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Mon Aug 10 09:27:53 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |    7 ++++++-
-# VERSION                          |    2 +-
-# dist.mk                          |    4 ++--
-# ncurses/base/MKlib_gen.sh        |    4 ++--
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# 10 files changed, 21 insertions(+), 16 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2476 
---- ncurses-6.0-20150808+/NEWS	2015-08-08 23:29:51.000000000 +0000
-+++ ncurses-6.0-20150810/NEWS	2015-08-10 09:27:32.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2476 2015/08/08 23:29:51 tom Exp $
-+-- $Id: NEWS,v 1.2478 2015/08/10 09:27:32 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,11 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150810
-+	+ workaround for Debian #65617, which was fixed in mawk's upstream
-+	  releases in 2009 (report by Sven Joachim).  See
-+	  	http://invisible-island.net/mawk/CHANGES.html#t20090727
-+
- 20150808 6.0 release for upload to ftp.gnu.org
- 
- 20150808
-Index: VERSION
---- ncurses-6.0-20150808+/VERSION	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/VERSION	2015-08-10 09:10:29.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150808
-+5:0:9	6.0	20150810
-Index: dist.mk
-Prereq:  1.1064 
---- ncurses-6.0-20150808+/dist.mk	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/dist.mk	2015-08-10 09:10:29.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1064 2015/08/06 23:13:39 tom Exp $
-+# $Id: dist.mk,v 1.1065 2015/08/10 09:10:29 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150808
-+NCURSES_PATCH = 20150810
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/base/MKlib_gen.sh
-Prereq:  1.50 
---- ncurses-6.0-20150808+/ncurses/base/MKlib_gen.sh	2015-08-07 00:48:24.000000000 +0000
-+++ ncurses-6.0-20150810/ncurses/base/MKlib_gen.sh	2015-08-10 08:56:39.000000000 +0000
-@@ -2,7 +2,7 @@
- #
- # MKlib_gen.sh -- generate sources from curses.h macro definitions
- #
--# ($Id: MKlib_gen.sh,v 1.50 2015/08/07 00:48:24 tom Exp $)
-+# ($Id: MKlib_gen.sh,v 1.51 2015/08/10 08:56:39 tom Exp $)
- #
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
-@@ -72,7 +72,7 @@
- # appears in gcc 5.0 and (with modification) in 5.1, making it necessary to
- # determine if we are using gcc, and if so, what version because the proposed
- # solution uses a nonstandard option.
--PRG=`echo "$1" | $AWK '{ sub(/^[[:space:]]*/,""); sub(/[[:space:]].*$/, ""); print; }' || exit 0`
-+PRG=`echo "$1" | $AWK '{ sub(/^[ 	]*/,""); sub(/[ 	].*$/, ""); print; }' || exit 0`
- FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
- ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
- ONE=`echo "$ALL" | sed -e 's/\..*$//'`
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150808+/package/debian-mingw/changelog	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/debian-mingw/changelog	2015-08-10 09:10:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150808) unstable; urgency=low
-+ncurses6 (6.0+20150810) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Aug 2015 19:13:39 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Aug 2015 05:10:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150808+/package/debian-mingw64/changelog	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/debian-mingw64/changelog	2015-08-10 09:10:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150808) unstable; urgency=low
-+ncurses6 (6.0+20150810) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Aug 2015 19:13:39 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Aug 2015 05:10:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150808+/package/debian/changelog	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/debian/changelog	2015-08-10 09:10:29.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150808) unstable; urgency=low
-+ncurses6 (6.0+20150810) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 06 Aug 2015 19:13:39 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Aug 2015 05:10:29 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.117 
---- ncurses-6.0-20150808+/package/mingw-ncurses.nsi	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/mingw-ncurses.nsi	2015-08-10 09:10:30.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.117 2015/08/06 23:13:39 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.118 2015/08/10 09:10:30 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0808"

-+!define VERSION_MMDD  "0810"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150808+/package/mingw-ncurses.spec	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/mingw-ncurses.spec	2015-08-10 09:10:29.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150808
-+Release: 20150810
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150808+/package/ncurses.spec	2015-08-06 23:13:39.000000000 +0000
-+++ ncurses-6.0-20150810/package/ncurses.spec	2015-08-10 09:10:29.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150808
-+Release: 20150810
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/patches/ncurses/6.0/110-ncurses-6.0-20150815.patch b/patches/ncurses/6.0/110-ncurses-6.0-20150815.patch
deleted file mode 100644
index 21fe06e..0000000
--- a/patches/ncurses/6.0/110-ncurses-6.0-20150815.patch
+++ /dev/null
@@ -1,11415 +0,0 @@
-# ncurses 6.0 - patch 20150815 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/5.9/ncurses-6.0-20150815.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sat Aug 15 23:50:26 UTC 2015
-# ------------------------------------------------------------------------------
-# INSTALL                          |   83 -
-# NEWS                             |    8 
-# VERSION                          |    2 
-# aclocal.m4                       |    9 
-# configure                        | 2920 ++++++++++++++++++-------------------
-# dist.mk                          |    4 
-# form/llib-lform                  |    4 
-# form/llib-lformt                 |    6 
-# form/llib-lformtw                |    4 
-# form/llib-lformw                 |    4 
-# menu/llib-lmenu                  |    4 
-# menu/llib-lmenut                 |    4 
-# menu/llib-lmenutw                |    6 
-# menu/llib-lmenuw                 |    6 
-# ncurses/llib-lncurses            |   22 
-# ncurses/llib-lncursest           |   22 
-# ncurses/llib-lncursestw          |   22 
-# ncurses/llib-lncursesw           |   51 
-# ncurses/llib-ltic                |   11 
-# ncurses/llib-ltict               |   11 
-# ncurses/llib-ltictw              |   11 
-# ncurses/llib-lticw               |   11 
-# ncurses/llib-ltinfo              |   39 
-# ncurses/llib-ltinfot             |   41 
-# ncurses/llib-ltinfotw            |   39 
-# ncurses/llib-ltinfow             |   39 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# panel/llib-lpanelt               |    2 
-# panel/llib-lpaneltw              |    2 
-# 34 files changed, 1579 insertions(+), 1828 deletions(-)
-# ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.187 
---- ncurses-6.0-20150810+/INSTALL	2015-07-16 23:59:08.000000000 +0000
-+++ ncurses-6.0-20150815/INSTALL	2015-08-15 20:11:48.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.187 2015/07/16 23:59:08 tom Exp $
-+-- $Id: INSTALL,v 1.192 2015/08/15 20:11:48 tom Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -196,17 +196,16 @@
-     NOTE: You must have installed the terminfo database, or set the
-     environment variable $TERMINFO to point to a SVr4-compatible terminfo
-     database before running the test programs.  Not all vendors' terminfo
--    databases are SVr4-compatible, but most seem to be.  Exceptions include
--    DEC's Digital Unix (formerly known as OSF/1).
-+    databases are SVr4-compatible, but most seem to be.
-+
-+    It is possible to configure ncurses to use other terminfo database formats.
-+    A few are provided as examples in the include-directory (see --with-caps).
- 
-     If you run the test programs WITHOUT installing terminfo, ncurses may
-     read the termcap file and cache that in $HOME/.terminfo, which will
-     thereafter be used instead of the terminfo database.  See the comments
-     on "--enable-getcap-cache", to see why this is a Bad Thing.
- 
--    It is possible to configure ncurses to use other terminfo database formats.
--    A few are provided as examples in the include-directory (see --with-caps).
--
-     The ncurses program is designed specifically to test the ncurses library.
-     You can use it to verify that the screen highlights work correctly, that
-     cursor addressing and window scrolling works OK, etc.
-@@ -227,8 +226,7 @@
-   ############################################################################
-   #     CAVEAT EMPTOR: `install.data' run as root will NUKE any existing     #
-   #  terminfo database. If you have any custom or unusual entries SAVE them  #
--  #  before you install ncurses.  I have a file called terminfo.custom for   #
--  #  this purpose.  Don't forget to run tic on the file once you're done.    #
-+  #  before you install ncurses.                                             #
-   ############################################################################
- 
-     The terminfo(5) manual page must be preprocessed with tbl(1) before
-@@ -1246,19 +1244,60 @@
- COMPATIBILITY WITH OLDER VERSIONS OF NCURSES:
- --------------------------------------------
- 
--    Because ncurses implements the X/Open Curses Specification, its interface
--    is fairly stable.  That does not mean the interface does not change.
--    Changes are made to the documented interfaces when we find differences
--    between ncurses and X/Open or implementations which they certify (such as
--    Solaris).  We add extensions to those interfaces to solve problems not
--    addressed by the original curses design, but those must not conflict with
--    the X/Open documentation.
-+    Because ncurses implements X/Open Curses, its interface is fairly stable. 
-+    That does not mean the interface does not change.  Changes are made to the
-+    documented interfaces when we find differences between ncurses and X/Open
-+    or implementations which largely correspond to X/Open (such as Solaris). 
-+    We add extensions to those interfaces to solve problems not addressed by
-+    the original curses design, but those must not conflict with the X/Open
-+    documentation.
- 
-     Here are some of the major interface changes, and related problems which
-     you may encounter when building a system with different versions of
-     ncurses:
- 
--    6.0 (??? ??, 2015)
-+    6.0 (Aug 08, 2015)
-+	Interface changes:
-+
-+	+ The 6.0 ABI modifies the defaults for these configure options:
-+	   --enable-const
-+	   --enable-ext-colors
-+	   --enable-ext-mouse
-+	   --enable-ext-putwin
-+	   --enable-interop
-+	   --enable-lp64
-+	   --enable-sp-funcs
-+	   --with-chtype=uint32_t
-+	   --with-mmask_t=uint32_t
-+	   --with-tparm-arg=intptr_t
-+
-+	+ ncurses supports symbol versioning.  If you use this feature, about
-+	  half of the "_nc_" private symbols are changed to local symbols.
-+
-+	+ a few applications may need to explicitly flush the standard output
-+	  when switching between printf's and (curses) printw.
-+
-+	Added extensions:
-+
-+	+ use_tioctl is an improvement over use_env
-+
-+	+ added wgetdelay to support the NCURSES_OPAQUE feature.
-+
-+	Added internal functions (other than "_sp" variants):
-+		_nc_init_termtype
-+		_nc_mvcur
-+		_nc_putchar
-+		_nc_setenv_num
-+		_nc_trace_mmask_t
-+
-+	Removed internal functions:
-+		none
-+
-+	Modified internal functions:
-+		_nc_do_color - change parameters from short/bool to int
-+		_nc_keypad - change parameter from bool to int
-+		_nc_setupscreen - change parameter from bool to int
-+		_nc_signal_handler - change parameter from bool to int
- 
-     5.9 (Apr 04, 2011)
-     5.8 (Feb 26, 2011)
-@@ -1811,9 +1850,10 @@
-     Configuration and Installation:
- 
- 	On platforms where ncurses is assumed to be installed in /usr/lib,
--	the configure script uses "/usr" as a default:
-+	the configure script uses "/usr" as a default.  These include any
-+	that use the Linux kernel, as well as these special cases:
- 
--		GNU/Linux, FreeBSD, NetBSD, OpenBSD, Cygwin
-+		FreeBSD, NetBSD, OpenBSD, Cygwin, MinGW
- 
- 	For other platforms, the default is "/usr/local".  See the discussion
- 	of the "--disable-overwrite" option.
-@@ -1974,11 +2014,10 @@
- They have to do with the ncurses library, which uses terminfo rather
- than termcap for describing terminal characteristics.
- 
--Though the ncurses library is terminfo-based, it will interpret your
-+Though the ncurses library is terminfo-based, it can interpret your
- TERMCAP variable (if present), any local termcap files you reference
--through it, and the system termcap file.  However, in order to avoid
--slowing down your application startup, it will only do this once per
--terminal type!
-+through it, and the system termcap file.  However, to avoid slowing
-+down your application startup, it does this only once per terminal type!
- 
- The first time you load a given terminal type from your termcap
- database, the library initialization code will automatically write it
-Index: NEWS
-Prereq:  1.2478 
---- ncurses-6.0-20150810+/NEWS	2015-08-10 09:27:32.000000000 +0000
-+++ ncurses-6.0-20150815/NEWS	2015-08-15 22:33:55.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2478 2015/08/10 09:27:32 tom Exp $
-+-- $Id: NEWS,v 1.2481 2015/08/15 22:33:55 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150815
-+	+ disallow "no" as a possible value for "--with-shlib-version" option,
-+	  overlooked in cleanup-changes for 20000708 (report by Tommy Alex).
-+	+ update release notes in INSTALL.
-+	+ regenerate llib-* files to help with review for release notes.
-+
- 20150810
- 	+ workaround for Debian #65617, which was fixed in mawk's upstream
- 	  releases in 2009 (report by Sven Joachim).  See
-Index: VERSION
---- ncurses-6.0-20150810+/VERSION	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/VERSION	2015-08-15 15:13:47.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150810
-+5:0:9	6.0	20150815
-Index: aclocal.m4
-Prereq:  1.761 
---- ncurses-6.0-20150810+/aclocal.m4	2015-08-06 00:46:34.000000000 +0000
-+++ ncurses-6.0-20150815/aclocal.m4	2015-08-15 22:39:55.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.761 2015/08/06 00:46:34 tom Exp $
-+dnl $Id: aclocal.m4,v 1.762 2015/08/15 22:39:55 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -5511,7 +5511,7 @@
- AC_SUBST(EXTRA_LDFLAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SHARED_OPTS version: 88 updated: 2015/08/05 20:44:28
-+dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59
- dnl --------------
- dnl --------------
- dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -5564,11 +5564,12 @@
- 	(yes)
- 		cf_cv_shlib_version=auto
- 		;;
--	(rel|abi|auto|no)
-+	(rel|abi|auto)
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
-+		AC_MSG_RESULT($withval)
-+		AC_MSG_ERROR([option value must be one of: rel, abi, or auto])
- 		;;
- 	esac
- 	],[cf_cv_shlib_version=auto])
-Index: configure
---- ncurses-6.0-20150810+/configure	2015-08-05 09:20:32.000000000 +0000
-+++ ncurses-6.0-20150815/configure	2015-08-15 22:38:44.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.618 .
-+# From configure.in Revision: 1.619 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20141204.
- #
-@@ -5966,12 +5966,14 @@
- 	(yes)
- 		cf_cv_shlib_version=auto
- 		;;
--	(rel|abi|auto|no)
-+	(rel|abi|auto)
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		{ { echo "$as_me:5973: error: option value must be one of: rel, abi, auto or no" >&5
--echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
-+		echo "$as_me:5973: result: $withval" >&5
-+echo "${ECHO_T}$withval" >&6
-+		{ { echo "$as_me:5975: error: option value must be one of: rel, abi, or auto" >&5
-+echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	esac
-@@ -5979,7 +5981,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5982: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5984: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -5989,14 +5991,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:5992: checking which $CC option to use" >&5
-+		echo "$as_me:5994: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5999 "configure"
-+#line 6001 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6008,16 +6010,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6011: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6013: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6014: \$? = $ac_status" >&5
-+  echo "$as_me:6016: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6017: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6019: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6020: \$? = $ac_status" >&5
-+  echo "$as_me:6022: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6026,7 +6028,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6029: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6031: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6097,7 +6099,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6100: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6102: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6106,7 +6108,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6109 "configure"
-+#line 6111 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6118,16 +6120,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6121: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6123: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6124: \$? = $ac_status" >&5
-+  echo "$as_me:6126: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6127: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6130: \$? = $ac_status" >&5
-+  echo "$as_me:6132: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6138,7 +6140,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6141: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6143: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6363,7 +6365,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6366 "configure"
-+#line 6368 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6375,16 +6377,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6378: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6380: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6381: \$? = $ac_status" >&5
-+  echo "$as_me:6383: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6384: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6386: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6387: \$? = $ac_status" >&5
-+  echo "$as_me:6389: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6421,7 +6423,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6424: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6426: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6431,7 +6433,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 6434 "${as_me:-configure}"
-+#line 6436 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -6443,18 +6445,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6446: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6448: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6448: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6450: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6451: \$? = $ac_status" >&5
-+  echo "$as_me:6453: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6453: result: yes" >&5
-+				echo "$as_me:6455: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6457: result: no" >&5
-+				echo "$as_me:6459: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6469,17 +6471,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6472: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6474: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6476: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6478: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6482: checking for additional libtool options" >&5
-+echo "$as_me:6484: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6489,7 +6491,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6492: result: $with_libtool_opts" >&5
-+echo "$as_me:6494: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6500,7 +6502,7 @@
- 	;;
- esac
- 
--echo "$as_me:6503: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6505: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6515,7 +6517,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6518: result: $with_export_syms" >&5
-+echo "$as_me:6520: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6526,12 +6528,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6529: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6531: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6534: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6536: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6546,7 +6548,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6549: result: $with_versioned_syms" >&5
-+echo "$as_me:6551: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6562,7 +6564,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6565: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6567: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6570,11 +6572,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6573: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6575: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6577: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6579: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6586,7 +6588,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6589: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6591: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6623,7 +6625,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <<EOF
--#line 6626 "configure"
-+#line 6628 "configure"
- int	_ismissing(void) { return 1; }
- int	_localf1(void) { return 1; }
- int	_localf2(void) { return 2; }
-@@ -6654,7 +6656,7 @@
- 			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6657: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6659: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6665,7 +6667,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6668: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6670: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6682,13 +6684,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6685: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6687: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6691: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6693: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -6705,21 +6707,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6708: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6710: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:6712: checking for updated LDFLAGS" >&5
-+echo "$as_me:6714: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:6715: result: maybe" >&5
-+	echo "$as_me:6717: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:6722: checking for $ac_word" >&5
-+echo "$as_me:6724: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6734,7 +6736,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:6737: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6739: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6742,10 +6744,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6745: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6747: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6748: result: no" >&5
-+  echo "$as_me:6750: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6759,7 +6761,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6762 "configure"
-+#line 6764 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6771,16 +6773,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6774: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6776: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6777: \$? = $ac_status" >&5
-+  echo "$as_me:6779: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6783: \$? = $ac_status" >&5
-+  echo "$as_me:6785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -6808,7 +6810,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6811: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6813: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6820,11 +6822,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6823: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6825: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6827: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6829: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6861,7 +6863,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6864: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6866: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6874,11 +6876,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6877: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6879: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6881: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6883: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6915,7 +6917,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6918: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6920: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6928,14 +6930,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6931: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6933: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6935: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6937: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6938: result: no" >&5
-+	echo "$as_me:6940: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6946,7 +6948,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6949: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6951: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6965,11 +6967,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6968: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6970: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6972: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6974: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6979,10 +6981,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6982: result: $with_overwrite" >&5
-+echo "$as_me:6984: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6985: checking if external terminfo-database is used" >&5
-+echo "$as_me:6987: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -6992,7 +6994,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:6995: result: $use_database" >&5
-+echo "$as_me:6997: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7008,7 +7010,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7011: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7013: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7016,10 +7018,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7019: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7021: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7022: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7024: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7029,13 +7031,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7032: result: $with_hashed_db" >&5
-+	echo "$as_me:7034: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7038: checking for list of fallback descriptions" >&5
-+echo "$as_me:7040: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7045,11 +7047,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7048: result: $with_fallback" >&5
-+echo "$as_me:7050: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7052: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7054: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7063,11 +7065,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7066: result: $with_xterm_new" >&5
-+echo "$as_me:7068: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7070: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7072: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7088,7 +7090,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7091: result: $with_xterm_kbs" >&5
-+echo "$as_me:7093: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7098,7 +7100,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7101: checking for list of terminfo directories" >&5
-+echo "$as_me:7103: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7138,7 +7140,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7141: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7143: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7161,14 +7163,14 @@
- 	;;
- esac
- 
--echo "$as_me:7164: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7166: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <<EOF
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:7171: checking for default terminfo directory" >&5
-+echo "$as_me:7173: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7204,7 +7206,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7207: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7209: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7213,7 +7215,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7216: result: $TERMINFO" >&5
-+echo "$as_me:7218: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -7224,7 +7226,7 @@
- 
- ###	use option --disable-big-core to make tic run on small machines
- ###	We need 4Mb, check if we can allocate 50% more than that.
--echo "$as_me:7227: checking if big-core option selected" >&5
-+echo "$as_me:7229: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7236,7 +7238,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7239 "configure"
-+#line 7241 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7250,15 +7252,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7253: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7255: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7256: \$? = $ac_status" >&5
-+  echo "$as_me:7258: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7258: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7260: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7261: \$? = $ac_status" >&5
-+  echo "$as_me:7263: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7270,7 +7272,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:7273: result: $with_big_core" >&5
-+echo "$as_me:7275: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7280,7 +7282,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7283: checking if big-strings option selected" >&5
-+echo "$as_me:7285: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7304,14 +7306,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7307: result: $with_big_strings" >&5
-+echo "$as_me:7309: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7314: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7316: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7321,14 +7323,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7324: result: $with_termcap" >&5
-+echo "$as_me:7326: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7331: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7333: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7341,13 +7343,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7344: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7346: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7350: checking for list of termcap files" >&5
-+	echo "$as_me:7352: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7387,7 +7389,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7390: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7392: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7410,7 +7412,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7413: result: $TERMPATH" >&5
-+	echo "$as_me:7415: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <<EOF
-@@ -7418,7 +7420,7 @@
- EOF
- 
- 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
--	echo "$as_me:7421: checking if fast termcap-loader is needed" >&5
-+	echo "$as_me:7423: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7428,14 +7430,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7431: result: $with_getcap" >&5
-+	echo "$as_me:7433: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7438: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7440: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7445,7 +7447,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7448: result: $with_getcap_cache" >&5
-+	echo "$as_me:7450: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7455,7 +7457,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7458: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7460: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7465,14 +7467,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7468: result: $with_home_terminfo" >&5
-+echo "$as_me:7470: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7475: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7477: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7482,7 +7484,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7485: result: $with_root_environ" >&5
-+echo "$as_me:7487: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7497,13 +7499,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7500: checking for $ac_func" >&5
-+echo "$as_me:7502: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7506 "configure"
-+#line 7508 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7534,16 +7536,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7537: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7539: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7540: \$? = $ac_status" >&5
-+  echo "$as_me:7542: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7543: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7545: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7546: \$? = $ac_status" >&5
-+  echo "$as_me:7548: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7553,7 +7555,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7556: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7558: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7570,13 +7572,13 @@
- 		symlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7573: checking for $ac_func" >&5
-+echo "$as_me:7575: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7579 "configure"
-+#line 7581 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7607,16 +7609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7610: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7612: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7613: \$? = $ac_status" >&5
-+  echo "$as_me:7615: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7616: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7619: \$? = $ac_status" >&5
-+  echo "$as_me:7621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7626,7 +7628,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7629: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7631: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7637,7 +7639,7 @@
- done
- 
- else
--	echo "$as_me:7640: checking if link/symlink functions work" >&5
-+	echo "$as_me:7642: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7650,7 +7652,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7653 "configure"
-+#line 7655 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -7680,15 +7682,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7683: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7685: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7686: \$? = $ac_status" >&5
-+  echo "$as_me:7688: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7688: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7690: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7691: \$? = $ac_status" >&5
-+  echo "$as_me:7693: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7706,7 +7708,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:7709: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7711: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7726,7 +7728,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7729: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7731: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7736,21 +7738,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:7739: result: $with_symlinks" >&5
-+	echo "$as_me:7741: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--	echo "$as_me:7746: checking if tic should use hard links" >&5
-+	echo "$as_me:7748: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:7753: result: $with_links" >&5
-+	echo "$as_me:7755: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7765,7 +7767,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7768: checking if you want broken-linker support code" >&5
-+echo "$as_me:7770: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7775,7 +7777,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7778: result: $with_broken_linker" >&5
-+echo "$as_me:7780: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -7797,14 +7799,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:7800: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7802: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7807: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7809: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7814,7 +7816,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:7817: result: $with_bsdpad" >&5
-+echo "$as_me:7819: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7871,14 +7873,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:7874: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7876: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7881 "configure"
-+#line 7883 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7893,16 +7895,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7896: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7898: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7899: \$? = $ac_status" >&5
-+  echo "$as_me:7901: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7902: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7904: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7905: \$? = $ac_status" >&5
-+  echo "$as_me:7907: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7911,7 +7913,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7914 "configure"
-+#line 7916 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7926,16 +7928,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7929: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7932: \$? = $ac_status" >&5
-+  echo "$as_me:7934: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7935: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7937: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7938: \$? = $ac_status" >&5
-+  echo "$as_me:7940: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7950,7 +7952,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7953: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7955: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -7975,16 +7977,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:7978: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7980: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:7984: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7986: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7987 "configure"
-+#line 7989 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7999,16 +8001,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8002: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8004: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8005: \$? = $ac_status" >&5
-+  echo "$as_me:8007: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8010: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8011: \$? = $ac_status" >&5
-+  echo "$as_me:8013: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8029,7 +8031,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8032 "configure"
-+#line 8034 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8044,16 +8046,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8047: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8049: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8050: \$? = $ac_status" >&5
-+  echo "$as_me:8052: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8053: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8055: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8056: \$? = $ac_status" >&5
-+  echo "$as_me:8058: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8064,15 +8066,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8067: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8069: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8072: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8074: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8075 "configure"
-+#line 8077 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8087,16 +8089,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8090: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8092: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8093: \$? = $ac_status" >&5
-+  echo "$as_me:8095: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8096: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8098: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8099: \$? = $ac_status" >&5
-+  echo "$as_me:8101: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8112,7 +8114,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8115: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8117: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8230,14 +8232,14 @@
- 	;;
- (*)
- 
--echo "$as_me:8233: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8235: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8240 "configure"
-+#line 8242 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8256,16 +8258,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8259: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8261: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8262: \$? = $ac_status" >&5
-+  echo "$as_me:8264: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8265: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8267: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8268: \$? = $ac_status" >&5
-+  echo "$as_me:8270: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8274,7 +8276,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8277 "configure"
-+#line 8279 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8293,16 +8295,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8296: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8299: \$? = $ac_status" >&5
-+  echo "$as_me:8301: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8302: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8304: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8305: \$? = $ac_status" >&5
-+  echo "$as_me:8307: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8317,7 +8319,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8320: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8322: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -8425,16 +8427,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:8428: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8430: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:8434: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8436: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8437 "configure"
-+#line 8439 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8449,16 +8451,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8452: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8454: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8455: \$? = $ac_status" >&5
-+  echo "$as_me:8457: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8458: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8460: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8461: \$? = $ac_status" >&5
-+  echo "$as_me:8463: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8479,7 +8481,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8482 "configure"
-+#line 8484 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8494,16 +8496,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8497: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8500: \$? = $ac_status" >&5
-+  echo "$as_me:8502: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8503: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8505: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8506: \$? = $ac_status" >&5
-+  echo "$as_me:8508: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8514,15 +8516,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8517: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8519: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8522: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8524: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8525 "configure"
-+#line 8527 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8537,16 +8539,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8540: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8542: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8543: \$? = $ac_status" >&5
-+  echo "$as_me:8545: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8546: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8548: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8549: \$? = $ac_status" >&5
-+  echo "$as_me:8551: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8562,7 +8564,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8565: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8567: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8720,7 +8722,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:8723: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8725: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -8728,7 +8730,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8731: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8733: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -8736,7 +8738,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8739: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8741: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -8744,10 +8746,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8747: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8749: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8750 "configure"
-+#line 8752 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8762,16 +8764,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8765: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8767: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8768: \$? = $ac_status" >&5
-+  echo "$as_me:8770: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8773: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8774: \$? = $ac_status" >&5
-+  echo "$as_me:8776: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8780,12 +8782,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8783: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8785: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8788 "configure"
-+#line 8790 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8800,16 +8802,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8803: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8805: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8806: \$? = $ac_status" >&5
-+  echo "$as_me:8808: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8809: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8811: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8812: \$? = $ac_status" >&5
-+  echo "$as_me:8814: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -8820,19 +8822,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:8823: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8825: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:8828: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8830: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8835 "configure"
-+#line 8837 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8851,16 +8853,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8854: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8856: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8857: \$? = $ac_status" >&5
-+  echo "$as_me:8859: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8860: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8863: \$? = $ac_status" >&5
-+  echo "$as_me:8865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8869,7 +8871,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8872 "configure"
-+#line 8874 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8888,16 +8890,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8891: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8893: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8894: \$? = $ac_status" >&5
-+  echo "$as_me:8896: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8897: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8899: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8900: \$? = $ac_status" >&5
-+  echo "$as_me:8902: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8912,7 +8914,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8915: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8917: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9014,14 +9016,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:9017: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9019: checking if SIGWINCH is defined" >&5
- echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
- if test "${cf_cv_define_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9024 "configure"
-+#line 9026 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9036,23 +9038,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9039: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9041: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9042: \$? = $ac_status" >&5
-+  echo "$as_me:9044: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9045: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9047: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9048: \$? = $ac_status" >&5
-+  echo "$as_me:9050: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 9055 "configure"
-+#line 9057 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9070,16 +9072,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9073: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9075: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9076: \$? = $ac_status" >&5
-+  echo "$as_me:9078: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9079: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9081: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9082: \$? = $ac_status" >&5
-+  echo "$as_me:9084: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9093,11 +9095,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9096: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9098: result: $cf_cv_define_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
- 
- if test "$cf_cv_define_sigwinch" = maybe ; then
--echo "$as_me:9100: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9102: checking for actual SIGWINCH definition" >&5
- echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
- if test "${cf_cv_fixup_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9108,7 +9110,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9111 "configure"
-+#line 9113 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9130,16 +9132,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9133: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9135: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9136: \$? = $ac_status" >&5
-+  echo "$as_me:9138: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9139: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9141: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9142: \$? = $ac_status" >&5
-+  echo "$as_me:9144: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -9153,7 +9155,7 @@
- done
- 
- fi
--echo "$as_me:9156: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9158: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9163,13 +9165,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:9166: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9168: checking for nl_langinfo and CODESET" >&5
- echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
- if test "${am_cv_langinfo_codeset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9172 "configure"
-+#line 9174 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -9181,16 +9183,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9184: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9186: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9187: \$? = $ac_status" >&5
-+  echo "$as_me:9189: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9190: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9192: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9193: \$? = $ac_status" >&5
-+  echo "$as_me:9195: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9201,7 +9203,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9204: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9206: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -9215,7 +9217,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:9218: checking if you want wide-character code" >&5
-+echo "$as_me:9220: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -9225,7 +9227,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9228: result: $with_widec" >&5
-+echo "$as_me:9230: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9240,14 +9242,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9243: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9245: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9250 "configure"
-+#line 9252 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9264,16 +9266,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9267: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9269: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9270: \$? = $ac_status" >&5
-+  echo "$as_me:9272: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9273: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9275: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9276: \$? = $ac_status" >&5
-+  echo "$as_me:9278: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9283,16 +9285,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9286: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9288: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9292: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9294: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9295 "configure"
-+#line 9297 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9308,16 +9310,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9311: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9313: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9314: \$? = $ac_status" >&5
-+  echo "$as_me:9316: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9317: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9319: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9320: \$? = $ac_status" >&5
-+  echo "$as_me:9322: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9326,16 +9328,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9329: result: $cf_result" >&5
-+echo "$as_me:9331: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9335: checking checking for compatible value versus " >&5
-+	echo "$as_me:9337: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9338 "configure"
-+#line 9340 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9351,16 +9353,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9354: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9356: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9357: \$? = $ac_status" >&5
-+  echo "$as_me:9359: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9360: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9362: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9363: \$? = $ac_status" >&5
-+  echo "$as_me:9365: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9369,7 +9371,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9372: result: $cf_result" >&5
-+	echo "$as_me:9374: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9385,13 +9387,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9388: checking for $ac_func" >&5
-+echo "$as_me:9390: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9394 "configure"
-+#line 9396 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9422,16 +9424,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9425: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9427: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9428: \$? = $ac_status" >&5
-+  echo "$as_me:9430: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9431: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9433: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9434: \$? = $ac_status" >&5
-+  echo "$as_me:9436: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9441,7 +9443,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9444: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9446: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9453,7 +9455,7 @@
- 
- 	if test "x$ac_cv_func_putwc" != xyes ; then
- 
--echo "$as_me:9456: checking for multibyte character support" >&5
-+echo "$as_me:9458: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9461,7 +9463,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9464 "configure"
-+#line 9466 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9474,16 +9476,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9477: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9479: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9480: \$? = $ac_status" >&5
-+  echo "$as_me:9482: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9483: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9485: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9486: \$? = $ac_status" >&5
-+  echo "$as_me:9488: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9495,12 +9497,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9498: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9500: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9503 "configure"
-+#line 9505 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9513,16 +9515,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9516: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9518: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9519: \$? = $ac_status" >&5
-+  echo "$as_me:9521: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9522: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9524: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9525: \$? = $ac_status" >&5
-+  echo "$as_me:9527: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9536,7 +9538,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9539 "configure"
-+#line 9541 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9549,16 +9551,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9552: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9554: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9555: \$? = $ac_status" >&5
-+  echo "$as_me:9557: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9558: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9560: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9561: \$? = $ac_status" >&5
-+  echo "$as_me:9563: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9575,9 +9577,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9578: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9580: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9580: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9582: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9668,11 +9670,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9671: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9673: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9675 "configure"
-+#line 9677 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9685,21 +9687,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9690: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9691: \$? = $ac_status" >&5
-+  echo "$as_me:9693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9694: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9697: \$? = $ac_status" >&5
-+  echo "$as_me:9699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9702: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9704: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9717,7 +9719,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9720: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9722: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9792,13 +9794,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9795: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9797: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 9801 "configure"
-+#line 9803 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9811,21 +9813,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9814: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9816: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9817: \$? = $ac_status" >&5
-+  echo "$as_me:9819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9820: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9823: \$? = $ac_status" >&5
-+  echo "$as_me:9825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9828: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9830: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9867,7 +9869,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9870: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9872: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -9902,7 +9904,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9905 "configure"
-+#line 9907 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9914,16 +9916,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9917: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9920: \$? = $ac_status" >&5
-+  echo "$as_me:9922: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9923: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9925: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9926: \$? = $ac_status" >&5
-+  echo "$as_me:9928: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9940,7 +9942,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9943: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9945: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9976,7 +9978,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9979: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9981: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10008,14 +10010,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10011: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10013: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10018 "configure"
-+#line 10020 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10033,23 +10035,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10036: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10038: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10039: \$? = $ac_status" >&5
-+  echo "$as_me:10041: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10042: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10044: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10045: \$? = $ac_status" >&5
-+  echo "$as_me:10047: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10052 "configure"
-+#line 10054 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10068,16 +10070,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10071: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10073: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10074: \$? = $ac_status" >&5
-+  echo "$as_me:10076: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10077: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10079: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10080: \$? = $ac_status" >&5
-+  echo "$as_me:10082: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10089,7 +10091,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10092: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10094: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10107,14 +10109,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10110: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10112: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10117 "configure"
-+#line 10119 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10132,23 +10134,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10135: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10137: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10138: \$? = $ac_status" >&5
-+  echo "$as_me:10140: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10141: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10143: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10144: \$? = $ac_status" >&5
-+  echo "$as_me:10146: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10151 "configure"
-+#line 10153 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10167,16 +10169,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10170: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10173: \$? = $ac_status" >&5
-+  echo "$as_me:10175: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10176: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10178: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10179: \$? = $ac_status" >&5
-+  echo "$as_me:10181: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10188,7 +10190,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10191: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10193: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10211,14 +10213,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10214: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10216: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10221 "configure"
-+#line 10223 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10236,23 +10238,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10239: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10241: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10242: \$? = $ac_status" >&5
-+  echo "$as_me:10244: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10245: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10247: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10248: \$? = $ac_status" >&5
-+  echo "$as_me:10250: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10255 "configure"
-+#line 10257 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10271,16 +10273,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10274: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10276: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10277: \$? = $ac_status" >&5
-+  echo "$as_me:10279: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10280: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10282: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10283: \$? = $ac_status" >&5
-+  echo "$as_me:10285: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10292,7 +10294,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10295: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10297: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10324,7 +10326,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10327: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10329: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10334,7 +10336,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10337: result: $with_lp64" >&5
-+echo "$as_me:10339: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10350,7 +10352,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10353: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10355: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10362,7 +10364,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10365 "configure"
-+#line 10367 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10382,16 +10384,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10385: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10387: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10388: \$? = $ac_status" >&5
-+  echo "$as_me:10390: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10391: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10393: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10394: \$? = $ac_status" >&5
-+  echo "$as_me:10396: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10401,16 +10403,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10404: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10406: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10407: \$? = $ac_status" >&5
-+  echo "$as_me:10409: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10410: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10412: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10413: \$? = $ac_status" >&5
-+  echo "$as_me:10415: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10424,13 +10426,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10427: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10429: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10433: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10435: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10438,7 +10440,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10441 "configure"
-+#line 10443 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10458,16 +10460,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10461: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10463: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10464: \$? = $ac_status" >&5
-+  echo "$as_me:10466: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10467: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10470: \$? = $ac_status" >&5
-+  echo "$as_me:10472: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10476,7 +10478,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10479 "configure"
-+#line 10481 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -10497,16 +10499,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10500: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10502: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10503: \$? = $ac_status" >&5
-+  echo "$as_me:10505: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10506: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10509: \$? = $ac_status" >&5
-+  echo "$as_me:10511: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10517,7 +10519,7 @@
-   break
- done
- fi
--echo "$as_me:10520: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10522: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -10527,7 +10529,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10530: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10532: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10535,7 +10537,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10538 "configure"
-+#line 10540 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10555,16 +10557,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10558: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10560: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10561: \$? = $ac_status" >&5
-+  echo "$as_me:10563: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10564: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10566: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10567: \$? = $ac_status" >&5
-+  echo "$as_me:10569: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10573,7 +10575,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10576 "configure"
-+#line 10578 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -10594,16 +10596,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10597: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10600: \$? = $ac_status" >&5
-+  echo "$as_me:10602: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10603: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10605: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10606: \$? = $ac_status" >&5
-+  echo "$as_me:10608: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10614,7 +10616,7 @@
-   break
- done
- fi
--echo "$as_me:10617: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10619: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -10627,7 +10629,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10630: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10632: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10635,7 +10637,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10638 "configure"
-+#line 10640 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10647,16 +10649,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10650: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10652: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10653: \$? = $ac_status" >&5
-+  echo "$as_me:10655: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10658: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10659: \$? = $ac_status" >&5
-+  echo "$as_me:10661: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10665,7 +10667,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10668 "configure"
-+#line 10670 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -10678,16 +10680,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10681: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10683: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10684: \$? = $ac_status" >&5
-+  echo "$as_me:10686: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10687: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10689: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10690: \$? = $ac_status" >&5
-+  echo "$as_me:10692: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10698,7 +10700,7 @@
-   break
- done
- fi
--echo "$as_me:10701: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10703: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -10712,13 +10714,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:10715: checking for fseeko" >&5
-+echo "$as_me:10717: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10721 "configure"
-+#line 10723 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10730,16 +10732,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10733: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10735: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10736: \$? = $ac_status" >&5
-+  echo "$as_me:10738: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10739: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10741: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10742: \$? = $ac_status" >&5
-+  echo "$as_me:10744: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10749,7 +10751,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10752: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10754: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10770,14 +10772,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:10773: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10775: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10780 "configure"
-+#line 10782 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10798,16 +10800,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10801: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10803: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10804: \$? = $ac_status" >&5
-+  echo "$as_me:10806: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10809: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10810: \$? = $ac_status" >&5
-+  echo "$as_me:10812: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10818,7 +10820,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10821: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10823: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10828,7 +10830,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10831: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10833: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10838,14 +10840,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10841: result: $with_tparm_varargs" >&5
-+echo "$as_me:10843: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10848: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10850: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10855,14 +10857,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10858: result: $with_tic_depends" >&5
-+echo "$as_me:10860: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10865: checking for type of bool" >&5
-+echo "$as_me:10867: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10872,10 +10874,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10875: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10877: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10878: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10880: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10886,11 +10888,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10889: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10891: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10893: checking for type of chtype" >&5
-+echo "$as_me:10895: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10900,11 +10902,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10903: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10905: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10907: checking for type of ospeed" >&5
-+echo "$as_me:10909: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10914,11 +10916,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10917: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10919: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10921: checking for type of mmask_t" >&5
-+echo "$as_me:10923: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10928,11 +10930,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10931: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10933: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10935: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10937: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10942,11 +10944,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10945: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10947: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10949: checking for type of tparm args" >&5
-+echo "$as_me:10951: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10956,11 +10958,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10959: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10961: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10963: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10965: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10970,7 +10972,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10973: result: $with_rcs_ids" >&5
-+echo "$as_me:10975: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10979,7 +10981,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10982: checking format of man-pages" >&5
-+echo "$as_me:10984: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11068,14 +11070,14 @@
- 	;;
- esac
- 
--echo "$as_me:11071: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11073: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11074: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11076: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11078: checking for manpage renaming" >&5
-+echo "$as_me:11080: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11103,7 +11105,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11106: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11108: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11117,10 +11119,10 @@
- 	fi
- fi
- 
--echo "$as_me:11120: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11122: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11123: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11125: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11131,7 +11133,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11134: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11136: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11145,7 +11147,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11148: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11150: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11158,17 +11160,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11161: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11163: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11167: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11169: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11171: checking for manpage tbl" >&5
-+echo "$as_me:11173: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11179,7 +11181,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11182: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11184: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11512,7 +11514,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11515: checking if you want to build with function extensions" >&5
-+echo "$as_me:11517: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11522,7 +11524,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11525: result: $with_ext_funcs" >&5
-+echo "$as_me:11527: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11577,7 +11579,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11580: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11582: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11587,7 +11589,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11590: result: $with_sp_funcs" >&5
-+echo "$as_me:11592: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11602,7 +11604,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11605: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11607: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11612,7 +11614,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11615: result: $with_term_driver" >&5
-+echo "$as_me:11617: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11621,19 +11623,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11624: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11626: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11629: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11631: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11636: checking for extended use of const keyword" >&5
-+echo "$as_me:11638: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11643,7 +11645,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11646: result: $with_ext_const" >&5
-+echo "$as_me:11648: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11651,7 +11653,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11654: checking if you want to use extended colors" >&5
-+echo "$as_me:11656: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11661,12 +11663,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11664: result: $with_ext_colors" >&5
-+echo "$as_me:11666: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11669: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11671: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11676,7 +11678,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11679: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11681: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11692,7 +11694,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11695: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11697: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11702,7 +11704,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11705: result: $with_ext_mouse" >&5
-+echo "$as_me:11707: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11713,7 +11715,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11716: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11718: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11722,7 +11724,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11725: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11727: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11732,7 +11734,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11735: result: $with_ext_putwin" >&5
-+echo "$as_me:11737: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11742,7 +11744,7 @@
- 
- fi
- 
--echo "$as_me:11745: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11747: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11752,20 +11754,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11755: result: $with_no_padding" >&5
-+echo "$as_me:11757: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11762: checking for ANSI C header files" >&5
-+echo "$as_me:11764: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11768 "configure"
-+#line 11770 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -11773,13 +11775,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:11776: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11778: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11782: \$? = $ac_status" >&5
-+  echo "$as_me:11784: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11801,7 +11803,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11804 "configure"
-+#line 11806 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -11819,7 +11821,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11822 "configure"
-+#line 11824 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -11840,7 +11842,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11843 "configure"
-+#line 11845 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11866,15 +11868,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11869: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11871: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11872: \$? = $ac_status" >&5
-+  echo "$as_me:11874: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11874: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11876: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11877: \$? = $ac_status" >&5
-+  echo "$as_me:11879: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11887,7 +11889,7 @@
- fi
- fi
- fi
--echo "$as_me:11890: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11892: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11903,28 +11905,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11906: checking for $ac_header" >&5
-+echo "$as_me:11908: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11912 "configure"
-+#line 11914 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11918: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11920: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11921: \$? = $ac_status" >&5
-+  echo "$as_me:11923: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11926: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11927: \$? = $ac_status" >&5
-+  echo "$as_me:11929: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11934,7 +11936,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11937: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11939: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11944,13 +11946,13 @@
- fi
- done
- 
--echo "$as_me:11947: checking for signed char" >&5
-+echo "$as_me:11949: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11953 "configure"
-+#line 11955 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11965,16 +11967,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11968: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11970: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11971: \$? = $ac_status" >&5
-+  echo "$as_me:11973: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11976: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11977: \$? = $ac_status" >&5
-+  echo "$as_me:11979: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -11984,10 +11986,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11987: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:11989: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:11990: checking size of signed char" >&5
-+echo "$as_me:11992: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11996,7 +11998,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 11999 "configure"
-+#line 12001 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12008,21 +12010,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12011: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12013: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12014: \$? = $ac_status" >&5
-+  echo "$as_me:12016: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12019: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12020: \$? = $ac_status" >&5
-+  echo "$as_me:12022: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12025 "configure"
-+#line 12027 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12034,16 +12036,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12037: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12039: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12040: \$? = $ac_status" >&5
-+  echo "$as_me:12042: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12043: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12045: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12046: \$? = $ac_status" >&5
-+  echo "$as_me:12048: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12059,7 +12061,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12062 "configure"
-+#line 12064 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12071,16 +12073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12074: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12076: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12077: \$? = $ac_status" >&5
-+  echo "$as_me:12079: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12083: \$? = $ac_status" >&5
-+  echo "$as_me:12085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12096,7 +12098,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12099 "configure"
-+#line 12101 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12108,16 +12110,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12111: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12113: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12114: \$? = $ac_status" >&5
-+  echo "$as_me:12116: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12117: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12120: \$? = $ac_status" >&5
-+  echo "$as_me:12122: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12130,12 +12132,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12133: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12135: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12138 "configure"
-+#line 12140 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12151,15 +12153,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12154: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12156: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12157: \$? = $ac_status" >&5
-+  echo "$as_me:12159: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12159: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12161: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12162: \$? = $ac_status" >&5
-+  echo "$as_me:12164: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12175,7 +12177,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12178: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12180: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -12186,7 +12188,7 @@
- else
- 	NCURSES_SBOOL="char"
- fi
--echo "$as_me:12189: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:12191: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12196,12 +12198,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12199: result: $with_signed_char" >&5
-+echo "$as_me:12201: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12204: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12206: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12211,7 +12213,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12214: result: $with_sigwinch" >&5
-+echo "$as_me:12216: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12219,7 +12221,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12222: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12224: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12229,7 +12231,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12232: result: $with_tcap_names" >&5
-+echo "$as_me:12234: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12237,7 +12239,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12240: checking if you want all development code" >&5
-+echo "$as_me:12242: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12247,11 +12249,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12250: result: $with_develop" >&5
-+echo "$as_me:12252: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12254: checking if you want hard-tabs code" >&5
-+echo "$as_me:12256: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12261,7 +12263,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12264: result: $enable_hard_tabs" >&5
-+echo "$as_me:12266: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12269,7 +12271,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12272: checking if you want limited support for xmc" >&5
-+echo "$as_me:12274: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12279,7 +12281,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12282: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12284: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12289,7 +12291,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12292: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12294: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12299,7 +12301,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12302: result: $with_assumed_color" >&5
-+echo "$as_me:12304: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12307,7 +12309,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12310: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12312: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12317,7 +12319,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12320: result: $with_hashmap" >&5
-+echo "$as_me:12322: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12325,7 +12327,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12328: checking if you want colorfgbg code" >&5
-+echo "$as_me:12330: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12335,7 +12337,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12338: result: $with_colorfgbg" >&5
-+echo "$as_me:12340: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12343,7 +12345,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12346: checking if you want interop bindings" >&5
-+echo "$as_me:12348: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12353,7 +12355,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12356: result: $with_exp_interop" >&5
-+echo "$as_me:12358: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12362,7 +12364,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12365: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12367: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12372,27 +12374,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12375: result: $with_pthread" >&5
-+echo "$as_me:12377: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12379: checking for pthread.h" >&5
-+	echo "$as_me:12381: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12385 "configure"
-+#line 12387 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:12389: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12391: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12395: \$? = $ac_status" >&5
-+  echo "$as_me:12397: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12411,7 +12413,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12414: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12416: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12421,7 +12423,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12424: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12426: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12442,7 +12444,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12445 "configure"
-+#line 12447 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -12459,16 +12461,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12462: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12464: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12465: \$? = $ac_status" >&5
-+  echo "$as_me:12467: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12468: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12470: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12471: \$? = $ac_status" >&5
-+  echo "$as_me:12473: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12478,7 +12480,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12481: result: $with_pthread" >&5
-+	    echo "$as_me:12483: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12506,7 +12508,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12509: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12511: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12516,13 +12518,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12519: checking for pthread_kill" >&5
-+	echo "$as_me:12521: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12525 "configure"
-+#line 12527 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12553,16 +12555,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12556: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12558: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12559: \$? = $ac_status" >&5
-+  echo "$as_me:12561: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12562: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12564: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12565: \$? = $ac_status" >&5
-+  echo "$as_me:12567: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12572,11 +12574,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12575: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12577: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12579: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12581: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12586,7 +12588,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12589: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12591: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12597,7 +12599,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12600: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12602: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12607,18 +12609,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12610: result: $use_weak_symbols" >&5
-+	echo "$as_me:12612: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12614: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12616: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12621 "configure"
-+#line 12623 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -12644,16 +12646,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12647: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12649: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12650: \$? = $ac_status" >&5
-+  echo "$as_me:12652: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12653: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12655: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12656: \$? = $ac_status" >&5
-+  echo "$as_me:12658: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12664,7 +12666,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12667: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12669: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12697,7 +12699,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12700: checking if you want reentrant code" >&5
-+echo "$as_me:12702: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12707,7 +12709,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12710: result: $with_reentrant" >&5
-+echo "$as_me:12712: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12780,7 +12782,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12783: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12785: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12795,7 +12797,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12798: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12800: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12805,7 +12807,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12808: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12810: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12815,7 +12817,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12818: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12820: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12825,7 +12827,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12828: result: $with_safe_sprintf" >&5
-+echo "$as_me:12830: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12835,7 +12837,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12838: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12840: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12845,7 +12847,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12848: result: $with_scroll_hints" >&5
-+echo "$as_me:12850: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12854,7 +12856,7 @@
- 
- fi
- 
--echo "$as_me:12857: checking if you want wgetch-events code" >&5
-+echo "$as_me:12859: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12864,7 +12866,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12867: result: $with_wgetch_events" >&5
-+echo "$as_me:12869: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12875,7 +12877,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12878: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12880: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -12909,7 +12911,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12912: result: $enableval" >&5
-+echo "$as_me:12914: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12921,7 +12923,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12924: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12926: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12929,7 +12931,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12932: result: $with_warnings" >&5
-+echo "$as_me:12934: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12941,12 +12943,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12944: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12946: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 12949 "configure"
-+#line 12951 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12963,16 +12965,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12968: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12969: \$? = $ac_status" >&5
-+  echo "$as_me:12971: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12974: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12975: \$? = $ac_status" >&5
-+  echo "$as_me:12977: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12983,7 +12985,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:12986: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:12988: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -12992,12 +12994,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:12995: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:12997: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13000 "configure"
-+#line 13002 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13014,16 +13016,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13017: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13019: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13020: \$? = $ac_status" >&5
-+  echo "$as_me:13022: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13023: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13025: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13026: \$? = $ac_status" >&5
-+  echo "$as_me:13028: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13034,12 +13036,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13037: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13039: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 13042 "${as_me:-configure}"
-+#line 13044 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13056,7 +13058,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:13059: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13061: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13072,12 +13074,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13075: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13077: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13078: \$? = $ac_status" >&5
-+  echo "$as_me:13080: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13080: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13082: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13086,7 +13088,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13089: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13091: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13110,12 +13112,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13113: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13115: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13116: \$? = $ac_status" >&5
-+  echo "$as_me:13118: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13118: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13120: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13126,7 +13128,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13129: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13131: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13136,7 +13138,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13139: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13141: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13156,12 +13158,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13159: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13161: checking if this is really Intel C++ compiler" >&5
- echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13164 "configure"
-+#line 13166 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13178,16 +13180,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13181: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13183: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13184: \$? = $ac_status" >&5
-+  echo "$as_me:13186: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13187: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13189: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13190: \$? = $ac_status" >&5
-+  echo "$as_me:13192: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13198,7 +13200,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13201: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13203: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13207,12 +13209,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13210: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13212: checking if this is really Clang C++ compiler" >&5
- echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13215 "configure"
-+#line 13217 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13229,16 +13231,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13232: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13234: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13235: \$? = $ac_status" >&5
-+  echo "$as_me:13237: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13238: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13241: \$? = $ac_status" >&5
-+  echo "$as_me:13243: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13249,7 +13251,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13252: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13254: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13261,7 +13263,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <<EOF
--#line 13264 "configure"
-+#line 13266 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13279,7 +13281,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:13282: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13284: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13296,12 +13298,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13299: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13301: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13302: \$? = $ac_status" >&5
-+  echo "$as_me:13304: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13304: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13306: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13310,7 +13312,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13313: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13315: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13340,16 +13342,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13346: \$? = $ac_status" >&5
-+  echo "$as_me:13348: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13348: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13350: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13352: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13354: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13385,10 +13387,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13388: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13390: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 13391 "${as_me:-configure}"
-+#line 13393 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -13437,12 +13439,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:13440: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13442: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13443: \$? = $ac_status" >&5
-+  echo "$as_me:13445: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13445: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13447: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13501,7 +13503,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13504: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13506: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13511,7 +13513,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13514: result: $with_string_hacks" >&5
-+echo "$as_me:13516: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13520,19 +13522,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13523: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13525: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13529: checking for $ac_func" >&5
-+echo "$as_me:13531: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13535 "configure"
-+#line 13537 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13563,16 +13565,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13568: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13569: \$? = $ac_status" >&5
-+  echo "$as_me:13571: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13572: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13574: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13575: \$? = $ac_status" >&5
-+  echo "$as_me:13577: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13582,7 +13584,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13585: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13587: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13595,7 +13597,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:13598: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:13600: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13605,7 +13607,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13608: result: $with_assertions" >&5
-+echo "$as_me:13610: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13621,7 +13623,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13624: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13626: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -13638,7 +13640,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13641: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13643: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13732,23 +13734,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13735: checking for dmalloc.h" >&5
-+	echo "$as_me:13737: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13741 "configure"
-+#line 13743 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13745: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13747: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13751: \$? = $ac_status" >&5
-+  echo "$as_me:13753: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13767,11 +13769,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13770: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13772: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:13774: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13776: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13779,7 +13781,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13782 "configure"
-+#line 13784 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13798,16 +13800,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13801: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13803: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13804: \$? = $ac_status" >&5
-+  echo "$as_me:13806: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13809: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13810: \$? = $ac_status" >&5
-+  echo "$as_me:13812: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13818,7 +13820,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13821: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13823: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13833,7 +13835,7 @@
- 
- fi
- 
--echo "$as_me:13836: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:13838: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -13850,7 +13852,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13853: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13855: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13944,23 +13946,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13947: checking for dbmalloc.h" >&5
-+	echo "$as_me:13949: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13953 "configure"
-+#line 13955 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13957: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13959: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13963: \$? = $ac_status" >&5
-+  echo "$as_me:13965: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13979,11 +13981,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13982: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13984: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:13986: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:13988: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13991,7 +13993,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13994 "configure"
-+#line 13996 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14010,16 +14012,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14013: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14015: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14016: \$? = $ac_status" >&5
-+  echo "$as_me:14018: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14019: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14022: \$? = $ac_status" >&5
-+  echo "$as_me:14024: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14030,7 +14032,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14033: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14035: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14045,7 +14047,7 @@
- 
- fi
- 
--echo "$as_me:14048: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:14050: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14062,7 +14064,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14065: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14067: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14155,7 +14157,7 @@
- 	;;
- esac
- 
--echo "$as_me:14158: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14160: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14165,7 +14167,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14168: result: $with_no_leaks" >&5
-+echo "$as_me:14170: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14217,7 +14219,7 @@
- 	;;
- esac
- 
--echo "$as_me:14220: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14222: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14227,7 +14229,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14230: result: $cf_with_trace" >&5
-+echo "$as_me:14232: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14317,7 +14319,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14320: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14322: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14334,7 +14336,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14337: result: $enable_gnat_projects" >&5
-+echo "$as_me:14339: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14344,13 +14346,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14347: checking for gettimeofday" >&5
-+echo "$as_me:14349: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14353 "configure"
-+#line 14355 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14381,16 +14383,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14384: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14386: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14387: \$? = $ac_status" >&5
-+  echo "$as_me:14389: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14390: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14393: \$? = $ac_status" >&5
-+  echo "$as_me:14395: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14400,7 +14402,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14403: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14405: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14410,7 +14412,7 @@
- 
- else
- 
--echo "$as_me:14413: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14415: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14418,7 +14420,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14421 "configure"
-+#line 14423 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14437,16 +14439,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14440: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14442: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14443: \$? = $ac_status" >&5
-+  echo "$as_me:14445: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14446: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14448: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14449: \$? = $ac_status" >&5
-+  echo "$as_me:14451: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14457,7 +14459,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14460: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14462: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14487,14 +14489,14 @@
- 	;;
- esac
- 
--echo "$as_me:14490: checking if -lm needed for math functions" >&5
-+echo "$as_me:14492: checking if -lm needed for math functions" >&5
- echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
- if test "${cf_cv_need_libm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14497 "configure"
-+#line 14499 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -14509,16 +14511,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14512: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14514: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14515: \$? = $ac_status" >&5
-+  echo "$as_me:14517: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14518: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14520: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14521: \$? = $ac_status" >&5
-+  echo "$as_me:14523: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14528,7 +14530,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14531: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14533: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14536,13 +14538,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14539: checking for ANSI C header files" >&5
-+echo "$as_me:14541: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14545 "configure"
-+#line 14547 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -14550,13 +14552,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:14553: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14555: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14559: \$? = $ac_status" >&5
-+  echo "$as_me:14561: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14578,7 +14580,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14581 "configure"
-+#line 14583 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -14596,7 +14598,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14599 "configure"
-+#line 14601 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -14617,7 +14619,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14620 "configure"
-+#line 14622 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14643,15 +14645,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14646: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14648: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14649: \$? = $ac_status" >&5
-+  echo "$as_me:14651: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14651: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14653: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14654: \$? = $ac_status" >&5
-+  echo "$as_me:14656: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14664,7 +14666,7 @@
- fi
- fi
- fi
--echo "$as_me:14667: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14669: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14677,13 +14679,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:14680: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14682: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14686 "configure"
-+#line 14688 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -14698,16 +14700,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14701: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14704: \$? = $ac_status" >&5
-+  echo "$as_me:14706: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14707: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14710: \$? = $ac_status" >&5
-+  echo "$as_me:14712: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14717,7 +14719,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14720: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14722: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14730,7 +14732,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:14733: checking for opendir in -ldir" >&5
-+  echo "$as_me:14735: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14738,7 +14740,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14741 "configure"
-+#line 14743 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14757,16 +14759,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14760: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14762: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14763: \$? = $ac_status" >&5
-+  echo "$as_me:14765: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14766: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14768: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14769: \$? = $ac_status" >&5
-+  echo "$as_me:14771: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14777,14 +14779,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14780: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14782: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:14787: checking for opendir in -lx" >&5
-+  echo "$as_me:14789: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14792,7 +14794,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14795 "configure"
-+#line 14797 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14811,16 +14813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14814: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14816: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14817: \$? = $ac_status" >&5
-+  echo "$as_me:14819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14820: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14823: \$? = $ac_status" >&5
-+  echo "$as_me:14825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14831,7 +14833,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14834: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14836: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -14839,13 +14841,13 @@
- 
- fi
- 
--echo "$as_me:14842: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14844: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14848 "configure"
-+#line 14850 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -14861,16 +14863,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14864: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14866: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14867: \$? = $ac_status" >&5
-+  echo "$as_me:14869: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14870: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14872: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14873: \$? = $ac_status" >&5
-+  echo "$as_me:14875: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14880,7 +14882,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14883: result: $ac_cv_header_time" >&5
-+echo "$as_me:14885: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14899,13 +14901,13 @@
- 	;;
- esac
- 
--echo "$as_me:14902: checking for regcomp" >&5
-+echo "$as_me:14904: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14908 "configure"
-+#line 14910 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14936,16 +14938,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14939: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14941: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14942: \$? = $ac_status" >&5
-+  echo "$as_me:14944: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14945: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14947: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14948: \$? = $ac_status" >&5
-+  echo "$as_me:14950: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14955,7 +14957,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14958: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14960: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14964,7 +14966,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14967: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14969: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14972,7 +14974,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14975 "configure"
-+#line 14977 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14991,16 +14993,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14994: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14996: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14997: \$? = $ac_status" >&5
-+  echo "$as_me:14999: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15002: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15003: \$? = $ac_status" >&5
-+  echo "$as_me:15005: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15011,7 +15013,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15014: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15016: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -15040,13 +15042,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15043: checking for compile" >&5
-+	echo "$as_me:15045: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15049 "configure"
-+#line 15051 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15077,16 +15079,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15080: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15082: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15083: \$? = $ac_status" >&5
-+  echo "$as_me:15085: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15086: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15089: \$? = $ac_status" >&5
-+  echo "$as_me:15091: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15096,13 +15098,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15099: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15101: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15105: checking for compile in -lgen" >&5
-+		echo "$as_me:15107: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15110,7 +15112,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15113 "configure"
-+#line 15115 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15129,16 +15131,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15132: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15134: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15135: \$? = $ac_status" >&5
-+  echo "$as_me:15137: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15138: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15140: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15141: \$? = $ac_status" >&5
-+  echo "$as_me:15143: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15149,7 +15151,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15152: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15154: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15177,11 +15179,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15180: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15182: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15184: checking for regular-expression headers" >&5
-+echo "$as_me:15186: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15193,7 +15195,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15196 "configure"
-+#line 15198 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15208,16 +15210,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15211: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15213: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15214: \$? = $ac_status" >&5
-+  echo "$as_me:15216: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15217: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15219: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15220: \$? = $ac_status" >&5
-+  echo "$as_me:15222: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15234,7 +15236,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15237 "configure"
-+#line 15239 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$cf_regex_hdr>
-@@ -15252,16 +15254,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15255: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15257: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15258: \$? = $ac_status" >&5
-+  echo "$as_me:15260: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15261: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15263: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15264: \$? = $ac_status" >&5
-+  echo "$as_me:15266: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15277,11 +15279,11 @@
- esac
- 
- fi
--echo "$as_me:15280: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15282: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15284: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15286: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15320,23 +15322,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15323: checking for $ac_header" >&5
-+echo "$as_me:15325: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15329 "configure"
-+#line 15331 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15333: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15335: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15339: \$? = $ac_status" >&5
-+  echo "$as_me:15341: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15355,7 +15357,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15358: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15360: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15368,23 +15370,23 @@
- for ac_header in unistd.h getopt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15371: checking for $ac_header" >&5
-+echo "$as_me:15373: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15377 "configure"
-+#line 15379 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15381: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15383: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15387: \$? = $ac_status" >&5
-+  echo "$as_me:15389: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15403,7 +15405,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15406: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15408: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15413,7 +15415,7 @@
- fi
- done
- 
--echo "$as_me:15416: checking for header declaring getopt variables" >&5
-+echo "$as_me:15418: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15423,7 +15425,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15426 "configure"
-+#line 15428 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15436,16 +15438,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15439: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15441: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15442: \$? = $ac_status" >&5
-+  echo "$as_me:15444: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15445: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15448: \$? = $ac_status" >&5
-+  echo "$as_me:15450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15457,7 +15459,7 @@
- done
- 
- fi
--echo "$as_me:15460: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15462: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15478,7 +15480,7 @@
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15481: checking for main in -lcposix" >&5
-+echo "$as_me:15483: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15486,7 +15488,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15489 "configure"
-+#line 15491 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15498,16 +15500,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15503: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15504: \$? = $ac_status" >&5
-+  echo "$as_me:15506: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15509: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15510: \$? = $ac_status" >&5
-+  echo "$as_me:15512: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15518,7 +15520,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15521: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15523: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15529,7 +15531,7 @@
- 
- fi
- 
--	echo "$as_me:15532: checking for bzero in -linet" >&5
-+	echo "$as_me:15534: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15537,7 +15539,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15540 "configure"
-+#line 15542 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15556,16 +15558,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15559: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15561: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15562: \$? = $ac_status" >&5
-+  echo "$as_me:15564: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15565: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15567: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15568: \$? = $ac_status" >&5
-+  echo "$as_me:15570: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15576,7 +15578,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15579: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15581: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15599,14 +15601,14 @@
- fi
- fi
- 
--echo "$as_me:15602: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15604: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15609 "configure"
-+#line 15611 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15626,16 +15628,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15629: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15631: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15632: \$? = $ac_status" >&5
-+  echo "$as_me:15634: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15635: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15637: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15638: \$? = $ac_status" >&5
-+  echo "$as_me:15640: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15647,7 +15649,7 @@
- 
- fi
- 
--echo "$as_me:15650: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15652: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15662,13 +15664,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15665: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15667: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15671 "configure"
-+#line 15673 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15726,16 +15728,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15729: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15732: \$? = $ac_status" >&5
-+  echo "$as_me:15734: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15735: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15738: \$? = $ac_status" >&5
-+  echo "$as_me:15740: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15745,7 +15747,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15748: result: $ac_cv_c_const" >&5
-+echo "$as_me:15750: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15755,7 +15757,7 @@
- 
- fi
- 
--echo "$as_me:15758: checking for inline" >&5
-+echo "$as_me:15760: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15763,7 +15765,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15766 "configure"
-+#line 15768 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15772,16 +15774,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15775: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15777: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15778: \$? = $ac_status" >&5
-+  echo "$as_me:15780: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15781: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15783: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15784: \$? = $ac_status" >&5
-+  echo "$as_me:15786: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15792,7 +15794,7 @@
- done
- 
- fi
--echo "$as_me:15795: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15797: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15818,7 +15820,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15821: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15823: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15827,7 +15829,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15830 "configure"
-+#line 15832 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15839,16 +15841,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15842: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15844: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15845: \$? = $ac_status" >&5
-+  echo "$as_me:15847: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15848: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15850: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15851: \$? = $ac_status" >&5
-+  echo "$as_me:15853: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15860,7 +15862,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15863: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15865: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15946,7 +15948,7 @@
- 	fi
- fi
- 
--echo "$as_me:15949: checking for signal global datatype" >&5
-+echo "$as_me:15951: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15958,7 +15960,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15961 "configure"
-+#line 15963 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15981,16 +15983,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15984: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15986: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15987: \$? = $ac_status" >&5
-+  echo "$as_me:15989: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15990: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15992: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15993: \$? = $ac_status" >&5
-+  echo "$as_me:15995: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16004,7 +16006,7 @@
- 
- fi
- 
--echo "$as_me:16007: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16009: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <<EOF
-@@ -16013,7 +16015,7 @@
- 
- if test $NCURSES_CHTYPE = auto ; then
- 
--echo "$as_me:16016: checking for type of chtype" >&5
-+echo "$as_me:16018: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16023,7 +16025,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16026 "configure"
-+#line 16028 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16058,15 +16060,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16061: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16063: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16064: \$? = $ac_status" >&5
-+  echo "$as_me:16066: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16066: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16068: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16069: \$? = $ac_status" >&5
-+  echo "$as_me:16071: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16081,7 +16083,7 @@
- 
- fi
- 
--echo "$as_me:16084: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16086: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -16093,14 +16095,14 @@
- fi
- test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- 
--echo "$as_me:16096: checking if unsigned literals are legal" >&5
-+echo "$as_me:16098: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16103 "configure"
-+#line 16105 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16112,16 +16114,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16115: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16117: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16118: \$? = $ac_status" >&5
-+  echo "$as_me:16120: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16121: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16123: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16124: \$? = $ac_status" >&5
-+  echo "$as_me:16126: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16133,7 +16135,7 @@
- 
- fi
- 
--echo "$as_me:16136: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16138: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16149,14 +16151,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16152: checking if external errno is declared" >&5
-+echo "$as_me:16154: checking if external errno is declared" >&5
- echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16159 "configure"
-+#line 16161 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16174,16 +16176,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16177: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16179: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16180: \$? = $ac_status" >&5
-+  echo "$as_me:16182: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16183: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16185: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16186: \$? = $ac_status" >&5
-+  echo "$as_me:16188: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16194,7 +16196,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16197: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16199: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16209,14 +16211,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16212: checking if external errno exists" >&5
-+echo "$as_me:16214: checking if external errno exists" >&5
- echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
- if test "${cf_cv_have_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16219 "configure"
-+#line 16221 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16231,16 +16233,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16234: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16236: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16237: \$? = $ac_status" >&5
-+  echo "$as_me:16239: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16240: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16242: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16243: \$? = $ac_status" >&5
-+  echo "$as_me:16245: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16251,7 +16253,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16254: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16256: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16264,7 +16266,7 @@
- 
- fi
- 
--echo "$as_me:16267: checking if data-only library module links" >&5
-+echo "$as_me:16269: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16272,20 +16274,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 16275 "configure"
-+#line 16277 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:16278: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16281: \$? = $ac_status" >&5
-+  echo "$as_me:16283: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 16288 "configure"
-+#line 16290 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -16298,10 +16300,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:16301: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16303: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16304: \$? = $ac_status" >&5
-+  echo "$as_me:16306: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16314,7 +16316,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16317 "configure"
-+#line 16319 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16325,15 +16327,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16328: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16330: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16331: \$? = $ac_status" >&5
-+  echo "$as_me:16333: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16335: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16336: \$? = $ac_status" >&5
-+  echo "$as_me:16338: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16348,7 +16350,7 @@
- 
- fi
- 
--echo "$as_me:16351: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16353: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16387,13 +16389,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16390: checking for $ac_func" >&5
-+echo "$as_me:16392: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16396 "configure"
-+#line 16398 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16424,16 +16426,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16427: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16429: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16430: \$? = $ac_status" >&5
-+  echo "$as_me:16432: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16433: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16436: \$? = $ac_status" >&5
-+  echo "$as_me:16438: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16443,7 +16445,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16446: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16448: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16455,21 +16457,21 @@
- 
- if test "x$ac_cv_func_getopt" = xno &&
-    test "x$cf_with_progs$cf_with_tests" != xnono; then
--	{ { echo "$as_me:16458: error: getopt is required for building programs" >&5
-+	{ { echo "$as_me:16460: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16465: checking for terminal-capability database functions" >&5
-+echo "$as_me:16467: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16472 "configure"
-+#line 16474 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16489,16 +16491,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16492: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16494: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16495: \$? = $ac_status" >&5
-+  echo "$as_me:16497: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16498: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16500: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16501: \$? = $ac_status" >&5
-+  echo "$as_me:16503: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16509,7 +16511,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16512: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16514: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16519,14 +16521,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16522: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16524: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16529 "configure"
-+#line 16531 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16548,16 +16550,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16551: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16553: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16554: \$? = $ac_status" >&5
-+  echo "$as_me:16556: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16557: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16559: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16560: \$? = $ac_status" >&5
-+  echo "$as_me:16562: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16568,7 +16570,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16571: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16573: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16582,14 +16584,14 @@
- 
- fi
- 
--echo "$as_me:16585: checking for isascii" >&5
-+echo "$as_me:16587: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16592 "configure"
-+#line 16594 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -16601,16 +16603,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16604: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16606: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16607: \$? = $ac_status" >&5
-+  echo "$as_me:16609: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16610: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16613: \$? = $ac_status" >&5
-+  echo "$as_me:16615: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16621,7 +16623,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16624: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16626: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16629,10 +16631,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16632: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16634: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16635 "configure"
-+#line 16637 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16646,16 +16648,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16649: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16651: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16652: \$? = $ac_status" >&5
-+  echo "$as_me:16654: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16655: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16657: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16658: \$? = $ac_status" >&5
-+  echo "$as_me:16660: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16663,7 +16665,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16666 "configure"
-+#line 16668 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16678,16 +16680,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16681: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16683: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16684: \$? = $ac_status" >&5
-+  echo "$as_me:16686: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16687: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16689: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16690: \$? = $ac_status" >&5
-+  echo "$as_me:16692: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16703,11 +16705,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16706: result: $sigact_bad" >&5
-+echo "$as_me:16708: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16710: checking if nanosleep really works" >&5
-+echo "$as_me:16712: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16717,7 +16719,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16720 "configure"
-+#line 16722 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -16742,15 +16744,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16745: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16747: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16748: \$? = $ac_status" >&5
-+  echo "$as_me:16750: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16752: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16753: \$? = $ac_status" >&5
-+  echo "$as_me:16755: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16762,7 +16764,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16765: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16767: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16777,23 +16779,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16780: checking for $ac_header" >&5
-+echo "$as_me:16782: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16786 "configure"
-+#line 16788 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16790: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16792: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16796: \$? = $ac_status" >&5
-+  echo "$as_me:16798: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16812,7 +16814,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16815: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16817: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16827,23 +16829,23 @@
- for ac_header in sys/termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16830: checking for $ac_header" >&5
-+echo "$as_me:16832: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16836 "configure"
-+#line 16838 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16840: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16842: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16846: \$? = $ac_status" >&5
-+  echo "$as_me:16848: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16862,7 +16864,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16865: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16867: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16880,10 +16882,10 @@
- 	(*)	termios_bad=maybe ;;
- 	esac
- 	if test "$termios_bad" = maybe ; then
--	echo "$as_me:16883: checking whether termios.h needs _POSIX_SOURCE" >&5
-+	echo "$as_me:16885: checking whether termios.h needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16886 "configure"
-+#line 16888 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -16895,16 +16897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16898: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16900: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16901: \$? = $ac_status" >&5
-+  echo "$as_me:16903: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16904: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16907: \$? = $ac_status" >&5
-+  echo "$as_me:16909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16912,7 +16914,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16915 "configure"
-+#line 16917 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16926,16 +16928,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16929: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16931: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16932: \$? = $ac_status" >&5
-+  echo "$as_me:16934: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16935: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16937: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16938: \$? = $ac_status" >&5
-+  echo "$as_me:16940: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16951,19 +16953,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16954: result: $termios_bad" >&5
-+	echo "$as_me:16956: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16959: checking for tcgetattr" >&5
-+echo "$as_me:16961: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16966 "configure"
-+#line 16968 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16991,16 +16993,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16994: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16996: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16997: \$? = $ac_status" >&5
-+  echo "$as_me:16999: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17002: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17003: \$? = $ac_status" >&5
-+  echo "$as_me:17005: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17010,21 +17012,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17013: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17015: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17020: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17022: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17027 "configure"
-+#line 17029 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17040,16 +17042,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17043: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17045: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17046: \$? = $ac_status" >&5
-+  echo "$as_me:17048: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17051: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17052: \$? = $ac_status" >&5
-+  echo "$as_me:17054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17057,7 +17059,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17060 "configure"
-+#line 17062 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17079,16 +17081,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17082: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17084: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17085: \$? = $ac_status" >&5
-+  echo "$as_me:17087: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17088: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17090: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17091: \$? = $ac_status" >&5
-+  echo "$as_me:17093: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17096,7 +17098,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17099 "configure"
-+#line 17101 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17118,16 +17120,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17121: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17123: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17124: \$? = $ac_status" >&5
-+  echo "$as_me:17126: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17127: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17129: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17130: \$? = $ac_status" >&5
-+  echo "$as_me:17132: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17142,7 +17144,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17145: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17147: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17163,7 +17165,7 @@
- ;;
- esac
- 
--echo "$as_me:17166: checking for working mkstemp" >&5
-+echo "$as_me:17168: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17174,7 +17176,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17177 "configure"
-+#line 17179 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -17212,15 +17214,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17215: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17217: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17218: \$? = $ac_status" >&5
-+  echo "$as_me:17220: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17220: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17222: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17223: \$? = $ac_status" >&5
-+  echo "$as_me:17225: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17235,16 +17237,16 @@
- fi
- 
- fi
--echo "$as_me:17238: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17240: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17241: checking for mkstemp" >&5
-+	echo "$as_me:17243: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17247 "configure"
-+#line 17249 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17275,16 +17277,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17278: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17280: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17281: \$? = $ac_status" >&5
-+  echo "$as_me:17283: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17284: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17286: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17287: \$? = $ac_status" >&5
-+  echo "$as_me:17289: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17294,7 +17296,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17297: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17299: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17315,21 +17317,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17318: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17320: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17321: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17323: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17327: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17329: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17332 "configure"
-+#line 17334 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17346,15 +17348,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17349: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17351: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17352: \$? = $ac_status" >&5
-+  echo "$as_me:17354: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17354: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17356: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17357: \$? = $ac_status" >&5
-+  echo "$as_me:17359: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17367,7 +17369,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17370: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17372: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17378,13 +17380,13 @@
- fi
- 
- fi
--echo "$as_me:17381: checking for intptr_t" >&5
-+echo "$as_me:17383: checking for intptr_t" >&5
- echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
- if test "${ac_cv_type_intptr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17387 "configure"
-+#line 17389 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17399,16 +17401,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17402: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17404: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17405: \$? = $ac_status" >&5
-+  echo "$as_me:17407: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17408: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17411: \$? = $ac_status" >&5
-+  echo "$as_me:17413: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17418,7 +17420,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17421: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17423: result: $ac_cv_type_intptr_t" >&5
- echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
- if test $ac_cv_type_intptr_t = yes; then
-   :
-@@ -17430,13 +17432,13 @@
- 
- fi
- 
--echo "$as_me:17433: checking for ssize_t" >&5
-+echo "$as_me:17435: checking for ssize_t" >&5
- echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17439 "configure"
-+#line 17441 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17451,16 +17453,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17454: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17456: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17457: \$? = $ac_status" >&5
-+  echo "$as_me:17459: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17460: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17462: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17463: \$? = $ac_status" >&5
-+  echo "$as_me:17465: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17470,7 +17472,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17473: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17475: result: $ac_cv_type_ssize_t" >&5
- echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
- if test $ac_cv_type_ssize_t = yes; then
-   :
-@@ -17482,14 +17484,14 @@
- 
- fi
- 
--echo "$as_me:17485: checking for type sigaction_t" >&5
-+echo "$as_me:17487: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17492 "configure"
-+#line 17494 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -17502,16 +17504,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17505: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17507: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17508: \$? = $ac_status" >&5
-+  echo "$as_me:17510: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17511: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17514: \$? = $ac_status" >&5
-+  echo "$as_me:17516: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17522,14 +17524,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17525: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17527: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17532: checking declaration of size-change" >&5
-+echo "$as_me:17534: checking declaration of size-change" >&5
- echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
- if test "${cf_cv_sizechange+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17544,7 +17546,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17547 "configure"
-+#line 17549 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -17588,16 +17590,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17591: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17593: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17594: \$? = $ac_status" >&5
-+  echo "$as_me:17596: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17597: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17599: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17600: \$? = $ac_status" >&5
-+  echo "$as_me:17602: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17616,7 +17618,7 @@
- done
- 
- fi
--echo "$as_me:17619: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17621: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17634,13 +17636,13 @@
- 	esac
- fi
- 
--echo "$as_me:17637: checking for memmove" >&5
-+echo "$as_me:17639: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17643 "configure"
-+#line 17645 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17671,16 +17673,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17674: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17676: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17677: \$? = $ac_status" >&5
-+  echo "$as_me:17679: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17680: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17682: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17683: \$? = $ac_status" >&5
-+  echo "$as_me:17685: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17690,19 +17692,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17693: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17695: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17699: checking for bcopy" >&5
-+echo "$as_me:17701: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17705 "configure"
-+#line 17707 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17733,16 +17735,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17736: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17738: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17739: \$? = $ac_status" >&5
-+  echo "$as_me:17741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17742: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17745: \$? = $ac_status" >&5
-+  echo "$as_me:17747: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17752,11 +17754,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17755: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17757: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17759: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17761: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17766,7 +17768,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17769 "configure"
-+#line 17771 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17780,15 +17782,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17783: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17785: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17786: \$? = $ac_status" >&5
-+  echo "$as_me:17788: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17788: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17790: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17791: \$? = $ac_status" >&5
-+  echo "$as_me:17793: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17801,7 +17803,7 @@
- fi
- 
- fi
--echo "$as_me:17804: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17806: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17824,7 +17826,7 @@
- 
- fi
- 
--echo "$as_me:17827: checking if poll really works" >&5
-+echo "$as_me:17829: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17834,7 +17836,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17837 "configure"
-+#line 17839 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17881,15 +17883,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17884: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17886: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17887: \$? = $ac_status" >&5
-+  echo "$as_me:17889: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17889: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17891: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17892: \$? = $ac_status" >&5
-+  echo "$as_me:17894: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17901,21 +17903,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17904: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17906: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:17911: checking for va_copy" >&5
-+echo "$as_me:17913: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17918 "configure"
-+#line 17920 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17932,16 +17934,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17935: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17937: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17938: \$? = $ac_status" >&5
-+  echo "$as_me:17940: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17941: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17943: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17944: \$? = $ac_status" >&5
-+  echo "$as_me:17946: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -17951,7 +17953,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17954: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:17956: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -17959,14 +17961,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:17962: checking for __va_copy" >&5
-+echo "$as_me:17964: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17969 "configure"
-+#line 17971 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17983,16 +17985,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17986: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17988: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17989: \$? = $ac_status" >&5
-+  echo "$as_me:17991: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17992: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17994: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17995: \$? = $ac_status" >&5
-+  echo "$as_me:17997: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18002,7 +18004,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18005: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18007: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18010,13 +18012,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18013: checking for pid_t" >&5
-+echo "$as_me:18015: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18019 "configure"
-+#line 18021 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18031,16 +18033,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18034: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18036: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18037: \$? = $ac_status" >&5
-+  echo "$as_me:18039: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18040: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18042: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18043: \$? = $ac_status" >&5
-+  echo "$as_me:18045: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18050,7 +18052,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18053: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18055: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -18065,23 +18067,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18068: checking for $ac_header" >&5
-+echo "$as_me:18070: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18074 "configure"
-+#line 18076 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18078: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18080: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18084: \$? = $ac_status" >&5
-+  echo "$as_me:18086: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18100,7 +18102,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18103: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18105: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18113,13 +18115,13 @@
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18116: checking for $ac_func" >&5
-+echo "$as_me:18118: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18122 "configure"
-+#line 18124 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18150,16 +18152,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18153: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18155: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18156: \$? = $ac_status" >&5
-+  echo "$as_me:18158: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18159: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18161: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18162: \$? = $ac_status" >&5
-+  echo "$as_me:18164: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18169,7 +18171,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18172: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18174: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18181,7 +18183,7 @@
- 
- ac_cv_func_fork_works=$ac_cv_func_fork
- if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:18184: checking for working fork" >&5
-+  echo "$as_me:18186: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18204,15 +18206,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18207: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18209: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18210: \$? = $ac_status" >&5
-+  echo "$as_me:18212: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18212: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18214: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18215: \$? = $ac_status" >&5
-+  echo "$as_me:18217: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18224,7 +18226,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18227: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18229: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18238,12 +18240,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18241: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18243: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:18246: checking for working vfork" >&5
-+  echo "$as_me:18248: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18252,7 +18254,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18255 "configure"
-+#line 18257 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -18349,15 +18351,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18352: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18354: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18355: \$? = $ac_status" >&5
-+  echo "$as_me:18357: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18357: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18359: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18360: \$? = $ac_status" >&5
-+  echo "$as_me:18362: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18369,13 +18371,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18372: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18374: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:18378: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18380: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -18402,7 +18404,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18405: checking for openpty in -lutil" >&5
-+echo "$as_me:18407: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18410,7 +18412,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18413 "configure"
-+#line 18415 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18429,16 +18431,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18432: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18434: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18435: \$? = $ac_status" >&5
-+  echo "$as_me:18437: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18438: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18440: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18441: \$? = $ac_status" >&5
-+  echo "$as_me:18443: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18449,7 +18451,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18452: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18454: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18457,7 +18459,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18460: checking for openpty header" >&5
-+echo "$as_me:18462: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18484,7 +18486,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18487 "configure"
-+#line 18489 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18501,16 +18503,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18504: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18506: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18507: \$? = $ac_status" >&5
-+  echo "$as_me:18509: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18510: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18513: \$? = $ac_status" >&5
-+  echo "$as_me:18515: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18528,7 +18530,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18531: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18533: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18598,7 +18600,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18601 "configure"
-+#line 18603 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18610,16 +18612,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18613: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18615: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18616: \$? = $ac_status" >&5
-+  echo "$as_me:18618: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18621: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18622: \$? = $ac_status" >&5
-+  echo "$as_me:18624: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18636,7 +18638,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18639: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18641: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18672,7 +18674,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18675: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18677: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18683,7 +18685,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18686: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18688: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18752,7 +18754,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18755 "configure"
-+#line 18757 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18764,16 +18766,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18767: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18769: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18770: \$? = $ac_status" >&5
-+  echo "$as_me:18772: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18773: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18776: \$? = $ac_status" >&5
-+  echo "$as_me:18778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18790,7 +18792,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18793: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18795: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18870,7 +18872,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18873: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18875: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18887,23 +18889,23 @@
- 	fi
- esac
- 
--echo "$as_me:18890: checking for db.h" >&5
-+echo "$as_me:18892: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18896 "configure"
-+#line 18898 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:18900: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18902: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18906: \$? = $ac_status" >&5
-+  echo "$as_me:18908: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18922,11 +18924,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18925: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:18927: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:18929: checking for version of db" >&5
-+echo "$as_me:18931: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18937,10 +18939,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:18940: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:18942: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18943 "configure"
-+#line 18945 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -18970,16 +18972,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18973: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18975: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18976: \$? = $ac_status" >&5
-+  echo "$as_me:18978: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18979: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18982: \$? = $ac_status" >&5
-+  echo "$as_me:18984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -18993,16 +18995,16 @@
- done
- 
- fi
--echo "$as_me:18996: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:18998: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19000: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19002: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19005: checking for db libraries" >&5
-+echo "$as_me:19007: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19032,10 +19034,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19035: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19037: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19038 "configure"
-+#line 19040 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19090,16 +19092,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19095: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19096: \$? = $ac_status" >&5
-+  echo "$as_me:19098: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19099: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19101: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19102: \$? = $ac_status" >&5
-+  echo "$as_me:19104: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19119,11 +19121,11 @@
- done
- 
- fi
--echo "$as_me:19122: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19124: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19126: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19128: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19149,7 +19151,7 @@
- 
- else
- 
--	{ { echo "$as_me:19152: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19154: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19164,7 +19166,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19167: checking if we should include stdbool.h" >&5
-+echo "$as_me:19169: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19172,7 +19174,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19175 "configure"
-+#line 19177 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19184,23 +19186,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19187: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19189: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19190: \$? = $ac_status" >&5
-+  echo "$as_me:19192: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19195: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19196: \$? = $ac_status" >&5
-+  echo "$as_me:19198: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19203 "configure"
-+#line 19205 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19216,16 +19218,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19219: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19221: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19222: \$? = $ac_status" >&5
-+  echo "$as_me:19224: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19225: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19227: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19228: \$? = $ac_status" >&5
-+  echo "$as_me:19230: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19239,13 +19241,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19242: result: yes" >&5
-+then	echo "$as_me:19244: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19244: result: no" >&5
-+else	echo "$as_me:19246: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19248: checking for builtin bool type" >&5
-+echo "$as_me:19250: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19253,7 +19255,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19256 "configure"
-+#line 19258 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -19268,16 +19270,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19273: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19274: \$? = $ac_status" >&5
-+  echo "$as_me:19276: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19277: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19279: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19280: \$? = $ac_status" >&5
-+  echo "$as_me:19282: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19290,9 +19292,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19293: result: yes" >&5
-+then	echo "$as_me:19295: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19295: result: no" >&5
-+else	echo "$as_me:19297: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19314,7 +19316,7 @@
- 	cf_stdcpp_libname=stdc++
- 	;;
- esac
--echo "$as_me:19317: checking for library $cf_stdcpp_libname" >&5
-+echo "$as_me:19319: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19339,7 +19341,7 @@
- LIBS="$cf_add_libs"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19342 "configure"
-+#line 19344 "configure"
- #include "confdefs.h"
- 
- #include <strstream.h>
-@@ -19355,16 +19357,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19358: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19360: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19361: \$? = $ac_status" >&5
-+  echo "$as_me:19363: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19364: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19366: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19367: \$? = $ac_status" >&5
-+  echo "$as_me:19369: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19376,7 +19378,7 @@
- 	LIBS="$cf_save"
- 
- fi
--echo "$as_me:19379: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19381: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- test "$cf_cv_libstdcpp" = yes &&
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19397,7 +19399,7 @@
- 
- fi
- 
--	echo "$as_me:19400: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19402: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19413,15 +19415,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19416: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19419: \$? = $ac_status" >&5
-+  echo "$as_me:19421: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19421: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19423: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19424: \$? = $ac_status" >&5
-+  echo "$as_me:19426: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19432,10 +19434,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19435: result: yes" >&5
-+  echo "$as_me:19437: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19438: result: no" >&5
-+  echo "$as_me:19440: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19455,7 +19457,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19458: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19460: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19476,7 +19478,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19479 "configure"
-+#line 19481 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19490,16 +19492,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19493: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19496: \$? = $ac_status" >&5
-+  echo "$as_me:19498: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19502: \$? = $ac_status" >&5
-+  echo "$as_me:19504: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19536,7 +19538,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19539 "configure"
-+#line 19541 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -19550,16 +19552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19553: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19555: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19556: \$? = $ac_status" >&5
-+  echo "$as_me:19558: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19559: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19562: \$? = $ac_status" >&5
-+  echo "$as_me:19564: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19592,7 +19594,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19595: result: $cf_cxx_library" >&5
-+	echo "$as_me:19597: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19608,7 +19610,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19611: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19613: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19625,18 +19627,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19628 "configure"
-+#line 19630 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19633: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19635: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19639: \$? = $ac_status" >&5
-+  echo "$as_me:19641: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19659,17 +19661,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19662 "configure"
-+#line 19664 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19666: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19668: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19672: \$? = $ac_status" >&5
-+  echo "$as_me:19674: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19706,7 +19708,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19709: result: $CXXCPP" >&5
-+echo "$as_me:19711: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19716,18 +19718,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19719 "configure"
-+#line 19721 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19724: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19726: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19730: \$? = $ac_status" >&5
-+  echo "$as_me:19732: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19750,17 +19752,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19753 "configure"
-+#line 19755 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19757: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19759: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19763: \$? = $ac_status" >&5
-+  echo "$as_me:19765: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19788,7 +19790,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19791: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19793: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19803,23 +19805,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19806: checking for $ac_header" >&5
-+echo "$as_me:19808: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19812 "configure"
-+#line 19814 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19816: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19818: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19822: \$? = $ac_status" >&5
-+  echo "$as_me:19824: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19838,7 +19840,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19841: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19843: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19851,23 +19853,23 @@
- for ac_header in iostream
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19854: checking for $ac_header" >&5
-+echo "$as_me:19856: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19860 "configure"
-+#line 19862 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19864: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19866: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19870: \$? = $ac_status" >&5
-+  echo "$as_me:19872: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19886,7 +19888,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19889: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19891: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19897,10 +19899,10 @@
- done
- 
- if test x"$ac_cv_header_iostream" = xyes ; then
--	echo "$as_me:19900: checking if iostream uses std-namespace" >&5
-+	echo "$as_me:19902: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19903 "configure"
-+#line 19905 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -19917,16 +19919,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19920: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19923: \$? = $ac_status" >&5
-+  echo "$as_me:19925: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19926: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19929: \$? = $ac_status" >&5
-+  echo "$as_me:19931: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -19935,7 +19937,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19938: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:19940: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -19946,7 +19948,7 @@
- 	fi
- fi
- 
--echo "$as_me:19949: checking if we should include stdbool.h" >&5
-+echo "$as_me:19951: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19954,7 +19956,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19957 "configure"
-+#line 19959 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19966,23 +19968,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19969: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19971: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19972: \$? = $ac_status" >&5
-+  echo "$as_me:19974: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19975: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19977: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19978: \$? = $ac_status" >&5
-+  echo "$as_me:19980: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19985 "configure"
-+#line 19987 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19998,16 +20000,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20001: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20003: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20004: \$? = $ac_status" >&5
-+  echo "$as_me:20006: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20007: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20009: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20010: \$? = $ac_status" >&5
-+  echo "$as_me:20012: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20021,13 +20023,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20024: result: yes" >&5
-+then	echo "$as_me:20026: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20026: result: no" >&5
-+else	echo "$as_me:20028: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20030: checking for builtin bool type" >&5
-+echo "$as_me:20032: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20035,7 +20037,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20038 "configure"
-+#line 20040 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -20050,16 +20052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20053: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20056: \$? = $ac_status" >&5
-+  echo "$as_me:20058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20059: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20062: \$? = $ac_status" >&5
-+  echo "$as_me:20064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20072,13 +20074,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20075: result: yes" >&5
-+then	echo "$as_me:20077: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20077: result: no" >&5
-+else	echo "$as_me:20079: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20081: checking for size of bool" >&5
-+echo "$as_me:20083: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20089,7 +20091,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20092 "configure"
-+#line 20094 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20131,15 +20133,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20136: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20137: \$? = $ac_status" >&5
-+  echo "$as_me:20139: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20139: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20141: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20142: \$? = $ac_status" >&5
-+  echo "$as_me:20144: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20157,18 +20159,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20160: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20162: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20166: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20168: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20171: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20173: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20186,7 +20188,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20189 "configure"
-+#line 20191 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -20200,16 +20202,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20203: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20205: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20206: \$? = $ac_status" >&5
-+  echo "$as_me:20208: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20209: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20211: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20212: \$? = $ac_status" >&5
-+  echo "$as_me:20214: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -20230,12 +20232,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:20233: result: $cf_result" >&5
-+echo "$as_me:20235: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20238: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20240: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20252,7 +20254,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20255 "configure"
-+#line 20257 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20271,15 +20273,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20276: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20277: \$? = $ac_status" >&5
-+  echo "$as_me:20279: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20281: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20282: \$? = $ac_status" >&5
-+  echo "$as_me:20284: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20298,7 +20300,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20301: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20303: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20308,7 +20310,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20311: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20313: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20322,7 +20324,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20325 "configure"
-+#line 20327 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20366,16 +20368,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20369: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20371: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20372: \$? = $ac_status" >&5
-+  echo "$as_me:20374: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20375: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20377: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20378: \$? = $ac_status" >&5
-+  echo "$as_me:20380: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20393,7 +20395,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20396: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20398: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20442,7 +20444,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20445: checking for size of bool" >&5
-+echo "$as_me:20447: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20453,7 +20455,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20456 "configure"
-+#line 20458 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20495,15 +20497,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20498: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20500: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20501: \$? = $ac_status" >&5
-+  echo "$as_me:20503: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20503: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20505: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20506: \$? = $ac_status" >&5
-+  echo "$as_me:20508: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20521,25 +20523,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20524: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20526: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20530: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20532: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20536: checking for fallback type of bool" >&5
-+			echo "$as_me:20538: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20542: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20544: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20568,7 +20570,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20571: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20573: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20579,7 +20581,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20582: checking for $ac_word" >&5
-+echo "$as_me:20584: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20594,7 +20596,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20597: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20599: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20603,10 +20605,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20606: result: $gnat_exists" >&5
-+  echo "$as_me:20608: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20609: result: no" >&5
-+  echo "$as_me:20611: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20615,12 +20617,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20618: checking for gnat version" >&5
-+echo "$as_me:20620: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20623: result: $cf_gnat_version" >&5
-+echo "$as_me:20625: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20628,7 +20630,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20631: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20633: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20636,7 +20638,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20639: checking for $ac_word" >&5
-+echo "$as_me:20641: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20651,7 +20653,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20654: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20656: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20660,10 +20662,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20663: result: $M4_exists" >&5
-+  echo "$as_me:20665: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20666: result: no" >&5
-+  echo "$as_me:20668: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20672,7 +20674,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20675: checking if GNAT works" >&5
-+		echo "$as_me:20677: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20700,7 +20702,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20703: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20705: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20709,7 +20711,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20712: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20714: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20726,10 +20728,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20729: result: $ADAFLAGS" >&5
-+	echo "$as_me:20731: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20732: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20734: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20739,11 +20741,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20742: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20744: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20746: checking if GNAT supports generics" >&5
-+echo "$as_me:20748: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20753,7 +20755,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20756: result: $cf_gnat_generics" >&5
-+echo "$as_me:20758: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20765,7 +20767,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20768: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20770: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20813,7 +20815,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20816: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20818: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20826,7 +20828,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20829: checking if GNAT supports project files" >&5
-+echo "$as_me:20831: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -20886,15 +20888,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:20889: result: $cf_gnat_projects" >&5
-+echo "$as_me:20891: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:20895: checking if GNAT supports libraries" >&5
-+	echo "$as_me:20897: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:20897: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:20899: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -20914,7 +20916,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:20917: checking for ada-compiler" >&5
-+echo "$as_me:20919: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -20925,12 +20927,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:20928: result: $cf_ada_compiler" >&5
-+echo "$as_me:20930: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:20933: checking for ada-include" >&5
-+echo "$as_me:20935: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -20966,7 +20968,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:20969: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:20971: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -20975,10 +20977,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:20978: result: $ADA_INCLUDE" >&5
-+echo "$as_me:20980: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:20981: checking for ada-objects" >&5
-+echo "$as_me:20983: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21014,7 +21016,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21017: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21019: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21023,10 +21025,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21026: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21028: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21029: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21031: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21036,7 +21038,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21039: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21041: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21059,13 +21061,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21062: checking for wchar_t" >&5
-+	echo "$as_me:21064: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21068 "configure"
-+#line 21070 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21080,16 +21082,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21083: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21085: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21086: \$? = $ac_status" >&5
-+  echo "$as_me:21088: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21091: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21092: \$? = $ac_status" >&5
-+  echo "$as_me:21094: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21099,10 +21101,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21102: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21104: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21105: checking size of wchar_t" >&5
-+echo "$as_me:21107: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21111,7 +21113,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21114 "configure"
-+#line 21116 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21123,21 +21125,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21126: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21128: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21129: \$? = $ac_status" >&5
-+  echo "$as_me:21131: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21132: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21134: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21135: \$? = $ac_status" >&5
-+  echo "$as_me:21137: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21140 "configure"
-+#line 21142 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21149,16 +21151,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21152: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21154: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21155: \$? = $ac_status" >&5
-+  echo "$as_me:21157: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21158: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21161: \$? = $ac_status" >&5
-+  echo "$as_me:21163: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21174,7 +21176,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21177 "configure"
-+#line 21179 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21186,16 +21188,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21189: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21191: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21192: \$? = $ac_status" >&5
-+  echo "$as_me:21194: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21195: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21197: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21198: \$? = $ac_status" >&5
-+  echo "$as_me:21200: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21211,7 +21213,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21214 "configure"
-+#line 21216 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21223,16 +21225,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21226: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21228: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21229: \$? = $ac_status" >&5
-+  echo "$as_me:21231: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21232: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21234: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21235: \$? = $ac_status" >&5
-+  echo "$as_me:21237: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21245,12 +21247,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21248: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21250: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21253 "configure"
-+#line 21255 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21266,15 +21268,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21269: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21271: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21272: \$? = $ac_status" >&5
-+  echo "$as_me:21274: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21274: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21276: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21277: \$? = $ac_status" >&5
-+  echo "$as_me:21279: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21290,7 +21292,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21293: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21295: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-@@ -21308,7 +21310,7 @@
- ### chooses to split module lists into libraries.
- ###
- ### (see CF_LIB_RULES).
--echo "$as_me:21311: checking for library subsets" >&5
-+echo "$as_me:21313: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21350,7 +21352,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21353: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21355: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21381,7 +21383,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21384: checking default library suffix" >&5
-+echo "$as_me:21386: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21392,10 +21394,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21395: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21397: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21398: checking default library-dependency suffix" >&5
-+echo "$as_me:21400: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21453,10 +21455,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21456: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21458: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21459: checking default object directory" >&5
-+echo "$as_me:21461: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21472,11 +21474,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21475: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21477: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21479: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21481: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21544,7 +21546,7 @@
- 	fi
- 
- fi
--echo "$as_me:21547: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21549: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21717,19 +21719,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21720: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21722: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 21725 "configure"
-+#line 21727 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21729: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21731: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21732: \$? = $ac_status" >&5
-+  echo "$as_me:21734: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21740,10 +21742,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21743 "configure"
-+#line 21745 "configure"
- #include "confdefs.h"
- 
--#line 21746 "configure"
-+#line 21748 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21758,16 +21760,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21761: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21763: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21764: \$? = $ac_status" >&5
-+  echo "$as_me:21766: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21767: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21769: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21770: \$? = $ac_status" >&5
-+  echo "$as_me:21772: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21790,7 +21792,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21793: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21795: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21806,7 +21808,7 @@
- 	;;
- esac
- 
--echo "$as_me:21809: checking where we will install curses.h" >&5
-+echo "$as_me:21811: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21816,7 +21818,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21819: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21821: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21824,7 +21826,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21827: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21829: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21842,7 +21844,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21845: checking for src modules" >&5
-+echo "$as_me:21847: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -21907,7 +21909,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:21910: result: $cf_cv_src_modules" >&5
-+echo "$as_me:21912: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22127,7 +22129,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22130: checking for $ac_word" >&5
-+echo "$as_me:22132: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22144,7 +22146,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22147: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22149: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22156,10 +22158,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22159: result: $TIC_PATH" >&5
-+  echo "$as_me:22161: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22162: result: no" >&5
-+  echo "$as_me:22164: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22167,7 +22169,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22170: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22172: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22193,7 +22195,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22196: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22198: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22204,7 +22206,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22207: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22209: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22220,7 +22222,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22223: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22225: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22277,7 +22279,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22280: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22282: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22379,7 +22381,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22382: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22384: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22555,7 +22557,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22558: error: ambiguous option: $1
-+    { { echo "$as_me:22560: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22574,7 +22576,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22577: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22579: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22692,7 +22694,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22695: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22697: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23147,7 +23149,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23150: creating $ac_file" >&5
-+    { echo "$as_me:23152: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23165,7 +23167,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23168: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23170: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23178,7 +23180,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23181: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23183: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23194,7 +23196,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23197: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23199: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -23203,7 +23205,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23206: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23208: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -23240,7 +23242,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:23243: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23245: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -23251,7 +23253,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:23254: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23256: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23300,7 +23302,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23303: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23305: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23311,7 +23313,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23314: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23316: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23324,7 +23326,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23327: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23329: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23382,7 +23384,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:23385: $ac_file is unchanged" >&5
-+      { echo "$as_me:23387: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23720,7 +23722,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23723: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23725: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: dist.mk
-Prereq:  1.1065 
---- ncurses-6.0-20150810+/dist.mk	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/dist.mk	2015-08-15 15:13:47.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1065 2015/08/10 09:10:29 tom Exp $
-+# $Id: dist.mk,v 1.1066 2015/08/15 15:13:47 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150810
-+NCURSES_PATCH = 20150815
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: form/llib-lform
---- ncurses-6.0-20150810+/form/llib-lform	2015-07-25 21:41:42.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lform	2015-08-15 17:20:49.000000000 +0000
-@@ -795,8 +795,6 @@
- 
- /* ./fty_num.c */
- 
--#include <locale.h>
--
- typedef struct
-   {
-     int precision;
-@@ -823,8 +821,6 @@
- 
- /* ./fty_regex.c */
- 
--#include <regex.h>
--
- typedef struct
-   {
-     regex_t *pRegExp;
-Index: form/llib-lformt
---- ncurses-6.0-20150810+/form/llib-lformt	2015-07-25 21:44:00.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lformt	2015-08-15 17:22:59.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2010,2015 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -795,8 +795,6 @@
- 
- /* ./fty_num.c */
- 
--#include <locale.h>
--
- typedef struct
-   {
-     int precision;
-@@ -823,8 +821,6 @@
- 
- /* ./fty_regex.c */
- 
--#include <regex.h>
--
- typedef struct
-   {
-     regex_t *pRegExp;
-Index: form/llib-lformtw
---- ncurses-6.0-20150810+/form/llib-lformtw	2015-07-25 21:43:11.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lformtw	2015-08-15 17:22:13.000000000 +0000
-@@ -808,8 +808,6 @@
- 
- /* ./fty_num.c */
- 
--#include <locale.h>
--
- typedef struct
-   {
-     int precision;
-@@ -836,8 +834,6 @@
- 
- /* ./fty_regex.c */
- 
--#include <regex.h>
--
- typedef struct
-   {
-     regex_t *pRegExp;
-Index: form/llib-lformw
---- ncurses-6.0-20150810+/form/llib-lformw	2015-07-25 21:42:23.000000000 +0000
-+++ ncurses-6.0-20150815/form/llib-lformw	2015-08-15 17:21:28.000000000 +0000
-@@ -808,8 +808,6 @@
- 
- /* ./fty_num.c */
- 
--#include <locale.h>
--
- typedef struct
-   {
-     int precision;
-@@ -836,8 +834,6 @@
- 
- /* ./fty_regex.c */
- 
--#include <regex.h>
--
- typedef struct
-   {
-     regex_t *pRegExp;
-Index: menu/llib-lmenu
---- ncurses-6.0-20150810+/menu/llib-lmenu	2010-01-09 21:22:33.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenu	2015-08-15 17:20:51.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1999-2005,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey        1996-2005,2010                          *
-+ *  Author: Thomas E. Dickey       1996-on                                  *
-  ****************************************************************************/
- /* LINTLIBRARY */
- 
-Index: menu/llib-lmenut
---- ncurses-6.0-20150810+/menu/llib-lmenut	2010-01-09 22:23:22.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenut	2015-08-15 17:23:01.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2010 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2010,2015 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey        2010                                    *
-+ *  Author: Thomas E. Dickey       2010-on                                  *
-  ****************************************************************************/
- /* LINTLIBRARY */
- 
-Index: menu/llib-lmenutw
---- ncurses-6.0-20150810+/menu/llib-lmenutw	2010-01-09 22:03:09.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenutw	2015-08-15 17:22:15.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2010 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2010,2015 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey                    2010                        *
-+ *  Author: Thomas E. Dickey       2010-on                                  *
-  ****************************************************************************/
- /* LINTLIBRARY */
- 
-@@ -237,8 +237,6 @@
- 
- /* ./m_item_new.c */
- 
--#include <wctype.h>
--
- #undef new_item
- ITEM	*new_item(
- 		const char *name, 
-Index: menu/llib-lmenuw
---- ncurses-6.0-20150810+/menu/llib-lmenuw	2010-01-09 21:53:58.000000000 +0000
-+++ ncurses-6.0-20150815/menu/llib-lmenuw	2015-08-15 17:21:31.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2010,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey                    2002-2005,2010              *
-+ *  Author: Thomas E. Dickey       2002-on                                  *
-  ****************************************************************************/
- /* LINTLIBRARY */
- 
-@@ -237,8 +237,6 @@
- 
- /* ./m_item_new.c */
- 
--#include <wctype.h>
--
- #undef new_item
- ITEM	*new_item(
- 		const char *name, 
-Index: ncurses/llib-lncurses
---- ncurses-6.0-20150810+/ncurses/llib-lncurses	2015-07-25 22:52:04.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncurses	2015-08-15 19:06:20.000000000 +0000
-@@ -2511,10 +2511,6 @@
- 
- /* ./trace/varargs.c */
- 
--typedef enum {
--    atUnknown = 0, atInteger, atFloat, atPoint, atString
--} ARGTYPE;
--
- #undef _nc_varargs
- char	*_nc_varargs(
- 		const char *fmt, 
-@@ -3792,11 +3788,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -3980,9 +3971,11 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#undef _nc_read_termcap
--void	_nc_read_termcap(void)
--		{ /* void */ }
-+#undef _nc_read_termcap_entry
-+int	_nc_read_termcap_entry(
-+		const char *const tn, 
-+		TERMTYPE *const tp)
-+		{ return(*(int *)0); }
- 
- /* ./tinfo/strings.c */
- 
-@@ -4264,11 +4257,6 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
- #undef _nc_set_writedir
-Index: ncurses/llib-lncursest
---- ncurses-6.0-20150810+/ncurses/llib-lncursest	2015-07-25 23:02:48.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncursest	2015-08-15 20:08:58.000000000 +0000
-@@ -2520,10 +2520,6 @@
- 
- /* ./trace/varargs.c */
- 
--typedef enum {
--    atUnknown = 0, atInteger, atFloat, atPoint, atString
--} ARGTYPE;
--
- #undef _nc_varargs
- char	*_nc_varargs(
- 		const char *fmt, 
-@@ -3894,11 +3890,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -4093,9 +4084,11 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#undef _nc_read_termcap
--void	_nc_read_termcap(void)
--		{ /* void */ }
-+#undef _nc_read_termcap_entry
-+int	_nc_read_termcap_entry(
-+		const char *const tn, 
-+		TERMTYPE *const tp)
-+		{ return(*(int *)0); }
- 
- /* ./tinfo/strings.c */
- 
-@@ -4377,11 +4370,6 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
- #undef _nc_set_writedir
-Index: ncurses/llib-lncursestw
---- ncurses-6.0-20150810+/ncurses/llib-lncursestw	2015-07-25 23:03:50.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncursestw	2015-08-15 19:07:52.000000000 +0000
-@@ -3028,10 +3028,6 @@
- 
- /* ./trace/varargs.c */
- 
--typedef enum {
--    atUnknown = 0, atInteger, atFloat, atPoint, atString
--} ARGTYPE;
--
- #undef _nc_varargs
- char	*_nc_varargs(
- 		const char *fmt, 
-@@ -4688,11 +4684,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -4887,9 +4878,11 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#undef _nc_read_termcap
--void	_nc_read_termcap(void)
--		{ /* void */ }
-+#undef _nc_read_termcap_entry
-+int	_nc_read_termcap_entry(
-+		const char *const tn, 
-+		TERMTYPE *const tp)
-+		{ return(*(int *)0); }
- 
- /* ./tinfo/strings.c */
- 
-@@ -5193,11 +5186,6 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
- #undef _nc_set_writedir
-Index: ncurses/llib-lncursesw
---- ncurses-6.0-20150810+/ncurses/llib-lncursesw	2015-07-25 23:04:15.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lncursesw	2015-08-15 20:03:43.000000000 +0000
-@@ -1904,13 +1904,6 @@
- 
- /* ./base/lib_mouse.c */
- 
--typedef struct {
--    int nerror; 
--    int nparam; 
--    int params[9];
--    int final; 
--} SGR_DATA;
--
- #undef getmouse_sp
- int	getmouse_sp(
- 		SCREEN	*sp, 
-@@ -2402,28 +2395,6 @@
- 
- /* ./base/lib_screen.c */
- 
--typedef enum {
--    pINT 
--    ,pSHORT 
--    ,pBOOL 
--    ,pATTR 
--    ,pCHAR 
--    ,pSIZE 
--    ,pCCHAR 
--} PARAM_TYPE;
--
--typedef struct {
--    const char name[11];
--    attr_t attr;
--} SCR_ATTRS;
--
--typedef struct {
--    const char name[17];
--    PARAM_TYPE type;
--    size_t size;
--    size_t offset;
--} SCR_PARAMS;
--
- #undef getwin_sp
- WINDOW	*getwin_sp(
- 		SCREEN	*sp, 
-@@ -3048,10 +3019,6 @@
- 
- /* ./trace/varargs.c */
- 
--typedef enum {
--    atUnknown = 0, atInteger, atFloat, atPoint, atString
--} ARGTYPE;
--
- #undef _nc_varargs
- char	*_nc_varargs(
- 		const char *fmt, 
-@@ -4615,11 +4582,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -4803,9 +4765,11 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#undef _nc_read_termcap
--void	_nc_read_termcap(void)
--		{ /* void */ }
-+#undef _nc_read_termcap_entry
-+int	_nc_read_termcap_entry(
-+		const char *const tn, 
-+		TERMTYPE *const tp)
-+		{ return(*(int *)0); }
- 
- /* ./tinfo/strings.c */
- 
-@@ -5109,11 +5073,6 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
- #undef _nc_set_writedir
-Index: ncurses/llib-ltic
---- ncurses-6.0-20150810+/ncurses/llib-ltic	2015-07-25 22:52:52.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltic	2015-08-15 19:06:29.000000000 +0000
-@@ -34,8 +34,6 @@
- /* ./tinfo/alloc_entry.c */
- 
- #include <curses.priv.h>
--#include <tic.h>
--
- #undef _nc_init_entry
- void	_nc_init_entry(
- 		TERMTYPE *const tp)
-@@ -65,8 +63,6 @@
- 
- /* ./tinfo/captoinfo.c */
- 
--#include <ctype.h>
--
- #undef _nc_captoinfo
- char	*_nc_captoinfo(
- 		const char *cap, 
-@@ -188,15 +184,8 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_set_writedir
- void	_nc_set_writedir(
- 		const char *dir)
-Index: ncurses/llib-ltict
---- ncurses-6.0-20150810+/ncurses/llib-ltict	2015-07-25 22:49:03.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltict	2015-08-15 19:08:45.000000000 +0000
-@@ -34,8 +34,6 @@
- /* ./tinfo/alloc_entry.c */
- 
- #include <curses.priv.h>
--#include <tic.h>
--
- #undef _nc_init_entry
- void	_nc_init_entry(
- 		TERMTYPE *const tp)
-@@ -65,8 +63,6 @@
- 
- /* ./tinfo/captoinfo.c */
- 
--#include <ctype.h>
--
- #undef _nc_captoinfo
- char	*_nc_captoinfo(
- 		const char *cap, 
-@@ -188,15 +184,8 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_set_writedir
- void	_nc_set_writedir(
- 		const char *dir)
-Index: ncurses/llib-ltictw
---- ncurses-6.0-20150810+/ncurses/llib-ltictw	2015-07-25 22:45:20.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltictw	2015-08-15 19:08:02.000000000 +0000
-@@ -34,8 +34,6 @@
- /* ./tinfo/alloc_entry.c */
- 
- #include <curses.priv.h>
--#include <tic.h>
--
- #undef _nc_init_entry
- void	_nc_init_entry(
- 		TERMTYPE *const tp)
-@@ -65,8 +63,6 @@
- 
- /* ./tinfo/captoinfo.c */
- 
--#include <ctype.h>
--
- #undef _nc_captoinfo
- char	*_nc_captoinfo(
- 		const char *cap, 
-@@ -188,15 +184,8 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_set_writedir
- void	_nc_set_writedir(
- 		const char *dir)
-Index: ncurses/llib-lticw
---- ncurses-6.0-20150810+/ncurses/llib-lticw	2015-07-25 22:45:08.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-lticw	2015-08-15 19:07:15.000000000 +0000
-@@ -34,8 +34,6 @@
- /* ./tinfo/alloc_entry.c */
- 
- #include <curses.priv.h>
--#include <tic.h>
--
- #undef _nc_init_entry
- void	_nc_init_entry(
- 		TERMTYPE *const tp)
-@@ -65,8 +63,6 @@
- 
- /* ./tinfo/captoinfo.c */
- 
--#include <ctype.h>
--
- #undef _nc_captoinfo
- char	*_nc_captoinfo(
- 		const char *cap, 
-@@ -188,15 +184,8 @@
- 		const char *t)
- 		{ return(*(int *)0); }
- 
--typedef struct {
--    const char from[3];
--    const char to[6];
--} assoc;
--
- /* ./tinfo/write_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_set_writedir
- void	_nc_set_writedir(
- 		const char *dir)
-Index: ncurses/llib-ltinfo
---- ncurses-6.0-20150810+/ncurses/llib-ltinfo	2015-07-25 21:42:11.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfo	2015-08-15 19:06:34.000000000 +0000
-@@ -34,9 +34,6 @@
- /* ./tinfo/access.c */
- 
- #include <curses.priv.h>
--#include <ctype.h>
--#include <tic.h>
--
- #undef _nc_rootname
- char	*_nc_rootname(
- 		char	*path)
-@@ -111,8 +108,6 @@
- 
- /* ./comp_captab.c */
- 
--#include <hashsize.h>
--
- #undef _nc_get_table
- const struct name_table_entry *_nc_get_table(
- 		NCURSES_BOOL termcap)
-@@ -196,8 +191,6 @@
- 
- /* ./tinfo/db_iterator.c */
- 
--#include <time.h>
--
- #undef _nc_tic_dir
- const char *_nc_tic_dir(
- 		const char *path)
-@@ -303,15 +296,6 @@
- 
- /* ./tinfo/init_keytry.c */
- 
--#if 0
--
--#include <init_keytry.h>
--
--#undef _nc_tinfo_fkeys
--const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
--
--#endif
--
- #undef _nc_init_keytry
- void	_nc_init_keytry(
- 		SCREEN	*sp)
-@@ -333,8 +317,6 @@
- 
- /* ./tinfo/lib_baudrate.c */
- 
--#include <termcap.h>
--
- struct speed {
-     short s; 
-     int sp; 
-@@ -485,8 +467,6 @@
- 
- /* ./tinfo/lib_napms.c */
- 
--#include <sys/time.h>
--
- #undef napms_sp
- int	napms_sp(
- 		SCREEN	*sp, 
-@@ -670,10 +650,6 @@
- 
- /* ./tinfo/lib_setup.c */
- 
--#include <locale.h>
--#include <sys/ioctl.h>
--#include <langinfo.h>
--
- #undef ttytype
- char	ttytype[256];
- #undef LINES
-@@ -791,12 +767,6 @@
- 		const char *name)
- 		{ return(*(int *)0); }
- 
--#if 0
--
--#include <capdefaults.c>
--
--#endif
--
- #undef tgetent
- int	tgetent(
- 		char	*bufp, 
-@@ -1136,11 +1106,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -1297,8 +1262,6 @@
- 
- /* ./tinfo/read_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_init_termtype
- void	_nc_init_termtype(
- 		TERMTYPE *const tp)
-@@ -1326,8 +1289,6 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#include <sys/types.h>
--
- #undef _nc_read_termcap
- void	_nc_read_termcap(void)
- 		{ /* void */ }
-Index: ncurses/llib-ltinfot
---- ncurses-6.0-20150810+/ncurses/llib-ltinfot	2015-07-25 21:44:32.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfot	2015-08-15 19:08:50.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2013-2013,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2013,2015 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,9 +34,6 @@
- /* ./tinfo/access.c */
- 
- #include <curses.priv.h>
--#include <ctype.h>
--#include <tic.h>
--
- #undef _nc_rootname
- char	*_nc_rootname(
- 		char	*path)
-@@ -116,8 +113,6 @@
- 
- /* ./comp_captab.c */
- 
--#include <hashsize.h>
--
- #undef _nc_get_table
- const struct name_table_entry *_nc_get_table(
- 		NCURSES_BOOL termcap)
-@@ -201,8 +196,6 @@
- 
- /* ./tinfo/db_iterator.c */
- 
--#include <time.h>
--
- #undef _nc_tic_dir
- const char *_nc_tic_dir(
- 		const char *path)
-@@ -308,15 +301,6 @@
- 
- /* ./tinfo/init_keytry.c */
- 
--#if 0
--
--#include <init_keytry.h>
--
--#undef _nc_tinfo_fkeys
--const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
--
--#endif
--
- #undef _nc_init_keytry
- void	_nc_init_keytry(
- 		SCREEN	*sp)
-@@ -339,8 +323,6 @@
- 
- /* ./tinfo/lib_baudrate.c */
- 
--#include <termcap.h>
--
- struct speed {
-     short s; 
-     int sp; 
-@@ -714,10 +696,6 @@
- 
- /* ./tinfo/lib_setup.c */
- 
--#include <locale.h>
--#include <sys/ioctl.h>
--#include <langinfo.h>
--
- #undef _nc_ttytype
- char	*_nc_ttytype(void)
- 		{ return(*(char **)0); }
-@@ -857,12 +835,6 @@
- 		const char *name)
- 		{ return(*(int *)0); }
- 
--#if 0
--
--#include <capdefaults.c>
--
--#endif
--
- #undef tgetent
- int	tgetent(
- 		char	*bufp, 
-@@ -1227,11 +1199,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -1334,8 +1301,6 @@
- 
- /* ./tty/lib_twait.c */
- 
--#include <sys/time.h>
--
- #undef _nc_timed_wait
- int	_nc_timed_wait(
- 		SCREEN	*sp, 
-@@ -1401,8 +1366,6 @@
- 
- /* ./tinfo/read_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_init_termtype
- void	_nc_init_termtype(
- 		TERMTYPE *const tp)
-@@ -1430,8 +1393,6 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#include <sys/types.h>
--
- #undef _nc_read_termcap
- void	_nc_read_termcap(void)
- 		{ /* void */ }
-Index: ncurses/llib-ltinfotw
---- ncurses-6.0-20150810+/ncurses/llib-ltinfotw	2015-07-25 21:43:48.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfotw	2015-08-15 19:08:08.000000000 +0000
-@@ -34,9 +34,6 @@
- /* ./tinfo/access.c */
- 
- #include <curses.priv.h>
--#include <ctype.h>
--#include <tic.h>
--
- #undef _nc_rootname
- char	*_nc_rootname(
- 		char	*path)
-@@ -116,8 +113,6 @@
- 
- /* ./comp_captab.c */
- 
--#include <hashsize.h>
--
- #undef _nc_get_table
- const struct name_table_entry *_nc_get_table(
- 		NCURSES_BOOL termcap)
-@@ -201,8 +196,6 @@
- 
- /* ./tinfo/db_iterator.c */
- 
--#include <time.h>
--
- #undef _nc_tic_dir
- const char *_nc_tic_dir(
- 		const char *path)
-@@ -308,15 +301,6 @@
- 
- /* ./tinfo/init_keytry.c */
- 
--#if 0
--
--#include <init_keytry.h>
--
--#undef _nc_tinfo_fkeys
--const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
--
--#endif
--
- #undef _nc_init_keytry
- void	_nc_init_keytry(
- 		SCREEN	*sp)
-@@ -339,8 +323,6 @@
- 
- /* ./tinfo/lib_baudrate.c */
- 
--#include <termcap.h>
--
- struct speed {
-     short s; 
-     int sp; 
-@@ -714,10 +696,6 @@
- 
- /* ./tinfo/lib_setup.c */
- 
--#include <locale.h>
--#include <sys/ioctl.h>
--#include <langinfo.h>
--
- #undef _nc_ttytype
- char	*_nc_ttytype(void)
- 		{ return(*(char **)0); }
-@@ -857,12 +835,6 @@
- 		const char *name)
- 		{ return(*(int *)0); }
- 
--#if 0
--
--#include <capdefaults.c>
--
--#endif
--
- #undef tgetent
- int	tgetent(
- 		char	*bufp, 
-@@ -1238,11 +1210,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -1345,8 +1312,6 @@
- 
- /* ./tty/lib_twait.c */
- 
--#include <sys/time.h>
--
- #undef _nc_timed_wait
- int	_nc_timed_wait(
- 		SCREEN	*sp, 
-@@ -1412,8 +1377,6 @@
- 
- /* ./tinfo/read_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_init_termtype
- void	_nc_init_termtype(
- 		TERMTYPE *const tp)
-@@ -1441,8 +1404,6 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#include <sys/types.h>
--
- #undef _nc_read_termcap
- void	_nc_read_termcap(void)
- 		{ /* void */ }
-Index: ncurses/llib-ltinfow
---- ncurses-6.0-20150810+/ncurses/llib-ltinfow	2015-07-25 21:42:57.000000000 +0000
-+++ ncurses-6.0-20150815/ncurses/llib-ltinfow	2015-08-15 19:07:20.000000000 +0000
-@@ -34,9 +34,6 @@
- /* ./tinfo/access.c */
- 
- #include <curses.priv.h>
--#include <ctype.h>
--#include <tic.h>
--
- #undef _nc_rootname
- char	*_nc_rootname(
- 		char	*path)
-@@ -111,8 +108,6 @@
- 
- /* ./comp_captab.c */
- 
--#include <hashsize.h>
--
- #undef _nc_get_table
- const struct name_table_entry *_nc_get_table(
- 		NCURSES_BOOL termcap)
-@@ -196,8 +191,6 @@
- 
- /* ./tinfo/db_iterator.c */
- 
--#include <time.h>
--
- #undef _nc_tic_dir
- const char *_nc_tic_dir(
- 		const char *path)
-@@ -303,15 +296,6 @@
- 
- /* ./tinfo/init_keytry.c */
- 
--#if 0
--
--#include <init_keytry.h>
--
--#undef _nc_tinfo_fkeys
--const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
--
--#endif
--
- #undef _nc_init_keytry
- void	_nc_init_keytry(
- 		SCREEN	*sp)
-@@ -333,8 +317,6 @@
- 
- /* ./tinfo/lib_baudrate.c */
- 
--#include <termcap.h>
--
- struct speed {
-     short s; 
-     int sp; 
-@@ -485,8 +467,6 @@
- 
- /* ./tinfo/lib_napms.c */
- 
--#include <sys/time.h>
--
- #undef napms_sp
- int	napms_sp(
- 		SCREEN	*sp, 
-@@ -670,10 +650,6 @@
- 
- /* ./tinfo/lib_setup.c */
- 
--#include <locale.h>
--#include <sys/ioctl.h>
--#include <langinfo.h>
--
- #undef ttytype
- char	ttytype[256];
- #undef LINES
-@@ -791,12 +767,6 @@
- 		const char *name)
- 		{ return(*(int *)0); }
- 
--#if 0
--
--#include <capdefaults.c>
--
--#endif
--
- #undef tgetent
- int	tgetent(
- 		char	*bufp, 
-@@ -1147,11 +1117,6 @@
- 
- /* ./trace/lib_tracebits.c */
- 
--typedef struct {
--    unsigned int val;
--    const char name[8];
--} BITNAMES;
--
- #undef _nc_trace_ttymode
- char	*_nc_trace_ttymode(
- 		struct termios *tty)
-@@ -1308,8 +1273,6 @@
- 
- /* ./tinfo/read_entry.c */
- 
--#include <hashed_db.h>
--
- #undef _nc_init_termtype
- void	_nc_init_termtype(
- 		TERMTYPE *const tp)
-@@ -1337,8 +1300,6 @@
- 
- /* ./tinfo/read_termcap.c */
- 
--#include <sys/types.h>
--
- #undef _nc_read_termcap
- void	_nc_read_termcap(void)
- 		{ /* void */ }
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150810+/package/debian-mingw/changelog	2015-08-10 09:10:30.000000000 +0000
-+++ ncurses-6.0-20150815/package/debian-mingw/changelog	2015-08-15 15:13:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150810) unstable; urgency=low
-+ncurses6 (6.0+20150815) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Aug 2015 05:10:30 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Aug 2015 11:13:47 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150810+/package/debian-mingw64/changelog	2015-08-10 09:10:30.000000000 +0000
-+++ ncurses-6.0-20150815/package/debian-mingw64/changelog	2015-08-15 15:13:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150810) unstable; urgency=low
-+ncurses6 (6.0+20150815) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Aug 2015 05:10:30 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Aug 2015 11:13:47 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150810+/package/debian/changelog	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/package/debian/changelog	2015-08-15 15:13:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150810) unstable; urgency=low
-+ncurses6 (6.0+20150815) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 10 Aug 2015 05:10:29 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Aug 2015 11:13:47 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.118 
---- ncurses-6.0-20150810+/package/mingw-ncurses.nsi	2015-08-10 09:10:30.000000000 +0000
-+++ ncurses-6.0-20150815/package/mingw-ncurses.nsi	2015-08-15 15:13:47.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.118 2015/08/10 09:10:30 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.119 2015/08/15 15:13:47 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0810"

-+!define VERSION_MMDD  "0815"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150810+/package/mingw-ncurses.spec	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/package/mingw-ncurses.spec	2015-08-15 15:13:47.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150810
-+Release: 20150815
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150810+/package/ncurses.spec	2015-08-10 09:10:29.000000000 +0000
-+++ ncurses-6.0-20150815/package/ncurses.spec	2015-08-15 15:13:47.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150810
-+Release: 20150815
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: panel/llib-lpanelt
---- ncurses-6.0-20150810+/panel/llib-lpanelt	2015-07-25 21:44:18.000000000 +0000
-+++ ncurses-6.0-20150815/panel/llib-lpanelt	2015-08-15 17:26:01.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2010,2015 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-Index: panel/llib-lpaneltw
---- ncurses-6.0-20150810+/panel/llib-lpaneltw	2015-07-25 21:43:33.000000000 +0000
-+++ ncurses-6.0-20150815/panel/llib-lpaneltw	2015-08-15 17:22:34.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2010-2010,2015 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2010,2015 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
diff --git a/patches/ncurses/6.0/120-ncurses-6.0-20150822.patch b/patches/ncurses/6.0/120-ncurses-6.0-20150822.patch
deleted file mode 100644
index 202ffe8..0000000
--- a/patches/ncurses/6.0/120-ncurses-6.0-20150822.patch
+++ /dev/null
@@ -1,19082 +0,0 @@
-# ncurses 6.0 - patch 20150822 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150822.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Aug 23 00:47:10 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   35 
-# Ada95/configure                  | 2022 +++++++++++----------
-# NEWS                             |   12 
-# VERSION                          |    2 
-# aclocal.m4                       |   28 
-# configure                        | 3412 ++++++++++++++++++-------------------
-# dist.mk                          |    4 
-# include/term_entry.h             |   10 
-# man/curs_variables.3x            |   18 
-# ncurses/base/lib_color.c         |    6 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# progs/infocmp.c                  |   10 
-# progs/tic.c                      |    7 
-# test/demo_menus.c                |    8 
-# test/savescreen.c                |    4 
-# 20 files changed, 2823 insertions(+), 2775 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.105 
---- ncurses-6.0-20150815+/Ada95/aclocal.m4	2015-08-08 14:25:40.000000000 +0000
-+++ ncurses-6.0-20150822/Ada95/aclocal.m4	2015-08-22 21:14:14.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.105 2015/08/08 14:25:40 tom Exp $
-+dnl $Id: aclocal.m4,v 1.106 2015/08/22 21:14:14 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -2921,7 +2921,7 @@
- $1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SHARED_OPTS version: 88 updated: 2015/08/05 20:44:28
-+dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59
- dnl --------------
- dnl --------------
- dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -2974,11 +2974,12 @@
- 	(yes)
- 		cf_cv_shlib_version=auto
- 		;;
--	(rel|abi|auto|no)
-+	(rel|abi|auto)
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
-+		AC_MSG_RESULT($withval)
-+		AC_MSG_ERROR([option value must be one of: rel, abi, or auto])
- 		;;
- 	esac
- 	],[cf_cv_shlib_version=auto])
-@@ -3701,19 +3702,25 @@
- AC_SUBST($3)dnl
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PKG_CONFIG_LIBDIR version: 9 updated: 2015/06/06 19:26:44
-+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 10 updated: 2015/08/22 17:10:56
- dnl -------------------------
- dnl Allow the choice of the pkg-config library directory to be overridden.
- AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
--if test "x$PKG_CONFIG" = xnone ; then
--	PKG_CONFIG_LIBDIR=no
--else
-+
-+case $PKG_CONFIG in
-+(no|none|yes)
-+	AC_MSG_CHECKING(for pkg-config library directory)
-+	;;
-+(*)
- 	AC_MSG_CHECKING(for $PKG_CONFIG library directory)
--	AC_ARG_WITH(pkg-config-libdir,
--		[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
--		[PKG_CONFIG_LIBDIR=$withval],
--		[PKG_CONFIG_LIBDIR=yes])
--fi
-+	;;
-+esac
-+
-+PKG_CONFIG_LIBDIR=no
-+AC_ARG_WITH(pkg-config-libdir,
-+	[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
-+	[PKG_CONFIG_LIBDIR=$withval],
-+	[test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes])
- 
- case x$PKG_CONFIG_LIBDIR in
- (x/*)
-@@ -3769,7 +3776,7 @@
- 	;;
- esac
- 
--if test "x$PKG_CONFIG" != xnone ; then
-+if test "x$PKG_CONFIG_LIBDIR" != xno ; then
- 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
- fi
- 
-Index: Ada95/configure
---- ncurses-6.0-20150815+/Ada95/configure	2015-08-08 14:26:00.000000000 +0000
-+++ ncurses-6.0-20150822/Ada95/configure	2015-08-22 21:14:42.000000000 +0000
-@@ -2547,20 +2547,26 @@
- echo "$as_me: WARNING: pkg-config is not installed" >&2;}
- fi
- 
--if test "x$PKG_CONFIG" = xnone ; then
--	PKG_CONFIG_LIBDIR=no
--else
--	echo "$as_me:2553: checking for $PKG_CONFIG library directory" >&5
-+case $PKG_CONFIG in
-+(no|none|yes)
-+	echo "$as_me:2552: checking for pkg-config library directory" >&5
-+echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
-+	;;
-+(*)
-+	echo "$as_me:2556: checking for $PKG_CONFIG library directory" >&5
- echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
-+	;;
-+esac
-+
-+PKG_CONFIG_LIBDIR=no
- 
- # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
- if test "${with_pkg_config_libdir+set}" = set; then
-   withval="$with_pkg_config_libdir"
-   PKG_CONFIG_LIBDIR=$withval
- else
--  PKG_CONFIG_LIBDIR=yes
-+  test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes
- fi;
--fi
- 
- case x$PKG_CONFIG_LIBDIR in
- (x/*)
-@@ -2602,18 +2608,18 @@
- 
- 	test -n "$verbose" && echo "	list..." 1>&6
- 
--echo "${as_me:-configure}:2605: testing list... ..." 1>&5
-+echo "${as_me:-configure}:2611: testing list... ..." 1>&5
- 
- 	for cf_config in $cf_search_path
- 	do
- 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
- 
--echo "${as_me:-configure}:2611: testing checking $cf_config/pkgconfig ..." 1>&5
-+echo "${as_me:-configure}:2617: testing checking $cf_config/pkgconfig ..." 1>&5
- 
- 		if test -d $cf_config/pkgconfig
- 		then
- 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
--			echo "$as_me:2616: checking done" >&5
-+			echo "$as_me:2622: checking done" >&5
- echo $ECHO_N "checking done... $ECHO_C" >&6
- 			break
- 		fi
-@@ -2623,12 +2629,12 @@
- 	;;
- esac
- 
--if test "x$PKG_CONFIG" != xnone ; then
--	echo "$as_me:2627: result: $PKG_CONFIG_LIBDIR" >&5
-+if test "x$PKG_CONFIG_LIBDIR" != xno ; then
-+	echo "$as_me:2633: result: $PKG_CONFIG_LIBDIR" >&5
- echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
- fi
- 
--echo "$as_me:2631: checking if you want to build test-programs" >&5
-+echo "$as_me:2637: checking if you want to build test-programs" >&5
- echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
- 
- # Check whether --with-tests or --without-tests was given.
-@@ -2638,10 +2644,10 @@
- else
-   cf_with_tests=yes
- fi;
--echo "$as_me:2641: result: $cf_with_tests" >&5
-+echo "$as_me:2647: result: $cf_with_tests" >&5
- echo "${ECHO_T}$cf_with_tests" >&6
- 
--echo "$as_me:2644: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:2650: checking if we should assume mixed-case filenames" >&5
- echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
- 
- # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -2651,11 +2657,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:2654: result: $enable_mixedcase" >&5
-+echo "$as_me:2660: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:2658: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:2664: checking if filesystem supports mixed-case filenames" >&5
- echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
- if test "${cf_cv_mixedcase+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2682,7 +2688,7 @@
- fi
- 
- fi
--echo "$as_me:2685: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:2691: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -2700,7 +2706,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:2703: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:2709: checking whether ${MAKE-make} sets \${MAKE}" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-@@ -2720,11 +2726,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:2723: result: yes" >&5
-+  echo "$as_me:2729: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:2727: result: no" >&5
-+  echo "$as_me:2733: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -2733,7 +2739,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2736: checking for $ac_word" >&5
-+echo "$as_me:2742: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CTAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2748,7 +2754,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CTAGS="$ac_prog"
--echo "$as_me:2751: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2757: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2756,10 +2762,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
--  echo "$as_me:2759: result: $CTAGS" >&5
-+  echo "$as_me:2765: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:2762: result: no" >&5
-+  echo "$as_me:2768: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2770,7 +2776,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2773: checking for $ac_word" >&5
-+echo "$as_me:2779: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ETAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2785,7 +2791,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ETAGS="$ac_prog"
--echo "$as_me:2788: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2794: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2793,10 +2799,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
--  echo "$as_me:2796: result: $ETAGS" >&5
-+  echo "$as_me:2802: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:2799: result: no" >&5
-+  echo "$as_me:2805: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2805,7 +2811,7 @@
- 
- # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
- set dummy ${CTAGS:-ctags}; ac_word=$2
--echo "$as_me:2808: checking for $ac_word" >&5
-+echo "$as_me:2814: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2820,7 +2826,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:2823: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2829: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2829,17 +2835,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:2832: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:2838: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:2835: result: no" >&5
-+  echo "$as_me:2841: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:2842: checking for $ac_word" >&5
-+echo "$as_me:2848: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2854,7 +2860,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:2857: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2863: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2863,10 +2869,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:2866: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:2872: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:2869: result: no" >&5
-+  echo "$as_me:2875: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2886,7 +2892,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:2889: checking for makeflags variable" >&5
-+echo "$as_me:2895: checking for makeflags variable" >&5
- echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
- if test "${cf_cv_makeflags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2920,13 +2926,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:2923: result: $cf_cv_makeflags" >&5
-+echo "$as_me:2929: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:2929: checking for $ac_word" >&5
-+echo "$as_me:2935: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2941,7 +2947,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:2944: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2950: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2949,10 +2955,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:2952: result: $RANLIB" >&5
-+  echo "$as_me:2958: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:2955: result: no" >&5
-+  echo "$as_me:2961: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2961,7 +2967,7 @@
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:2964: checking for $ac_word" >&5
-+echo "$as_me:2970: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2976,7 +2982,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:2979: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2985: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2985,10 +2991,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:2988: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:2994: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:2991: result: no" >&5
-+  echo "$as_me:2997: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3000,7 +3006,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:3003: checking for $ac_word" >&5
-+echo "$as_me:3009: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3015,7 +3021,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:3018: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3024: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3023,10 +3029,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:3026: result: $LD" >&5
-+  echo "$as_me:3032: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:3029: result: no" >&5
-+  echo "$as_me:3035: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3035,7 +3041,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:3038: checking for $ac_word" >&5
-+echo "$as_me:3044: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3050,7 +3056,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:3053: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3059: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3059,10 +3065,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:3062: result: $ac_ct_LD" >&5
-+  echo "$as_me:3068: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:3065: result: no" >&5
-+  echo "$as_me:3071: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3074,7 +3080,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:3077: checking for $ac_word" >&5
-+echo "$as_me:3083: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3089,7 +3095,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:3092: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3098: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3097,10 +3103,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3100: result: $AR" >&5
-+  echo "$as_me:3106: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3103: result: no" >&5
-+  echo "$as_me:3109: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3109,7 +3115,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:3112: checking for $ac_word" >&5
-+echo "$as_me:3118: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3124,7 +3130,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3127: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3133: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3133,10 +3139,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3136: result: $ac_ct_AR" >&5
-+  echo "$as_me:3142: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3139: result: no" >&5
-+  echo "$as_me:3145: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3148,7 +3154,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:3151: checking for $ac_word" >&5
-+echo "$as_me:3157: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3163,7 +3169,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:3166: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3172: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3171,10 +3177,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3174: result: $AR" >&5
-+  echo "$as_me:3180: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3177: result: no" >&5
-+  echo "$as_me:3183: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3183,7 +3189,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:3186: checking for $ac_word" >&5
-+echo "$as_me:3192: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3198,7 +3204,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3201: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3207: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3207,10 +3213,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3210: result: $ac_ct_AR" >&5
-+  echo "$as_me:3216: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3213: result: no" >&5
-+  echo "$as_me:3219: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3219,7 +3225,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:3222: checking for options to update archives" >&5
-+echo "$as_me:3228: checking for options to update archives" >&5
- echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
- if test "${cf_cv_ar_flags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3242,13 +3248,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <<EOF
--#line 3245 "configure"
-+#line 3251 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--		if { (eval echo "$as_me:3248: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:3254: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3251: \$? = $ac_status" >&5
-+  echo "$as_me:3257: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
- 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -3259,7 +3265,7 @@
- 		else
- 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--echo "${as_me:-configure}:3262: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:3268: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -3267,7 +3273,7 @@
- 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
--echo "$as_me:3270: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:3276: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -3278,17 +3284,17 @@
- 	ARFLAGS=$cf_cv_ar_flags
- fi
- 
--	echo "$as_me:3281: checking for PATH separator" >&5
-+	echo "$as_me:3287: checking for PATH separator" >&5
- echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(os2*)	PATH_SEPARATOR=';'  ;;
- 	(*)	${PATH_SEPARATOR:=':'}  ;;
- 	esac
- 
--	echo "$as_me:3288: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:3294: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
--echo "$as_me:3291: checking if you have specified an install-prefix" >&5
-+echo "$as_me:3297: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -3301,7 +3307,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:3304: result: $DESTDIR" >&5
-+echo "$as_me:3310: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -3329,7 +3335,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3332: checking for $ac_word" >&5
-+echo "$as_me:3338: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3344,7 +3350,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:3347: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3353: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3352,10 +3358,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:3355: result: $BUILD_CC" >&5
-+  echo "$as_me:3361: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:3358: result: no" >&5
-+  echo "$as_me:3364: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3363,12 +3369,12 @@
- done
- 
- fi;
--	echo "$as_me:3366: checking for native build C compiler" >&5
-+	echo "$as_me:3372: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:3368: result: $BUILD_CC" >&5
-+	echo "$as_me:3374: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:3371: checking for native build C preprocessor" >&5
-+	echo "$as_me:3377: checking for native build C preprocessor" >&5
- echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
- 
- # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -3378,10 +3384,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:3381: result: $BUILD_CPP" >&5
-+	echo "$as_me:3387: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:3384: checking for native build C flags" >&5
-+	echo "$as_me:3390: checking for native build C flags" >&5
- echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -3389,10 +3395,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:3392: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:3398: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:3395: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:3401: checking for native build C preprocessor-flags" >&5
- echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -3400,10 +3406,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:3403: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:3409: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:3406: checking for native build linker-flags" >&5
-+	echo "$as_me:3412: checking for native build linker-flags" >&5
- echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -3411,10 +3417,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:3414: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:3420: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:3417: checking for native build linker-libraries" >&5
-+	echo "$as_me:3423: checking for native build linker-libraries" >&5
- echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
- 
- # Check whether --with-build-libs or --without-build-libs was given.
-@@ -3422,7 +3428,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:3425: result: $BUILD_LIBS" >&5
-+	echo "$as_me:3431: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -3432,7 +3438,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:3435: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:3441: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&5
- echo "$as_me: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&2;}
-@@ -3457,7 +3463,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:3460: checking if you want to build shared C-objects" >&5
-+echo "$as_me:3466: checking if you want to build shared C-objects" >&5
- echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -3467,27 +3473,27 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:3470: result: $with_shared" >&5
-+echo "$as_me:3476: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:3474: checking for specified models" >&5
-+echo "$as_me:3480: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
--echo "$as_me:3477: result: $cf_list_models" >&5
-+echo "$as_me:3483: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:3482: checking for default model" >&5
-+echo "$as_me:3488: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:3485: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:3491: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--echo "$as_me:3490: checking for specific curses-directory" >&5
-+echo "$as_me:3496: checking for specific curses-directory" >&5
- echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
- 
- # Check whether --with-curses-dir or --without-curses-dir was given.
-@@ -3497,7 +3503,7 @@
- else
-   cf_cv_curses_dir=no
- fi;
--echo "$as_me:3500: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:3506: result: $cf_cv_curses_dir" >&5
- echo "${ECHO_T}$cf_cv_curses_dir" >&6
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
-@@ -3528,7 +3534,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:3531: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:3537: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -3561,7 +3567,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 3564 "configure"
-+#line 3570 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -3573,16 +3579,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3576: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3582: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3579: \$? = $ac_status" >&5
-+  echo "$as_me:3585: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3582: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3588: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3585: \$? = $ac_status" >&5
-+  echo "$as_me:3591: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3599,7 +3605,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:3602: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:3608: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -3635,7 +3641,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:3638: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:3644: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -3650,13 +3656,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:3653: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:3659: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:3656: result: yes" >&5
-+		echo "$as_me:3662: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:3659: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:3665: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -3682,7 +3688,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3685 "configure"
-+#line 3691 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -3694,37 +3700,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3697: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3703: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3700: \$? = $ac_status" >&5
-+  echo "$as_me:3706: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3709: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3706: \$? = $ac_status" >&5
-+  echo "$as_me:3712: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3712 "configure"
-+#line 3718 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:3719: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3725: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3722: \$? = $ac_status" >&5
-+  echo "$as_me:3728: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:3724: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3730: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3727: \$? = $ac_status" >&5
-+  echo "$as_me:3733: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -3741,7 +3747,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:3744: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:3750: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -3759,7 +3765,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:3762: result: no" >&5
-+		echo "$as_me:3768: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -3775,7 +3781,7 @@
-   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
--echo "$as_me:3778: checking for $ac_word" >&5
-+echo "$as_me:3784: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3790,7 +3796,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:3793: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3799: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3798,10 +3804,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:3801: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:3807: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:3804: result: no" >&5
-+  echo "$as_me:3810: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3814,7 +3820,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3817: checking for $ac_word" >&5
-+echo "$as_me:3823: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3829,7 +3835,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:3832: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3838: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3837,10 +3843,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:3840: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:3846: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:3843: result: no" >&5
-+  echo "$as_me:3849: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3873,7 +3879,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:3876: checking if we have identified curses headers" >&5
-+echo "$as_me:3882: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3885,7 +3891,7 @@
- 	curses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 3888 "configure"
-+#line 3894 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -3897,16 +3903,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3900: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3906: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3903: \$? = $ac_status" >&5
-+  echo "$as_me:3909: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3906: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3912: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3909: \$? = $ac_status" >&5
-+  echo "$as_me:3915: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -3917,11 +3923,11 @@
- done
- 
- fi
--echo "$as_me:3920: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:3926: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:3924: error: No curses header-files found" >&5
-+	{ { echo "$as_me:3930: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -3931,23 +3937,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:3934: checking for $ac_header" >&5
-+echo "$as_me:3940: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3940 "configure"
-+#line 3946 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:3944: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:3950: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:3950: \$? = $ac_status" >&5
-+  echo "$as_me:3956: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -3966,7 +3972,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:3969: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:3975: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -4019,7 +4025,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4022 "configure"
-+#line 4028 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4031,16 +4037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4034: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4040: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4037: \$? = $ac_status" >&5
-+  echo "$as_me:4043: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4040: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4046: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4043: \$? = $ac_status" >&5
-+  echo "$as_me:4049: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4057,7 +4063,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4060: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4066: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4076,7 +4082,7 @@
- 
- }
- 
--echo "$as_me:4079: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:4085: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4088,7 +4094,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4091 "configure"
-+#line 4097 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -4112,16 +4118,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4115: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4118: \$? = $ac_status" >&5
-+  echo "$as_me:4124: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4121: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4127: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4124: \$? = $ac_status" >&5
-+  echo "$as_me:4130: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -4136,14 +4142,14 @@
- 	done
- 
- fi
--echo "$as_me:4139: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:4145: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:4146: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:4152: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4261,7 +4267,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4264 "configure"
-+#line 4270 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4273,16 +4279,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4276: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4279: \$? = $ac_status" >&5
-+  echo "$as_me:4285: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4282: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4288: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4285: \$? = $ac_status" >&5
-+  echo "$as_me:4291: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4299,7 +4305,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4302: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4308: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4322,7 +4328,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4325 "configure"
-+#line 4331 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -4346,16 +4352,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4349: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4355: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4352: \$? = $ac_status" >&5
-+  echo "$as_me:4358: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4355: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4361: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4358: \$? = $ac_status" >&5
-+  echo "$as_me:4364: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -4376,12 +4382,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4379: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4385: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:4384: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:4390: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -4414,7 +4420,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4417 "configure"
-+#line 4423 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4426,16 +4432,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4429: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4435: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4432: \$? = $ac_status" >&5
-+  echo "$as_me:4438: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4435: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4438: \$? = $ac_status" >&5
-+  echo "$as_me:4444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4452,7 +4458,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4455: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4461: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4500,7 +4506,7 @@
- 	;;
- esac
- 
--echo "$as_me:4503: checking for terminfo header" >&5
-+echo "$as_me:4509: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4518,7 +4524,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 4521 "configure"
-+#line 4527 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4533,16 +4539,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4536: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4542: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4539: \$? = $ac_status" >&5
-+  echo "$as_me:4545: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4542: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4548: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4545: \$? = $ac_status" >&5
-+  echo "$as_me:4551: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -4558,7 +4564,7 @@
- done
- 
- fi
--echo "$as_me:4561: result: $cf_cv_term_header" >&5
-+echo "$as_me:4567: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -4596,7 +4602,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:4599: checking for ncurses version" >&5
-+echo "$as_me:4605: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4622,10 +4628,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:4625: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:4631: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4628: \$? = $ac_status" >&5
-+  echo "$as_me:4634: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -4635,7 +4641,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4638 "configure"
-+#line 4644 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4660,15 +4666,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4669: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4666: \$? = $ac_status" >&5
-+  echo "$as_me:4672: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:4668: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4674: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4671: \$? = $ac_status" >&5
-+  echo "$as_me:4677: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -4682,7 +4688,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:4685: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:4691: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -4695,7 +4701,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:4698: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:4704: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4703,7 +4709,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4706 "configure"
-+#line 4712 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4722,16 +4728,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4725: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4731: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4728: \$? = $ac_status" >&5
-+  echo "$as_me:4734: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4731: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4734: \$? = $ac_status" >&5
-+  echo "$as_me:4740: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -4742,10 +4748,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4745: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:4751: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:4748: checking for initscr in -lgpm" >&5
-+  echo "$as_me:4754: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4753,7 +4759,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4756 "configure"
-+#line 4762 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4772,16 +4778,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4775: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4781: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4778: \$? = $ac_status" >&5
-+  echo "$as_me:4784: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4781: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4787: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4784: \$? = $ac_status" >&5
-+  echo "$as_me:4790: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -4792,7 +4798,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4795: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:4801: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -4807,7 +4813,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:4810: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:4816: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4815,7 +4821,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4818 "configure"
-+#line 4824 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4834,16 +4840,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4837: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4843: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4840: \$? = $ac_status" >&5
-+  echo "$as_me:4846: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4849: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4846: \$? = $ac_status" >&5
-+  echo "$as_me:4852: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -4854,7 +4860,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4857: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:4863: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -4903,13 +4909,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:4906: checking for initscr" >&5
-+	echo "$as_me:4912: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4912 "configure"
-+#line 4918 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -4940,16 +4946,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4943: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4949: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4946: \$? = $ac_status" >&5
-+  echo "$as_me:4952: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4949: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4955: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4952: \$? = $ac_status" >&5
-+  echo "$as_me:4958: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -4959,18 +4965,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:4962: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:4968: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:4969: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:4975: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 4973 "configure"
-+#line 4979 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -4982,25 +4988,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4985: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4991: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4988: \$? = $ac_status" >&5
-+  echo "$as_me:4994: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4991: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4997: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4994: \$? = $ac_status" >&5
-+  echo "$as_me:5000: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:4996: result: yes" >&5
-+  echo "$as_me:5002: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5003: result: no" >&5
-+echo "$as_me:5009: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -5068,11 +5074,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:5071: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:5077: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 5075 "configure"
-+#line 5081 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5084,25 +5090,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5087: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5093: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5090: \$? = $ac_status" >&5
-+  echo "$as_me:5096: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5093: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5099: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5096: \$? = $ac_status" >&5
-+  echo "$as_me:5102: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5098: result: yes" >&5
-+  echo "$as_me:5104: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5105: result: no" >&5
-+echo "$as_me:5111: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -5117,7 +5123,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:5120: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:5126: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5125,7 +5131,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:5128: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:5134: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -5135,7 +5141,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5138 "configure"
-+#line 5144 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5147,23 +5153,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5150: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5156: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5153: \$? = $ac_status" >&5
-+  echo "$as_me:5159: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5156: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5162: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5159: \$? = $ac_status" >&5
-+  echo "$as_me:5165: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5161: result: yes" >&5
-+  echo "$as_me:5167: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5166: result: no" >&5
-+echo "$as_me:5172: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -5181,7 +5187,7 @@
- 	NCURSES_CONFIG=none
- fi
- 
--echo "$as_me:5184: checking if you want wide-character code" >&5
-+echo "$as_me:5190: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -5191,11 +5197,11 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:5194: result: $with_widec" >&5
-+echo "$as_me:5200: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "$with_widec" = yes ; then
- 
--echo "$as_me:5198: checking for multibyte character support" >&5
-+echo "$as_me:5204: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5203,7 +5209,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5206 "configure"
-+#line 5212 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5216,16 +5222,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5219: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5225: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5222: \$? = $ac_status" >&5
-+  echo "$as_me:5228: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5225: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5231: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5228: \$? = $ac_status" >&5
-+  echo "$as_me:5234: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -5237,12 +5243,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:5240: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5246: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5245 "configure"
-+#line 5251 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5255,16 +5261,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5258: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5264: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5261: \$? = $ac_status" >&5
-+  echo "$as_me:5267: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5264: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5270: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5267: \$? = $ac_status" >&5
-+  echo "$as_me:5273: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5278,7 +5284,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5281 "configure"
-+#line 5287 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5291,16 +5297,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5294: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5300: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5297: \$? = $ac_status" >&5
-+  echo "$as_me:5303: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5300: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5306: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5303: \$? = $ac_status" >&5
-+  echo "$as_me:5309: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5317,9 +5323,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:5320: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:5326: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:5322: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5328: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5410,11 +5416,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5413: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5419: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5417 "configure"
-+#line 5423 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5427,21 +5433,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5430: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5433: \$? = $ac_status" >&5
-+  echo "$as_me:5439: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5436: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5442: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5439: \$? = $ac_status" >&5
-+  echo "$as_me:5445: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5444: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5450: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5459,7 +5465,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:5462: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5468: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -5534,13 +5540,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5537: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5543: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 5543 "configure"
-+#line 5549 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5553,21 +5559,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5556: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5562: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5559: \$? = $ac_status" >&5
-+  echo "$as_me:5565: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5562: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5568: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5565: \$? = $ac_status" >&5
-+  echo "$as_me:5571: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5570: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5576: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -5609,7 +5615,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5612: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:5618: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -5644,7 +5650,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 5647 "configure"
-+#line 5653 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -5656,16 +5662,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5659: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5665: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5662: \$? = $ac_status" >&5
-+  echo "$as_me:5668: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5665: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5671: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5668: \$? = $ac_status" >&5
-+  echo "$as_me:5674: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -5682,7 +5688,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:5685: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5691: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -5718,7 +5724,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:5721: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5727: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -5748,13 +5754,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:5751: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:5757: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:5754: result: yes" >&5
-+		echo "$as_me:5760: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:5757: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:5763: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -5780,7 +5786,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5783 "configure"
-+#line 5789 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5792,37 +5798,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5795: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5801: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5798: \$? = $ac_status" >&5
-+  echo "$as_me:5804: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5801: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5807: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5804: \$? = $ac_status" >&5
-+  echo "$as_me:5810: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5810 "configure"
-+#line 5816 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5817: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5823: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5820: \$? = $ac_status" >&5
-+  echo "$as_me:5826: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5822: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5828: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5825: \$? = $ac_status" >&5
-+  echo "$as_me:5831: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -5839,7 +5845,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:5842: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:5848: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -5857,7 +5863,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:5860: result: no" >&5
-+		echo "$as_me:5866: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -5873,7 +5879,7 @@
-   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
--echo "$as_me:5876: checking for $ac_word" >&5
-+echo "$as_me:5882: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5888,7 +5894,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:5891: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5897: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5896,10 +5902,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:5899: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:5905: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:5902: result: no" >&5
-+  echo "$as_me:5908: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5912,7 +5918,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:5915: checking for $ac_word" >&5
-+echo "$as_me:5921: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5927,7 +5933,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:5930: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5936: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5935,10 +5941,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:5938: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:5944: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:5941: result: no" >&5
-+  echo "$as_me:5947: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5971,7 +5977,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:5974: checking if we have identified curses headers" >&5
-+echo "$as_me:5980: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5983,7 +5989,7 @@
- 	curses.h ncursesw/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5986 "configure"
-+#line 5992 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -5995,16 +6001,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5998: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6004: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6001: \$? = $ac_status" >&5
-+  echo "$as_me:6007: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6004: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6010: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6007: \$? = $ac_status" >&5
-+  echo "$as_me:6013: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -6015,11 +6021,11 @@
- done
- 
- fi
--echo "$as_me:6018: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6024: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:6022: error: No curses header-files found" >&5
-+	{ { echo "$as_me:6028: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -6029,23 +6035,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:6032: checking for $ac_header" >&5
-+echo "$as_me:6038: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6038 "configure"
-+#line 6044 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:6042: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6048: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:6048: \$? = $ac_status" >&5
-+  echo "$as_me:6054: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -6064,7 +6070,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:6067: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6073: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -6117,7 +6123,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6120 "configure"
-+#line 6126 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6129,16 +6135,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6135: \$? = $ac_status" >&5
-+  echo "$as_me:6141: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6138: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6141: \$? = $ac_status" >&5
-+  echo "$as_me:6147: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6155,7 +6161,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6158: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6174,7 +6180,7 @@
- 
- }
- 
--echo "$as_me:6177: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6183: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6186,7 +6192,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6189 "configure"
-+#line 6195 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -6218,16 +6224,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6221: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6224: \$? = $ac_status" >&5
-+  echo "$as_me:6230: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6233: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6230: \$? = $ac_status" >&5
-+  echo "$as_me:6236: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -6242,14 +6248,14 @@
- 	done
- 
- fi
--echo "$as_me:6245: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6251: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:6252: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6258: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6367,7 +6373,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6370 "configure"
-+#line 6376 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6379,16 +6385,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6385: \$? = $ac_status" >&5
-+  echo "$as_me:6391: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6388: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6391: \$? = $ac_status" >&5
-+  echo "$as_me:6397: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6405,7 +6411,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6408: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6414: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6428,7 +6434,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6431 "configure"
-+#line 6437 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6452,16 +6458,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6455: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6458: \$? = $ac_status" >&5
-+  echo "$as_me:6464: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6464: \$? = $ac_status" >&5
-+  echo "$as_me:6470: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -6482,12 +6488,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6485: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6491: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:6490: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:6496: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -6520,7 +6526,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6523 "configure"
-+#line 6529 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6532,16 +6538,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6535: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6541: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6538: \$? = $ac_status" >&5
-+  echo "$as_me:6544: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6541: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6547: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6544: \$? = $ac_status" >&5
-+  echo "$as_me:6550: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6558,7 +6564,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6561: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6567: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6606,7 +6612,7 @@
- 	;;
- esac
- 
--echo "$as_me:6609: checking for terminfo header" >&5
-+echo "$as_me:6615: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6624,7 +6630,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6627 "configure"
-+#line 6633 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6639,16 +6645,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6642: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6648: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6645: \$? = $ac_status" >&5
-+  echo "$as_me:6651: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6654: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6651: \$? = $ac_status" >&5
-+  echo "$as_me:6657: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -6664,7 +6670,7 @@
- done
- 
- fi
--echo "$as_me:6667: result: $cf_cv_term_header" >&5
-+echo "$as_me:6673: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -6702,7 +6708,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:6705: checking for ncurses version" >&5
-+echo "$as_me:6711: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6728,10 +6734,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:6731: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:6737: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6734: \$? = $ac_status" >&5
-+  echo "$as_me:6740: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -6741,7 +6747,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6744 "configure"
-+#line 6750 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6766,15 +6772,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6769: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6775: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6772: \$? = $ac_status" >&5
-+  echo "$as_me:6778: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6774: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6777: \$? = $ac_status" >&5
-+  echo "$as_me:6783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6788,7 +6794,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:6791: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:6797: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -6801,7 +6807,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:6804: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:6810: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6809,7 +6815,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6812 "configure"
-+#line 6818 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6828,16 +6834,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6831: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6834: \$? = $ac_status" >&5
-+  echo "$as_me:6840: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6837: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6840: \$? = $ac_status" >&5
-+  echo "$as_me:6846: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -6848,10 +6854,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6851: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:6857: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:6854: checking for initscr in -lgpm" >&5
-+  echo "$as_me:6860: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6859,7 +6865,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6862 "configure"
-+#line 6868 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6878,16 +6884,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6881: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6887: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6884: \$? = $ac_status" >&5
-+  echo "$as_me:6890: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6887: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6893: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6890: \$? = $ac_status" >&5
-+  echo "$as_me:6896: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -6898,7 +6904,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6901: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:6907: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -6913,7 +6919,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:6916: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:6922: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6921,7 +6927,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6924 "configure"
-+#line 6930 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6940,16 +6946,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6943: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6949: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6946: \$? = $ac_status" >&5
-+  echo "$as_me:6952: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6949: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6955: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6952: \$? = $ac_status" >&5
-+  echo "$as_me:6958: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -6960,7 +6966,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6963: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:6969: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -7009,13 +7015,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:7012: checking for initscr" >&5
-+	echo "$as_me:7018: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7018 "configure"
-+#line 7024 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -7046,16 +7052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7049: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7055: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7052: \$? = $ac_status" >&5
-+  echo "$as_me:7058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7055: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7058: \$? = $ac_status" >&5
-+  echo "$as_me:7064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -7065,18 +7071,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7068: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7074: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:7075: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:7081: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7079 "configure"
-+#line 7085 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7088,25 +7094,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7091: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7097: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7094: \$? = $ac_status" >&5
-+  echo "$as_me:7100: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7097: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7103: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7100: \$? = $ac_status" >&5
-+  echo "$as_me:7106: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7102: result: yes" >&5
-+  echo "$as_me:7108: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7109: result: no" >&5
-+echo "$as_me:7115: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -7174,11 +7180,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:7177: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:7183: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 7181 "configure"
-+#line 7187 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7190,25 +7196,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7193: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7199: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7196: \$? = $ac_status" >&5
-+  echo "$as_me:7202: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7205: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7202: \$? = $ac_status" >&5
-+  echo "$as_me:7208: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7204: result: yes" >&5
-+  echo "$as_me:7210: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7211: result: no" >&5
-+echo "$as_me:7217: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -7223,7 +7229,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:7226: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:7232: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7231,7 +7237,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:7234: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:7240: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -7241,7 +7247,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7244 "configure"
-+#line 7250 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7253,23 +7259,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7256: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7259: \$? = $ac_status" >&5
-+  echo "$as_me:7265: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7262: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7268: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7265: \$? = $ac_status" >&5
-+  echo "$as_me:7271: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7267: result: yes" >&5
-+  echo "$as_me:7273: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7272: result: no" >&5
-+echo "$as_me:7278: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -7293,13 +7299,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:7296: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:7302: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:7299: result: yes" >&5
-+		echo "$as_me:7305: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:7302: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:7308: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -7325,7 +7331,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7328 "configure"
-+#line 7334 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7337,37 +7343,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7340: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7346: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7343: \$? = $ac_status" >&5
-+  echo "$as_me:7349: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7346: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7352: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7349: \$? = $ac_status" >&5
-+  echo "$as_me:7355: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7355 "configure"
-+#line 7361 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7362: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7368: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7365: \$? = $ac_status" >&5
-+  echo "$as_me:7371: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7367: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7370: \$? = $ac_status" >&5
-+  echo "$as_me:7376: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -7384,7 +7390,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:7387: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:7393: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -7402,7 +7408,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:7405: result: no" >&5
-+		echo "$as_me:7411: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -7418,7 +7424,7 @@
-   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
--echo "$as_me:7421: checking for $ac_word" >&5
-+echo "$as_me:7427: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7433,7 +7439,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:7436: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7442: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7441,10 +7447,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:7444: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:7450: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7447: result: no" >&5
-+  echo "$as_me:7453: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7457,7 +7463,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:7460: checking for $ac_word" >&5
-+echo "$as_me:7466: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7472,7 +7478,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:7475: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7481: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7480,10 +7486,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:7483: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:7489: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7486: result: no" >&5
-+  echo "$as_me:7492: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7516,7 +7522,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:7519: checking if we have identified curses headers" >&5
-+echo "$as_me:7525: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7528,7 +7534,7 @@
- 	curses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 7531 "configure"
-+#line 7537 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -7540,16 +7546,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7543: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7549: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7546: \$? = $ac_status" >&5
-+  echo "$as_me:7552: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7549: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7552: \$? = $ac_status" >&5
-+  echo "$as_me:7558: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -7560,11 +7566,11 @@
- done
- 
- fi
--echo "$as_me:7563: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:7569: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:7567: error: No curses header-files found" >&5
-+	{ { echo "$as_me:7573: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7574,23 +7580,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:7577: checking for $ac_header" >&5
-+echo "$as_me:7583: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7583 "configure"
-+#line 7589 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:7587: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:7593: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:7593: \$? = $ac_status" >&5
-+  echo "$as_me:7599: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -7609,7 +7615,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:7612: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:7618: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7662,7 +7668,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7665 "configure"
-+#line 7671 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7674,16 +7680,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7677: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7683: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7680: \$? = $ac_status" >&5
-+  echo "$as_me:7686: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7683: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7689: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7686: \$? = $ac_status" >&5
-+  echo "$as_me:7692: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7700,7 +7706,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:7703: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:7709: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -7719,7 +7725,7 @@
- 
- }
- 
--echo "$as_me:7722: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:7728: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7731,7 +7737,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7734 "configure"
-+#line 7740 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7755,16 +7761,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7758: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7764: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7761: \$? = $ac_status" >&5
-+  echo "$as_me:7767: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7764: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7770: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7767: \$? = $ac_status" >&5
-+  echo "$as_me:7773: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -7779,14 +7785,14 @@
- 	done
- 
- fi
--echo "$as_me:7782: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:7788: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:7789: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:7795: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7904,7 +7910,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7907 "configure"
-+#line 7913 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7916,16 +7922,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7919: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7925: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7922: \$? = $ac_status" >&5
-+  echo "$as_me:7928: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7925: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7931: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7928: \$? = $ac_status" >&5
-+  echo "$as_me:7934: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7942,7 +7948,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:7945: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:7951: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -7965,7 +7971,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7968 "configure"
-+#line 7974 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7989,16 +7995,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7992: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7998: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7995: \$? = $ac_status" >&5
-+  echo "$as_me:8001: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7998: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8004: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8001: \$? = $ac_status" >&5
-+  echo "$as_me:8007: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -8019,12 +8025,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8022: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8028: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:8027: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:8033: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -8057,7 +8063,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8060 "configure"
-+#line 8066 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8069,16 +8075,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8072: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8075: \$? = $ac_status" >&5
-+  echo "$as_me:8081: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8078: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8084: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8081: \$? = $ac_status" >&5
-+  echo "$as_me:8087: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8095,7 +8101,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:8098: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8104: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8143,7 +8149,7 @@
- 	;;
- esac
- 
--echo "$as_me:8146: checking for terminfo header" >&5
-+echo "$as_me:8152: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8161,7 +8167,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 8164 "configure"
-+#line 8170 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8176,16 +8182,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8179: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8185: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8182: \$? = $ac_status" >&5
-+  echo "$as_me:8188: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8185: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8188: \$? = $ac_status" >&5
-+  echo "$as_me:8194: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -8201,7 +8207,7 @@
- done
- 
- fi
--echo "$as_me:8204: result: $cf_cv_term_header" >&5
-+echo "$as_me:8210: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -8239,7 +8245,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:8242: checking for ncurses version" >&5
-+echo "$as_me:8248: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8265,10 +8271,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:8268: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:8274: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8271: \$? = $ac_status" >&5
-+  echo "$as_me:8277: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -8278,7 +8284,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8281 "configure"
-+#line 8287 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8303,15 +8309,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8306: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8312: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8309: \$? = $ac_status" >&5
-+  echo "$as_me:8315: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8317: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8314: \$? = $ac_status" >&5
-+  echo "$as_me:8320: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -8325,7 +8331,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:8328: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:8334: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -8338,7 +8344,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:8341: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:8347: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8346,7 +8352,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8349 "configure"
-+#line 8355 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8365,16 +8371,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8368: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8374: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8371: \$? = $ac_status" >&5
-+  echo "$as_me:8377: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8374: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8380: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8377: \$? = $ac_status" >&5
-+  echo "$as_me:8383: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -8385,10 +8391,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8388: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:8394: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:8391: checking for initscr in -lgpm" >&5
-+  echo "$as_me:8397: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8396,7 +8402,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8399 "configure"
-+#line 8405 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8415,16 +8421,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8418: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8424: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8421: \$? = $ac_status" >&5
-+  echo "$as_me:8427: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8424: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8430: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8427: \$? = $ac_status" >&5
-+  echo "$as_me:8433: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -8435,7 +8441,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8438: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:8444: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -8450,7 +8456,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:8453: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:8459: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8458,7 +8464,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8461 "configure"
-+#line 8467 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8477,16 +8483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8480: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8486: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8483: \$? = $ac_status" >&5
-+  echo "$as_me:8489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8486: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8489: \$? = $ac_status" >&5
-+  echo "$as_me:8495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -8497,7 +8503,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8500: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:8506: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -8546,13 +8552,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:8549: checking for initscr" >&5
-+	echo "$as_me:8555: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8555 "configure"
-+#line 8561 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -8583,16 +8589,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8586: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8592: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8589: \$? = $ac_status" >&5
-+  echo "$as_me:8595: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8592: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8598: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8595: \$? = $ac_status" >&5
-+  echo "$as_me:8601: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -8602,18 +8608,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8605: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:8611: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:8612: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:8618: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8616 "configure"
-+#line 8622 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8625,25 +8631,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8628: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8634: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8631: \$? = $ac_status" >&5
-+  echo "$as_me:8637: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8634: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8640: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8637: \$? = $ac_status" >&5
-+  echo "$as_me:8643: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8639: result: yes" >&5
-+  echo "$as_me:8645: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8646: result: no" >&5
-+echo "$as_me:8652: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -8711,11 +8717,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:8714: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:8720: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 8718 "configure"
-+#line 8724 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8727,25 +8733,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8730: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8736: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8733: \$? = $ac_status" >&5
-+  echo "$as_me:8739: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8742: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8739: \$? = $ac_status" >&5
-+  echo "$as_me:8745: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8741: result: yes" >&5
-+  echo "$as_me:8747: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8748: result: no" >&5
-+echo "$as_me:8754: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -8760,7 +8766,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:8763: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:8769: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -8768,7 +8774,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:8771: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:8777: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -8778,7 +8784,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8781 "configure"
-+#line 8787 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8790,23 +8796,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8799: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8796: \$? = $ac_status" >&5
-+  echo "$as_me:8802: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8805: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8802: \$? = $ac_status" >&5
-+  echo "$as_me:8808: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8804: result: yes" >&5
-+  echo "$as_me:8810: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8809: result: no" >&5
-+echo "$as_me:8815: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -8859,10 +8865,10 @@
- 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
- CF_EOF
- 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
--		{ (eval echo "$as_me:8862: \"$cf_try\"") >&5
-+		{ (eval echo "$as_me:8868: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8865: \$? = $ac_status" >&5
-+  echo "$as_me:8871: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 		if test -f conftest.out ; then
- 			cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ 	][ 	]*//"`
-@@ -8880,10 +8886,10 @@
- 
- cf_cv_timestamp=`date`
- 
--echo "$as_me:8883: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:8889: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
- echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
- 
--echo "$as_me:8886: checking if you want to have a library-prefix" >&5
-+echo "$as_me:8892: checking if you want to have a library-prefix" >&5
- echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
- 
- # Check whether --with-lib-prefix or --without-lib-prefix was given.
-@@ -8893,7 +8899,7 @@
- else
-   with_lib_prefix=auto
- fi;
--echo "$as_me:8896: result: $with_lib_prefix" >&5
-+echo "$as_me:8902: result: $with_lib_prefix" >&5
- echo "${ECHO_T}$with_lib_prefix" >&6
- 
- if test $with_lib_prefix = auto
-@@ -8924,7 +8930,7 @@
- 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
- fi
- 
--echo "$as_me:8927: checking for default loader flags" >&5
-+echo "$as_me:8933: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (normal)  LD_MODEL=''   ;;
-@@ -8932,11 +8938,11 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:8935: result: $LD_MODEL" >&5
-+echo "$as_me:8941: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- LD_RPATH_OPT=
--echo "$as_me:8939: checking for an rpath option" >&5
-+echo "$as_me:8945: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -8967,12 +8973,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:8970: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:8976: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:8975: checking if we need a space after rpath option" >&5
-+	echo "$as_me:8981: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -8993,7 +8999,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8996 "configure"
-+#line 9002 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9005,16 +9011,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9008: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9011: \$? = $ac_status" >&5
-+  echo "$as_me:9017: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9014: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9017: \$? = $ac_status" >&5
-+  echo "$as_me:9023: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -9024,7 +9030,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:9027: result: $cf_rpath_space" >&5
-+	echo "$as_me:9033: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -9045,7 +9051,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:9048: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:9054: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -9056,12 +9062,14 @@
- 	(yes)
- 		cf_cv_shlib_version=auto
- 		;;
--	(rel|abi|auto|no)
-+	(rel|abi|auto)
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		{ { echo "$as_me:9063: error: option value must be one of: rel, abi, auto or no" >&5
--echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
-+		echo "$as_me:9069: result: $withval" >&5
-+echo "${ECHO_T}$withval" >&6
-+		{ { echo "$as_me:9071: error: option value must be one of: rel, abi, or auto" >&5
-+echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
- 	esac
-@@ -9069,7 +9077,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:9072: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:9080: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -9079,14 +9087,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:9082: checking which $CC option to use" >&5
-+		echo "$as_me:9090: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9089 "configure"
-+#line 9097 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9098,16 +9106,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9101: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9109: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9104: \$? = $ac_status" >&5
-+  echo "$as_me:9112: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9107: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9115: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9110: \$? = $ac_status" >&5
-+  echo "$as_me:9118: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9116,7 +9124,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:9119: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:9127: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -9187,7 +9195,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:9190: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:9198: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9196,7 +9204,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9199 "configure"
-+#line 9207 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9208,16 +9216,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9211: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9219: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9214: \$? = $ac_status" >&5
-+  echo "$as_me:9222: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9217: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9225: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9220: \$? = $ac_status" >&5
-+  echo "$as_me:9228: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -9228,7 +9236,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:9231: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:9239: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -9453,7 +9461,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 9456 "configure"
-+#line 9464 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9465,16 +9473,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9468: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9476: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9471: \$? = $ac_status" >&5
-+  echo "$as_me:9479: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9474: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9482: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9477: \$? = $ac_status" >&5
-+  echo "$as_me:9485: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9511,7 +9519,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:9514: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:9522: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -9521,7 +9529,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 9524 "${as_me:-configure}"
-+#line 9532 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -9533,18 +9541,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:9536: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:9544: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:9538: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:9546: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9541: \$? = $ac_status" >&5
-+  echo "$as_me:9549: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:9543: result: yes" >&5
-+				echo "$as_me:9551: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:9547: result: no" >&5
-+				echo "$as_me:9555: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -9559,17 +9567,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:9562: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:9570: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:9566: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:9574: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- # The test/sample programs in the original tree link using rpath option.
- # Make it optional for packagers.
- if test -n "$LOCAL_LDFLAGS"
- then
--	echo "$as_me:9572: checking if you want to link sample programs with rpath option" >&5
-+	echo "$as_me:9580: checking if you want to link sample programs with rpath option" >&5
- echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-link or --disable-rpath-link was given.
-@@ -9579,7 +9587,7 @@
- else
-   with_rpath_link=yes
- fi;
--	echo "$as_me:9582: result: $with_rpath_link" >&5
-+	echo "$as_me:9590: result: $with_rpath_link" >&5
- echo "${ECHO_T}$with_rpath_link" >&6
- 	if test "$with_rpath_link" = no
- 	then
-@@ -9591,7 +9599,7 @@
- ###############################################################################
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:9594: checking if you want broken-linker support code" >&5
-+echo "$as_me:9602: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -9601,7 +9609,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:9604: result: $with_broken_linker" >&5
-+echo "$as_me:9612: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -9621,7 +9629,7 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:9624: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:9632: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
-@@ -9667,14 +9675,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:9670: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:9678: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9677 "configure"
-+#line 9685 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9689,16 +9697,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9700: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9695: \$? = $ac_status" >&5
-+  echo "$as_me:9703: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9698: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9706: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9701: \$? = $ac_status" >&5
-+  echo "$as_me:9709: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9707,7 +9715,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9710 "configure"
-+#line 9718 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9722,16 +9730,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9725: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9733: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9728: \$? = $ac_status" >&5
-+  echo "$as_me:9736: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9739: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9734: \$? = $ac_status" >&5
-+  echo "$as_me:9742: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9746,7 +9754,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9749: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:9757: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -9771,16 +9779,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:9774: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:9782: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:9780: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:9788: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9783 "configure"
-+#line 9791 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9795,16 +9803,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9798: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9806: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9801: \$? = $ac_status" >&5
-+  echo "$as_me:9809: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9804: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9812: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9807: \$? = $ac_status" >&5
-+  echo "$as_me:9815: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -9825,7 +9833,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9828 "configure"
-+#line 9836 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9840,16 +9848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9843: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9851: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9846: \$? = $ac_status" >&5
-+  echo "$as_me:9854: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9852: \$? = $ac_status" >&5
-+  echo "$as_me:9860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9860,15 +9868,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:9863: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:9871: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:9868: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:9876: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9871 "configure"
-+#line 9879 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9883,16 +9891,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9886: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9894: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9889: \$? = $ac_status" >&5
-+  echo "$as_me:9897: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9892: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9900: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9895: \$? = $ac_status" >&5
-+  echo "$as_me:9903: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9908,7 +9916,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9911: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:9919: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -10026,14 +10034,14 @@
- 	;;
- (*)
- 
--echo "$as_me:10029: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10037: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10036 "configure"
-+#line 10044 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10052,16 +10060,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10063: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10058: \$? = $ac_status" >&5
-+  echo "$as_me:10066: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10069: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10064: \$? = $ac_status" >&5
-+  echo "$as_me:10072: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10070,7 +10078,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10073 "configure"
-+#line 10081 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10089,16 +10097,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10092: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10100: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10095: \$? = $ac_status" >&5
-+  echo "$as_me:10103: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10106: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10101: \$? = $ac_status" >&5
-+  echo "$as_me:10109: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10113,7 +10121,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10116: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10124: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10221,16 +10229,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:10224: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:10232: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:10230: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:10238: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10233 "configure"
-+#line 10241 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10245,16 +10253,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10256: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10251: \$? = $ac_status" >&5
-+  echo "$as_me:10259: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10262: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10257: \$? = $ac_status" >&5
-+  echo "$as_me:10265: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -10275,7 +10283,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10278 "configure"
-+#line 10286 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10290,16 +10298,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10301: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10296: \$? = $ac_status" >&5
-+  echo "$as_me:10304: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10307: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10302: \$? = $ac_status" >&5
-+  echo "$as_me:10310: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10310,15 +10318,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:10313: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:10321: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:10318: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:10326: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10321 "configure"
-+#line 10329 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10333,16 +10341,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10336: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10339: \$? = $ac_status" >&5
-+  echo "$as_me:10347: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10342: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10350: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10345: \$? = $ac_status" >&5
-+  echo "$as_me:10353: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10358,7 +10366,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10361: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:10369: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -10516,7 +10524,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:10519: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:10527: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -10524,7 +10532,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10527: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10535: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -10532,7 +10540,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10535: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10543: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -10540,10 +10548,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:10543: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:10551: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10546 "configure"
-+#line 10554 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -10558,16 +10566,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10561: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10569: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10564: \$? = $ac_status" >&5
-+  echo "$as_me:10572: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10575: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10570: \$? = $ac_status" >&5
-+  echo "$as_me:10578: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -10576,12 +10584,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:10579: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:10587: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10584 "configure"
-+#line 10592 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -10596,16 +10604,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10607: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10602: \$? = $ac_status" >&5
-+  echo "$as_me:10610: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10613: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10608: \$? = $ac_status" >&5
-+  echo "$as_me:10616: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -10616,19 +10624,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:10619: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:10627: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:10624: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10632: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10631 "configure"
-+#line 10639 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10647,16 +10655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10650: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10653: \$? = $ac_status" >&5
-+  echo "$as_me:10661: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10659: \$? = $ac_status" >&5
-+  echo "$as_me:10667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10665,7 +10673,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10668 "configure"
-+#line 10676 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10684,16 +10692,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10687: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10690: \$? = $ac_status" >&5
-+  echo "$as_me:10698: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10693: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10701: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10696: \$? = $ac_status" >&5
-+  echo "$as_me:10704: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10708,7 +10716,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10711: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10719: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10813,7 +10821,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10816: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10824: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10825,7 +10833,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10828 "configure"
-+#line 10836 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10845,16 +10853,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10848: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10856: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10851: \$? = $ac_status" >&5
-+  echo "$as_me:10859: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10854: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10857: \$? = $ac_status" >&5
-+  echo "$as_me:10865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10864,16 +10872,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10867: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10875: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10870: \$? = $ac_status" >&5
-+  echo "$as_me:10878: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10873: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10881: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10876: \$? = $ac_status" >&5
-+  echo "$as_me:10884: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10887,13 +10895,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10890: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10898: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10896: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10904: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10901,7 +10909,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10904 "configure"
-+#line 10912 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10921,16 +10929,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10924: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10932: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10927: \$? = $ac_status" >&5
-+  echo "$as_me:10935: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10930: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10938: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10933: \$? = $ac_status" >&5
-+  echo "$as_me:10941: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10939,7 +10947,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10942 "configure"
-+#line 10950 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -10960,16 +10968,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10963: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10971: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10966: \$? = $ac_status" >&5
-+  echo "$as_me:10974: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10969: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10977: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10972: \$? = $ac_status" >&5
-+  echo "$as_me:10980: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10980,7 +10988,7 @@
-   break
- done
- fi
--echo "$as_me:10983: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10991: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -10990,7 +10998,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10993: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:11001: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10998,7 +11006,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11001 "configure"
-+#line 11009 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -11018,16 +11026,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11029: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11024: \$? = $ac_status" >&5
-+  echo "$as_me:11032: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11035: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11030: \$? = $ac_status" >&5
-+  echo "$as_me:11038: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11036,7 +11044,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11039 "configure"
-+#line 11047 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -11057,16 +11065,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11060: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11068: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11063: \$? = $ac_status" >&5
-+  echo "$as_me:11071: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11066: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11074: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11069: \$? = $ac_status" >&5
-+  echo "$as_me:11077: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -11077,7 +11085,7 @@
-   break
- done
- fi
--echo "$as_me:11080: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:11088: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -11090,7 +11098,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:11093: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:11101: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11098,7 +11106,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11101 "configure"
-+#line 11109 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -11110,16 +11118,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11113: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11121: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11116: \$? = $ac_status" >&5
-+  echo "$as_me:11124: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11119: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11127: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11122: \$? = $ac_status" >&5
-+  echo "$as_me:11130: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11128,7 +11136,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11131 "configure"
-+#line 11139 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -11141,16 +11149,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11144: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11152: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11147: \$? = $ac_status" >&5
-+  echo "$as_me:11155: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11150: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11158: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11153: \$? = $ac_status" >&5
-+  echo "$as_me:11161: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -11161,7 +11169,7 @@
-   break
- done
- fi
--echo "$as_me:11164: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:11172: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -11175,13 +11183,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:11178: checking for fseeko" >&5
-+echo "$as_me:11186: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11184 "configure"
-+#line 11192 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -11193,16 +11201,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11196: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11204: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11199: \$? = $ac_status" >&5
-+  echo "$as_me:11207: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11202: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11210: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11205: \$? = $ac_status" >&5
-+  echo "$as_me:11213: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -11212,7 +11220,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11215: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:11223: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -11233,14 +11241,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:11236: checking whether to use struct dirent64" >&5
-+	echo "$as_me:11244: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11243 "configure"
-+#line 11251 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -11261,16 +11269,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11264: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11272: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11267: \$? = $ac_status" >&5
-+  echo "$as_me:11275: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11270: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11278: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11273: \$? = $ac_status" >&5
-+  echo "$as_me:11281: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -11281,7 +11289,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11284: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:11292: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11291,7 +11299,7 @@
- 	fi
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:11294: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:11302: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -11301,7 +11309,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:11304: result: $with_rcs_ids" >&5
-+echo "$as_me:11312: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "$with_rcs_ids" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11311,7 +11319,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11314: checking if you want to build with function extensions" >&5
-+echo "$as_me:11322: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11321,7 +11329,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11324: result: $with_ext_funcs" >&5
-+echo "$as_me:11332: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "$with_ext_funcs" = yes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11339,7 +11347,7 @@
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11342: checking for extended use of const keyword" >&5
-+echo "$as_me:11350: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11349,7 +11357,7 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:11352: result: $with_ext_const" >&5
-+echo "$as_me:11360: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "$with_ext_const" = yes ; then
-@@ -11359,7 +11367,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:11362: checking if you want all development code" >&5
-+echo "$as_me:11370: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -11369,7 +11377,7 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:11372: result: $with_develop" >&5
-+echo "$as_me:11380: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###############################################################################
-@@ -11378,7 +11386,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:11381: checking if you want to link with the pthread library" >&5
-+echo "$as_me:11389: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -11388,27 +11396,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:11391: result: $with_pthread" >&5
-+echo "$as_me:11399: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:11395: checking for pthread.h" >&5
-+	echo "$as_me:11403: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11401 "configure"
-+#line 11409 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:11405: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11413: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11411: \$? = $ac_status" >&5
-+  echo "$as_me:11419: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11427,7 +11435,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:11430: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:11438: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -11437,7 +11445,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:11440: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:11448: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -11458,7 +11466,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 11461 "configure"
-+#line 11469 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -11475,16 +11483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11478: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11486: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11481: \$? = $ac_status" >&5
-+  echo "$as_me:11489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11484: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11487: \$? = $ac_status" >&5
-+  echo "$as_me:11495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -11494,7 +11502,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:11497: result: $with_pthread" >&5
-+	    echo "$as_me:11505: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -11522,7 +11530,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:11525: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:11533: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11531,7 +11539,7 @@
- 
- fi
- 
--echo "$as_me:11534: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:11542: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -11541,18 +11549,18 @@
- else
-   use_weak_symbols=no
- fi;
--echo "$as_me:11544: result: $use_weak_symbols" >&5
-+echo "$as_me:11552: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- if test "$use_weak_symbols" = yes ; then
- 
--echo "$as_me:11548: checking if $CC supports weak symbols" >&5
-+echo "$as_me:11556: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11555 "configure"
-+#line 11563 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -11578,16 +11586,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11581: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11589: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11584: \$? = $ac_status" >&5
-+  echo "$as_me:11592: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11587: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11595: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11590: \$? = $ac_status" >&5
-+  echo "$as_me:11598: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -11598,7 +11606,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11601: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:11609: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- else
-@@ -11627,13 +11635,13 @@
- fi
- 
- # OpenSUSE is installing ncurses6, using reentrant option.
--echo "$as_me:11630: checking for _nc_TABSIZE" >&5
-+echo "$as_me:11638: checking for _nc_TABSIZE" >&5
- echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
- if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11636 "configure"
-+#line 11644 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char _nc_TABSIZE (); below.  */
-@@ -11664,16 +11672,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11667: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11670: \$? = $ac_status" >&5
-+  echo "$as_me:11678: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11673: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11681: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11676: \$? = $ac_status" >&5
-+  echo "$as_me:11684: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func__nc_TABSIZE=yes
- else
-@@ -11683,7 +11691,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11686: result: $ac_cv_func__nc_TABSIZE" >&5
-+echo "$as_me:11694: result: $ac_cv_func__nc_TABSIZE" >&5
- echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
- if test $ac_cv_func__nc_TABSIZE = yes; then
-   assume_reentrant=yes
-@@ -11695,7 +11703,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:11698: checking if you want experimental reentrant code" >&5
-+echo "$as_me:11706: checking if you want experimental reentrant code" >&5
- echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -11705,7 +11713,7 @@
- else
-   with_reentrant=$assume_reentrant
- fi;
--echo "$as_me:11708: result: $with_reentrant" >&5
-+echo "$as_me:11716: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "$with_reentrant" = yes ; then
- 	cf_cv_enable_reentrant=1
-@@ -11728,7 +11736,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:11731: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:11739: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -11738,7 +11746,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:11741: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:11749: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -11752,7 +11760,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:11755: checking if you want to see long compiling messages" >&5
-+echo "$as_me:11763: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -11786,11 +11794,11 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:11789: result: $enableval" >&5
-+echo "$as_me:11797: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:11793: checking if you want to see compiler warnings" >&5
-+echo "$as_me:11801: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -11798,7 +11806,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:11801: result: $with_warnings" >&5
-+echo "$as_me:11809: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -11810,12 +11818,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:11813: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:11821: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11818 "configure"
-+#line 11826 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11832,16 +11840,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11835: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11843: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11838: \$? = $ac_status" >&5
-+  echo "$as_me:11846: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11841: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11849: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11844: \$? = $ac_status" >&5
-+  echo "$as_me:11852: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -11852,7 +11860,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:11855: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:11863: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -11861,12 +11869,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:11864: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:11872: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11869 "configure"
-+#line 11877 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11883,16 +11891,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11886: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11889: \$? = $ac_status" >&5
-+  echo "$as_me:11897: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11892: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11895: \$? = $ac_status" >&5
-+  echo "$as_me:11903: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -11903,12 +11911,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:11906: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:11914: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 11911 "${as_me:-configure}"
-+#line 11919 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -11925,7 +11933,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:11928: checking for $CC warning options..." >&5
-+	{ echo "$as_me:11936: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -11941,12 +11949,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11944: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:11952: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11947: \$? = $ac_status" >&5
-+  echo "$as_me:11955: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11949: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:11957: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -11955,7 +11963,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:11958: checking for $CC warning options..." >&5
-+	{ echo "$as_me:11966: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -11979,12 +11987,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11982: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11985: \$? = $ac_status" >&5
-+  echo "$as_me:11993: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11987: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:11995: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -11995,7 +12003,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:11998: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12006: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12005,7 +12013,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:12008: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12016: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12038,10 +12046,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:12041: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:12049: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 12044 "${as_me:-configure}"
-+#line 12052 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -12090,12 +12098,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:12093: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12096: \$? = $ac_status" >&5
-+  echo "$as_me:12104: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:12098: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:12106: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -12155,7 +12163,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:12158: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:12166: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -12165,7 +12173,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:12168: result: $with_assertions" >&5
-+echo "$as_me:12176: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -12218,7 +12226,7 @@
- 	;;
- esac
- 
--echo "$as_me:12221: checking whether to add trace feature to all models" >&5
-+echo "$as_me:12229: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -12228,7 +12236,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:12231: result: $cf_with_trace" >&5
-+echo "$as_me:12239: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "$cf_with_trace" = yes ; then
-@@ -12316,7 +12324,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:12319: checking if we want to use GNAT projects" >&5
-+echo "$as_me:12327: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -12333,7 +12341,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:12336: result: $enable_gnat_projects" >&5
-+echo "$as_me:12344: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -12341,13 +12349,13 @@
- (*mingw32*)
- 	;;
- (*)
--echo "$as_me:12344: checking for gettimeofday" >&5
-+echo "$as_me:12352: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12350 "configure"
-+#line 12358 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -12378,16 +12386,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12381: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12389: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12384: \$? = $ac_status" >&5
-+  echo "$as_me:12392: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12387: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12395: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12390: \$? = $ac_status" >&5
-+  echo "$as_me:12398: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -12397,7 +12405,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12400: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:12408: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -12406,7 +12414,7 @@
- 
- else
- 
--echo "$as_me:12409: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:12417: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12414,7 +12422,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12417 "configure"
-+#line 12425 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12433,16 +12441,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12436: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12444: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12439: \$? = $ac_status" >&5
-+  echo "$as_me:12447: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12450: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12445: \$? = $ac_status" >&5
-+  echo "$as_me:12453: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -12453,7 +12461,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12456: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:12464: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -12469,13 +12477,13 @@
- esac
- 
- ###	Checks for header files.
--echo "$as_me:12472: checking for ANSI C header files" >&5
-+echo "$as_me:12480: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12478 "configure"
-+#line 12486 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -12483,13 +12491,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:12486: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12494: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12492: \$? = $ac_status" >&5
-+  echo "$as_me:12500: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12511,7 +12519,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12514 "configure"
-+#line 12522 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -12529,7 +12537,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12532 "configure"
-+#line 12540 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -12550,7 +12558,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12553 "configure"
-+#line 12561 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12576,15 +12584,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12579: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12587: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12582: \$? = $ac_status" >&5
-+  echo "$as_me:12590: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12584: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12592: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12587: \$? = $ac_status" >&5
-+  echo "$as_me:12595: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12597,7 +12605,7 @@
- fi
- fi
- fi
--echo "$as_me:12600: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:12608: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -12610,13 +12618,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:12613: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:12621: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12619 "configure"
-+#line 12627 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -12631,16 +12639,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12637: \$? = $ac_status" >&5
-+  echo "$as_me:12645: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12648: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12643: \$? = $ac_status" >&5
-+  echo "$as_me:12651: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -12650,7 +12658,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12653: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:12661: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -12663,7 +12671,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:12666: checking for opendir in -ldir" >&5
-+  echo "$as_me:12674: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12671,7 +12679,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12674 "configure"
-+#line 12682 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12690,16 +12698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12693: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12701: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12696: \$? = $ac_status" >&5
-+  echo "$as_me:12704: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12699: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12702: \$? = $ac_status" >&5
-+  echo "$as_me:12710: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -12710,14 +12718,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12713: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:12721: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:12720: checking for opendir in -lx" >&5
-+  echo "$as_me:12728: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12725,7 +12733,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12728 "configure"
-+#line 12736 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12744,16 +12752,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12747: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12750: \$? = $ac_status" >&5
-+  echo "$as_me:12758: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12753: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12761: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12756: \$? = $ac_status" >&5
-+  echo "$as_me:12764: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -12764,7 +12772,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12767: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:12775: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -12772,13 +12780,13 @@
- 
- fi
- 
--echo "$as_me:12775: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:12783: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12781 "configure"
-+#line 12789 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -12794,16 +12802,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12797: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12800: \$? = $ac_status" >&5
-+  echo "$as_me:12808: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12803: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12806: \$? = $ac_status" >&5
-+  echo "$as_me:12814: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -12813,7 +12821,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12816: result: $ac_cv_header_time" >&5
-+echo "$as_me:12824: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -12831,13 +12839,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:12834: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:12842: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12840 "configure"
-+#line 12848 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12895,16 +12903,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12898: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12906: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12901: \$? = $ac_status" >&5
-+  echo "$as_me:12909: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12904: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12912: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12907: \$? = $ac_status" >&5
-+  echo "$as_me:12915: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -12914,7 +12922,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12917: result: $ac_cv_c_const" >&5
-+echo "$as_me:12925: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -12926,7 +12934,7 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:12929: checking if data-only library module links" >&5
-+echo "$as_me:12937: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12934,20 +12942,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 12937 "configure"
-+#line 12945 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:12940: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12943: \$? = $ac_status" >&5
-+  echo "$as_me:12951: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 12950 "configure"
-+#line 12958 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -12960,10 +12968,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:12963: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:12971: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12966: \$? = $ac_status" >&5
-+  echo "$as_me:12974: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -12976,7 +12984,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12979 "configure"
-+#line 12987 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -12987,15 +12995,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12990: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12998: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12993: \$? = $ac_status" >&5
-+  echo "$as_me:13001: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12995: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12998: \$? = $ac_status" >&5
-+  echo "$as_me:13006: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -13010,7 +13018,7 @@
- 
- fi
- 
--echo "$as_me:13013: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:13021: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -13024,7 +13032,7 @@
- 
- ###	Checks for library functions.
- 
--echo "$as_me:13027: checking for working mkstemp" >&5
-+echo "$as_me:13035: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13035,7 +13043,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13038 "configure"
-+#line 13046 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -13073,15 +13081,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13076: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13079: \$? = $ac_status" >&5
-+  echo "$as_me:13087: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13089: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13084: \$? = $ac_status" >&5
-+  echo "$as_me:13092: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -13096,16 +13104,16 @@
- fi
- 
- fi
--echo "$as_me:13099: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:13107: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:13102: checking for mkstemp" >&5
-+	echo "$as_me:13110: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13108 "configure"
-+#line 13116 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -13136,16 +13144,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13139: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13147: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13142: \$? = $ac_status" >&5
-+  echo "$as_me:13150: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13145: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13153: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13148: \$? = $ac_status" >&5
-+  echo "$as_me:13156: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -13155,7 +13163,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13158: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:13166: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -13178,7 +13186,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:13181: checking for $ac_word" >&5
-+echo "$as_me:13189: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13193,7 +13201,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:13196: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13204: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13202,10 +13210,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:13205: result: $gnat_exists" >&5
-+  echo "$as_me:13213: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:13208: result: no" >&5
-+  echo "$as_me:13216: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13214,12 +13222,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:13217: checking for gnat version" >&5
-+echo "$as_me:13225: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:13222: result: $cf_gnat_version" >&5
-+echo "$as_me:13230: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -13227,7 +13235,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:13230: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:13238: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -13235,7 +13243,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:13238: checking for $ac_word" >&5
-+echo "$as_me:13246: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13250,7 +13258,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:13253: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13261: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13259,10 +13267,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:13262: result: $M4_exists" >&5
-+  echo "$as_me:13270: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:13265: result: no" >&5
-+  echo "$as_me:13273: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13271,7 +13279,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:13274: checking if GNAT works" >&5
-+		echo "$as_me:13282: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -13299,14 +13307,14 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:13302: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:13310: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
- 
- 	if test	"$cf_cv_prog_gnat_correct" = yes; then
- 
--	echo "$as_me:13309: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:13317: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -13323,10 +13331,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:13326: result: $ADAFLAGS" >&5
-+	echo "$as_me:13334: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:13329: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:13337: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13336,11 +13344,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:13339: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:13347: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:13343: checking if GNAT supports generics" >&5
-+echo "$as_me:13351: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -13350,7 +13358,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:13353: result: $cf_gnat_generics" >&5
-+echo "$as_me:13361: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -13362,7 +13370,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:13365: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:13373: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13410,7 +13418,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:13413: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:13421: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -13423,7 +13431,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:13426: checking if GNAT supports project files" >&5
-+echo "$as_me:13434: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -13483,15 +13491,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:13486: result: $cf_gnat_projects" >&5
-+echo "$as_me:13494: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:13492: checking if GNAT supports libraries" >&5
-+	echo "$as_me:13500: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:13494: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:13502: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -13511,7 +13519,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:13514: checking for ada-compiler" >&5
-+echo "$as_me:13522: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -13522,12 +13530,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:13525: result: $cf_ada_compiler" >&5
-+echo "$as_me:13533: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 		cf_ada_package=terminal_interface
- 
--echo "$as_me:13530: checking for ada-include" >&5
-+echo "$as_me:13538: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -13563,7 +13571,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:13566: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:13574: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -13572,10 +13580,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:13575: result: $ADA_INCLUDE" >&5
-+echo "$as_me:13583: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:13578: checking for ada-objects" >&5
-+echo "$as_me:13586: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -13611,7 +13619,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:13614: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:13622: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -13620,10 +13628,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:13623: result: $ADA_OBJECTS" >&5
-+echo "$as_me:13631: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:13626: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:13634: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -13633,7 +13641,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:13636: result: $with_ada_sharedlib" >&5
-+echo "$as_me:13644: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -13649,12 +13657,12 @@
- fi
- 
- 	else
--		{ { echo "$as_me:13652: error: No usable Ada compiler found" >&5
-+		{ { echo "$as_me:13660: error: No usable Ada compiler found" >&5
- echo "$as_me: error: No usable Ada compiler found" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:13657: error: The Ada compiler is needed for this package" >&5
-+	{ { echo "$as_me:13665: error: The Ada compiler is needed for this package" >&5
- echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -13694,7 +13702,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:13697: checking default library suffix" >&5
-+echo "$as_me:13705: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -13705,10 +13713,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:13708: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:13716: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:13711: checking default library-dependency suffix" >&5
-+echo "$as_me:13719: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -13766,10 +13774,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:13769: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:13777: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:13772: checking default object directory" >&5
-+echo "$as_me:13780: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -13785,7 +13793,7 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:13788: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:13796: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- ### Set up low-level terminfo dependencies for makefiles.
-@@ -13997,7 +14005,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:14000: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:14008: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -14173,7 +14181,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:14176: error: ambiguous option: $1
-+    { { echo "$as_me:14184: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -14192,7 +14200,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:14195: error: unrecognized option: $1
-+  -*) { { echo "$as_me:14203: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -14263,7 +14271,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:14266: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:14274: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -14587,7 +14595,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:14590: creating $ac_file" >&5
-+    { echo "$as_me:14598: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -14605,7 +14613,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:14608: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:14616: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -14618,7 +14626,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:14621: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:14629: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -14634,7 +14642,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:14637: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:14645: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -14643,7 +14651,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:14646: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:14654: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -14680,7 +14688,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:14683: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:14691: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -14691,7 +14699,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:14694: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:14702: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -14740,7 +14748,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:14743: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:14751: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -14751,7 +14759,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:14754: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:14762: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -14764,7 +14772,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:14767: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:14775: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -14822,7 +14830,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:14825: $ac_file is unchanged" >&5
-+      { echo "$as_me:14833: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: NEWS
-Prereq:  1.2481 
---- ncurses-6.0-20150815+/NEWS	2015-08-15 22:33:55.000000000 +0000
-+++ ncurses-6.0-20150822/NEWS	2015-08-22 23:55:21.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2481 2015/08/15 22:33:55 tom Exp $
-+-- $Id: NEWS,v 1.2487 2015/08/22 23:55:21 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,16 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150822
-+	+ sort options in usage message for infocmp, to make it simpler to
-+	  see unused letters.
-+	+ update usage message for tic, adding "-0" option.
-+	+ documented differences in ESCDELAY versus AIX's implementation.
-+	+ fix some compiler warnings from ports.
-+	+ modify --with-pkg-config-libdir option to make it possible to install
-+	  ".pc" files even if pkg-config is not found (adapted by patch by
-+	  Joshua Root).
-+
- 20150815
- 	+ disallow "no" as a possible value for "--with-shlib-version" option,
- 	  overlooked in cleanup-changes for 20000708 (report by Tommy Alex).
-Index: VERSION
---- ncurses-6.0-20150815+/VERSION	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/VERSION	2015-08-17 08:41:12.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150815
-+5:0:9	6.0	20150822
-Index: aclocal.m4
-Prereq:  1.762 
---- ncurses-6.0-20150815+/aclocal.m4	2015-08-15 22:39:55.000000000 +0000
-+++ ncurses-6.0-20150822/aclocal.m4	2015-08-22 21:12:39.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.762 2015/08/15 22:39:55 tom Exp $
-+dnl $Id: aclocal.m4,v 1.765 2015/08/22 21:12:39 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -7282,19 +7282,25 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PKG_CONFIG_LIBDIR version: 9 updated: 2015/06/06 19:26:44
-+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 10 updated: 2015/08/22 17:10:56
- dnl -------------------------
- dnl Allow the choice of the pkg-config library directory to be overridden.
- AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
--if test "x$PKG_CONFIG" = xnone ; then
--	PKG_CONFIG_LIBDIR=no
--else
-+
-+case $PKG_CONFIG in
-+(no|none|yes)
-+	AC_MSG_CHECKING(for pkg-config library directory)
-+	;;
-+(*)
- 	AC_MSG_CHECKING(for $PKG_CONFIG library directory)
--	AC_ARG_WITH(pkg-config-libdir,
--		[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
--		[PKG_CONFIG_LIBDIR=$withval],
--		[PKG_CONFIG_LIBDIR=yes])
--fi
-+	;;
-+esac
-+
-+PKG_CONFIG_LIBDIR=no
-+AC_ARG_WITH(pkg-config-libdir,
-+	[  --with-pkg-config-libdir=XXX use given directory for installing pc-files],
-+	[PKG_CONFIG_LIBDIR=$withval],
-+	[test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes])
- 
- case x$PKG_CONFIG_LIBDIR in
- (x/*)
-@@ -7350,7 +7356,7 @@
- 	;;
- esac
- 
--if test "x$PKG_CONFIG" != xnone ; then
-+if test "x$PKG_CONFIG_LIBDIR" != xno ; then
- 	AC_MSG_RESULT($PKG_CONFIG_LIBDIR)
- fi
- 
-Index: configure
---- ncurses-6.0-20150815+/configure	2015-08-15 22:38:44.000000000 +0000
-+++ ncurses-6.0-20150822/configure	2015-08-22 21:08:03.000000000 +0000
-@@ -3571,20 +3571,26 @@
- echo "$as_me: WARNING: pkg-config is not installed" >&2;}
- fi
- 
--if test "x$PKG_CONFIG" = xnone ; then
--	PKG_CONFIG_LIBDIR=no
--else
--	echo "$as_me:3577: checking for $PKG_CONFIG library directory" >&5
-+case $PKG_CONFIG in
-+(no|none|yes)
-+	echo "$as_me:3576: checking for pkg-config library directory" >&5
-+echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
-+	;;
-+(*)
-+	echo "$as_me:3580: checking for $PKG_CONFIG library directory" >&5
- echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
-+	;;
-+esac
-+
-+PKG_CONFIG_LIBDIR=no
- 
- # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given.
- if test "${with_pkg_config_libdir+set}" = set; then
-   withval="$with_pkg_config_libdir"
-   PKG_CONFIG_LIBDIR=$withval
- else
--  PKG_CONFIG_LIBDIR=yes
-+  test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes
- fi;
--fi
- 
- case x$PKG_CONFIG_LIBDIR in
- (x/*)
-@@ -3626,18 +3632,18 @@
- 
- 	test -n "$verbose" && echo "	list..." 1>&6
- 
--echo "${as_me:-configure}:3629: testing list... ..." 1>&5
-+echo "${as_me:-configure}:3635: testing list... ..." 1>&5
- 
- 	for cf_config in $cf_search_path
- 	do
- 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
- 
--echo "${as_me:-configure}:3635: testing checking $cf_config/pkgconfig ..." 1>&5
-+echo "${as_me:-configure}:3641: testing checking $cf_config/pkgconfig ..." 1>&5
- 
- 		if test -d $cf_config/pkgconfig
- 		then
- 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
--			echo "$as_me:3640: checking done" >&5
-+			echo "$as_me:3646: checking done" >&5
- echo $ECHO_N "checking done... $ECHO_C" >&6
- 			break
- 		fi
-@@ -3647,17 +3653,17 @@
- 	;;
- esac
- 
--if test "x$PKG_CONFIG" != xnone ; then
--	echo "$as_me:3651: result: $PKG_CONFIG_LIBDIR" >&5
-+if test "x$PKG_CONFIG_LIBDIR" != xno ; then
-+	echo "$as_me:3657: result: $PKG_CONFIG_LIBDIR" >&5
- echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
- fi
- 
- if test "x$PKG_CONFIG" != xnone
- then
--	echo "$as_me:3657: checking if we should install .pc files for $PKG_CONFIG" >&5
-+	echo "$as_me:3663: checking if we should install .pc files for $PKG_CONFIG" >&5
- echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
- else
--	echo "$as_me:3660: checking if we should install .pc files" >&5
-+	echo "$as_me:3666: checking if we should install .pc files" >&5
- echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
- fi
- 
-@@ -3668,14 +3674,14 @@
- else
-   enable_pc_files=no
- fi;
--echo "$as_me:3671: result: $enable_pc_files" >&5
-+echo "$as_me:3677: result: $enable_pc_files" >&5
- echo "${ECHO_T}$enable_pc_files" >&6
- 
- if test "x$enable_pc_files" != xno
- then
- 	case "x$PKG_CONFIG_LIBDIR" in
- 	(xno|xyes)
--		{ echo "$as_me:3678: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
-+		{ echo "$as_me:3684: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
- echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
- 		MAKE_PC_FILES="#"
- 		;;
-@@ -3706,7 +3712,7 @@
- 	PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:3709: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
-+	{ { echo "$as_me:3715: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
- echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -3721,7 +3727,7 @@
- 
- if test -z "$MAKE_PC_FILES"
- then
--	echo "$as_me:3724: checking for suffix to add to pc-files" >&5
-+	echo "$as_me:3730: checking for suffix to add to pc-files" >&5
- echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
- 
- # Check whether --with-pc-suffix or --without-pc-suffix was given.
-@@ -3736,13 +3742,13 @@
- 	esac
- fi;
- 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
--	echo "$as_me:3739: result: $PC_MODULE_SUFFIX" >&5
-+	echo "$as_me:3745: result: $PC_MODULE_SUFFIX" >&5
- echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
- 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
- 
- fi
- 
--echo "$as_me:3745: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3751: checking if we should assume mixed-case filenames" >&5
- echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
- 
- # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -3752,11 +3758,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:3755: result: $enable_mixedcase" >&5
-+echo "$as_me:3761: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:3759: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3765: checking if filesystem supports mixed-case filenames" >&5
- echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
- if test "${cf_cv_mixedcase+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3783,7 +3789,7 @@
- fi
- 
- fi
--echo "$as_me:3786: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3792: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -3802,7 +3808,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:3805: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3811: checking whether ${MAKE-make} sets \${MAKE}" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-@@ -3822,11 +3828,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:3825: result: yes" >&5
-+  echo "$as_me:3831: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:3829: result: no" >&5
-+  echo "$as_me:3835: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -3835,7 +3841,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3838: checking for $ac_word" >&5
-+echo "$as_me:3844: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CTAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3850,7 +3856,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CTAGS="$ac_prog"
--echo "$as_me:3853: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3859: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3858,10 +3864,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
--  echo "$as_me:3861: result: $CTAGS" >&5
-+  echo "$as_me:3867: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:3864: result: no" >&5
-+  echo "$as_me:3870: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3872,7 +3878,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3875: checking for $ac_word" >&5
-+echo "$as_me:3881: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ETAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3887,7 +3893,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ETAGS="$ac_prog"
--echo "$as_me:3890: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3896: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3895,10 +3901,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
--  echo "$as_me:3898: result: $ETAGS" >&5
-+  echo "$as_me:3904: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:3901: result: no" >&5
-+  echo "$as_me:3907: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3907,7 +3913,7 @@
- 
- # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
- set dummy ${CTAGS:-ctags}; ac_word=$2
--echo "$as_me:3910: checking for $ac_word" >&5
-+echo "$as_me:3916: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3922,7 +3928,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:3925: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3931: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3931,17 +3937,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:3934: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3940: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:3937: result: no" >&5
-+  echo "$as_me:3943: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:3944: checking for $ac_word" >&5
-+echo "$as_me:3950: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3956,7 +3962,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:3959: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3965: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3965,10 +3971,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:3968: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:3974: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:3971: result: no" >&5
-+  echo "$as_me:3977: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3988,7 +3994,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:3991: checking for makeflags variable" >&5
-+echo "$as_me:3997: checking for makeflags variable" >&5
- echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
- if test "${cf_cv_makeflags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4022,13 +4028,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:4025: result: $cf_cv_makeflags" >&5
-+echo "$as_me:4031: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:4031: checking for $ac_word" >&5
-+echo "$as_me:4037: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4043,7 +4049,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:4046: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4052: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4051,10 +4057,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:4054: result: $RANLIB" >&5
-+  echo "$as_me:4060: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:4057: result: no" >&5
-+  echo "$as_me:4063: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4063,7 +4069,7 @@
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:4066: checking for $ac_word" >&5
-+echo "$as_me:4072: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4078,7 +4084,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:4081: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4087: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4087,10 +4093,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:4090: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:4096: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:4093: result: no" >&5
-+  echo "$as_me:4099: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4102,7 +4108,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:4105: checking for $ac_word" >&5
-+echo "$as_me:4111: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4117,7 +4123,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:4120: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4126: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4125,10 +4131,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:4128: result: $LD" >&5
-+  echo "$as_me:4134: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:4131: result: no" >&5
-+  echo "$as_me:4137: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4137,7 +4143,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:4140: checking for $ac_word" >&5
-+echo "$as_me:4146: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4152,7 +4158,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:4155: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4161: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4161,10 +4167,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:4164: result: $ac_ct_LD" >&5
-+  echo "$as_me:4170: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:4167: result: no" >&5
-+  echo "$as_me:4173: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4176,7 +4182,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:4179: checking for $ac_word" >&5
-+echo "$as_me:4185: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4191,7 +4197,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:4194: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4200: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4199,10 +4205,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4202: result: $AR" >&5
-+  echo "$as_me:4208: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4205: result: no" >&5
-+  echo "$as_me:4211: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4211,7 +4217,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:4214: checking for $ac_word" >&5
-+echo "$as_me:4220: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4226,7 +4232,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:4229: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4235: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4235,10 +4241,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4238: result: $ac_ct_AR" >&5
-+  echo "$as_me:4244: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4241: result: no" >&5
-+  echo "$as_me:4247: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4250,7 +4256,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nm; ac_word=$2
--echo "$as_me:4253: checking for $ac_word" >&5
-+echo "$as_me:4259: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4265,7 +4271,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NM="${ac_tool_prefix}nm"
--echo "$as_me:4268: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4274: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4273,10 +4279,10 @@
- fi
- NM=$ac_cv_prog_NM
- if test -n "$NM"; then
--  echo "$as_me:4276: result: $NM" >&5
-+  echo "$as_me:4282: result: $NM" >&5
- echo "${ECHO_T}$NM" >&6
- else
--  echo "$as_me:4279: result: no" >&5
-+  echo "$as_me:4285: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4285,7 +4291,7 @@
-   ac_ct_NM=$NM
-   # Extract the first word of "nm", so it can be a program name with args.
- set dummy nm; ac_word=$2
--echo "$as_me:4288: checking for $ac_word" >&5
-+echo "$as_me:4294: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4300,7 +4306,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NM="nm"
--echo "$as_me:4303: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4309: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4309,10 +4315,10 @@
- fi
- ac_ct_NM=$ac_cv_prog_ac_ct_NM
- if test -n "$ac_ct_NM"; then
--  echo "$as_me:4312: result: $ac_ct_NM" >&5
-+  echo "$as_me:4318: result: $ac_ct_NM" >&5
- echo "${ECHO_T}$ac_ct_NM" >&6
- else
--  echo "$as_me:4315: result: no" >&5
-+  echo "$as_me:4321: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4324,7 +4330,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:4327: checking for $ac_word" >&5
-+echo "$as_me:4333: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4339,7 +4345,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:4342: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4348: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4347,10 +4353,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4350: result: $AR" >&5
-+  echo "$as_me:4356: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4353: result: no" >&5
-+  echo "$as_me:4359: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4359,7 +4365,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:4362: checking for $ac_word" >&5
-+echo "$as_me:4368: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4374,7 +4380,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:4377: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4383: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4383,10 +4389,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4386: result: $ac_ct_AR" >&5
-+  echo "$as_me:4392: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4389: result: no" >&5
-+  echo "$as_me:4395: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4395,7 +4401,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:4398: checking for options to update archives" >&5
-+echo "$as_me:4404: checking for options to update archives" >&5
- echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
- if test "${cf_cv_ar_flags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4418,13 +4424,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <<EOF
--#line 4421 "configure"
-+#line 4427 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--		if { (eval echo "$as_me:4424: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:4430: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4427: \$? = $ac_status" >&5
-+  echo "$as_me:4433: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
- 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -4435,7 +4441,7 @@
- 		else
- 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--echo "${as_me:-configure}:4438: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:4444: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -4443,7 +4449,7 @@
- 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
--echo "$as_me:4446: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:4452: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -4454,7 +4460,7 @@
- 	ARFLAGS=$cf_cv_ar_flags
- fi
- 
--echo "$as_me:4457: checking if you have specified an install-prefix" >&5
-+echo "$as_me:4463: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -4467,7 +4473,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:4470: result: $DESTDIR" >&5
-+echo "$as_me:4476: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -4495,7 +4501,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4498: checking for $ac_word" >&5
-+echo "$as_me:4504: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4510,7 +4516,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:4513: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4519: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4518,10 +4524,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:4521: result: $BUILD_CC" >&5
-+  echo "$as_me:4527: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:4524: result: no" >&5
-+  echo "$as_me:4530: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4529,12 +4535,12 @@
- done
- 
- fi;
--	echo "$as_me:4532: checking for native build C compiler" >&5
-+	echo "$as_me:4538: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:4534: result: $BUILD_CC" >&5
-+	echo "$as_me:4540: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:4537: checking for native build C preprocessor" >&5
-+	echo "$as_me:4543: checking for native build C preprocessor" >&5
- echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
- 
- # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -4544,10 +4550,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:4547: result: $BUILD_CPP" >&5
-+	echo "$as_me:4553: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:4550: checking for native build C flags" >&5
-+	echo "$as_me:4556: checking for native build C flags" >&5
- echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -4555,10 +4561,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:4558: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:4564: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:4561: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:4567: checking for native build C preprocessor-flags" >&5
- echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -4566,10 +4572,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:4569: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:4575: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:4572: checking for native build linker-flags" >&5
-+	echo "$as_me:4578: checking for native build linker-flags" >&5
- echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -4577,10 +4583,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:4580: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:4586: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:4583: checking for native build linker-libraries" >&5
-+	echo "$as_me:4589: checking for native build linker-libraries" >&5
- echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
- 
- # Check whether --with-build-libs or --without-build-libs was given.
-@@ -4588,7 +4594,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:4591: result: $BUILD_LIBS" >&5
-+	echo "$as_me:4597: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -4598,7 +4604,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:4601: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:4607: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&5
- echo "$as_me: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&2;}
-@@ -4623,7 +4629,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:4626: checking if libtool -version-number should be used" >&5
-+echo "$as_me:4632: checking if libtool -version-number should be used" >&5
- echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
- 
- # Check whether --enable-libtool-version or --disable-libtool-version was given.
-@@ -4640,7 +4646,7 @@
- 	cf_libtool_version=yes
- 
- fi;
--echo "$as_me:4643: result: $cf_libtool_version" >&5
-+echo "$as_me:4649: result: $cf_libtool_version" >&5
- echo "${ECHO_T}$cf_libtool_version" >&6
- 
- if test "$cf_libtool_version" = yes ; then
-@@ -4649,25 +4655,25 @@
- 	LIBTOOL_VERSION="-version-info"
- 	case "x$VERSION" in
- 	(x)
--		{ echo "$as_me:4652: WARNING: VERSION was not set" >&5
-+		{ echo "$as_me:4658: WARNING: VERSION was not set" >&5
- echo "$as_me: WARNING: VERSION was not set" >&2;}
- 		;;
- 	(x*.*.*)
- 		ABI_VERSION="$VERSION"
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4659: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4665: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(x*:*:*)
- 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4666: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4672: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:4670: WARNING: unexpected VERSION value: $VERSION" >&5
-+		{ echo "$as_me:4676: WARNING: unexpected VERSION value: $VERSION" >&5
- echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
- 		;;
- 	esac
-@@ -4689,7 +4695,7 @@
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
--echo "$as_me:4692: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4698: checking if you want to build libraries with libtool" >&5
- echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
- 
- # Check whether --with-libtool or --without-libtool was given.
-@@ -4699,7 +4705,7 @@
- else
-   with_libtool=no
- fi;
--echo "$as_me:4702: result: $with_libtool" >&5
-+echo "$as_me:4708: result: $with_libtool" >&5
- echo "${ECHO_T}$with_libtool" >&6
- if test "$with_libtool" != "no"; then
- 
-@@ -4730,7 +4736,7 @@
- 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:4733: error: expected a pathname, not \"$with_libtool\"" >&5
-+	{ { echo "$as_me:4739: error: expected a pathname, not \"$with_libtool\"" >&5
- echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -4743,7 +4749,7 @@
-   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
--echo "$as_me:4746: checking for $ac_word" >&5
-+echo "$as_me:4752: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4758,7 +4764,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:4761: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4767: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4766,10 +4772,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4769: result: $LIBTOOL" >&5
-+  echo "$as_me:4775: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4772: result: no" >&5
-+  echo "$as_me:4778: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4782,7 +4788,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4785: checking for $ac_word" >&5
-+echo "$as_me:4791: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4797,7 +4803,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:4800: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4806: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4805,10 +4811,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:4808: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:4814: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:4811: result: no" >&5
-+  echo "$as_me:4817: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4839,7 +4845,7 @@
-   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
--echo "$as_me:4842: checking for $ac_word" >&5
-+echo "$as_me:4848: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4854,7 +4860,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:4857: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4863: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4862,10 +4868,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4865: result: $LIBTOOL" >&5
-+  echo "$as_me:4871: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4868: result: no" >&5
-+  echo "$as_me:4874: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4878,7 +4884,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4881: checking for $ac_word" >&5
-+echo "$as_me:4887: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4893,7 +4899,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:4896: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4902: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4901,10 +4907,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:4904: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:4910: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:4907: result: no" >&5
-+  echo "$as_me:4913: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4926,7 +4932,7 @@
- 		fi
- 	fi
- 	if test -z "$LIBTOOL" ; then
--		{ { echo "$as_me:4929: error: Cannot find libtool" >&5
-+		{ { echo "$as_me:4935: error: Cannot find libtool" >&5
- echo "$as_me: error: Cannot find libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -4942,7 +4948,7 @@
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
- then
--	echo "$as_me:4945: checking version of $LIBTOOL" >&5
-+	echo "$as_me:4951: checking version of $LIBTOOL" >&5
- echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
-@@ -4953,15 +4959,15 @@
- fi
- test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
- 
--	echo "$as_me:4956: result: $cf_cv_libtool_version" >&5
-+	echo "$as_me:4962: result: $cf_cv_libtool_version" >&5
- echo "${ECHO_T}$cf_cv_libtool_version" >&6
- 	if test -z "$cf_cv_libtool_version" ; then
--		{ { echo "$as_me:4959: error: This is not GNU libtool" >&5
-+		{ { echo "$as_me:4965: error: This is not GNU libtool" >&5
- echo "$as_me: error: This is not GNU libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:4964: error: GNU libtool has not been found" >&5
-+	{ { echo "$as_me:4970: error: GNU libtool has not been found" >&5
- echo "$as_me: error: GNU libtool has not been found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -4997,7 +5003,7 @@
- 
- else
- 
--echo "$as_me:5000: checking if you want to build shared libraries" >&5
-+echo "$as_me:5006: checking if you want to build shared libraries" >&5
- echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -5007,11 +5013,11 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:5010: result: $with_shared" >&5
-+echo "$as_me:5016: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:5014: checking if you want to build static libraries" >&5
-+echo "$as_me:5020: checking if you want to build static libraries" >&5
- echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
- 
- # Check whether --with-normal or --without-normal was given.
-@@ -5021,11 +5027,11 @@
- else
-   with_normal=yes
- fi;
--echo "$as_me:5024: result: $with_normal" >&5
-+echo "$as_me:5030: result: $with_normal" >&5
- echo "${ECHO_T}$with_normal" >&6
- test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
- 
--echo "$as_me:5028: checking if you want to build debug libraries" >&5
-+echo "$as_me:5034: checking if you want to build debug libraries" >&5
- echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
- 
- # Check whether --with-debug or --without-debug was given.
-@@ -5035,11 +5041,11 @@
- else
-   with_debug=yes
- fi;
--echo "$as_me:5038: result: $with_debug" >&5
-+echo "$as_me:5044: result: $with_debug" >&5
- echo "${ECHO_T}$with_debug" >&6
- test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
- 
--echo "$as_me:5042: checking if you want to build profiling libraries" >&5
-+echo "$as_me:5048: checking if you want to build profiling libraries" >&5
- echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
- 
- # Check whether --with-profile or --without-profile was given.
-@@ -5049,7 +5055,7 @@
- else
-   with_profile=no
- fi;
--echo "$as_me:5052: result: $with_profile" >&5
-+echo "$as_me:5058: result: $with_profile" >&5
- echo "${ECHO_T}$with_profile" >&6
- test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
- 
-@@ -5057,7 +5063,7 @@
- 
- if test "X$cf_with_cxx_binding" != Xno; then
- if test "x$with_shared" = "xyes"; then
--echo "$as_me:5060: checking if you want to build C++ shared libraries" >&5
-+echo "$as_me:5066: checking if you want to build C++ shared libraries" >&5
- echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-cxx-shared or --without-cxx-shared was given.
-@@ -5067,26 +5073,26 @@
- else
-   with_shared_cxx=no
- fi;
--echo "$as_me:5070: result: $with_shared_cxx" >&5
-+echo "$as_me:5076: result: $with_shared_cxx" >&5
- echo "${ECHO_T}$with_shared_cxx" >&6
- fi
- fi
- 
- ###############################################################################
- 
--echo "$as_me:5077: checking for specified models" >&5
-+echo "$as_me:5083: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
- test "$with_libtool" != "no" && cf_list_models=libtool
--echo "$as_me:5081: result: $cf_list_models" >&5
-+echo "$as_me:5087: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:5086: checking for default model" >&5
-+echo "$as_me:5092: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:5089: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:5095: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-@@ -5100,7 +5106,7 @@
- LIB_DIR=../lib
- LIB_2ND=../../lib
- 
--echo "$as_me:5103: checking if you want to have a library-prefix" >&5
-+echo "$as_me:5109: checking if you want to have a library-prefix" >&5
- echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
- 
- # Check whether --with-lib-prefix or --without-lib-prefix was given.
-@@ -5110,7 +5116,7 @@
- else
-   with_lib_prefix=auto
- fi;
--echo "$as_me:5113: result: $with_lib_prefix" >&5
-+echo "$as_me:5119: result: $with_lib_prefix" >&5
- echo "${ECHO_T}$with_lib_prefix" >&6
- 
- if test $with_lib_prefix = auto
-@@ -5134,19 +5140,19 @@
- 
- LIB_SUFFIX=
- 
--	echo "$as_me:5137: checking for PATH separator" >&5
-+	echo "$as_me:5143: checking for PATH separator" >&5
- echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(os2*)	PATH_SEPARATOR=';'  ;;
- 	(*)	${PATH_SEPARATOR:=':'}  ;;
- 	esac
- 
--	echo "$as_me:5144: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:5150: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
- ###############################################################################
- 
--echo "$as_me:5149: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:5155: checking if you want to build a separate terminfo library" >&5
- echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
- 
- # Check whether --with-termlib or --without-termlib was given.
-@@ -5156,10 +5162,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:5159: result: $with_termlib" >&5
-+echo "$as_me:5165: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
--echo "$as_me:5162: checking if you want to build a separate tic library" >&5
-+echo "$as_me:5168: checking if you want to build a separate tic library" >&5
- echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
- 
- # Check whether --with-ticlib or --without-ticlib was given.
-@@ -5169,13 +5175,13 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:5172: result: $with_ticlib" >&5
-+echo "$as_me:5178: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:5178: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:5184: checking if you want to link with the GPM mouse library" >&5
- echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
- 
- # Check whether --with-gpm or --without-gpm was given.
-@@ -5185,27 +5191,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:5188: result: $with_gpm" >&5
-+echo "$as_me:5194: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5192: checking for gpm.h" >&5
-+	echo "$as_me:5198: checking for gpm.h" >&5
- echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
- if test "${ac_cv_header_gpm_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5198 "configure"
-+#line 5204 "configure"
- #include "confdefs.h"
- #include <gpm.h>
- _ACEOF
--if { (eval echo "$as_me:5202: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:5208: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:5208: \$? = $ac_status" >&5
-+  echo "$as_me:5214: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5224,7 +5230,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:5227: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:5233: result: $ac_cv_header_gpm_h" >&5
- echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
- if test $ac_cv_header_gpm_h = yes; then
- 
-@@ -5235,14 +5241,14 @@
- 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
- 
--echo "${as_me:-configure}:5238: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:5244: testing assuming we really have GPM library ..." 1>&5
- 
- cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:5245: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:5251: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5250,7 +5256,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5253 "configure"
-+#line 5259 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5269,16 +5275,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5272: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5278: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5275: \$? = $ac_status" >&5
-+  echo "$as_me:5281: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5278: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5284: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5281: \$? = $ac_status" >&5
-+  echo "$as_me:5287: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -5289,13 +5295,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5292: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5298: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-   :
- else
- 
--				{ { echo "$as_me:5298: error: Cannot link with GPM library" >&5
-+				{ { echo "$as_me:5304: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5305,7 +5311,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:5308: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:5314: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -5314,7 +5320,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5317: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:5323: checking if you want to load GPM dynamically" >&5
- echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
- 
- # Check whether --with-dlsym or --without-dlsym was given.
-@@ -5324,18 +5330,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:5327: result: $with_dlsym" >&5
-+	echo "$as_me:5333: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "x$with_dlsym" = xyes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:5332: checking for dlsym" >&5
-+echo "$as_me:5338: checking for dlsym" >&5
- echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
- if test "${ac_cv_func_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5338 "configure"
-+#line 5344 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -5366,16 +5372,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5369: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5375: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5372: \$? = $ac_status" >&5
-+  echo "$as_me:5378: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5375: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5381: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5378: \$? = $ac_status" >&5
-+  echo "$as_me:5384: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -5385,14 +5391,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5388: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:5394: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:5395: checking for dlsym in -ldl" >&5
-+echo "$as_me:5401: checking for dlsym in -ldl" >&5
- echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5400,7 +5406,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5403 "configure"
-+#line 5409 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5419,16 +5425,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5422: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5428: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5425: \$? = $ac_status" >&5
-+  echo "$as_me:5431: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5428: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5434: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5431: \$? = $ac_status" >&5
-+  echo "$as_me:5437: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -5439,7 +5445,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5442: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:5448: result: $ac_cv_lib_dl_dlsym" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
- if test $ac_cv_lib_dl_dlsym = yes; then
- 
-@@ -5467,10 +5473,10 @@
- done
- LIBS="$cf_add_libs"
- 
--	echo "$as_me:5470: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:5476: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5473 "configure"
-+#line 5479 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- int
-@@ -5488,16 +5494,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5491: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5497: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5494: \$? = $ac_status" >&5
-+  echo "$as_me:5500: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5497: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5503: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5500: \$? = $ac_status" >&5
-+  echo "$as_me:5506: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -5508,15 +5514,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:5511: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:5517: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5516: result: ok" >&5
-+	echo "$as_me:5522: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:5519: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:5525: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5524,12 +5530,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:5527: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5533: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5532: checking for soname of gpm library" >&5
-+echo "$as_me:5538: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5563,15 +5569,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:5566: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5572: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5569: \$? = $ac_status" >&5
-+  echo "$as_me:5575: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5571: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5577: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5574: \$? = $ac_status" >&5
-+  echo "$as_me:5580: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5582,7 +5588,7 @@
- fi
- 
- fi
--echo "$as_me:5585: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5591: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -5617,7 +5623,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5620: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5626: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5625,7 +5631,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5628 "configure"
-+#line 5634 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5644,16 +5650,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5647: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5653: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5650: \$? = $ac_status" >&5
-+  echo "$as_me:5656: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5653: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5659: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5656: \$? = $ac_status" >&5
-+  echo "$as_me:5662: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -5664,11 +5670,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5667: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5673: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:5671: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5677: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5692,15 +5698,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:5695: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5698: \$? = $ac_status" >&5
-+  echo "$as_me:5704: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5700: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5706: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5703: \$? = $ac_status" >&5
-+  echo "$as_me:5709: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5712,11 +5718,11 @@
- fi
- 
- fi
--echo "$as_me:5715: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5721: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:5719: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5725: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -5726,7 +5732,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:5729: checking if you want to use sysmouse" >&5
-+echo "$as_me:5735: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5738,7 +5744,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5741 "configure"
-+#line 5747 "configure"
- #include "confdefs.h"
- 
- #include <osreldate.h>
-@@ -5761,16 +5767,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5764: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5767: \$? = $ac_status" >&5
-+  echo "$as_me:5773: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5770: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5773: \$? = $ac_status" >&5
-+  echo "$as_me:5779: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -5780,7 +5786,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:5783: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5789: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -5799,7 +5805,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5802: checking for default loader flags" >&5
-+echo "$as_me:5808: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (libtool) LD_MODEL=''   ;;
-@@ -5808,13 +5814,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5811: result: $LD_MODEL" >&5
-+echo "$as_me:5817: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5817: checking if rpath option should be used" >&5
-+echo "$as_me:5823: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5824,10 +5830,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5827: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5833: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5830: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5836: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -5837,7 +5843,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5840: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5846: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5846,7 +5852,7 @@
- rel_builddir=..
- 
- LD_RPATH_OPT=
--echo "$as_me:5849: checking for an rpath option" >&5
-+echo "$as_me:5855: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -5877,12 +5883,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:5880: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5886: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:5885: checking if we need a space after rpath option" >&5
-+	echo "$as_me:5891: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -5903,7 +5909,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5906 "configure"
-+#line 5912 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5915,16 +5921,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5918: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5924: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5921: \$? = $ac_status" >&5
-+  echo "$as_me:5927: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5930: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5927: \$? = $ac_status" >&5
-+  echo "$as_me:5933: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5934,7 +5940,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:5937: result: $cf_rpath_space" >&5
-+	echo "$as_me:5943: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -5955,7 +5961,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5958: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5964: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5970,9 +5976,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5973: result: $withval" >&5
-+		echo "$as_me:5979: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5975: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5981: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5981,7 +5987,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5984: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5990: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -5991,14 +5997,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:5994: checking which $CC option to use" >&5
-+		echo "$as_me:6000: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6001 "configure"
-+#line 6007 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6010,16 +6016,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6013: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6019: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6016: \$? = $ac_status" >&5
-+  echo "$as_me:6022: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6019: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6022: \$? = $ac_status" >&5
-+  echo "$as_me:6028: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6028,7 +6034,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6031: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6037: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6099,7 +6105,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6102: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6108: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6108,7 +6114,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6111 "configure"
-+#line 6117 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6120,16 +6126,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6123: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6129: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6126: \$? = $ac_status" >&5
-+  echo "$as_me:6132: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6129: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6132: \$? = $ac_status" >&5
-+  echo "$as_me:6138: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6140,7 +6146,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6143: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6149: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6365,7 +6371,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6368 "configure"
-+#line 6374 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6377,16 +6383,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6380: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6383: \$? = $ac_status" >&5
-+  echo "$as_me:6389: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6386: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6389: \$? = $ac_status" >&5
-+  echo "$as_me:6395: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6423,7 +6429,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6426: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6432: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6433,7 +6439,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 6436 "${as_me:-configure}"
-+#line 6442 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -6445,18 +6451,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6448: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6454: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6450: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6453: \$? = $ac_status" >&5
-+  echo "$as_me:6459: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6455: result: yes" >&5
-+				echo "$as_me:6461: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6459: result: no" >&5
-+				echo "$as_me:6465: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6471,17 +6477,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6474: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6480: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6478: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6484: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6484: checking for additional libtool options" >&5
-+echo "$as_me:6490: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6491,7 +6497,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6494: result: $with_libtool_opts" >&5
-+echo "$as_me:6500: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6502,7 +6508,7 @@
- 	;;
- esac
- 
--echo "$as_me:6505: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6511: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6517,7 +6523,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6520: result: $with_export_syms" >&5
-+echo "$as_me:6526: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6528,12 +6534,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6531: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6537: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6536: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6542: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6548,7 +6554,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6551: result: $with_versioned_syms" >&5
-+echo "$as_me:6557: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6564,7 +6570,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6567: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6573: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6572,11 +6578,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6575: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6581: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6579: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6585: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6588,7 +6594,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6591: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6597: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6625,7 +6631,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <<EOF
--#line 6628 "configure"
-+#line 6634 "configure"
- int	_ismissing(void) { return 1; }
- int	_localf1(void) { return 1; }
- int	_localf2(void) { return 2; }
-@@ -6656,7 +6662,7 @@
- 			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6659: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6665: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6667,7 +6673,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6670: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6676: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6684,13 +6690,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6687: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6693: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6693: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6699: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -6707,21 +6713,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6710: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6716: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:6714: checking for updated LDFLAGS" >&5
-+echo "$as_me:6720: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:6717: result: maybe" >&5
-+	echo "$as_me:6723: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:6724: checking for $ac_word" >&5
-+echo "$as_me:6730: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6736,7 +6742,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:6739: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6745: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6744,10 +6750,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6747: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6753: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6750: result: no" >&5
-+  echo "$as_me:6756: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6761,7 +6767,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6764 "configure"
-+#line 6770 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6773,16 +6779,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6776: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6782: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6779: \$? = $ac_status" >&5
-+  echo "$as_me:6785: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6782: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6785: \$? = $ac_status" >&5
-+  echo "$as_me:6791: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -6810,7 +6816,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6813: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6819: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6822,11 +6828,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6825: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6831: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6829: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6835: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6863,7 +6869,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6866: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6872: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6876,11 +6882,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6879: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6885: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6883: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6889: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6917,7 +6923,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6920: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6926: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6930,14 +6936,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6933: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6939: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6937: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6943: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6940: result: no" >&5
-+	echo "$as_me:6946: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6948,7 +6954,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6951: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6957: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6967,11 +6973,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6970: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6976: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6974: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6980: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6981,10 +6987,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6984: result: $with_overwrite" >&5
-+echo "$as_me:6990: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6987: checking if external terminfo-database is used" >&5
-+echo "$as_me:6993: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -6994,7 +7000,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:6997: result: $use_database" >&5
-+echo "$as_me:7003: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7010,7 +7016,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7013: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7019: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7018,10 +7024,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7021: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7027: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7024: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7030: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7031,13 +7037,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7034: result: $with_hashed_db" >&5
-+	echo "$as_me:7040: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7040: checking for list of fallback descriptions" >&5
-+echo "$as_me:7046: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7047,11 +7053,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7050: result: $with_fallback" >&5
-+echo "$as_me:7056: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7054: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7060: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7065,11 +7071,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7068: result: $with_xterm_new" >&5
-+echo "$as_me:7074: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7072: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7078: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7090,7 +7096,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7093: result: $with_xterm_kbs" >&5
-+echo "$as_me:7099: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7100,7 +7106,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7103: checking for list of terminfo directories" >&5
-+echo "$as_me:7109: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7140,7 +7146,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7143: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7149: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7163,14 +7169,14 @@
- 	;;
- esac
- 
--echo "$as_me:7166: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7172: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <<EOF
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:7173: checking for default terminfo directory" >&5
-+echo "$as_me:7179: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7206,7 +7212,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7209: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7215: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7215,7 +7221,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7218: result: $TERMINFO" >&5
-+echo "$as_me:7224: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -7226,7 +7232,7 @@
- 
- ###	use option --disable-big-core to make tic run on small machines
- ###	We need 4Mb, check if we can allocate 50% more than that.
--echo "$as_me:7229: checking if big-core option selected" >&5
-+echo "$as_me:7235: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7238,7 +7244,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7241 "configure"
-+#line 7247 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7252,15 +7258,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7255: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7261: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7258: \$? = $ac_status" >&5
-+  echo "$as_me:7264: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7260: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7266: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7263: \$? = $ac_status" >&5
-+  echo "$as_me:7269: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7272,7 +7278,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:7275: result: $with_big_core" >&5
-+echo "$as_me:7281: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7282,7 +7288,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7285: checking if big-strings option selected" >&5
-+echo "$as_me:7291: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7306,14 +7312,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7309: result: $with_big_strings" >&5
-+echo "$as_me:7315: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7316: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7322: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7323,14 +7329,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7326: result: $with_termcap" >&5
-+echo "$as_me:7332: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7333: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7339: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7343,13 +7349,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7346: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7352: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7352: checking for list of termcap files" >&5
-+	echo "$as_me:7358: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7389,7 +7395,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7392: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7398: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7412,7 +7418,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7415: result: $TERMPATH" >&5
-+	echo "$as_me:7421: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <<EOF
-@@ -7420,7 +7426,7 @@
- EOF
- 
- 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
--	echo "$as_me:7423: checking if fast termcap-loader is needed" >&5
-+	echo "$as_me:7429: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7430,14 +7436,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7433: result: $with_getcap" >&5
-+	echo "$as_me:7439: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7440: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7446: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7447,7 +7453,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7450: result: $with_getcap_cache" >&5
-+	echo "$as_me:7456: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7457,7 +7463,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7460: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7466: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7467,14 +7473,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7470: result: $with_home_terminfo" >&5
-+echo "$as_me:7476: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7477: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7483: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7484,7 +7490,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7487: result: $with_root_environ" >&5
-+echo "$as_me:7493: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7499,13 +7505,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7502: checking for $ac_func" >&5
-+echo "$as_me:7508: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7508 "configure"
-+#line 7514 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7536,16 +7542,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7539: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7545: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7542: \$? = $ac_status" >&5
-+  echo "$as_me:7548: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7545: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7551: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7548: \$? = $ac_status" >&5
-+  echo "$as_me:7554: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7555,7 +7561,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7558: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7564: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7572,13 +7578,13 @@
- 		symlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7575: checking for $ac_func" >&5
-+echo "$as_me:7581: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7581 "configure"
-+#line 7587 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7609,16 +7615,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7612: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7618: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7615: \$? = $ac_status" >&5
-+  echo "$as_me:7621: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7618: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7624: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7621: \$? = $ac_status" >&5
-+  echo "$as_me:7627: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7628,7 +7634,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7631: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7637: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7639,7 +7645,7 @@
- done
- 
- else
--	echo "$as_me:7642: checking if link/symlink functions work" >&5
-+	echo "$as_me:7648: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7652,7 +7658,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7655 "configure"
-+#line 7661 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -7682,15 +7688,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7685: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7691: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7688: \$? = $ac_status" >&5
-+  echo "$as_me:7694: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7690: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7693: \$? = $ac_status" >&5
-+  echo "$as_me:7699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7708,7 +7714,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:7711: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7717: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7728,7 +7734,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7731: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7737: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7738,21 +7744,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:7741: result: $with_symlinks" >&5
-+	echo "$as_me:7747: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--	echo "$as_me:7748: checking if tic should use hard links" >&5
-+	echo "$as_me:7754: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:7755: result: $with_links" >&5
-+	echo "$as_me:7761: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7767,7 +7773,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7770: checking if you want broken-linker support code" >&5
-+echo "$as_me:7776: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7777,7 +7783,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7780: result: $with_broken_linker" >&5
-+echo "$as_me:7786: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -7799,14 +7805,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:7802: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7808: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7809: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7815: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7816,7 +7822,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:7819: result: $with_bsdpad" >&5
-+echo "$as_me:7825: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7873,14 +7879,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:7876: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7882: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7883 "configure"
-+#line 7889 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7895,16 +7901,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7898: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7904: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7901: \$? = $ac_status" >&5
-+  echo "$as_me:7907: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7904: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7910: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7907: \$? = $ac_status" >&5
-+  echo "$as_me:7913: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7913,7 +7919,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7916 "configure"
-+#line 7922 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7928,16 +7934,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7931: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7937: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7934: \$? = $ac_status" >&5
-+  echo "$as_me:7940: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7943: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7940: \$? = $ac_status" >&5
-+  echo "$as_me:7946: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7952,7 +7958,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7955: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7961: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -7977,16 +7983,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:7980: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7986: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:7986: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7992: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7989 "configure"
-+#line 7995 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8001,16 +8007,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8004: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8010: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8007: \$? = $ac_status" >&5
-+  echo "$as_me:8013: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8010: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8016: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8013: \$? = $ac_status" >&5
-+  echo "$as_me:8019: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8031,7 +8037,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8034 "configure"
-+#line 8040 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8046,16 +8052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8049: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8055: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8052: \$? = $ac_status" >&5
-+  echo "$as_me:8058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8055: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8058: \$? = $ac_status" >&5
-+  echo "$as_me:8064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8066,15 +8072,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8069: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8075: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8074: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8080: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8077 "configure"
-+#line 8083 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8089,16 +8095,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8092: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8098: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8095: \$? = $ac_status" >&5
-+  echo "$as_me:8101: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8104: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8101: \$? = $ac_status" >&5
-+  echo "$as_me:8107: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8114,7 +8120,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8117: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8123: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8232,14 +8238,14 @@
- 	;;
- (*)
- 
--echo "$as_me:8235: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8241: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8242 "configure"
-+#line 8248 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8258,16 +8264,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8261: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8267: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8264: \$? = $ac_status" >&5
-+  echo "$as_me:8270: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8267: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8273: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8270: \$? = $ac_status" >&5
-+  echo "$as_me:8276: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8276,7 +8282,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8279 "configure"
-+#line 8285 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8295,16 +8301,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8304: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8301: \$? = $ac_status" >&5
-+  echo "$as_me:8307: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8304: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8310: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8307: \$? = $ac_status" >&5
-+  echo "$as_me:8313: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8319,7 +8325,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8322: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8328: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -8427,16 +8433,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:8430: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8436: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:8436: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8442: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8439 "configure"
-+#line 8445 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8451,16 +8457,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8454: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8460: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8457: \$? = $ac_status" >&5
-+  echo "$as_me:8463: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8460: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8466: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8463: \$? = $ac_status" >&5
-+  echo "$as_me:8469: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8481,7 +8487,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8484 "configure"
-+#line 8490 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8496,16 +8502,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8505: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8502: \$? = $ac_status" >&5
-+  echo "$as_me:8508: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8505: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8511: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8508: \$? = $ac_status" >&5
-+  echo "$as_me:8514: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8516,15 +8522,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8519: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8525: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8524: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8530: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8527 "configure"
-+#line 8533 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8539,16 +8545,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8542: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8545: \$? = $ac_status" >&5
-+  echo "$as_me:8551: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8548: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8554: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8551: \$? = $ac_status" >&5
-+  echo "$as_me:8557: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8564,7 +8570,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8567: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8573: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8722,7 +8728,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:8725: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8731: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -8730,7 +8736,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8733: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8739: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -8738,7 +8744,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8741: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8747: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -8746,10 +8752,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8749: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8755: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8752 "configure"
-+#line 8758 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8764,16 +8770,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8767: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8770: \$? = $ac_status" >&5
-+  echo "$as_me:8776: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8773: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8776: \$? = $ac_status" >&5
-+  echo "$as_me:8782: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8782,12 +8788,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8785: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8791: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8790 "configure"
-+#line 8796 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8802,16 +8808,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8805: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8811: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8808: \$? = $ac_status" >&5
-+  echo "$as_me:8814: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8811: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8817: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8814: \$? = $ac_status" >&5
-+  echo "$as_me:8820: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -8822,19 +8828,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:8825: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8831: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:8830: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8836: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8837 "configure"
-+#line 8843 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8853,16 +8859,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8856: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8859: \$? = $ac_status" >&5
-+  echo "$as_me:8865: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8868: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8865: \$? = $ac_status" >&5
-+  echo "$as_me:8871: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8871,7 +8877,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8874 "configure"
-+#line 8880 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8890,16 +8896,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8893: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8899: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8896: \$? = $ac_status" >&5
-+  echo "$as_me:8902: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8899: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8905: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8902: \$? = $ac_status" >&5
-+  echo "$as_me:8908: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8914,7 +8920,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8917: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8923: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9016,14 +9022,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:9019: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9025: checking if SIGWINCH is defined" >&5
- echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
- if test "${cf_cv_define_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9026 "configure"
-+#line 9032 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9038,23 +9044,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9041: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9047: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9044: \$? = $ac_status" >&5
-+  echo "$as_me:9050: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9047: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9053: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9050: \$? = $ac_status" >&5
-+  echo "$as_me:9056: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 9057 "configure"
-+#line 9063 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9072,16 +9078,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9075: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9081: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9078: \$? = $ac_status" >&5
-+  echo "$as_me:9084: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9087: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9084: \$? = $ac_status" >&5
-+  echo "$as_me:9090: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9095,11 +9101,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9098: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9104: result: $cf_cv_define_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
- 
- if test "$cf_cv_define_sigwinch" = maybe ; then
--echo "$as_me:9102: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9108: checking for actual SIGWINCH definition" >&5
- echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
- if test "${cf_cv_fixup_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9110,7 +9116,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9113 "configure"
-+#line 9119 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9132,16 +9138,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9135: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9141: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9138: \$? = $ac_status" >&5
-+  echo "$as_me:9144: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9141: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9147: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9144: \$? = $ac_status" >&5
-+  echo "$as_me:9150: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -9155,7 +9161,7 @@
- done
- 
- fi
--echo "$as_me:9158: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9164: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9165,13 +9171,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:9168: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9174: checking for nl_langinfo and CODESET" >&5
- echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
- if test "${am_cv_langinfo_codeset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9174 "configure"
-+#line 9180 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -9183,16 +9189,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9186: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9192: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9189: \$? = $ac_status" >&5
-+  echo "$as_me:9195: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9192: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9195: \$? = $ac_status" >&5
-+  echo "$as_me:9201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9203,7 +9209,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9206: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9212: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -9217,7 +9223,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:9220: checking if you want wide-character code" >&5
-+echo "$as_me:9226: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -9227,7 +9233,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9230: result: $with_widec" >&5
-+echo "$as_me:9236: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9242,14 +9248,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9245: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9251: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9252 "configure"
-+#line 9258 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9266,16 +9272,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9269: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9272: \$? = $ac_status" >&5
-+  echo "$as_me:9278: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9275: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9281: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9278: \$? = $ac_status" >&5
-+  echo "$as_me:9284: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9285,16 +9291,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9288: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9294: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9294: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9300: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9297 "configure"
-+#line 9303 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9310,16 +9316,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9313: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9319: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9316: \$? = $ac_status" >&5
-+  echo "$as_me:9322: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9319: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9325: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9322: \$? = $ac_status" >&5
-+  echo "$as_me:9328: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9328,16 +9334,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9331: result: $cf_result" >&5
-+echo "$as_me:9337: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9337: checking checking for compatible value versus " >&5
-+	echo "$as_me:9343: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9340 "configure"
-+#line 9346 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9353,16 +9359,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9356: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9362: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9359: \$? = $ac_status" >&5
-+  echo "$as_me:9365: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9362: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9368: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9365: \$? = $ac_status" >&5
-+  echo "$as_me:9371: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9371,7 +9377,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9374: result: $cf_result" >&5
-+	echo "$as_me:9380: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9387,13 +9393,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9390: checking for $ac_func" >&5
-+echo "$as_me:9396: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9396 "configure"
-+#line 9402 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9424,16 +9430,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9427: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9433: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9430: \$? = $ac_status" >&5
-+  echo "$as_me:9436: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9433: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9439: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9436: \$? = $ac_status" >&5
-+  echo "$as_me:9442: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9443,7 +9449,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9446: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9452: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9455,7 +9461,7 @@
- 
- 	if test "x$ac_cv_func_putwc" != xyes ; then
- 
--echo "$as_me:9458: checking for multibyte character support" >&5
-+echo "$as_me:9464: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9463,7 +9469,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9466 "configure"
-+#line 9472 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9476,16 +9482,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9479: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9485: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9482: \$? = $ac_status" >&5
-+  echo "$as_me:9488: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9485: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9491: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9488: \$? = $ac_status" >&5
-+  echo "$as_me:9494: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9497,12 +9503,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9500: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9506: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9505 "configure"
-+#line 9511 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9515,16 +9521,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9518: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9524: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9521: \$? = $ac_status" >&5
-+  echo "$as_me:9527: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9524: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9530: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9527: \$? = $ac_status" >&5
-+  echo "$as_me:9533: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9538,7 +9544,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9541 "configure"
-+#line 9547 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9551,16 +9557,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9554: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9560: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9557: \$? = $ac_status" >&5
-+  echo "$as_me:9563: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9560: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9563: \$? = $ac_status" >&5
-+  echo "$as_me:9569: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9577,9 +9583,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9580: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9586: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9582: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9588: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9670,11 +9676,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9673: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9679: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9677 "configure"
-+#line 9683 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9687,21 +9693,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9690: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9693: \$? = $ac_status" >&5
-+  echo "$as_me:9699: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9699: \$? = $ac_status" >&5
-+  echo "$as_me:9705: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9704: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9710: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9719,7 +9725,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9722: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9728: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9794,13 +9800,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9797: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9803: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 9803 "configure"
-+#line 9809 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9813,21 +9819,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9816: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9822: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9819: \$? = $ac_status" >&5
-+  echo "$as_me:9825: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9822: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9828: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9825: \$? = $ac_status" >&5
-+  echo "$as_me:9831: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9830: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9836: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9869,7 +9875,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9872: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9878: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -9904,7 +9910,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9907 "configure"
-+#line 9913 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9916,16 +9922,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9925: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9922: \$? = $ac_status" >&5
-+  echo "$as_me:9928: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9925: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9931: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9928: \$? = $ac_status" >&5
-+  echo "$as_me:9934: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9942,7 +9948,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9945: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9951: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9978,7 +9984,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9981: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9987: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10010,14 +10016,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10013: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10019: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10020 "configure"
-+#line 10026 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10035,23 +10041,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10038: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10044: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10041: \$? = $ac_status" >&5
-+  echo "$as_me:10047: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10044: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10050: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10047: \$? = $ac_status" >&5
-+  echo "$as_me:10053: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10054 "configure"
-+#line 10060 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10070,16 +10076,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10073: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10079: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10076: \$? = $ac_status" >&5
-+  echo "$as_me:10082: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10079: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10085: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10082: \$? = $ac_status" >&5
-+  echo "$as_me:10088: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10091,7 +10097,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10094: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10100: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10109,14 +10115,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10112: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10118: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10119 "configure"
-+#line 10125 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10134,23 +10140,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10137: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10140: \$? = $ac_status" >&5
-+  echo "$as_me:10146: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10149: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10146: \$? = $ac_status" >&5
-+  echo "$as_me:10152: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10153 "configure"
-+#line 10159 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10169,16 +10175,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10172: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10178: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10175: \$? = $ac_status" >&5
-+  echo "$as_me:10181: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10178: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10184: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10181: \$? = $ac_status" >&5
-+  echo "$as_me:10187: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10190,7 +10196,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10193: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10199: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10213,14 +10219,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10216: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10222: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10223 "configure"
-+#line 10229 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10238,23 +10244,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10241: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10247: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10244: \$? = $ac_status" >&5
-+  echo "$as_me:10250: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10247: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10253: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10250: \$? = $ac_status" >&5
-+  echo "$as_me:10256: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10257 "configure"
-+#line 10263 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10273,16 +10279,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10276: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10282: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10279: \$? = $ac_status" >&5
-+  echo "$as_me:10285: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10282: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10288: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10285: \$? = $ac_status" >&5
-+  echo "$as_me:10291: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10294,7 +10300,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10297: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10303: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10326,7 +10332,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10329: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10335: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10336,7 +10342,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10339: result: $with_lp64" >&5
-+echo "$as_me:10345: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10352,7 +10358,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10355: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10361: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10364,7 +10370,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10367 "configure"
-+#line 10373 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10384,16 +10390,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10387: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10393: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10390: \$? = $ac_status" >&5
-+  echo "$as_me:10396: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10393: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10399: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10396: \$? = $ac_status" >&5
-+  echo "$as_me:10402: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10403,16 +10409,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10406: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10412: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10409: \$? = $ac_status" >&5
-+  echo "$as_me:10415: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10412: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10415: \$? = $ac_status" >&5
-+  echo "$as_me:10421: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10426,13 +10432,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10429: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10435: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10435: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10441: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10440,7 +10446,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10443 "configure"
-+#line 10449 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10460,16 +10466,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10463: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10469: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10466: \$? = $ac_status" >&5
-+  echo "$as_me:10472: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10475: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10472: \$? = $ac_status" >&5
-+  echo "$as_me:10478: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10478,7 +10484,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10481 "configure"
-+#line 10487 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -10499,16 +10505,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10502: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10505: \$? = $ac_status" >&5
-+  echo "$as_me:10511: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10508: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10511: \$? = $ac_status" >&5
-+  echo "$as_me:10517: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10519,7 +10525,7 @@
-   break
- done
- fi
--echo "$as_me:10522: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10528: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -10529,7 +10535,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10532: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10538: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10537,7 +10543,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10540 "configure"
-+#line 10546 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10557,16 +10563,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10560: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10566: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10563: \$? = $ac_status" >&5
-+  echo "$as_me:10569: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10566: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10572: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10569: \$? = $ac_status" >&5
-+  echo "$as_me:10575: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10575,7 +10581,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10578 "configure"
-+#line 10584 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -10596,16 +10602,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10602: \$? = $ac_status" >&5
-+  echo "$as_me:10608: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10608: \$? = $ac_status" >&5
-+  echo "$as_me:10614: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10616,7 +10622,7 @@
-   break
- done
- fi
--echo "$as_me:10619: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10625: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -10629,7 +10635,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10632: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10638: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10637,7 +10643,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10640 "configure"
-+#line 10646 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10649,16 +10655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10652: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10655: \$? = $ac_status" >&5
-+  echo "$as_me:10661: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10658: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10661: \$? = $ac_status" >&5
-+  echo "$as_me:10667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10667,7 +10673,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10670 "configure"
-+#line 10676 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -10680,16 +10686,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10683: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10686: \$? = $ac_status" >&5
-+  echo "$as_me:10692: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10692: \$? = $ac_status" >&5
-+  echo "$as_me:10698: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10700,7 +10706,7 @@
-   break
- done
- fi
--echo "$as_me:10703: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10709: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -10714,13 +10720,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:10717: checking for fseeko" >&5
-+echo "$as_me:10723: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10723 "configure"
-+#line 10729 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10732,16 +10738,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10735: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10741: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10738: \$? = $ac_status" >&5
-+  echo "$as_me:10744: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10741: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10747: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10744: \$? = $ac_status" >&5
-+  echo "$as_me:10750: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10751,7 +10757,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10754: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10760: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10772,14 +10778,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:10775: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10781: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10782 "configure"
-+#line 10788 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10800,16 +10806,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10803: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10809: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10806: \$? = $ac_status" >&5
-+  echo "$as_me:10812: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10809: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10815: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10812: \$? = $ac_status" >&5
-+  echo "$as_me:10818: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10820,7 +10826,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10823: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10829: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10830,7 +10836,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10833: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10839: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10840,14 +10846,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10843: result: $with_tparm_varargs" >&5
-+echo "$as_me:10849: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10850: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10856: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10857,14 +10863,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10860: result: $with_tic_depends" >&5
-+echo "$as_me:10866: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10867: checking for type of bool" >&5
-+echo "$as_me:10873: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10874,10 +10880,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10877: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10883: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10880: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10886: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10888,11 +10894,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10891: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10897: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10895: checking for type of chtype" >&5
-+echo "$as_me:10901: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10902,11 +10908,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10905: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10911: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10909: checking for type of ospeed" >&5
-+echo "$as_me:10915: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10916,11 +10922,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10919: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10925: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10923: checking for type of mmask_t" >&5
-+echo "$as_me:10929: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10930,11 +10936,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10933: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10939: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10937: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10943: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10944,11 +10950,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10947: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10953: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10951: checking for type of tparm args" >&5
-+echo "$as_me:10957: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10958,11 +10964,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10961: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10967: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10965: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10971: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10972,7 +10978,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10975: result: $with_rcs_ids" >&5
-+echo "$as_me:10981: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10981,7 +10987,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10984: checking format of man-pages" >&5
-+echo "$as_me:10990: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11070,14 +11076,14 @@
- 	;;
- esac
- 
--echo "$as_me:11073: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11079: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11076: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11082: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11080: checking for manpage renaming" >&5
-+echo "$as_me:11086: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11105,7 +11111,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11108: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11114: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11119,10 +11125,10 @@
- 	fi
- fi
- 
--echo "$as_me:11122: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11128: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11125: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11131: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11133,7 +11139,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11136: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11142: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11147,7 +11153,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11150: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11156: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11160,17 +11166,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11163: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11169: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11169: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11175: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11173: checking for manpage tbl" >&5
-+echo "$as_me:11179: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11181,7 +11187,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11184: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11190: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11514,7 +11520,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11517: checking if you want to build with function extensions" >&5
-+echo "$as_me:11523: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11524,7 +11530,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11527: result: $with_ext_funcs" >&5
-+echo "$as_me:11533: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11579,7 +11585,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11582: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11588: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11589,7 +11595,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11592: result: $with_sp_funcs" >&5
-+echo "$as_me:11598: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11604,7 +11610,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11607: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11613: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11614,7 +11620,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11617: result: $with_term_driver" >&5
-+echo "$as_me:11623: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11623,19 +11629,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11626: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11632: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11631: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11637: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11638: checking for extended use of const keyword" >&5
-+echo "$as_me:11644: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11645,7 +11651,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11648: result: $with_ext_const" >&5
-+echo "$as_me:11654: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11653,7 +11659,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11656: checking if you want to use extended colors" >&5
-+echo "$as_me:11662: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11663,12 +11669,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11666: result: $with_ext_colors" >&5
-+echo "$as_me:11672: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11671: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11677: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11678,7 +11684,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11681: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11687: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11694,7 +11700,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11697: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11703: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11704,7 +11710,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11707: result: $with_ext_mouse" >&5
-+echo "$as_me:11713: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11715,7 +11721,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11718: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11724: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11724,7 +11730,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11727: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11733: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11734,7 +11740,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11737: result: $with_ext_putwin" >&5
-+echo "$as_me:11743: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11744,7 +11750,7 @@
- 
- fi
- 
--echo "$as_me:11747: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11753: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11754,20 +11760,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11757: result: $with_no_padding" >&5
-+echo "$as_me:11763: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11764: checking for ANSI C header files" >&5
-+echo "$as_me:11770: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11770 "configure"
-+#line 11776 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -11775,13 +11781,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:11778: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11784: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11784: \$? = $ac_status" >&5
-+  echo "$as_me:11790: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11803,7 +11809,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11806 "configure"
-+#line 11812 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -11821,7 +11827,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11824 "configure"
-+#line 11830 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -11842,7 +11848,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11845 "configure"
-+#line 11851 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11868,15 +11874,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11871: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11877: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11874: \$? = $ac_status" >&5
-+  echo "$as_me:11880: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11876: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11882: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11879: \$? = $ac_status" >&5
-+  echo "$as_me:11885: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11889,7 +11895,7 @@
- fi
- fi
- fi
--echo "$as_me:11892: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11898: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11905,28 +11911,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11908: checking for $ac_header" >&5
-+echo "$as_me:11914: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11914 "configure"
-+#line 11920 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11920: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11923: \$? = $ac_status" >&5
-+  echo "$as_me:11929: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11926: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11932: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11929: \$? = $ac_status" >&5
-+  echo "$as_me:11935: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11936,7 +11942,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11939: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11945: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11946,13 +11952,13 @@
- fi
- done
- 
--echo "$as_me:11949: checking for signed char" >&5
-+echo "$as_me:11955: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11955 "configure"
-+#line 11961 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11967,16 +11973,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11970: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11976: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11973: \$? = $ac_status" >&5
-+  echo "$as_me:11979: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11976: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11982: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11979: \$? = $ac_status" >&5
-+  echo "$as_me:11985: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -11986,10 +11992,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11989: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:11995: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:11992: checking size of signed char" >&5
-+echo "$as_me:11998: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11998,7 +12004,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12001 "configure"
-+#line 12007 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12010,21 +12016,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12013: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12019: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12016: \$? = $ac_status" >&5
-+  echo "$as_me:12022: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12019: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12025: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12022: \$? = $ac_status" >&5
-+  echo "$as_me:12028: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12027 "configure"
-+#line 12033 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12036,16 +12042,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12039: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12045: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12042: \$? = $ac_status" >&5
-+  echo "$as_me:12048: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12045: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12048: \$? = $ac_status" >&5
-+  echo "$as_me:12054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12061,7 +12067,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12064 "configure"
-+#line 12070 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12073,16 +12079,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12076: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12082: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12079: \$? = $ac_status" >&5
-+  echo "$as_me:12085: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12082: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12088: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12085: \$? = $ac_status" >&5
-+  echo "$as_me:12091: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12098,7 +12104,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12101 "configure"
-+#line 12107 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12110,16 +12116,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12113: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12116: \$? = $ac_status" >&5
-+  echo "$as_me:12122: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12122: \$? = $ac_status" >&5
-+  echo "$as_me:12128: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12132,12 +12138,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12135: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12141: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12140 "configure"
-+#line 12146 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12153,15 +12159,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12156: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12162: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12159: \$? = $ac_status" >&5
-+  echo "$as_me:12165: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12161: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12167: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12164: \$? = $ac_status" >&5
-+  echo "$as_me:12170: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12177,7 +12183,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12180: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12186: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -12188,7 +12194,7 @@
- else
- 	NCURSES_SBOOL="char"
- fi
--echo "$as_me:12191: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:12197: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12198,12 +12204,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12201: result: $with_signed_char" >&5
-+echo "$as_me:12207: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12206: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12212: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12213,7 +12219,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12216: result: $with_sigwinch" >&5
-+echo "$as_me:12222: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12221,7 +12227,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12224: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12230: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12231,7 +12237,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12234: result: $with_tcap_names" >&5
-+echo "$as_me:12240: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12239,7 +12245,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12242: checking if you want all development code" >&5
-+echo "$as_me:12248: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12249,11 +12255,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12252: result: $with_develop" >&5
-+echo "$as_me:12258: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12256: checking if you want hard-tabs code" >&5
-+echo "$as_me:12262: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12263,7 +12269,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12266: result: $enable_hard_tabs" >&5
-+echo "$as_me:12272: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12271,7 +12277,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12274: checking if you want limited support for xmc" >&5
-+echo "$as_me:12280: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12281,7 +12287,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12284: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12290: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12291,7 +12297,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12294: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12300: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12301,7 +12307,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12304: result: $with_assumed_color" >&5
-+echo "$as_me:12310: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12309,7 +12315,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12312: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12318: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12319,7 +12325,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12322: result: $with_hashmap" >&5
-+echo "$as_me:12328: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12327,7 +12333,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12330: checking if you want colorfgbg code" >&5
-+echo "$as_me:12336: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12337,7 +12343,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12340: result: $with_colorfgbg" >&5
-+echo "$as_me:12346: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12345,7 +12351,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12348: checking if you want interop bindings" >&5
-+echo "$as_me:12354: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12355,7 +12361,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12358: result: $with_exp_interop" >&5
-+echo "$as_me:12364: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12364,7 +12370,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12367: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12373: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12374,27 +12380,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12377: result: $with_pthread" >&5
-+echo "$as_me:12383: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12381: checking for pthread.h" >&5
-+	echo "$as_me:12387: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12387 "configure"
-+#line 12393 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:12391: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12397: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12397: \$? = $ac_status" >&5
-+  echo "$as_me:12403: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12413,7 +12419,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12416: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12422: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12423,7 +12429,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12426: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12432: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12444,7 +12450,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12447 "configure"
-+#line 12453 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -12461,16 +12467,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12464: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12470: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12467: \$? = $ac_status" >&5
-+  echo "$as_me:12473: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12470: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12476: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12473: \$? = $ac_status" >&5
-+  echo "$as_me:12479: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12480,7 +12486,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12483: result: $with_pthread" >&5
-+	    echo "$as_me:12489: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12508,7 +12514,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12511: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12517: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12518,13 +12524,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12521: checking for pthread_kill" >&5
-+	echo "$as_me:12527: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12527 "configure"
-+#line 12533 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12555,16 +12561,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12558: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12564: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12561: \$? = $ac_status" >&5
-+  echo "$as_me:12567: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12564: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12570: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12567: \$? = $ac_status" >&5
-+  echo "$as_me:12573: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12574,11 +12580,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12577: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12583: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12581: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12587: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12588,7 +12594,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12591: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12597: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12599,7 +12605,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12602: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12608: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12609,18 +12615,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12612: result: $use_weak_symbols" >&5
-+	echo "$as_me:12618: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12616: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12622: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12623 "configure"
-+#line 12629 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -12646,16 +12652,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12649: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12655: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12652: \$? = $ac_status" >&5
-+  echo "$as_me:12658: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12655: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12661: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12658: \$? = $ac_status" >&5
-+  echo "$as_me:12664: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12666,7 +12672,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12669: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12675: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12699,7 +12705,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12702: checking if you want reentrant code" >&5
-+echo "$as_me:12708: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12709,7 +12715,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12712: result: $with_reentrant" >&5
-+echo "$as_me:12718: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12782,7 +12788,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12785: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12791: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12797,7 +12803,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12800: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12806: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12807,7 +12813,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12810: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12816: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12817,7 +12823,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12820: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12826: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12827,7 +12833,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12830: result: $with_safe_sprintf" >&5
-+echo "$as_me:12836: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12837,7 +12843,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12840: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12846: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12847,7 +12853,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12850: result: $with_scroll_hints" >&5
-+echo "$as_me:12856: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12856,7 +12862,7 @@
- 
- fi
- 
--echo "$as_me:12859: checking if you want wgetch-events code" >&5
-+echo "$as_me:12865: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12866,7 +12872,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12869: result: $with_wgetch_events" >&5
-+echo "$as_me:12875: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12877,7 +12883,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12880: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12886: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -12911,7 +12917,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12914: result: $enableval" >&5
-+echo "$as_me:12920: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12923,7 +12929,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12926: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12932: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12931,7 +12937,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12934: result: $with_warnings" >&5
-+echo "$as_me:12940: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12943,12 +12949,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12946: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12952: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 12951 "configure"
-+#line 12957 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12965,16 +12971,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12968: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12974: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12971: \$? = $ac_status" >&5
-+  echo "$as_me:12977: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12980: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12977: \$? = $ac_status" >&5
-+  echo "$as_me:12983: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12985,7 +12991,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:12988: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:12994: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -12994,12 +13000,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:12997: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13003: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13002 "configure"
-+#line 13008 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13016,16 +13022,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13019: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13025: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13022: \$? = $ac_status" >&5
-+  echo "$as_me:13028: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13031: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13028: \$? = $ac_status" >&5
-+  echo "$as_me:13034: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13036,12 +13042,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13039: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13045: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 13044 "${as_me:-configure}"
-+#line 13050 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13058,7 +13064,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:13061: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13067: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13074,12 +13080,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13077: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13083: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13080: \$? = $ac_status" >&5
-+  echo "$as_me:13086: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13082: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13088: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13088,7 +13094,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13091: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13097: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13112,12 +13118,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13115: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13121: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13118: \$? = $ac_status" >&5
-+  echo "$as_me:13124: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13120: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13126: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13128,7 +13134,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13131: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13138,7 +13144,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13141: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13147: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13158,12 +13164,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13161: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13167: checking if this is really Intel C++ compiler" >&5
- echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13166 "configure"
-+#line 13172 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13180,16 +13186,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13183: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13186: \$? = $ac_status" >&5
-+  echo "$as_me:13192: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13189: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13192: \$? = $ac_status" >&5
-+  echo "$as_me:13198: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13200,7 +13206,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13203: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13209: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13209,12 +13215,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13212: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13218: checking if this is really Clang C++ compiler" >&5
- echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13217 "configure"
-+#line 13223 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13231,16 +13237,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13234: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13240: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13237: \$? = $ac_status" >&5
-+  echo "$as_me:13243: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13240: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13246: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13243: \$? = $ac_status" >&5
-+  echo "$as_me:13249: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13251,7 +13257,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13254: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13260: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13263,7 +13269,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <<EOF
--#line 13266 "configure"
-+#line 13272 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13281,7 +13287,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:13284: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13290: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13298,12 +13304,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13301: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13304: \$? = $ac_status" >&5
-+  echo "$as_me:13310: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13306: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13312: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13312,7 +13318,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13315: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13321: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13342,16 +13348,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13351: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13348: \$? = $ac_status" >&5
-+  echo "$as_me:13354: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13350: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13356: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13354: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13360: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13387,10 +13393,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13390: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13396: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 13393 "${as_me:-configure}"
-+#line 13399 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -13439,12 +13445,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:13442: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13448: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13445: \$? = $ac_status" >&5
-+  echo "$as_me:13451: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13447: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13453: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13503,7 +13509,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13506: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13512: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13513,7 +13519,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13516: result: $with_string_hacks" >&5
-+echo "$as_me:13522: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13522,19 +13528,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13525: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13531: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13531: checking for $ac_func" >&5
-+echo "$as_me:13537: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13537 "configure"
-+#line 13543 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13565,16 +13571,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13568: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13574: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13571: \$? = $ac_status" >&5
-+  echo "$as_me:13577: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13577: \$? = $ac_status" >&5
-+  echo "$as_me:13583: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13584,7 +13590,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13587: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13593: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13597,7 +13603,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:13600: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:13606: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13607,7 +13613,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13610: result: $with_assertions" >&5
-+echo "$as_me:13616: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13623,7 +13629,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13626: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13632: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -13640,7 +13646,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13643: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13649: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13734,23 +13740,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13737: checking for dmalloc.h" >&5
-+	echo "$as_me:13743: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13743 "configure"
-+#line 13749 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13747: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13753: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13753: \$? = $ac_status" >&5
-+  echo "$as_me:13759: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13769,11 +13775,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13772: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13778: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:13776: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13782: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13781,7 +13787,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13784 "configure"
-+#line 13790 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13800,16 +13806,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13803: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13809: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13806: \$? = $ac_status" >&5
-+  echo "$as_me:13812: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13809: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13812: \$? = $ac_status" >&5
-+  echo "$as_me:13818: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13820,7 +13826,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13823: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13829: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13835,7 +13841,7 @@
- 
- fi
- 
--echo "$as_me:13838: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:13844: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -13852,7 +13858,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13855: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13861: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13946,23 +13952,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13949: checking for dbmalloc.h" >&5
-+	echo "$as_me:13955: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13955 "configure"
-+#line 13961 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13959: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13965: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13965: \$? = $ac_status" >&5
-+  echo "$as_me:13971: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13981,11 +13987,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13984: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13990: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:13988: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:13994: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13993,7 +13999,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13996 "configure"
-+#line 14002 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14012,16 +14018,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14015: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14021: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14018: \$? = $ac_status" >&5
-+  echo "$as_me:14024: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14027: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14024: \$? = $ac_status" >&5
-+  echo "$as_me:14030: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14032,7 +14038,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14035: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14041: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14047,7 +14053,7 @@
- 
- fi
- 
--echo "$as_me:14050: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:14056: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14064,7 +14070,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14067: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14073: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14157,7 +14163,7 @@
- 	;;
- esac
- 
--echo "$as_me:14160: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14166: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14167,7 +14173,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14170: result: $with_no_leaks" >&5
-+echo "$as_me:14176: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14219,7 +14225,7 @@
- 	;;
- esac
- 
--echo "$as_me:14222: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14228: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14229,7 +14235,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14232: result: $cf_with_trace" >&5
-+echo "$as_me:14238: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14319,7 +14325,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14322: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14328: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14336,7 +14342,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14339: result: $enable_gnat_projects" >&5
-+echo "$as_me:14345: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14346,13 +14352,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14349: checking for gettimeofday" >&5
-+echo "$as_me:14355: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14355 "configure"
-+#line 14361 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14383,16 +14389,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14386: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14392: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14389: \$? = $ac_status" >&5
-+  echo "$as_me:14395: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14392: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14398: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14395: \$? = $ac_status" >&5
-+  echo "$as_me:14401: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14402,7 +14408,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14405: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14411: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14412,7 +14418,7 @@
- 
- else
- 
--echo "$as_me:14415: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14421: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14420,7 +14426,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14423 "configure"
-+#line 14429 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14439,16 +14445,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14442: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14448: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14445: \$? = $ac_status" >&5
-+  echo "$as_me:14451: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14448: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14454: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14451: \$? = $ac_status" >&5
-+  echo "$as_me:14457: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14459,7 +14465,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14462: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14468: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14489,14 +14495,14 @@
- 	;;
- esac
- 
--echo "$as_me:14492: checking if -lm needed for math functions" >&5
-+echo "$as_me:14498: checking if -lm needed for math functions" >&5
- echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
- if test "${cf_cv_need_libm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14499 "configure"
-+#line 14505 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -14511,16 +14517,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14514: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14520: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14517: \$? = $ac_status" >&5
-+  echo "$as_me:14523: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14520: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14526: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14523: \$? = $ac_status" >&5
-+  echo "$as_me:14529: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14530,7 +14536,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14533: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14539: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14538,13 +14544,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14541: checking for ANSI C header files" >&5
-+echo "$as_me:14547: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14547 "configure"
-+#line 14553 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -14552,13 +14558,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:14555: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14561: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14561: \$? = $ac_status" >&5
-+  echo "$as_me:14567: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14580,7 +14586,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14583 "configure"
-+#line 14589 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -14598,7 +14604,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14601 "configure"
-+#line 14607 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -14619,7 +14625,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14622 "configure"
-+#line 14628 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14645,15 +14651,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14648: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14654: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14651: \$? = $ac_status" >&5
-+  echo "$as_me:14657: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14653: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14659: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14656: \$? = $ac_status" >&5
-+  echo "$as_me:14662: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14666,7 +14672,7 @@
- fi
- fi
- fi
--echo "$as_me:14669: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14675: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14679,13 +14685,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:14682: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14688: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14688 "configure"
-+#line 14694 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -14700,16 +14706,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14703: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14709: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14706: \$? = $ac_status" >&5
-+  echo "$as_me:14712: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14715: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14712: \$? = $ac_status" >&5
-+  echo "$as_me:14718: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14719,7 +14725,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14722: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14728: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14732,7 +14738,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:14735: checking for opendir in -ldir" >&5
-+  echo "$as_me:14741: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14740,7 +14746,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14743 "configure"
-+#line 14749 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14759,16 +14765,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14762: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14768: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14765: \$? = $ac_status" >&5
-+  echo "$as_me:14771: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14768: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14774: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14771: \$? = $ac_status" >&5
-+  echo "$as_me:14777: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14779,14 +14785,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14782: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14788: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:14789: checking for opendir in -lx" >&5
-+  echo "$as_me:14795: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14794,7 +14800,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14797 "configure"
-+#line 14803 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14813,16 +14819,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14816: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14822: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14819: \$? = $ac_status" >&5
-+  echo "$as_me:14825: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14822: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14828: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14825: \$? = $ac_status" >&5
-+  echo "$as_me:14831: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14833,7 +14839,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14836: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14842: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -14841,13 +14847,13 @@
- 
- fi
- 
--echo "$as_me:14844: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14850: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14850 "configure"
-+#line 14856 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -14863,16 +14869,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14866: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14872: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14869: \$? = $ac_status" >&5
-+  echo "$as_me:14875: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14872: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14878: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14875: \$? = $ac_status" >&5
-+  echo "$as_me:14881: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14882,7 +14888,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14885: result: $ac_cv_header_time" >&5
-+echo "$as_me:14891: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14901,13 +14907,13 @@
- 	;;
- esac
- 
--echo "$as_me:14904: checking for regcomp" >&5
-+echo "$as_me:14910: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14910 "configure"
-+#line 14916 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14938,16 +14944,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14941: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14947: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14944: \$? = $ac_status" >&5
-+  echo "$as_me:14950: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14947: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14953: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14950: \$? = $ac_status" >&5
-+  echo "$as_me:14956: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14957,7 +14963,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14960: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14966: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14966,7 +14972,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14969: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14975: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14974,7 +14980,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14977 "configure"
-+#line 14983 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14993,16 +14999,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14996: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15002: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14999: \$? = $ac_status" >&5
-+  echo "$as_me:15005: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15002: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15008: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15005: \$? = $ac_status" >&5
-+  echo "$as_me:15011: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15013,7 +15019,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15016: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15022: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -15042,13 +15048,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15045: checking for compile" >&5
-+	echo "$as_me:15051: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15051 "configure"
-+#line 15057 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15079,16 +15085,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15082: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15088: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15085: \$? = $ac_status" >&5
-+  echo "$as_me:15091: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15094: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15091: \$? = $ac_status" >&5
-+  echo "$as_me:15097: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15098,13 +15104,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15101: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15107: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15107: checking for compile in -lgen" >&5
-+		echo "$as_me:15113: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15112,7 +15118,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15115 "configure"
-+#line 15121 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15131,16 +15137,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15137: \$? = $ac_status" >&5
-+  echo "$as_me:15143: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15146: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15143: \$? = $ac_status" >&5
-+  echo "$as_me:15149: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15151,7 +15157,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15154: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15160: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15179,11 +15185,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15182: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15188: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15186: checking for regular-expression headers" >&5
-+echo "$as_me:15192: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15195,7 +15201,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15198 "configure"
-+#line 15204 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15210,16 +15216,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15213: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15219: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15216: \$? = $ac_status" >&5
-+  echo "$as_me:15222: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15219: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15225: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15222: \$? = $ac_status" >&5
-+  echo "$as_me:15228: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15236,7 +15242,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15239 "configure"
-+#line 15245 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$cf_regex_hdr>
-@@ -15254,16 +15260,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15257: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15263: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15260: \$? = $ac_status" >&5
-+  echo "$as_me:15266: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15263: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15269: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15266: \$? = $ac_status" >&5
-+  echo "$as_me:15272: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15279,11 +15285,11 @@
- esac
- 
- fi
--echo "$as_me:15282: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15288: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15286: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15292: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15322,23 +15328,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15325: checking for $ac_header" >&5
-+echo "$as_me:15331: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15331 "configure"
-+#line 15337 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15335: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15341: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15341: \$? = $ac_status" >&5
-+  echo "$as_me:15347: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15357,7 +15363,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15360: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15366: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15370,23 +15376,23 @@
- for ac_header in unistd.h getopt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15373: checking for $ac_header" >&5
-+echo "$as_me:15379: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15379 "configure"
-+#line 15385 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15383: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15389: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15389: \$? = $ac_status" >&5
-+  echo "$as_me:15395: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15405,7 +15411,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15408: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15414: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15415,7 +15421,7 @@
- fi
- done
- 
--echo "$as_me:15418: checking for header declaring getopt variables" >&5
-+echo "$as_me:15424: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15425,7 +15431,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15428 "configure"
-+#line 15434 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15438,16 +15444,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15441: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15447: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15444: \$? = $ac_status" >&5
-+  echo "$as_me:15450: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15453: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15450: \$? = $ac_status" >&5
-+  echo "$as_me:15456: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15459,7 +15465,7 @@
- done
- 
- fi
--echo "$as_me:15462: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15468: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15480,7 +15486,7 @@
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15483: checking for main in -lcposix" >&5
-+echo "$as_me:15489: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15488,7 +15494,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15491 "configure"
-+#line 15497 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15500,16 +15506,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15503: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15509: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15506: \$? = $ac_status" >&5
-+  echo "$as_me:15512: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15509: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15515: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15512: \$? = $ac_status" >&5
-+  echo "$as_me:15518: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15520,7 +15526,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15523: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15529: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15531,7 +15537,7 @@
- 
- fi
- 
--	echo "$as_me:15534: checking for bzero in -linet" >&5
-+	echo "$as_me:15540: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15539,7 +15545,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15542 "configure"
-+#line 15548 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15558,16 +15564,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15567: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15564: \$? = $ac_status" >&5
-+  echo "$as_me:15570: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15573: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15570: \$? = $ac_status" >&5
-+  echo "$as_me:15576: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15578,7 +15584,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15581: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15587: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15601,14 +15607,14 @@
- fi
- fi
- 
--echo "$as_me:15604: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15610: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15611 "configure"
-+#line 15617 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15628,16 +15634,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15631: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15637: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15634: \$? = $ac_status" >&5
-+  echo "$as_me:15640: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15637: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15643: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15640: \$? = $ac_status" >&5
-+  echo "$as_me:15646: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15649,7 +15655,7 @@
- 
- fi
- 
--echo "$as_me:15652: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15658: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15664,13 +15670,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15667: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15673: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15673 "configure"
-+#line 15679 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15728,16 +15734,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15731: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15734: \$? = $ac_status" >&5
-+  echo "$as_me:15740: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15737: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15740: \$? = $ac_status" >&5
-+  echo "$as_me:15746: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15747,7 +15753,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15750: result: $ac_cv_c_const" >&5
-+echo "$as_me:15756: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15757,7 +15763,7 @@
- 
- fi
- 
--echo "$as_me:15760: checking for inline" >&5
-+echo "$as_me:15766: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15765,7 +15771,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15768 "configure"
-+#line 15774 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15774,16 +15780,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15777: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15783: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15780: \$? = $ac_status" >&5
-+  echo "$as_me:15786: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15783: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15789: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15786: \$? = $ac_status" >&5
-+  echo "$as_me:15792: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15794,7 +15800,7 @@
- done
- 
- fi
--echo "$as_me:15797: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15803: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15820,7 +15826,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15823: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15829: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15829,7 +15835,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15832 "configure"
-+#line 15838 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15841,16 +15847,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15844: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15850: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15847: \$? = $ac_status" >&5
-+  echo "$as_me:15853: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15850: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15856: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15853: \$? = $ac_status" >&5
-+  echo "$as_me:15859: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15862,7 +15868,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15865: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15871: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15948,7 +15954,7 @@
- 	fi
- fi
- 
--echo "$as_me:15951: checking for signal global datatype" >&5
-+echo "$as_me:15957: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15960,7 +15966,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15963 "configure"
-+#line 15969 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15983,16 +15989,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15986: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15992: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15989: \$? = $ac_status" >&5
-+  echo "$as_me:15995: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15992: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15998: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15995: \$? = $ac_status" >&5
-+  echo "$as_me:16001: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16006,7 +16012,7 @@
- 
- fi
- 
--echo "$as_me:16009: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16015: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <<EOF
-@@ -16015,7 +16021,7 @@
- 
- if test $NCURSES_CHTYPE = auto ; then
- 
--echo "$as_me:16018: checking for type of chtype" >&5
-+echo "$as_me:16024: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16025,7 +16031,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16028 "configure"
-+#line 16034 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16060,15 +16066,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16063: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16066: \$? = $ac_status" >&5
-+  echo "$as_me:16072: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16068: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16074: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16071: \$? = $ac_status" >&5
-+  echo "$as_me:16077: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16083,7 +16089,7 @@
- 
- fi
- 
--echo "$as_me:16086: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16092: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -16095,14 +16101,14 @@
- fi
- test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- 
--echo "$as_me:16098: checking if unsigned literals are legal" >&5
-+echo "$as_me:16104: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16105 "configure"
-+#line 16111 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16114,16 +16120,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16117: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16123: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16120: \$? = $ac_status" >&5
-+  echo "$as_me:16126: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16123: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16126: \$? = $ac_status" >&5
-+  echo "$as_me:16132: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16135,7 +16141,7 @@
- 
- fi
- 
--echo "$as_me:16138: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16144: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16151,14 +16157,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16154: checking if external errno is declared" >&5
-+echo "$as_me:16160: checking if external errno is declared" >&5
- echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16161 "configure"
-+#line 16167 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16176,16 +16182,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16179: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16185: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16182: \$? = $ac_status" >&5
-+  echo "$as_me:16188: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16185: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16191: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16188: \$? = $ac_status" >&5
-+  echo "$as_me:16194: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16196,7 +16202,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16199: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16205: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16211,14 +16217,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16214: checking if external errno exists" >&5
-+echo "$as_me:16220: checking if external errno exists" >&5
- echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
- if test "${cf_cv_have_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16221 "configure"
-+#line 16227 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16233,16 +16239,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16236: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16242: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16239: \$? = $ac_status" >&5
-+  echo "$as_me:16245: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16242: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16248: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16245: \$? = $ac_status" >&5
-+  echo "$as_me:16251: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16253,7 +16259,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16256: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16262: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16266,7 +16272,7 @@
- 
- fi
- 
--echo "$as_me:16269: checking if data-only library module links" >&5
-+echo "$as_me:16275: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16274,20 +16280,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 16277 "configure"
-+#line 16283 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:16280: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16286: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16283: \$? = $ac_status" >&5
-+  echo "$as_me:16289: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 16290 "configure"
-+#line 16296 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -16300,10 +16306,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:16303: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16309: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16306: \$? = $ac_status" >&5
-+  echo "$as_me:16312: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16316,7 +16322,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16319 "configure"
-+#line 16325 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16327,15 +16333,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16330: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16336: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16333: \$? = $ac_status" >&5
-+  echo "$as_me:16339: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16335: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16341: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16338: \$? = $ac_status" >&5
-+  echo "$as_me:16344: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16350,7 +16356,7 @@
- 
- fi
- 
--echo "$as_me:16353: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16359: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16389,13 +16395,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16392: checking for $ac_func" >&5
-+echo "$as_me:16398: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16398 "configure"
-+#line 16404 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16426,16 +16432,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16429: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16435: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16432: \$? = $ac_status" >&5
-+  echo "$as_me:16438: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16438: \$? = $ac_status" >&5
-+  echo "$as_me:16444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16445,7 +16451,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16448: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16454: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16457,21 +16463,21 @@
- 
- if test "x$ac_cv_func_getopt" = xno &&
-    test "x$cf_with_progs$cf_with_tests" != xnono; then
--	{ { echo "$as_me:16460: error: getopt is required for building programs" >&5
-+	{ { echo "$as_me:16466: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16467: checking for terminal-capability database functions" >&5
-+echo "$as_me:16473: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16474 "configure"
-+#line 16480 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16491,16 +16497,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16494: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16500: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16497: \$? = $ac_status" >&5
-+  echo "$as_me:16503: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16500: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16506: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16503: \$? = $ac_status" >&5
-+  echo "$as_me:16509: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16511,7 +16517,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16514: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16520: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16521,14 +16527,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16524: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16530: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16531 "configure"
-+#line 16537 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16550,16 +16556,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16553: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16559: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16556: \$? = $ac_status" >&5
-+  echo "$as_me:16562: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16559: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16565: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16562: \$? = $ac_status" >&5
-+  echo "$as_me:16568: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16570,7 +16576,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16573: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16579: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16584,14 +16590,14 @@
- 
- fi
- 
--echo "$as_me:16587: checking for isascii" >&5
-+echo "$as_me:16593: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16594 "configure"
-+#line 16600 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -16603,16 +16609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16606: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16612: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16609: \$? = $ac_status" >&5
-+  echo "$as_me:16615: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16615: \$? = $ac_status" >&5
-+  echo "$as_me:16621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16623,7 +16629,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16626: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16632: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16631,10 +16637,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16634: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16640: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16637 "configure"
-+#line 16643 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16648,16 +16654,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16651: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16657: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16654: \$? = $ac_status" >&5
-+  echo "$as_me:16660: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16657: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16663: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16660: \$? = $ac_status" >&5
-+  echo "$as_me:16666: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16665,7 +16671,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16668 "configure"
-+#line 16674 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16680,16 +16686,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16683: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16689: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16686: \$? = $ac_status" >&5
-+  echo "$as_me:16692: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16695: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16692: \$? = $ac_status" >&5
-+  echo "$as_me:16698: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16705,11 +16711,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16708: result: $sigact_bad" >&5
-+echo "$as_me:16714: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16712: checking if nanosleep really works" >&5
-+echo "$as_me:16718: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16719,7 +16725,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16722 "configure"
-+#line 16728 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -16744,15 +16750,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16747: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16753: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16750: \$? = $ac_status" >&5
-+  echo "$as_me:16756: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16752: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16758: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16755: \$? = $ac_status" >&5
-+  echo "$as_me:16761: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16764,7 +16770,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16767: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16773: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16779,23 +16785,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16782: checking for $ac_header" >&5
-+echo "$as_me:16788: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16788 "configure"
-+#line 16794 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16792: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16798: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16798: \$? = $ac_status" >&5
-+  echo "$as_me:16804: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16814,7 +16820,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16817: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16823: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16829,23 +16835,23 @@
- for ac_header in sys/termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16832: checking for $ac_header" >&5
-+echo "$as_me:16838: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16838 "configure"
-+#line 16844 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16842: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16848: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16848: \$? = $ac_status" >&5
-+  echo "$as_me:16854: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16864,7 +16870,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16867: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16873: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16882,10 +16888,10 @@
- 	(*)	termios_bad=maybe ;;
- 	esac
- 	if test "$termios_bad" = maybe ; then
--	echo "$as_me:16885: checking whether termios.h needs _POSIX_SOURCE" >&5
-+	echo "$as_me:16891: checking whether termios.h needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16888 "configure"
-+#line 16894 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -16897,16 +16903,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16900: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16906: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16903: \$? = $ac_status" >&5
-+  echo "$as_me:16909: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16906: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16912: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16909: \$? = $ac_status" >&5
-+  echo "$as_me:16915: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16914,7 +16920,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16917 "configure"
-+#line 16923 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16928,16 +16934,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16931: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16937: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16934: \$? = $ac_status" >&5
-+  echo "$as_me:16940: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16943: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16940: \$? = $ac_status" >&5
-+  echo "$as_me:16946: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16953,19 +16959,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16956: result: $termios_bad" >&5
-+	echo "$as_me:16962: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16961: checking for tcgetattr" >&5
-+echo "$as_me:16967: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16968 "configure"
-+#line 16974 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16993,16 +16999,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16996: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17002: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16999: \$? = $ac_status" >&5
-+  echo "$as_me:17005: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17002: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17008: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17005: \$? = $ac_status" >&5
-+  echo "$as_me:17011: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17012,21 +17018,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17015: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17021: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17022: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17028: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17029 "configure"
-+#line 17035 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17042,16 +17048,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17045: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17051: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17048: \$? = $ac_status" >&5
-+  echo "$as_me:17054: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17051: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17057: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17054: \$? = $ac_status" >&5
-+  echo "$as_me:17060: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17059,7 +17065,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17062 "configure"
-+#line 17068 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17081,16 +17087,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17084: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17090: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17087: \$? = $ac_status" >&5
-+  echo "$as_me:17093: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17090: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17096: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17093: \$? = $ac_status" >&5
-+  echo "$as_me:17099: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17098,7 +17104,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17101 "configure"
-+#line 17107 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17120,16 +17126,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17123: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17129: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17126: \$? = $ac_status" >&5
-+  echo "$as_me:17132: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17129: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17135: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17132: \$? = $ac_status" >&5
-+  echo "$as_me:17138: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17144,7 +17150,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17147: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17153: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17165,7 +17171,7 @@
- ;;
- esac
- 
--echo "$as_me:17168: checking for working mkstemp" >&5
-+echo "$as_me:17174: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17176,7 +17182,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17179 "configure"
-+#line 17185 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -17214,15 +17220,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17217: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17223: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17220: \$? = $ac_status" >&5
-+  echo "$as_me:17226: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17222: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17225: \$? = $ac_status" >&5
-+  echo "$as_me:17231: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17237,16 +17243,16 @@
- fi
- 
- fi
--echo "$as_me:17240: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17246: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17243: checking for mkstemp" >&5
-+	echo "$as_me:17249: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17249 "configure"
-+#line 17255 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17277,16 +17283,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17280: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17286: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17283: \$? = $ac_status" >&5
-+  echo "$as_me:17289: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17286: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17292: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17289: \$? = $ac_status" >&5
-+  echo "$as_me:17295: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17296,7 +17302,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17299: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17305: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17317,21 +17323,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17320: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17326: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17323: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17329: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17329: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17335: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17334 "configure"
-+#line 17340 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17348,15 +17354,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17351: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17357: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17354: \$? = $ac_status" >&5
-+  echo "$as_me:17360: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17356: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17362: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17359: \$? = $ac_status" >&5
-+  echo "$as_me:17365: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17369,7 +17375,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17372: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17378: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17380,13 +17386,13 @@
- fi
- 
- fi
--echo "$as_me:17383: checking for intptr_t" >&5
-+echo "$as_me:17389: checking for intptr_t" >&5
- echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
- if test "${ac_cv_type_intptr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17389 "configure"
-+#line 17395 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17401,16 +17407,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17404: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17410: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17407: \$? = $ac_status" >&5
-+  echo "$as_me:17413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17413: \$? = $ac_status" >&5
-+  echo "$as_me:17419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17420,7 +17426,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17423: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17429: result: $ac_cv_type_intptr_t" >&5
- echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
- if test $ac_cv_type_intptr_t = yes; then
-   :
-@@ -17432,13 +17438,13 @@
- 
- fi
- 
--echo "$as_me:17435: checking for ssize_t" >&5
-+echo "$as_me:17441: checking for ssize_t" >&5
- echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17441 "configure"
-+#line 17447 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17453,16 +17459,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17456: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17459: \$? = $ac_status" >&5
-+  echo "$as_me:17465: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17462: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17465: \$? = $ac_status" >&5
-+  echo "$as_me:17471: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17472,7 +17478,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17475: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17481: result: $ac_cv_type_ssize_t" >&5
- echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
- if test $ac_cv_type_ssize_t = yes; then
-   :
-@@ -17484,14 +17490,14 @@
- 
- fi
- 
--echo "$as_me:17487: checking for type sigaction_t" >&5
-+echo "$as_me:17493: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17494 "configure"
-+#line 17500 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -17504,16 +17510,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17507: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17513: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17510: \$? = $ac_status" >&5
-+  echo "$as_me:17516: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17519: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17516: \$? = $ac_status" >&5
-+  echo "$as_me:17522: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17524,14 +17530,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17527: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17533: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17534: checking declaration of size-change" >&5
-+echo "$as_me:17540: checking declaration of size-change" >&5
- echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
- if test "${cf_cv_sizechange+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17546,7 +17552,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17549 "configure"
-+#line 17555 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -17590,16 +17596,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17593: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17599: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17596: \$? = $ac_status" >&5
-+  echo "$as_me:17602: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17599: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17605: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17602: \$? = $ac_status" >&5
-+  echo "$as_me:17608: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17618,7 +17624,7 @@
- done
- 
- fi
--echo "$as_me:17621: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17627: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17636,13 +17642,13 @@
- 	esac
- fi
- 
--echo "$as_me:17639: checking for memmove" >&5
-+echo "$as_me:17645: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17645 "configure"
-+#line 17651 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17673,16 +17679,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17676: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17682: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17679: \$? = $ac_status" >&5
-+  echo "$as_me:17685: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17682: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17688: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17685: \$? = $ac_status" >&5
-+  echo "$as_me:17691: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17692,19 +17698,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17695: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17701: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17701: checking for bcopy" >&5
-+echo "$as_me:17707: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17707 "configure"
-+#line 17713 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17735,16 +17741,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17738: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17744: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17741: \$? = $ac_status" >&5
-+  echo "$as_me:17747: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17744: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17750: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17747: \$? = $ac_status" >&5
-+  echo "$as_me:17753: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17754,11 +17760,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17757: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17763: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17761: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17767: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17768,7 +17774,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17771 "configure"
-+#line 17777 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17782,15 +17788,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17785: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17791: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17788: \$? = $ac_status" >&5
-+  echo "$as_me:17794: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17790: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17796: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17793: \$? = $ac_status" >&5
-+  echo "$as_me:17799: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17803,7 +17809,7 @@
- fi
- 
- fi
--echo "$as_me:17806: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17812: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17826,7 +17832,7 @@
- 
- fi
- 
--echo "$as_me:17829: checking if poll really works" >&5
-+echo "$as_me:17835: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17836,7 +17842,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17839 "configure"
-+#line 17845 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17883,15 +17889,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17886: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17892: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17889: \$? = $ac_status" >&5
-+  echo "$as_me:17895: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17891: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17894: \$? = $ac_status" >&5
-+  echo "$as_me:17900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17903,21 +17909,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17906: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17912: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:17913: checking for va_copy" >&5
-+echo "$as_me:17919: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17920 "configure"
-+#line 17926 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17934,16 +17940,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17937: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17943: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17940: \$? = $ac_status" >&5
-+  echo "$as_me:17946: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17943: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17949: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17946: \$? = $ac_status" >&5
-+  echo "$as_me:17952: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -17953,7 +17959,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17956: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:17962: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -17961,14 +17967,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:17964: checking for __va_copy" >&5
-+echo "$as_me:17970: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17971 "configure"
-+#line 17977 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17985,16 +17991,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17988: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17994: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17991: \$? = $ac_status" >&5
-+  echo "$as_me:17997: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17994: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18000: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17997: \$? = $ac_status" >&5
-+  echo "$as_me:18003: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18004,7 +18010,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18007: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18013: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18012,13 +18018,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18015: checking for pid_t" >&5
-+echo "$as_me:18021: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18021 "configure"
-+#line 18027 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18033,16 +18039,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18036: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18042: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18039: \$? = $ac_status" >&5
-+  echo "$as_me:18045: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18042: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18048: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18045: \$? = $ac_status" >&5
-+  echo "$as_me:18051: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18052,7 +18058,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18055: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18061: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -18067,23 +18073,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18070: checking for $ac_header" >&5
-+echo "$as_me:18076: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18076 "configure"
-+#line 18082 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18080: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18086: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18086: \$? = $ac_status" >&5
-+  echo "$as_me:18092: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18102,7 +18108,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18105: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18111: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18115,13 +18121,13 @@
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18118: checking for $ac_func" >&5
-+echo "$as_me:18124: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18124 "configure"
-+#line 18130 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18152,16 +18158,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18155: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18161: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18158: \$? = $ac_status" >&5
-+  echo "$as_me:18164: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18161: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18164: \$? = $ac_status" >&5
-+  echo "$as_me:18170: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18171,7 +18177,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18174: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18180: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18183,7 +18189,7 @@
- 
- ac_cv_func_fork_works=$ac_cv_func_fork
- if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:18186: checking for working fork" >&5
-+  echo "$as_me:18192: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18206,15 +18212,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18209: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18215: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18212: \$? = $ac_status" >&5
-+  echo "$as_me:18218: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18214: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18217: \$? = $ac_status" >&5
-+  echo "$as_me:18223: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18226,7 +18232,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18229: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18235: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18240,12 +18246,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18243: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18249: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:18248: checking for working vfork" >&5
-+  echo "$as_me:18254: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18254,7 +18260,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18257 "configure"
-+#line 18263 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -18351,15 +18357,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18354: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18360: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18357: \$? = $ac_status" >&5
-+  echo "$as_me:18363: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18359: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18365: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18362: \$? = $ac_status" >&5
-+  echo "$as_me:18368: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18371,13 +18377,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18374: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18380: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:18380: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18386: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -18404,7 +18410,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18407: checking for openpty in -lutil" >&5
-+echo "$as_me:18413: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18412,7 +18418,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18415 "configure"
-+#line 18421 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18431,16 +18437,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18434: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18440: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18437: \$? = $ac_status" >&5
-+  echo "$as_me:18443: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18440: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18446: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18443: \$? = $ac_status" >&5
-+  echo "$as_me:18449: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18451,7 +18457,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18454: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18460: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18459,7 +18465,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18462: checking for openpty header" >&5
-+echo "$as_me:18468: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18486,7 +18492,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18489 "configure"
-+#line 18495 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18503,16 +18509,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18506: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18509: \$? = $ac_status" >&5
-+  echo "$as_me:18515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18515: \$? = $ac_status" >&5
-+  echo "$as_me:18521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18530,7 +18536,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18533: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18539: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18600,7 +18606,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18603 "configure"
-+#line 18609 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18612,16 +18618,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18615: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18621: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18618: \$? = $ac_status" >&5
-+  echo "$as_me:18624: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18621: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18627: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18624: \$? = $ac_status" >&5
-+  echo "$as_me:18630: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18638,7 +18644,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18641: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18647: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18674,7 +18680,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18677: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18683: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18685,7 +18691,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18688: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18694: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18754,7 +18760,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18757 "configure"
-+#line 18763 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18766,16 +18772,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18769: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18775: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18772: \$? = $ac_status" >&5
-+  echo "$as_me:18778: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18781: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18778: \$? = $ac_status" >&5
-+  echo "$as_me:18784: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18792,7 +18798,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18795: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18801: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18872,7 +18878,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18875: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18881: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18889,23 +18895,23 @@
- 	fi
- esac
- 
--echo "$as_me:18892: checking for db.h" >&5
-+echo "$as_me:18898: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18898 "configure"
-+#line 18904 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:18902: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18908: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18908: \$? = $ac_status" >&5
-+  echo "$as_me:18914: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18924,11 +18930,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18927: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:18933: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:18931: checking for version of db" >&5
-+echo "$as_me:18937: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18939,10 +18945,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:18942: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:18948: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18945 "configure"
-+#line 18951 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -18972,16 +18978,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18975: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18981: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18978: \$? = $ac_status" >&5
-+  echo "$as_me:18984: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18981: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18987: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18984: \$? = $ac_status" >&5
-+  echo "$as_me:18990: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -18995,16 +19001,16 @@
- done
- 
- fi
--echo "$as_me:18998: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19004: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19002: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19008: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19007: checking for db libraries" >&5
-+echo "$as_me:19013: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19034,10 +19040,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19037: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19043: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19040 "configure"
-+#line 19046 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19092,16 +19098,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19095: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19098: \$? = $ac_status" >&5
-+  echo "$as_me:19104: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19101: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19104: \$? = $ac_status" >&5
-+  echo "$as_me:19110: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19121,11 +19127,11 @@
- done
- 
- fi
--echo "$as_me:19124: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19130: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19128: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19134: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19151,7 +19157,7 @@
- 
- else
- 
--	{ { echo "$as_me:19154: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19160: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19166,7 +19172,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19169: checking if we should include stdbool.h" >&5
-+echo "$as_me:19175: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19174,7 +19180,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19177 "configure"
-+#line 19183 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19186,23 +19192,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19189: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19195: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19192: \$? = $ac_status" >&5
-+  echo "$as_me:19198: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19195: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19201: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19198: \$? = $ac_status" >&5
-+  echo "$as_me:19204: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19205 "configure"
-+#line 19211 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19218,16 +19224,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19221: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19224: \$? = $ac_status" >&5
-+  echo "$as_me:19230: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19233: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19230: \$? = $ac_status" >&5
-+  echo "$as_me:19236: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19241,13 +19247,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19244: result: yes" >&5
-+then	echo "$as_me:19250: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19246: result: no" >&5
-+else	echo "$as_me:19252: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19250: checking for builtin bool type" >&5
-+echo "$as_me:19256: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19255,7 +19261,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19258 "configure"
-+#line 19264 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -19270,16 +19276,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19273: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19279: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19276: \$? = $ac_status" >&5
-+  echo "$as_me:19282: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19285: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19282: \$? = $ac_status" >&5
-+  echo "$as_me:19288: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19292,9 +19298,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19295: result: yes" >&5
-+then	echo "$as_me:19301: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19297: result: no" >&5
-+else	echo "$as_me:19303: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19316,7 +19322,7 @@
- 	cf_stdcpp_libname=stdc++
- 	;;
- esac
--echo "$as_me:19319: checking for library $cf_stdcpp_libname" >&5
-+echo "$as_me:19325: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19341,7 +19347,7 @@
- LIBS="$cf_add_libs"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 19344 "configure"
-+#line 19350 "configure"
- #include "confdefs.h"
- 
- #include <strstream.h>
-@@ -19357,16 +19363,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19360: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19366: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19363: \$? = $ac_status" >&5
-+  echo "$as_me:19369: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19366: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19372: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19369: \$? = $ac_status" >&5
-+  echo "$as_me:19375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19378,7 +19384,7 @@
- 	LIBS="$cf_save"
- 
- fi
--echo "$as_me:19381: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19387: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- test "$cf_cv_libstdcpp" = yes &&
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19399,7 +19405,7 @@
- 
- fi
- 
--	echo "$as_me:19402: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19408: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19415,15 +19421,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19418: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19424: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19421: \$? = $ac_status" >&5
-+  echo "$as_me:19427: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19423: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19429: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19426: \$? = $ac_status" >&5
-+  echo "$as_me:19432: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19434,10 +19440,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19437: result: yes" >&5
-+  echo "$as_me:19443: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19440: result: no" >&5
-+  echo "$as_me:19446: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19457,7 +19463,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19460: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19466: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19478,7 +19484,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19481 "configure"
-+#line 19487 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19492,16 +19498,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19495: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19498: \$? = $ac_status" >&5
-+  echo "$as_me:19504: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19501: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19504: \$? = $ac_status" >&5
-+  echo "$as_me:19510: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19538,7 +19544,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19541 "configure"
-+#line 19547 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -19552,16 +19558,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19555: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19558: \$? = $ac_status" >&5
-+  echo "$as_me:19564: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19561: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19564: \$? = $ac_status" >&5
-+  echo "$as_me:19570: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19594,7 +19600,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19597: result: $cf_cxx_library" >&5
-+	echo "$as_me:19603: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19610,7 +19616,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19613: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19619: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19627,18 +19633,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19630 "configure"
-+#line 19636 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19635: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19641: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19641: \$? = $ac_status" >&5
-+  echo "$as_me:19647: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19661,17 +19667,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19664 "configure"
-+#line 19670 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19668: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19674: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19674: \$? = $ac_status" >&5
-+  echo "$as_me:19680: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19708,7 +19714,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19711: result: $CXXCPP" >&5
-+echo "$as_me:19717: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19718,18 +19724,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19721 "configure"
-+#line 19727 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19726: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19732: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19732: \$? = $ac_status" >&5
-+  echo "$as_me:19738: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19752,17 +19758,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19755 "configure"
-+#line 19761 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19759: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19765: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19765: \$? = $ac_status" >&5
-+  echo "$as_me:19771: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19790,7 +19796,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19793: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19799: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19805,23 +19811,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19808: checking for $ac_header" >&5
-+echo "$as_me:19814: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19814 "configure"
-+#line 19820 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19818: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19824: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19824: \$? = $ac_status" >&5
-+  echo "$as_me:19830: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19840,7 +19846,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19843: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19849: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19853,23 +19859,23 @@
- for ac_header in iostream
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19856: checking for $ac_header" >&5
-+echo "$as_me:19862: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19862 "configure"
-+#line 19868 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19866: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19872: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19872: \$? = $ac_status" >&5
-+  echo "$as_me:19878: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19888,7 +19894,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19891: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19897: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19899,10 +19905,10 @@
- done
- 
- if test x"$ac_cv_header_iostream" = xyes ; then
--	echo "$as_me:19902: checking if iostream uses std-namespace" >&5
-+	echo "$as_me:19908: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19905 "configure"
-+#line 19911 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -19919,16 +19925,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19925: \$? = $ac_status" >&5
-+  echo "$as_me:19931: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19931: \$? = $ac_status" >&5
-+  echo "$as_me:19937: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -19937,7 +19943,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19940: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:19946: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -19948,7 +19954,7 @@
- 	fi
- fi
- 
--echo "$as_me:19951: checking if we should include stdbool.h" >&5
-+echo "$as_me:19957: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19956,7 +19962,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19959 "configure"
-+#line 19965 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19968,23 +19974,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19971: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19977: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19974: \$? = $ac_status" >&5
-+  echo "$as_me:19980: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19977: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19983: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19980: \$? = $ac_status" >&5
-+  echo "$as_me:19986: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19987 "configure"
-+#line 19993 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20000,16 +20006,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20003: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20009: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20006: \$? = $ac_status" >&5
-+  echo "$as_me:20012: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20009: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20012: \$? = $ac_status" >&5
-+  echo "$as_me:20018: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20023,13 +20029,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20026: result: yes" >&5
-+then	echo "$as_me:20032: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20028: result: no" >&5
-+else	echo "$as_me:20034: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20032: checking for builtin bool type" >&5
-+echo "$as_me:20038: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20037,7 +20043,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20040 "configure"
-+#line 20046 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -20052,16 +20058,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20058: \$? = $ac_status" >&5
-+  echo "$as_me:20064: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20064: \$? = $ac_status" >&5
-+  echo "$as_me:20070: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20074,13 +20080,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20077: result: yes" >&5
-+then	echo "$as_me:20083: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20079: result: no" >&5
-+else	echo "$as_me:20085: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20083: checking for size of bool" >&5
-+echo "$as_me:20089: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20091,7 +20097,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20094 "configure"
-+#line 20100 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20133,15 +20139,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20136: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20142: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20139: \$? = $ac_status" >&5
-+  echo "$as_me:20145: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20141: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20144: \$? = $ac_status" >&5
-+  echo "$as_me:20150: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20159,18 +20165,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20162: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20168: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20168: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20174: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20173: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20179: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20188,7 +20194,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20191 "configure"
-+#line 20197 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -20202,16 +20208,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20205: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20211: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20208: \$? = $ac_status" >&5
-+  echo "$as_me:20214: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20211: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20214: \$? = $ac_status" >&5
-+  echo "$as_me:20220: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -20232,12 +20238,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:20235: result: $cf_result" >&5
-+echo "$as_me:20241: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20240: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20246: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20254,7 +20260,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20257 "configure"
-+#line 20263 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20273,15 +20279,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20276: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20282: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20279: \$? = $ac_status" >&5
-+  echo "$as_me:20285: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20281: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20284: \$? = $ac_status" >&5
-+  echo "$as_me:20290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20300,7 +20306,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20303: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20309: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20310,7 +20316,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20313: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20319: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20324,7 +20330,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20327 "configure"
-+#line 20333 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20368,16 +20374,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20371: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20377: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20374: \$? = $ac_status" >&5
-+  echo "$as_me:20380: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20377: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20383: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20380: \$? = $ac_status" >&5
-+  echo "$as_me:20386: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20395,7 +20401,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20398: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20404: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20444,7 +20450,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20447: checking for size of bool" >&5
-+echo "$as_me:20453: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20455,7 +20461,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20458 "configure"
-+#line 20464 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20497,15 +20503,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20500: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20506: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20503: \$? = $ac_status" >&5
-+  echo "$as_me:20509: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20505: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20511: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20508: \$? = $ac_status" >&5
-+  echo "$as_me:20514: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20523,25 +20529,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20526: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20532: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20532: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20538: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20538: checking for fallback type of bool" >&5
-+			echo "$as_me:20544: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20544: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20550: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20570,7 +20576,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20573: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20579: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20581,7 +20587,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20584: checking for $ac_word" >&5
-+echo "$as_me:20590: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20596,7 +20602,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20599: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20605: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20605,10 +20611,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20608: result: $gnat_exists" >&5
-+  echo "$as_me:20614: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20611: result: no" >&5
-+  echo "$as_me:20617: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20617,12 +20623,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20620: checking for gnat version" >&5
-+echo "$as_me:20626: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20625: result: $cf_gnat_version" >&5
-+echo "$as_me:20631: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20630,7 +20636,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20633: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20639: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20638,7 +20644,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20641: checking for $ac_word" >&5
-+echo "$as_me:20647: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20653,7 +20659,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20656: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20662: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20662,10 +20668,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20665: result: $M4_exists" >&5
-+  echo "$as_me:20671: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20668: result: no" >&5
-+  echo "$as_me:20674: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20674,7 +20680,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20677: checking if GNAT works" >&5
-+		echo "$as_me:20683: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20702,7 +20708,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20705: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20711: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20711,7 +20717,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20714: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20720: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20728,10 +20734,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20731: result: $ADAFLAGS" >&5
-+	echo "$as_me:20737: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20734: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20740: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20741,11 +20747,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20744: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20750: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20748: checking if GNAT supports generics" >&5
-+echo "$as_me:20754: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20755,7 +20761,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20758: result: $cf_gnat_generics" >&5
-+echo "$as_me:20764: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20767,7 +20773,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20770: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20776: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20815,7 +20821,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20818: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20824: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20828,7 +20834,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20831: checking if GNAT supports project files" >&5
-+echo "$as_me:20837: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -20888,15 +20894,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:20891: result: $cf_gnat_projects" >&5
-+echo "$as_me:20897: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:20897: checking if GNAT supports libraries" >&5
-+	echo "$as_me:20903: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:20899: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:20905: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -20916,7 +20922,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:20919: checking for ada-compiler" >&5
-+echo "$as_me:20925: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -20927,12 +20933,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:20930: result: $cf_ada_compiler" >&5
-+echo "$as_me:20936: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:20935: checking for ada-include" >&5
-+echo "$as_me:20941: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -20968,7 +20974,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:20971: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:20977: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -20977,10 +20983,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:20980: result: $ADA_INCLUDE" >&5
-+echo "$as_me:20986: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:20983: checking for ada-objects" >&5
-+echo "$as_me:20989: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21016,7 +21022,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21019: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21025: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21025,10 +21031,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21028: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21034: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21031: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21037: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21038,7 +21044,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21041: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21047: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21061,13 +21067,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21064: checking for wchar_t" >&5
-+	echo "$as_me:21070: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21070 "configure"
-+#line 21076 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21082,16 +21088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21085: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21091: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21088: \$? = $ac_status" >&5
-+  echo "$as_me:21094: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21091: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21097: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21094: \$? = $ac_status" >&5
-+  echo "$as_me:21100: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21101,10 +21107,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21104: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21110: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21107: checking size of wchar_t" >&5
-+echo "$as_me:21113: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21113,7 +21119,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21116 "configure"
-+#line 21122 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21125,21 +21131,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21128: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21131: \$? = $ac_status" >&5
-+  echo "$as_me:21137: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21134: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21137: \$? = $ac_status" >&5
-+  echo "$as_me:21143: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21142 "configure"
-+#line 21148 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21151,16 +21157,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21154: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21160: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21157: \$? = $ac_status" >&5
-+  echo "$as_me:21163: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21166: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21163: \$? = $ac_status" >&5
-+  echo "$as_me:21169: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21176,7 +21182,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21179 "configure"
-+#line 21185 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21188,16 +21194,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21191: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21197: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21194: \$? = $ac_status" >&5
-+  echo "$as_me:21200: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21197: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21203: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21200: \$? = $ac_status" >&5
-+  echo "$as_me:21206: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21213,7 +21219,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21216 "configure"
-+#line 21222 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21225,16 +21231,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21228: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21234: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21231: \$? = $ac_status" >&5
-+  echo "$as_me:21237: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21234: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21240: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21237: \$? = $ac_status" >&5
-+  echo "$as_me:21243: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21247,12 +21253,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21250: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21256: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21255 "configure"
-+#line 21261 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21268,15 +21274,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21271: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21277: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21274: \$? = $ac_status" >&5
-+  echo "$as_me:21280: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21276: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21282: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21279: \$? = $ac_status" >&5
-+  echo "$as_me:21285: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21292,7 +21298,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21295: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21301: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-@@ -21310,7 +21316,7 @@
- ### chooses to split module lists into libraries.
- ###
- ### (see CF_LIB_RULES).
--echo "$as_me:21313: checking for library subsets" >&5
-+echo "$as_me:21319: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21352,7 +21358,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21355: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21361: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21383,7 +21389,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21386: checking default library suffix" >&5
-+echo "$as_me:21392: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21394,10 +21400,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21397: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21403: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21400: checking default library-dependency suffix" >&5
-+echo "$as_me:21406: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21455,10 +21461,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21458: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21464: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21461: checking default object directory" >&5
-+echo "$as_me:21467: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21474,11 +21480,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21477: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21483: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21481: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21487: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21546,7 +21552,7 @@
- 	fi
- 
- fi
--echo "$as_me:21549: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21555: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21719,19 +21725,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21722: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21728: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 21727 "configure"
-+#line 21733 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21731: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21737: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21734: \$? = $ac_status" >&5
-+  echo "$as_me:21740: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21742,10 +21748,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21745 "configure"
-+#line 21751 "configure"
- #include "confdefs.h"
- 
--#line 21748 "configure"
-+#line 21754 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21760,16 +21766,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21763: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21769: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21766: \$? = $ac_status" >&5
-+  echo "$as_me:21772: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21769: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21772: \$? = $ac_status" >&5
-+  echo "$as_me:21778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21792,7 +21798,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21795: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21801: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21808,7 +21814,7 @@
- 	;;
- esac
- 
--echo "$as_me:21811: checking where we will install curses.h" >&5
-+echo "$as_me:21817: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21818,7 +21824,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21821: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21827: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21826,7 +21832,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21829: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21835: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21844,7 +21850,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21847: checking for src modules" >&5
-+echo "$as_me:21853: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -21909,7 +21915,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:21912: result: $cf_cv_src_modules" >&5
-+echo "$as_me:21918: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22129,7 +22135,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22132: checking for $ac_word" >&5
-+echo "$as_me:22138: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22146,7 +22152,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22149: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22155: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22158,10 +22164,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22161: result: $TIC_PATH" >&5
-+  echo "$as_me:22167: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22164: result: no" >&5
-+  echo "$as_me:22170: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22169,7 +22175,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22172: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22178: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22195,7 +22201,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22198: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22204: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22206,7 +22212,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22209: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22215: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22222,7 +22228,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22225: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22231: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22279,7 +22285,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22282: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22288: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22381,7 +22387,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22384: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22390: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22557,7 +22563,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22560: error: ambiguous option: $1
-+    { { echo "$as_me:22566: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22576,7 +22582,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22579: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22585: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22694,7 +22700,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22697: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22703: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23149,7 +23155,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23152: creating $ac_file" >&5
-+    { echo "$as_me:23158: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23167,7 +23173,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23170: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23176: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23180,7 +23186,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23183: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23189: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23196,7 +23202,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23199: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23205: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -23205,7 +23211,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23208: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23214: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -23242,7 +23248,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:23245: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23251: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -23253,7 +23259,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:23256: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23262: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23302,7 +23308,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23305: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23311: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23313,7 +23319,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23316: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23322: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23326,7 +23332,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23329: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23335: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23384,7 +23390,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:23387: $ac_file is unchanged" >&5
-+      { echo "$as_me:23393: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23722,7 +23728,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23725: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23731: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: dist.mk
-Prereq:  1.1066 
---- ncurses-6.0-20150815+/dist.mk	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/dist.mk	2015-08-17 08:41:12.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1066 2015/08/15 15:13:47 tom Exp $
-+# $Id: dist.mk,v 1.1067 2015/08/17 08:41:12 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150815
-+NCURSES_PATCH = 20150822
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: include/term_entry.h
-Prereq:  1.45 
---- ncurses-6.0-20150815+/include/term_entry.h	2014-11-01 14:47:00.000000000 +0000
-+++ ncurses-6.0-20150822/include/term_entry.h	2015-08-22 23:04:25.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1998-on                 *
-  ****************************************************************************/
- 
--/* $Id: term_entry.h,v 1.45 2014/11/01 14:47:00 tom Exp $ */
-+/* $Id: term_entry.h,v 1.46 2015/08/22 23:04:25 tom Exp $ */
- 
- /*
-  *	term_entry.h -- interface to entry-manipulation code
-@@ -106,9 +106,9 @@
- #define for_each_string(n,tp)  for(n = 0; n < NUM_STRINGS(tp);  n++)
- 
- #if NCURSES_XNAMES
--#define for_each_ext_boolean(n,tp) for(n = BOOLCOUNT; n < NUM_BOOLEANS(tp); n++)
--#define for_each_ext_number(n,tp)  for(n = NUMCOUNT; n < NUM_NUMBERS(tp);  n++)
--#define for_each_ext_string(n,tp)  for(n = STRCOUNT; n < NUM_STRINGS(tp);  n++)
-+#define for_each_ext_boolean(n,tp) for(n = BOOLCOUNT; (int) n < (int) NUM_BOOLEANS(tp); n++)
-+#define for_each_ext_number(n,tp)  for(n = NUMCOUNT; (int) n < (int) NUM_NUMBERS(tp);  n++)
-+#define for_each_ext_string(n,tp)  for(n = STRCOUNT; (int) n < (int) NUM_STRINGS(tp);  n++)
- #endif
- 
- #define ExtBoolname(tp,i,names) EXT_NAMES(tp, i, BOOLCOUNT, (i - (tp->num_Booleans - tp->ext_Booleans)), names)
-Index: man/curs_variables.3x
-Prereq:  1.6 
---- ncurses-6.0-20150815+/man/curs_variables.3x	2013-12-21 18:41:32.000000000 +0000
-+++ ncurses-6.0-20150822/man/curs_variables.3x	2015-08-22 23:33:22.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2010,2013 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 2010-2013,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_variables.3x,v 1.6 2013/12/21 18:41:32 tom Exp $
-+.\" $Id: curs_variables.3x,v 1.8 2015/08/22 23:33:22 tom Exp $
- .TH curs_variables 3X ""
- .de bP
- .IP \(bu 4
-@@ -127,6 +127,20 @@
- .SH PORTABILITY
- ESCDELAY and TABSIZE are extensions,
- not provided in most other implementations of curses.
-+.PP
-+ESCDELAY is an extension in AIX curses:
-+.bP
-+In AIX, the units for ESCDELAY are \fIfifths\fP of a millisecond.
-+.bP
-+The default value for AIX's ESCDELAY is 0.1 seconds.
-+.bP
-+AIX also enforces a limit of 10,000 seconds for ESCDELAY;
-+this implementation currently has no upper limit.
-+.PP
-+This implementation has long used ESCDELAY with units of milliseconds,
-+making it impossible to be completely compatible with AIX.
-+Likewise, most users have either decided to override the value,
-+or rely upon its default value.
- .SH SEE ALSO
- \fBcurses\fR(3X),
- \fBcurs_opaque\fR(3X),
-Index: ncurses/base/lib_color.c
-Prereq:  1.110 
---- ncurses-6.0-20150815+/ncurses/base/lib_color.c	2014-03-08 20:04:44.000000000 +0000
-+++ ncurses-6.0-20150822/ncurses/base/lib_color.c	2015-08-22 22:38:58.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -45,7 +45,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_color.c,v 1.110 2014/03/08 20:04:44 tom Exp $")
-+MODULE_ID("$Id: lib_color.c,v 1.111 2015/08/22 22:38:58 tom Exp $")
- 
- #ifdef USE_TERM_DRIVER
- #define CanChange      InfoOf(SP_PARM).canchange
-@@ -544,7 +544,7 @@
- 
-     SP_PARM->_color_pairs[pair] = result;
-     if (GET_SCREEN_PAIR(SP_PARM) == pair)
--	SET_SCREEN_PAIR(SP_PARM, (chtype) (~0));	/* force attribute update */
-+	SET_SCREEN_PAIR(SP_PARM, (int) (~0));	/* force attribute update */
- 
- #ifdef USE_TERM_DRIVER
-     CallDriver_3(SP_PARM, td_initpair, pair, f, b);
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150815+/package/debian-mingw/changelog	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/debian-mingw/changelog	2015-08-17 08:41:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150815) unstable; urgency=low
-+ncurses6 (6.0+20150822) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Aug 2015 11:13:47 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Aug 2015 04:41:12 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150815+/package/debian-mingw64/changelog	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/debian-mingw64/changelog	2015-08-17 08:41:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150815) unstable; urgency=low
-+ncurses6 (6.0+20150822) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Aug 2015 11:13:47 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Aug 2015 04:41:12 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150815+/package/debian/changelog	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/debian/changelog	2015-08-17 08:41:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150815) unstable; urgency=low
-+ncurses6 (6.0+20150822) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 15 Aug 2015 11:13:47 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Aug 2015 04:41:12 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.119 
---- ncurses-6.0-20150815+/package/mingw-ncurses.nsi	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/mingw-ncurses.nsi	2015-08-17 08:41:12.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.119 2015/08/15 15:13:47 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.120 2015/08/17 08:41:12 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0815"

-+!define VERSION_MMDD  "0822"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150815+/package/mingw-ncurses.spec	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/mingw-ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150815
-+Release: 20150822
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150815+/package/ncurses.spec	2015-08-15 15:13:47.000000000 +0000
-+++ ncurses-6.0-20150822/package/ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150815
-+Release: 20150822
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/infocmp.c
-Prereq:  1.133 
---- ncurses-6.0-20150815+/progs/infocmp.c	2015-05-27 00:57:41.000000000 +0000
-+++ ncurses-6.0-20150822/progs/infocmp.c	2015-08-22 23:54:25.000000000 +0000
-@@ -42,7 +42,7 @@
- 
- #include <dump_entry.h>
- 
--MODULE_ID("$Id: infocmp.c,v 1.133 2015/05/27 00:57:41 tom Exp $")
-+MODULE_ID("$Id: infocmp.c,v 1.134 2015/08/22 23:54:25 tom Exp $")
- 
- #define L_CURL "{"
- #define R_CURL "}"
-@@ -1173,15 +1173,17 @@
-     {
- 	"  -0    print single-row"
- 	,"  -1    print single-column"
--	,"  -K    use termcap-names and BSD syntax"
- 	,"  -C    use termcap-names"
-+	,"  -D    print database locations"
-+	,"  -E    format output as C tables"
- 	,"  -F    compare terminfo-files"
-+	,"  -G    format %{number} to %'char'"
- 	,"  -I    use terminfo-names"
-+	,"  -K    use termcap-names and BSD syntax"
- 	,"  -L    use long names"
- 	,"  -R subset (see manpage)"
- 	,"  -T    eliminate size limits (test)"
- 	,"  -U    do not post-process entries"
--	,"  -D    print database locations"
- 	,"  -V    print version"
- #if NCURSES_XNAMES
- 	,"  -a    with -F, list commented-out caps"
-@@ -1189,9 +1191,7 @@
- 	,"  -c    list common capabilities"
- 	,"  -d    list different capabilities"
- 	,"  -e    format output for C initializer"
--	,"  -E    format output as C tables"
- 	,"  -f    with -1, format complex strings"
--	,"  -G    format %{number} to %'char'"
- 	,"  -g    format %'char' to %{number}"
- 	,"  -i    analyze initialization/reset"
- 	,"  -l    output terminfo names"
-Index: progs/tic.c
-Prereq:  1.211 
---- ncurses-6.0-20150815+/progs/tic.c	2015-07-04 21:12:41.000000000 +0000
-+++ ncurses-6.0-20150822/progs/tic.c	2015-08-22 23:49:57.000000000 +0000
-@@ -48,7 +48,7 @@
- #include <parametrized.h>
- #include <transform.h>
- 
--MODULE_ID("$Id: tic.c,v 1.211 2015/07/04 21:12:41 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.213 2015/08/22 23:49:57 tom Exp $")
- 
- #define STDIN_NAME "<stdin>"
- 
-@@ -142,6 +142,7 @@
-     static const char options_string[] =
-     {
- 	DATA("Options:")
-+	DATA("  -0         format translation output all capabilities on one line")
- 	DATA("  -1         format translation output one capability per line")
- #if NCURSES_XNAMES
- 	DATA("  -a         retain commented-out capabilities (sets -x also)")
-@@ -2149,7 +2150,7 @@
-     NAME_VALUE *result = typeMalloc(NAME_VALUE, NUM_STRINGS(tp) + 1);
-     const struct tinfo_fkeys *all_fkeys = _nc_tinfo_fkeys;
-     int used = 0;
--    int j;
-+    unsigned j;
- 
-     if (result == 0)
- 	failed("get_fkey_list");
-@@ -2165,7 +2166,7 @@
-     }
- #if NCURSES_XNAMES
-     for (j = STRCOUNT; j < NUM_STRINGS(tp); ++j) {
--	const char *name = ExtStrname(tp, j, strnames);
-+	const char *name = ExtStrname(tp, (int) j, strnames);
- 	if (*name == 'k') {
- 	    result[used].keycode = -1;
- 	    result[used].name = name;
-Index: test/demo_menus.c
-Prereq:  1.54 
---- ncurses-6.0-20150815+/test/demo_menus.c	2014-09-05 08:34:06.000000000 +0000
-+++ ncurses-6.0-20150822/test/demo_menus.c	2015-08-22 22:59:56.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2005-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2005-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_menus.c,v 1.54 2014/09/05 08:34:06 tom Exp $
-+ * $Id: demo_menus.c,v 1.55 2015/08/22 22:59:56 tom Exp $
-  *
-  * Demonstrate a variety of functions from the menu library.
-  * Thomas Dickey - 2005/4/9
-@@ -868,10 +868,6 @@
- 	    beep();
- 	continue;
-     }
--
--#ifdef NCURSES_MOUSE_VERSION
--    mousemask(0, (mmask_t *) 0);
--#endif
- }
- 
- static void
-Index: test/savescreen.c
-Prereq:  1.27 
---- ncurses-6.0-20150815+/test/savescreen.c	2015-03-28 23:21:28.000000000 +0000
-+++ ncurses-6.0-20150822/test/savescreen.c	2015-08-22 22:40:22.000000000 +0000
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: savescreen.c,v 1.27 2015/03/28 23:21:28 tom Exp $
-+ * $Id: savescreen.c,v 1.28 2015/08/22 22:40:22 tom Exp $
-  *
-  * Demonstrate save/restore functions from the curses library.
-  * Thomas Dickey - 2007/7/14
-@@ -471,7 +471,7 @@
- 		continue;
- 	    }
- 	    if (!done) {
--		attr_t attr = (A_REVERSE | COLOR_PAIR(color * COLORS));
-+		attr_t attr = (A_REVERSE | (attr_t) COLOR_PAIR(color * COLORS));
- 		chtype ch2 = (altchars ? ACS_DIAMOND : '#');
- 		move(y, x);
- 		addch(ch2 | attr);
diff --git a/patches/ncurses/6.0/130-ncurses-6.0-20150905.patch b/patches/ncurses/6.0/130-ncurses-6.0-20150905.patch
deleted file mode 100644
index 76dd45c..0000000
--- a/patches/ncurses/6.0/130-ncurses-6.0-20150905.patch
+++ /dev/null
@@ -1,1911 +0,0 @@
-# ncurses 6.0 - patch 20150905 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150905.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Sep  6 01:23:48 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                                |   12 ++
-# VERSION                             |    2 
-# dist.mk                             |    4 
-# doc/html/man/captoinfo.1m.html      |    2 
-# doc/html/man/clear.1.html           |    2 
-# doc/html/man/curs_addch.3x.html     |   50 ++++++++----
-# doc/html/man/curs_attr.3x.html      |    4 
-# doc/html/man/curs_variables.3x.html |   21 ++++-
-# doc/html/man/form.3x.html           |    2 
-# doc/html/man/infocmp.1m.html        |   77 +++++++++++-------
-# doc/html/man/infotocap.1m.html      |    2 
-# doc/html/man/menu.3x.html           |    2 
-# doc/html/man/ncurses.3x.html        |    2 
-# doc/html/man/panel.3x.html          |    2 
-# doc/html/man/tabs.1.html            |    2 
-# doc/html/man/terminfo.5.html        |    2 
-# doc/html/man/tic.1m.html            |  139 ++++++++++++++++++----------------
-# doc/html/man/toe.1m.html            |   39 +++++----
-# doc/html/man/tput.1.html            |    2 
-# doc/html/man/tset.1.html            |    2 
-# include/term_entry.h                |    3 
-# man/curs_addch.3x                   |   19 ++++
-# man/curs_attr.3x                    |    6 -
-# man/curs_threads.3x                 |    4 
-# man/infocmp.1m                      |   26 +++++-
-# man/tic.1m                          |   25 +++++-
-# man/toe.1m                          |    7 +
-# ncurses/tinfo/write_entry.c         |   13 +--
-# package/debian-mingw/changelog      |    4 
-# package/debian-mingw64/changelog    |    4 
-# package/debian/changelog            |    4 
-# package/mingw-ncurses.nsi           |    4 
-# package/mingw-ncurses.spec          |    2 
-# package/ncurses.map                 |    9 +-
-# package/ncurses.spec                |    2 
-# package/ncurses.sym                 |    3 
-# package/ncursest.map                |    9 +-
-# package/ncursest.sym                |    3 
-# package/ncursestw.map               |    9 +-
-# package/ncursestw.sym               |    3 
-# package/ncursesw.map                |    9 +-
-# package/ncursesw.sym                |    3 
-# progs/dump_entry.c                  |   96 +++++++++++++++++++++--
-# progs/dump_entry.h                  |    5 -
-# progs/infocmp.c                     |   21 +++--
-# progs/tic.c                         |   47 ++++++++---
-# 46 files changed, 491 insertions(+), 219 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2487 
---- ncurses-6.0-20150822+/NEWS	2015-08-22 23:55:21.000000000 +0000
-+++ ncurses-6.0-20150905/NEWS	2015-09-05 21:14:36.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2487 2015/08/22 23:55:21 tom Exp $
-+-- $Id: NEWS,v 1.2490 2015/09/05 21:14:36 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,16 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150905
-+	+ add note in curs_addch.3x about line-drawing when it depends upon
-+	  UTF-8.
-+	+ add tic -q option for consistency with infocmp, use it to suppress
-+	  all comments from the "tic -I" output.
-+	+ modify infocmp -q option to suppress the "Reconstructed from"
-+	  header.
-+	+ add infocmp/tic -Q option, which allows one to dump the compiled
-+	  form of the terminal entry, in hexadecimal or base64.
-+
- 20150822
- 	+ sort options in usage message for infocmp, to make it simpler to
- 	  see unused letters.
-Index: VERSION
---- ncurses-6.0-20150822+/VERSION	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/VERSION	2015-09-05 21:14:02.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150822
-+5:0:9	6.0	20150905
-Index: dist.mk
-Prereq:  1.1067 
---- ncurses-6.0-20150822+/dist.mk	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/dist.mk	2015-09-05 21:14:02.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1067 2015/08/17 08:41:12 tom Exp $
-+# $Id: dist.mk,v 1.1069 2015/09/05 21:14:02 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150822
-+NCURSES_PATCH = 20150905
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150822+/doc/html/man/captoinfo.1m.html	2015-08-08 18:45:46.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/captoinfo.1m.html	2015-09-05 21:19:32.000000000 +0000
-@@ -205,7 +205,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150822+/doc/html/man/clear.1.html	2015-08-08 18:45:46.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/clear.1.html	2015-09-05 21:19:32.000000000 +0000
-@@ -71,7 +71,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_addch.3x.html	2015-07-16 09:29:40.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_addch.3x.html	2015-09-05 21:19:33.000000000 +0000
-@@ -136,8 +136,11 @@
-        characters to the screen with routines of the  <STRONG>addch</STRONG>  fam-
-        ily.   The  default  character listed below is used if the
-        <STRONG>acsc</STRONG>  capability  does  not  define  a   terminal-specific
--       replacement for it.  The names are taken from VT100 nomen-
--       clature.
-+       replacement for it, or if the terminal and locale configu-
-+       ration requires Unicode but the library is unable  to  use
-+       Unicode.
-+
-+       The names are taken from VT100 nomenclature.
- 
-        <EM>Name</EM>           <EM>Default</EM>   <EM>Description</EM>
-        --------------------------------------------------
-@@ -178,41 +181,54 @@
- </PRE>
- <H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
-        All routines return the integer <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> on
--       success  (the  SVr4 manuals specify only "an integer value
-+       success (the SVr4 manuals specify only "an  integer  value
-        other than <STRONG>ERR</STRONG>") upon successful completion, unless other-
-        wise noted in the preceding routine descriptions.
- 
--       Functions  with a "mv" prefix first perform a cursor move-
--       ment using <STRONG>wmove</STRONG>, and return an error if the  position  is
-+       Functions with a "mv" prefix first perform a cursor  move-
-+       ment  using  <STRONG>wmove</STRONG>, and return an error if the position is
-        outside the window, or if the window pointer is null.
- 
- 
- </PRE>
- <H2><a name="h2-NOTES">NOTES</a></H2><PRE>
--       Note  that  <STRONG>addch</STRONG>,  <STRONG>mvaddch</STRONG>, <STRONG>mvwaddch</STRONG>, and <STRONG>echochar</STRONG> may be
-+       Note that <STRONG>addch</STRONG>, <STRONG>mvaddch</STRONG>, <STRONG>mvwaddch</STRONG>, and  <STRONG>echochar</STRONG>  may  be
-        macros.
- 
- 
- </PRE>
- <H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
--       All these functions are described in the XSI Curses  stan-
--       dard,  Issue  4.  The defaults specified for forms-drawing
-+       All  these functions are described in the XSI Curses stan-
-+       dard, Issue 4.  The defaults specified  for  forms-drawing
-        characters apply in the POSIX locale.
- 
--       X/Open Curses states that the <EM>ACS</EM><STRONG>_</STRONG>  definitions  are  <STRONG>char</STRONG>
--       constants.   For  the  wide-character  implementation (see
-+       X/Open  Curses  states  that the <EM>ACS</EM><STRONG>_</STRONG> definitions are <STRONG>char</STRONG>
-+       constants.  For  the  wide-character  implementation  (see
-        <STRONG>curs_add_wch</STRONG>), there are analogous <EM>WACS</EM><STRONG>_</STRONG> definitions which
-        are <STRONG>cchar_t</STRONG> constants.
- 
--       Some  ACS symbols (ACS_S3, ACS_S7, ACS_LEQUAL, ACS_GEQUAL,
--       ACS_PI, ACS_NEQUAL, ACS_STERLING) were not  documented  in
--       any  publicly  released  System V.  However, many publicly
--       available terminfos include <STRONG>acsc</STRONG> strings  in  which  their
--       key  characters  (pryz{|}) are embedded, and a second-hand
--       list of their character descriptions has  come  to  light.
--       The   ACS-prefixed   names  for  them  were  invented  for
-+       Some ACS symbols (ACS_S3, ACS_S7, ACS_LEQUAL,  ACS_GEQUAL,
-+       ACS_PI,  ACS_NEQUAL,  ACS_STERLING) were not documented in
-+       any publicly released System V.   However,  many  publicly
-+       available  terminfos  include  <STRONG>acsc</STRONG> strings in which their
-+       key characters (pryz{|}) are embedded, and  a  second-hand
-+       list  of  their  character descriptions has come to light.
-+       The  ACS-prefixed  names  for  them  were   invented   for
-        <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>.
- 
-+       The  <EM>displayed</EM>  values  for  the  <EM>ACS</EM><STRONG>_</STRONG> and <EM>WACS</EM><STRONG>_</STRONG> constants
-+       depend on
-+
-+       <STRONG>o</STRONG>   the library configuration, i.e., <STRONG>ncurses</STRONG> versus <STRONG>ncurs-</STRONG>
-+           <STRONG>esw</STRONG>, where the latter is capable of displaying Unicode
-+           while the former is not, and
-+
-+       <STRONG>o</STRONG>   whether the <EM>locale</EM> uses UTF-8 encoding.
-+
-+       In certain cases, the terminal is unable to display  line-
-+       drawing  characters except by using UTF-8 (see the discus-
-+       sion of <STRONG>NCURSES_NO_UTF8_ACS</STRONG> in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>).
-+
-        The <STRONG>TABSIZE</STRONG> variable is implemented in  some  versions  of
-        curses, but is not part of X/Open curses.
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_attr.3x.html	2015-07-22 00:49:55.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_attr.3x.html	2015-09-05 23:05:55.000000000 +0000
-@@ -173,8 +173,8 @@
- <H3><a name="h3-Attributes">Attributes</a></H3><PRE>
-        The following video attributes, defined in <STRONG>&lt;curses.h&gt;</STRONG>, can
-        be passed to the routines <STRONG>attron</STRONG>, <STRONG>attroff</STRONG>, and <STRONG>attrset</STRONG>, or
--       OR'd with the characters passed to  <STRONG>addch</STRONG>  (see  curs_add-
--       <STRONG><A HREF="ch.3x.html">ch(3x)</A></STRONG>).
-+       OR'd with the characters passed to  <STRONG>addch</STRONG>  (see  <STRONG><A HREF="curs_addch.3x.html">curs_add-
-+       ch(3x)</A></STRONG>).
- 
-               <EM>Name</EM>            <EM>Description</EM>
-               ------------------------------------------------------------
-Index: doc/html/man/curs_variables.3x.html
---- ncurses-6.0-20150822+/doc/html/man/curs_variables.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/curs_variables.3x.html	2015-09-05 21:19:36.000000000 +0000
-@@ -1,6 +1,6 @@
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 2010,2013 Free Software Foundation, Inc.                   *
-+  * Copyright (c) 2010-2013,2015 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_variables.3x,v 1.6 2013/12/21 18:41:32 tom Exp @
-+  * @Id: curs_variables.3x,v 1.8 2015/08/22 23:33:22 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -163,10 +163,25 @@
-        ESCDELAY  and TABSIZE are extensions, not provided in most
-        other implementations of curses.
- 
-+       ESCDELAY is an extension in AIX curses:
-+
-+       <STRONG>o</STRONG>   In AIX, the units for ESCDELAY are <EM>fifths</EM>  of  a  mil-
-+           lisecond.
-+
-+       <STRONG>o</STRONG>   The default value for AIX's ESCDELAY is 0.1 seconds.
-+
-+       <STRONG>o</STRONG>   AIX also enforces a limit of 10,000 seconds for ESCDE-
-+           LAY; this implementation currently has no upper limit.
-+
-+       This implementation has long used ESCDELAY with  units  of
-+       milliseconds,  making  it impossible to be completely com-
-+       patible with AIX.  Likewise, most users have either decid-
-+       ed to override the value, or rely upon its default value.
-+
- 
- </PRE>
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,      <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,       <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,       <STRONG><A HREF="curs_opaque.3x.html">curs_opaque(3x)</A></STRONG>,      <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,
-        <STRONG><A HREF="curs_threads.3x.html">curs_threads(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
- 
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150822+/doc/html/man/form.3x.html	2015-08-08 18:45:50.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/form.3x.html	2015-09-05 21:19:36.000000000 +0000
-@@ -245,7 +245,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150822+/doc/html/man/infocmp.1m.html	2015-08-08 18:45:51.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/infocmp.1m.html	2015-09-05 21:19:38.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: infocmp.1m,v 1.56 2015/05/23 20:50:00 tom Exp @
-+  * @Id: infocmp.1m,v 1.57 2015/09/05 20:50:22 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -54,7 +54,7 @@
- </PRE>
- <H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
-        <STRONG>infocmp</STRONG> [<STRONG>-1CDEFGIKLTUVcdegilnpqrtux</STRONG>]
--             [<STRONG>-v</STRONG> <EM>n</EM>] [<STRONG>-s</STRONG> <STRONG>d</STRONG>| <STRONG>i</STRONG>| <STRONG>l</STRONG>| <STRONG>c</STRONG>] [<STRONG>-R</STRONG> <STRONG>subset</STRONG>]
-+             [<STRONG>-v</STRONG> <EM>n</EM>] [<STRONG>-s</STRONG> <STRONG>d</STRONG>| <STRONG>i</STRONG>| <STRONG>l</STRONG>| <STRONG>c</STRONG>] [<STRONG>-Q</STRONG> <EM>n</EM>] [<STRONG>-R</STRONG> <STRONG>subset</STRONG>]
-              [<STRONG>-w</STRONG> <EM>width</EM>] [<STRONG>-A</STRONG> <EM>directory</EM>] [<STRONG>-B</STRONG> <EM>directory</EM>]
-              [<EM>termname</EM>...]
- 
-@@ -374,29 +374,44 @@
- 
-        <STRONG>-p</STRONG>   Ignore padding specifications when comparing strings.
- 
--       <STRONG>-q</STRONG>   Make  the comparison listing shorter by omitting sub-
--            headings, and using "-" for absent capabilities,  "@"
--            for canceled rather than "NULL".
-+       <STRONG>-Q</STRONG> <EM>n</EM> Rather  than  show  source in terminfo (text) format,
-+            print the compiled (binary) format in hexadecimal  or
-+            base64 form, depending on the option's value:
-+
-+               1  hexadecimal
-+
-+               2  base64
-+
-+               3  hexadecimal and base64
-+
-+       <STRONG>-q</STRONG>   This makes the output a little shorter:
-+
-+            <STRONG>o</STRONG>   Make  the  comparison listing shorter by omitting
-+                subheadings, and using "-" for  absent  capabili-
-+                ties, "@" for canceled rather than "NULL".
-+
-+            <STRONG>o</STRONG>   Omit  the "Reconstructed from" comment for source
-+                listings.
- 
-        <STRONG>-R</STRONG><EM>subset</EM>
--            Restrict  output  to  a given subset.  This option is
--            for use with archaic versions of terminfo like  those
--            on  SVr1,  Ultrix,  or  HP/UX that do not support the
--            full set of SVR4/XSI Curses  terminfo;  and  variants
-+            Restrict output to a given subset.   This  option  is
-+            for  use with archaic versions of terminfo like those
-+            on SVr1, Ultrix, or HP/UX that  do  not  support  the
-+            full  set  of  SVR4/XSI Curses terminfo; and variants
-             such as AIX that have their own extensions incompati-
-             ble with SVr4/XSI.
- 
-             Available  terminfo  subsets  are  "SVr1",  "Ultrix",
--            "HP",  and  "AIX";  see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.  You
--            can also choose the subset "BSD" which  selects  only
--            capabilities  with  termcap equivalents recognized by
-+            "HP", and "AIX"; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  for  details.   You
-+            can  also  choose the subset "BSD" which selects only
-+            capabilities with termcap equivalents  recognized  by
-             4.4BSD.
- 
-        <STRONG>-s</STRONG> <EM>[d|i|l|c]</EM>
--            The <STRONG>-s</STRONG> option  sorts  the  fields  within  each  type
-+            The  <STRONG>-s</STRONG>  option  sorts  the  fields  within each type
-             according to the argument below:
- 
--            <STRONG>d</STRONG>    leave  fields  in the order that they are stored
-+            <STRONG>d</STRONG>    leave fields in the order that they  are  stored
-                  in the <EM>terminfo</EM> database.
- 
-             <STRONG>i</STRONG>    sort by <EM>terminfo</EM> name.
-@@ -406,38 +421,38 @@
-             <STRONG>c</STRONG>    sort by the <EM>termcap</EM> name.
- 
-             If the <STRONG>-s</STRONG> option is not given, the fields printed out
--            will  be  sorted  alphabetically by the <STRONG>terminfo</STRONG> name
-+            will be sorted alphabetically by  the  <STRONG>terminfo</STRONG>  name
-             within each type, except in the case of the <STRONG>-C</STRONG> or the
-             <STRONG>-L</STRONG> options, which cause the sorting to be done by the
--            <STRONG>termcap</STRONG> name or the long  C  variable  name,  respec-
-+            <STRONG>termcap</STRONG>  name  or  the  long C variable name, respec-
-             tively.
- 
--       <STRONG>-T</STRONG>   eliminates  size-restrictions  on the generated text.
-+       <STRONG>-T</STRONG>   eliminates size-restrictions on the  generated  text.
-             This is mainly useful for testing and analysis, since
-             the compiled descriptions are limited (e.g., 1023 for
-             termcap, 4096 for terminfo).
- 
-        <STRONG>-t</STRONG>   tells  <STRONG>tic</STRONG>  to  discard  commented-out  capabilities.
--            Normally  when  translating from terminfo to termcap,
-+            Normally when translating from terminfo  to  termcap,
-             untranslatable capabilities are commented-out.
- 
--       <STRONG>-U</STRONG>   tells <STRONG>infocmp</STRONG> to  not  post-process  the  data  after
--            parsing  the  source  file.   This feature helps when
--            comparing the actual contents of  two  source  files,
--            since  it  excludes the inferences that <STRONG>infocmp</STRONG> makes
-+       <STRONG>-U</STRONG>   tells  <STRONG>infocmp</STRONG>  to  not  post-process  the data after
-+            parsing the source file.   This  feature  helps  when
-+            comparing  the  actual  contents of two source files,
-+            since it excludes the inferences that  <STRONG>infocmp</STRONG>  makes
-             to fill in missing data.
- 
-        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this
-             program, and exits.
- 
--       <STRONG>-v</STRONG> <EM>n</EM> prints  out  tracing information on standard error as
--            the program runs.  Higher values of n induce  greater
-+       <STRONG>-v</STRONG> <EM>n</EM> prints out tracing information on standard  error  as
-+            the  program runs.  Higher values of n induce greater
-             verbosity.
- 
-        <STRONG>-w</STRONG> <EM>width</EM>
-             changes the output to <EM>width</EM> characters.
- 
--       <STRONG>-x</STRONG>   print   information  for  user-defined  capabilities.
-+       <STRONG>-x</STRONG>   print  information  for  user-defined   capabilities.
-             These are extensions to the terminfo repertoire which
-             can be loaded using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>.
- 
-@@ -450,13 +465,13 @@
- 
- </PRE>
- <H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
--       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>,  <STRONG>-f</STRONG>,  <STRONG>-g</STRONG>,  <STRONG>-i</STRONG>,
--       <STRONG>-l</STRONG>,  <STRONG>-p</STRONG>,  <STRONG>-q</STRONG>  and  <STRONG>-t</STRONG>  options  are  not supported in SVr4
-+       The  <STRONG>-0</STRONG>,  <STRONG>-1</STRONG>,  <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>,
-+       <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG> and  <STRONG>-t</STRONG>  options  are  not  supported  in  SVr4
-        curses.
- 
-        The <STRONG>-r</STRONG> option's notion of `termcap' capabilities is System
--       V  Release  4's.   Actual  BSD curses versions will have a
--       more restricted set.  To see only the 4.4BSD set,  use  <STRONG>-r</STRONG>
-+       V Release 4's.  Actual BSD curses  versions  will  have  a
-+       more  restricted  set.  To see only the 4.4BSD set, use <STRONG>-r</STRONG>
-        <STRONG>-RBSD</STRONG>.
- 
- 
-@@ -467,12 +482,12 @@
- 
- </PRE>
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
--       <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,     <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,     <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-+       <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,     <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,     <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150822+/doc/html/man/infotocap.1m.html	2015-08-08 18:45:51.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/infotocap.1m.html	2015-09-05 21:19:38.000000000 +0000
-@@ -94,7 +94,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150822+/doc/html/man/menu.3x.html	2015-08-08 18:45:52.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/menu.3x.html	2015-09-05 21:19:38.000000000 +0000
-@@ -227,7 +227,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150822+/doc/html/man/ncurses.3x.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/ncurses.3x.html	2015-09-05 21:19:39.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
-        The <STRONG>ncurses</STRONG> library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150822+/doc/html/man/panel.3x.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/panel.3x.html	2015-09-05 21:19:39.000000000 +0000
-@@ -218,7 +218,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- </PRE>
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150822+/doc/html/man/tabs.1.html	2015-08-08 18:45:53.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tabs.1.html	2015-09-05 21:19:40.000000000 +0000
-@@ -168,7 +168,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150822+/doc/html/man/terminfo.5.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/terminfo.5.html	2015-09-05 21:19:40.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
-        Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150822+/doc/html/man/tic.1m.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tic.1m.html	2015-09-05 21:19:40.000000000 +0000
-@@ -1,6 +1,6 @@
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tic.1m,v 1.60 2014/05/24 22:00:11 tom Exp @
-+  * @Id: tic.1m,v 1.61 2015/09/05 20:45:49 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -52,8 +52,8 @@
- 
- </PRE>
- <H2><a name="h2-SYNOPSIS">SYNOPSIS</a></H2><PRE>
--       <STRONG>tic</STRONG>  [<STRONG>-01CDGIKLNTUVacfgrstx</STRONG>]  [<STRONG>-e</STRONG> <EM>names</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-R</STRONG> <EM>sub-</EM>
--       <EM>set</EM>] [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM>
-+       <STRONG>tic</STRONG>  [<STRONG>-01CDGIKLNTUVacfgqrstx</STRONG>]  [<STRONG>-e</STRONG> <EM>names</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-Q</STRONG>[<EM>n</EM>]]
-+       [<STRONG>-R</STRONG> <EM>subset</EM>] [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM>
- 
- 
- </PRE>
-@@ -228,22 +228,35 @@
-        <STRONG>-o</STRONG><EM>dir</EM>  Write  compiled entries to given database location.
-               Overrides the TERMINFO environment variable.
- 
-+       <STRONG>-Q</STRONG><EM>n</EM>    Rather than show source in terminfo (text)  format,
-+              print  the  compiled (binary) format in hexadecimal
-+              or base64 form, depending on the option's value:
-+
-+               1  hexadecimal
-+
-+               2  base64
-+
-+               3  hexadecimal and base64
-+
-+       <STRONG>-q</STRONG>     Suppress comments  and  blank  lines  when  showing
-+              translated source.
-+
-        <STRONG>-R</STRONG><EM>subset</EM>
--              Restrict output to a given subset.  This option  is
--              for  use  with  archaic  versions  of terminfo like
-+              Restrict  output to a given subset.  This option is
-+              for use with  archaic  versions  of  terminfo  like
-               those on SVr1, Ultrix, or HP/UX that do not support
--              the  full set of SVR4/XSI Curses terminfo; and out-
-+              the full set of SVR4/XSI Curses terminfo; and  out-
-               right broken ports like AIX 3.x that have their own
--              extensions  incompatible  with SVr4/XSI.  Available
-+              extensions incompatible with  SVr4/XSI.   Available
-               subsets  are  "SVr1",  "Ultrix",  "HP",  "BSD"  and
-               "AIX"; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details.
- 
--       <STRONG>-r</STRONG>     Force  entry  resolution (so there are no remaining
--              tc capabilities) even  when  doing  translation  to
-+       <STRONG>-r</STRONG>     Force entry resolution (so there are  no  remaining
-+              tc  capabilities)  even  when  doing translation to
-               termcap format.  This may be needed if you are pre-
--              paring a termcap file for a termcap  library  (such
--              as  GNU  termcap through version 1.3 or BSD termcap
--              through 4.3BSD) that does not  handle  multiple  tc
-+              paring  a  termcap file for a termcap library (such
-+              as GNU termcap through version 1.3 or  BSD  termcap
-+              through  4.3BSD)  that  does not handle multiple tc
-               capabilities per entry.
- 
-        <STRONG>-s</STRONG>     Summarize the compile by showing the database loca-
-@@ -251,28 +264,28 @@
-               of entries which are compiled.
- 
-        <STRONG>-T</STRONG>     eliminates size-restrictions on the generated text.
--              This is mainly useful  for  testing  and  analysis,
--              since  the compiled descriptions are limited (e.g.,
-+              This  is  mainly  useful  for testing and analysis,
-+              since the compiled descriptions are limited  (e.g.,
-               1023 for termcap, 4096 for terminfo).
- 
--       <STRONG>-t</STRONG>     tells <STRONG>tic</STRONG> to  discard  commented-out  capabilities.
-+       <STRONG>-t</STRONG>     tells  <STRONG>tic</STRONG>  to  discard commented-out capabilities.
-               Normally when translating from terminfo to termcap,
-               untranslatable capabilities are commented-out.
- 
--       <STRONG>-U</STRONG>   tells <STRONG>tic</STRONG> to not post-process the data after  parsing
--            the  source  file.  Normally, it infers data which is
--            commonly missing in older terminfo data, or in  term-
-+       <STRONG>-U</STRONG>   tells  <STRONG>tic</STRONG> to not post-process the data after parsing
-+            the source file.  Normally, it infers data  which  is
-+            commonly  missing in older terminfo data, or in term-
-             caps.
- 
-        <STRONG>-V</STRONG>   reports the version of ncurses which was used in this
-             program, and exits.
- 
--       <STRONG>-v</STRONG><EM>n</EM>  specifies that (verbose) output be written  to  stan-
--            dard  error trace information showing <STRONG>tic</STRONG>'s progress.
--            The optional parameter <EM>n</EM> is a number from  1  to  10,
--            inclusive,  indicating the desired level of detail of
--            information.  If <EM>n</EM> is omitted, the default  level  is
--            1.   If  <EM>n</EM> is specified and greater than 1, the level
-+       <STRONG>-v</STRONG><EM>n</EM>  specifies  that  (verbose) output be written to stan-
-+            dard error trace information showing <STRONG>tic</STRONG>'s  progress.
-+            The  optional  parameter  <EM>n</EM> is a number from 1 to 10,
-+            inclusive, indicating the desired level of detail  of
-+            information.   If  <EM>n</EM> is omitted, the default level is
-+            1.  If <EM>n</EM> is specified and greater than 1,  the  level
-             of detail is increased.
- 
-             The debug flag levels are as follows:
-@@ -289,32 +302,32 @@
- 
-             8      List of tokens encountered by scanner
- 
--            9      All values computed  in  construction  of  the
-+            9      All  values  computed  in  construction of the
-                    hash table
- 
--            If  the debug level <EM>n</EM> is not given, it is taken to be
-+            If the debug level <EM>n</EM> is not given, it is taken to  be
-             one.
- 
--       <STRONG>-w</STRONG><EM>n</EM>  specifies the width of the output.  The parameter  is
-+       <STRONG>-w</STRONG><EM>n</EM>  specifies  the width of the output.  The parameter is
-             optional.  If it is omitted, it defaults to 60.
- 
-        <STRONG>-x</STRONG>   Treat unknown capabilities as user-defined.  That is,
--            if you supply a capability name which  <STRONG>tic</STRONG>  does  not
-+            if  you  supply  a capability name which <STRONG>tic</STRONG> does not
-             recognize, it will infer its type (boolean, number or
--            string) from the syntax and make  an  extended  table
-+            string)  from  the  syntax and make an extended table
-             entry  for  that.   User-defined  capability  strings
--            whose name begins with "k" are  treated  as  function
-+            whose  name  begins  with "k" are treated as function
-             keys.
- 
- 
- </PRE>
- <H3><a name="h3-PARAMETERS">PARAMETERS</a></H3><PRE>
-        <EM>file</EM>   contains one or more <STRONG>terminfo</STRONG> terminal descriptions
--              in source format [see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].  Each  descrip-
--              tion  in  the  file describes the capabilities of a
-+              in  source format [see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>].  Each descrip-
-+              tion in the file describes the  capabilities  of  a
-               particular terminal.
- 
--              If <EM>file</EM> is "-", then the  data  is  read  from  the
-+              If  <EM>file</EM>  is  "-",  then  the data is read from the
-               standard input.  The <EM>file</EM> parameter may also be the
-               path of a character-device.
- 
-@@ -325,62 +338,62 @@
-        umented in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  The exception is the <STRONG>use</STRONG> capabil-
-        ity.
- 
--       When a <STRONG>use</STRONG>=<EM>entry</EM>-<EM>name</EM> field is discovered  in  a  terminal
--       entry  currently  being  compiled, <STRONG>tic</STRONG> reads in the binary
--       from <STRONG>/usr/share/terminfo</STRONG> to complete the entry.   (Entries
--       created  from <EM>file</EM> will be used first.  <STRONG>tic</STRONG> duplicates the
-+       When  a  <STRONG>use</STRONG>=<EM>entry</EM>-<EM>name</EM>  field is discovered in a terminal
-+       entry currently being compiled, <STRONG>tic</STRONG> reads  in  the  binary
-+       from  <STRONG>/usr/share/terminfo</STRONG> to complete the entry.  (Entries
-+       created from <EM>file</EM> will be used first.  <STRONG>tic</STRONG> duplicates  the
-        capabilities in <EM>entry</EM>-<EM>name</EM> for the current entry, with the
--       exception   of  those  capabilities  that  explicitly  are
-+       exception  of  those  capabilities  that  explicitly   are
-        defined in the current entry.
- 
--       When   an   entry,   e.g.,   <STRONG>entry_name_1</STRONG>,   contains    a
--       <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM>   field,  any  canceled  capabilities  in
--       <EM>entry</EM>_<EM>name</EM>_<EM>2</EM> must also appear in <STRONG>entry_name_1</STRONG> before  <STRONG>use=</STRONG>
-+       When    an   entry,   e.g.,   <STRONG>entry_name_1</STRONG>,   contains   a
-+       <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM>  field,  any  canceled  capabilities   in
-+       <EM>entry</EM>_<EM>name</EM>_<EM>2</EM>  must also appear in <STRONG>entry_name_1</STRONG> before <STRONG>use=</STRONG>
-        for these capabilities to be canceled in <STRONG>entry_name_1</STRONG>.
- 
-        Total compiled entries cannot exceed 4096 bytes.  The name
--       field cannot exceed 512 bytes.  Terminal  names  exceeding
--       the  maximum  alias  length (32 characters on systems with
-+       field  cannot  exceed 512 bytes.  Terminal names exceeding
-+       the maximum alias length (32 characters  on  systems  with
-        long filenames, 14 characters otherwise) will be truncated
--       to  the maximum alias length and a warning message will be
-+       to the maximum alias length and a warning message will  be
-        printed.
- 
- 
- </PRE>
- <H2><a name="h2-COMPATIBILITY">COMPATIBILITY</a></H2><PRE>
--       There is some evidence that historic  <STRONG>tic</STRONG>  implementations
--       treated  description  fields with no whitespace in them as
--       additional aliases or short names.  This <STRONG>tic</STRONG> does  not  do
--       that,  but  it  does  warn  when description fields may be
-+       There  is  some evidence that historic <STRONG>tic</STRONG> implementations
-+       treated description fields with no whitespace in  them  as
-+       additional  aliases  or short names.  This <STRONG>tic</STRONG> does not do
-+       that, but it does warn  when  description  fields  may  be
-        treated that way and check them for dangerous characters.
- 
- 
- </PRE>
- <H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE>
-        Unlike the SVr4 <STRONG>tic</STRONG> command, this implementation can actu-
--       ally  compile  termcap  sources.  In fact, entries in ter-
--       minfo and termcap syntax can be mixed in a  single  source
-+       ally compile termcap sources.  In fact,  entries  in  ter-
-+       minfo  and  termcap syntax can be mixed in a single source
-        file.  See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for the list of termcap names taken
-        to be equivalent to terminfo names.
- 
--       The SVr4 manual pages are  not  clear  on  the  resolution
--       rules  for  <STRONG>use</STRONG>  capabilities.  This implementation of <STRONG>tic</STRONG>
-+       The  SVr4  manual  pages  are  not clear on the resolution
-+       rules for <STRONG>use</STRONG> capabilities.  This  implementation  of  <STRONG>tic</STRONG>
-        will find <STRONG>use</STRONG> targets anywhere in the source file, or any-
--       where  in the file tree rooted at <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG> is
-+       where in the file tree rooted at <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG>  is
-        defined), or in the user's <EM>$HOME/.terminfo</EM> database (if it
--       exists),  or  (finally) anywhere in the system's file tree
-+       exists), or (finally) anywhere in the system's  file  tree
-        of compiled entries.
- 
--       The error messages from this <STRONG>tic</STRONG> have the same  format  as
--       GNU  C  error  messages,  and can be parsed by GNU Emacs's
-+       The  error  messages from this <STRONG>tic</STRONG> have the same format as
-+       GNU C error messages, and can be  parsed  by  GNU  Emacs's
-        compile facility.
- 
--       The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-C</STRONG>, <STRONG>-G</STRONG>, <STRONG>-I</STRONG>, <STRONG>-N</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>,  <STRONG>-e</STRONG>,  <STRONG>-f</STRONG>,  <STRONG>-g</STRONG>,
--       <STRONG>-o</STRONG>,  <STRONG>-r</STRONG>,  <STRONG>-s</STRONG>,  <STRONG>-t</STRONG>  and  <STRONG>-x</STRONG> options are not supported under
-+       The  <STRONG>-0</STRONG>,  <STRONG>-1</STRONG>,  <STRONG>-C</STRONG>, <STRONG>-G</STRONG>, <STRONG>-I</STRONG>, <STRONG>-N</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>,
-+       <STRONG>-o</STRONG>, <STRONG>-r</STRONG>, <STRONG>-s</STRONG>, <STRONG>-t</STRONG> and <STRONG>-x</STRONG>  options  are  not  supported  under
-        SVr4.  The SVr4 <STRONG>-c</STRONG> mode does not report bad use links.
- 
--       System V does not compile entries to or read entries  from
--       your  <EM>$HOME/.terminfo</EM>  database unless TERMINFO is explic-
-+       System  V does not compile entries to or read entries from
-+       your <EM>$HOME/.terminfo</EM> database unless TERMINFO  is  explic-
-        itly set to it.
- 
- 
-@@ -392,10 +405,10 @@
- 
- </PRE>
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
--       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,    <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-+       <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150822+/doc/html/man/toe.1m.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/toe.1m.html	2015-09-05 21:19:40.000000000 +0000
-@@ -1,6 +1,6 @@
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2011,2015 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: toe.1m,v 1.26 2012/01/01 00:40:51 tom Exp @
-+  * @Id: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -77,34 +77,37 @@
-               marks entries which differ, and "+"  marks  equiva-
-               lent entries.
- 
-+              Without  the  <STRONG>-s</STRONG>  option,  <STRONG>toe</STRONG>  does not attempt to
-+              merge duplicates in its report
-+
-        <STRONG>-s</STRONG>     sort the output by the entry names.
- 
-        <STRONG>-u</STRONG> <EM>file</EM>
--              says  to  write  a  report  to the standard output,
--              listing dependencies in the given  terminfo/termcap
--              source  file.  The report condenses the `use' rela-
--              tion: each line consists of the primary name  of  a
--              terminal  that  has use capabilities, followed by a
-+              says to write a  report  to  the  standard  output,
-+              listing  dependencies in the given terminfo/termcap
-+              source file.  The report condenses the `use'  rela-
-+              tion:  each  line consists of the primary name of a
-+              terminal that has use capabilities, followed  by  a
-               colon, followed by the whitespace-separated primary
--              names  of  all  terminals  which occur in those use
-+              names of all terminals which  occur  in  those  use
-               capabilities, followed by a newline
- 
-        <STRONG>-U</STRONG> <EM>file</EM>
--              says to write a  report  to  the  standard  output,
--              listing  reverse  dependencies  in  the  given ter-
-+              says  to  write  a  report  to the standard output,
-+              listing reverse  dependencies  in  the  given  ter-
-               minfo/termcap source file.  The report reverses the
--              `use'  relation:  each line consists of the primary
-+              `use' relation: each line consists of  the  primary
-               name of a terminal that occurs in use capabilities,
--              followed  by  a  colon, followed by the whitespace-
--              separated primary  names  of  all  terminals  which
-+              followed by a colon, followed  by  the  whitespace-
-+              separated  primary  names  of  all  terminals which
-               depend on it, followed by a newline.
- 
-        <STRONG>-v</STRONG><EM>n</EM>    specifies that (verbose) output be written to stan-
--              dard error, showing <STRONG>toe</STRONG>'s progress.   The  optional
--              parameter  <EM>n</EM>  is a number from 1 to 10, interpreted
-+              dard  error,  showing <STRONG>toe</STRONG>'s progress.  The optional
-+              parameter <EM>n</EM> is a number from 1 to  10,  interpreted
-               as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.
- 
--       <STRONG>-V</STRONG>     reports the version of ncurses which  was  used  in
-+       <STRONG>-V</STRONG>     reports  the  version  of ncurses which was used in
-               this program, and exits.
- 
- 
-@@ -116,10 +119,10 @@
- 
- </PRE>
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
--       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-+       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150822+/doc/html/man/tput.1.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tput.1.html	2015-09-05 21:19:40.000000000 +0000
-@@ -338,7 +338,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150822+/doc/html/man/tset.1.html	2015-08-08 18:45:54.000000000 +0000
-+++ ncurses-6.0-20150905/doc/html/man/tset.1.html	2015-09-05 21:19:40.000000000 +0000
-@@ -319,7 +319,7 @@
-        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
-        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150808).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
- 
- 
- 
-Index: include/term_entry.h
-Prereq:  1.46 
---- ncurses-6.0-20150822+/include/term_entry.h	2015-08-22 23:04:25.000000000 +0000
-+++ ncurses-6.0-20150905/include/term_entry.h	2015-08-30 00:41:20.000000000 +0000
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1998-on                 *
-  ****************************************************************************/
- 
--/* $Id: term_entry.h,v 1.46 2015/08/22 23:04:25 tom Exp $ */
-+/* $Id: term_entry.h,v 1.47 2015/08/30 00:41:20 tom Exp $ */
- 
- /*
-  *	term_entry.h -- interface to entry-manipulation code
-@@ -172,6 +172,7 @@
- /* write_entry.c: writing an entry to the file system */
- extern NCURSES_EXPORT(void) _nc_set_writedir (const char *);
- extern NCURSES_EXPORT(void) _nc_write_entry (TERMTYPE *const);
-+extern NCURSES_EXPORT(int) _nc_write_object(TERMTYPE *, char *, unsigned *, unsigned);
- 
- /* comp_parse.c: entry list handling */
- extern NCURSES_EXPORT(void) _nc_read_entry_source (FILE*, char*, int, bool, bool (*)(ENTRY*));
-Index: man/curs_addch.3x
-Prereq:  1.36 
---- ncurses-6.0-20150822+/man/curs_addch.3x	2015-07-16 09:14:44.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_addch.3x	2015-09-05 21:13:25.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_addch.3x,v 1.36 2015/07/16 09:14:44 tom Exp $
-+.\" $Id: curs_addch.3x,v 1.37 2015/09/05 21:13:25 tom Exp $
- .TH curs_addch 3X ""
- .de bP
- .IP \(bu 4
-@@ -110,7 +110,10 @@
- The following variables may be used to add line drawing characters to the
- screen with routines of the \fBaddch\fR family.  The default character listed
- below is used if the \fBacsc\fR capability does not define a terminal-specific
--replacement for it.
-+replacement for it,
-+or if the terminal and locale configuration requires Unicode but the
-+library is unable to use Unicode.
-+.PP
- The names are taken from VT100 nomenclature.
- .PP
- .TS
-@@ -185,6 +188,18 @@
- embedded, and a second-hand list of their character descriptions has come
- to light.  The ACS-prefixed names for them were invented for \fBncurses\fR(3X).
- .LP
-+The \fIdisplayed\fP values for the \fIACS_\fP and \fIWACS_\fP constants
-+depend on 
-+.bP
-+the library configuration, i.e., \fBncurses\fP versus \fBncursesw\fP,
-+where the latter is capable of displaying Unicode while the former is not, and
-+.bP
-+whether the \fIlocale\fP uses UTF-8 encoding.
-+.LP
-+In certain cases, the terminal is unable to display line-drawing characters
-+except by using UTF-8 (see the discussion of \fBNCURSES_NO_UTF8_ACS\fP in
-+ncurses(3X)).
-+.LP
- The \fBTABSIZE\fR variable is implemented in some versions of curses,
- but is not part of X/Open curses.
- .LP
-Index: man/curs_attr.3x
-Prereq:  1.40 
---- ncurses-6.0-20150822+/man/curs_attr.3x	2015-07-20 23:35:38.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_attr.3x	2015-09-05 21:13:25.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.40 2015/07/20 23:35:38 tom Exp $
-+.\" $Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp $
- .TH curs_attr 3X ""
- .na
- .hy 0
-@@ -168,7 +168,7 @@
- for \fBstdscr\fR.
- .PP
- There is no corresponding \fBattrget\fP function as such in X/Open Curses,
--although ncurses provides \fBgetattrs\fP (see curs_legacy(3x)).
-+although ncurses provides \fBgetattrs\fP (see curs_legacy(3X)).
- .SS chgat
- .PP
- The routine \fBchgat\fR changes the attributes of a given number of characters
-@@ -188,7 +188,7 @@
- .SS Attributes
- The following video attributes, defined in \fB<curses.h>\fR, can be passed to
- the routines \fBattron\fR, \fBattroff\fR, and \fBattrset\fR, or OR'd with the
--characters passed to \fBaddch\fR (see curs_addch(3x)).
-+characters passed to \fBaddch\fR (see curs_addch(3X)).
- .PP
- .RS
- .TS
-Index: man/curs_threads.3x
-Prereq:  1.21 
---- ncurses-6.0-20150822+/man/curs_threads.3x	2015-04-11 10:23:49.000000000 +0000
-+++ ncurses-6.0-20150905/man/curs_threads.3x	2015-09-05 21:13:25.000000000 +0000
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_threads.3x,v 1.21 2015/04/11 10:23:49 tom Exp $
-+.\" $Id: curs_threads.3x,v 1.22 2015/09/05 21:13:25 tom Exp $
- .TH curs_threads 3X ""
- .de bP
- .IP \(bu 4
-@@ -67,7 +67,7 @@
- use of the global variables when configured for threading.
- .PP
- In addition to forcing access to members of the \fBWINDOW\fP structure
--to be via functions (see \fBcurs_opaque\fP(3x)),
-+to be via functions (see \fBcurs_opaque\fP(3X)),
- it makes functions of the common global variables,
- e.g.,
- COLORS,
-Index: man/infocmp.1m
-Prereq:  1.56 
---- ncurses-6.0-20150822+/man/infocmp.1m	2015-05-23 20:50:00.000000000 +0000
-+++ ncurses-6.0-20150905/man/infocmp.1m	2015-09-05 20:50:22.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: infocmp.1m,v 1.56 2015/05/23 20:50:00 tom Exp $
-+.\" $Id: infocmp.1m,v 1.57 2015/09/05 20:50:22 tom Exp $
- .TH @INFOCMP@ 1M ""
- .ds n 5
- .de bP
-@@ -65,7 +65,7 @@
- x\
- \fR]
- .br
--      [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-R \fR\fBsubset\fR]
-+      [\fB\-v\fR \fIn\fR] [\fB\-s d\fR| \fBi\fR| \fBl\fR| \fBc\fR] [\fB\-Q\fR \fIn\fR] [\fB\-R \fR\fBsubset\fR]
- .br
-       [\fB\-w\fR\ \fIwidth\fR] [\fB\-A\fR\ \fIdirectory\fR] [\fB\-B\fR\ \fIdirectory\fR]
- .br
-@@ -390,9 +390,31 @@
- \fB\-p\fR
- Ignore padding specifications when comparing strings.
- .TP 5
-+\fB\-Q\fR \fIn\fR
-+Rather than show source in terminfo (text) format,
-+print the compiled (binary) format in hexadecimal or base64 form,
-+depending on the option's value:
-+.RS 8
-+.TP 3
-+1
-+hexadecimal
-+.TP 3
-+2
-+base64
-+.TP 3
-+3
-+hexadecimal and base64
-+.RE
-+.TP 5
- \fB\-q\fR
-+This makes the output a little shorter:
-+.RS
-+.bP
- Make the comparison listing shorter by omitting subheadings, and using
- "\-" for absent capabilities, "@" for canceled rather than "NULL".
-+.bP
-+Omit the "Reconstructed from" comment for source listings.
-+.RE
- .TP 5
- \fB\-R\fR\fIsubset\fR
- Restrict output to a given subset.
-Index: man/tic.1m
-Prereq:  1.60 
---- ncurses-6.0-20150822+/man/tic.1m	2014-05-24 22:00:11.000000000 +0000
-+++ ncurses-6.0-20150905/man/tic.1m	2015-09-05 20:45:49.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tic.1m,v 1.60 2014/05/24 22:00:11 tom Exp $
-+.\" $Id: tic.1m,v 1.61 2015/09/05 20:45:49 tom Exp $
- .TH @TIC@ 1M ""
- .ie \n(.g .ds `` \(lq
- .el       .ds `` ``
-@@ -58,6 +58,7 @@
- c\
- f\
- g\
-+q\
- r\
- s\
- t\
-@@ -65,6 +66,7 @@
- \fR]
- [\fB\-e\fR \fInames\fR]
- [\fB\-o\fR \fIdir\fR]
-+[\fB\-Q\fR[\fIn\fR]]
- [\fB\-R\fR \fIsubset\fR]
- [\fB\-v\fR[\fIn\fR]]
- [\fB\-w\fR[\fIn\fR]]
-@@ -243,6 +245,25 @@
- Write compiled entries to given database location.
- Overrides the TERMINFO environment variable.
- .TP
-+\fB\-Q\fR\fIn\fR
-+Rather than show source in terminfo (text) format,
-+print the compiled (binary) format in hexadecimal or base64 form,
-+depending on the option's value:
-+.RS 8
-+.TP 3
-+1
-+hexadecimal
-+.TP 3
-+2
-+base64
-+.TP 3
-+3
-+hexadecimal and base64
-+.RE
-+.TP
-+\fB\-q\fR
-+Suppress comments and blank lines when showing translated source.
-+.TP
- \fB\-R\fR\fIsubset\fR
- Restrict output to a given subset.
- This option is for use with archaic
-Index: man/toe.1m
-Prereq:  1.26 
---- ncurses-6.0-20150822+/man/toe.1m	2012-01-01 00:40:51.000000000 +0000
-+++ ncurses-6.0-20150905/man/toe.1m	2015-08-29 22:04:48.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2011,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: toe.1m,v 1.26 2012/01/01 00:40:51 tom Exp $
-+.\" $Id: toe.1m,v 1.27 2015/08/29 22:04:48 tom Exp $
- .TH @TOE@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
-@@ -58,6 +58,9 @@
- showing (like \fBconflict\fP(1)) which entries which 
- belong to a given terminal database.
- An "*" marks entries which differ, and "+" marks equivalent entries.
-+.IP
-+Without the \fB\-s\fP option, \fB@TOE@\fR does not attempt to merge
-+duplicates in its report
- .TP
- \fB\-s\fR
- sort the output by the entry names.
-Index: ncurses/tinfo/write_entry.c
-Prereq:  1.92 
---- ncurses-6.0-20150822+/ncurses/tinfo/write_entry.c	2014-11-01 14:47:00.000000000 +0000
-+++ ncurses-6.0-20150905/ncurses/tinfo/write_entry.c	2015-09-05 21:24:29.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -47,12 +47,11 @@
- #define TRACE_OUT(p)		/*nothing */
- #endif
- 
--MODULE_ID("$Id: write_entry.c,v 1.92 2014/11/01 14:47:00 tom Exp $")
-+MODULE_ID("$Id: write_entry.c,v 1.93 2015/09/05 21:24:29 tom Exp $")
- 
- static int total_written;
- 
- static int make_db_root(const char *);
--static int write_object(TERMTYPE *, char *, unsigned *, unsigned);
- 
- #if !USE_HASHED_DB
- static void
-@@ -69,7 +68,7 @@
-     }
-     DEBUG(1, ("Created %s", filename));
- 
--    if (write_object(tp, buffer, &offset, limit) == ERR
-+    if (_nc_write_object(tp, buffer, &offset, limit) == ERR
- 	|| fwrite(buffer, sizeof(char), (size_t) offset, fp) != offset) {
- 	_nc_syserr_abort("error writing %s/%s", _nc_tic_dir(0), filename);
-     }
-@@ -316,7 +315,7 @@
-     _nc_set_type(first_name);
- 
- #if USE_HASHED_DB
--    if (write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {
-+    if (_nc_write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {
- 	DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE);
- 	DBT key, data;
- 
-@@ -620,8 +619,8 @@
- }
- #endif
- 
--static int
--write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
-+NCURSES_EXPORT(int)
-+_nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
- {
-     char *namelist;
-     size_t namelen, boolmax, nummax, strmax;
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150822+/package/debian-mingw/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian-mingw/changelog	2015-09-05 21:14:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150822) unstable; urgency=low
-+ncurses6 (6.0+20150905) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Aug 2015 04:41:12 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Sep 2015 17:14:03 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150822+/package/debian-mingw64/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian-mingw64/changelog	2015-09-05 21:14:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150822) unstable; urgency=low
-+ncurses6 (6.0+20150905) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Aug 2015 04:41:12 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Sep 2015 17:14:03 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150822+/package/debian/changelog	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/debian/changelog	2015-09-05 21:14:03.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150822) unstable; urgency=low
-+ncurses6 (6.0+20150905) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 17 Aug 2015 04:41:12 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Sep 2015 17:14:03 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.120 
---- ncurses-6.0-20150822+/package/mingw-ncurses.nsi	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/mingw-ncurses.nsi	2015-09-05 21:14:03.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.120 2015/08/17 08:41:12 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.122 2015/09/05 21:14:03 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0822"

-+!define VERSION_MMDD  "0905"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150822+/package/mingw-ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/mingw-ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150822
-+Release: 20150905
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.map
-Prereq:  1.34 
---- ncurses-6.0-20150822+/package/ncurses.map	2015-06-27 22:28:50.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.map	2015-09-05 19:27:16.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncurses.map,v 1.34 2015/06/27 22:28:50 tom Exp $
-+# $Id: ncurses.map,v 1.35 2015/09/05 19:27:16 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -806,6 +806,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncurses.spec
---- ncurses-6.0-20150822+/package/ncurses.spec	2015-08-17 08:41:12.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150822
-+Release: 20150905
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.sym
-Prereq:  1.23 
---- ncurses-6.0-20150822+/package/ncurses.sym	2015-06-27 22:30:44.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncurses.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncurses.sym,v 1.23 2015/06/27 22:30:44 tom Exp $
-+# $Id: ncurses.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -231,6 +231,7 @@
- _nc_viscbuf
- _nc_warning
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracechar
-Index: package/ncursest.map
-Prereq:  1.30 
---- ncurses-6.0-20150822+/package/ncursest.map	2015-07-11 13:01:10.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursest.map	2015-09-05 19:35:45.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursest.map,v 1.30 2015/07/11 13:01:10 tom Exp $
-+# $Id: ncursest.map,v 1.31 2015/09/05 19:35:45 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -105,6 +105,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncursest.sym
-Prereq:  1.25 
---- ncurses-6.0-20150822+/package/ncursest.sym	2015-07-11 23:33:50.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursest.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursest.sym,v 1.25 2015/07/11 23:33:50 tom Exp $
-+# $Id: ncursest.sym,v 1.26 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -233,6 +233,7 @@
- _nc_viscbuf
- _nc_warning
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracechtype
-Index: package/ncursestw.map
-Prereq:  1.31 
---- ncurses-6.0-20150822+/package/ncursestw.map	2015-07-11 13:02:44.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursestw.map	2015-09-05 19:35:05.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursestw.map,v 1.31 2015/07/11 13:02:44 tom Exp $
-+# $Id: ncursestw.map,v 1.32 2015/09/05 19:35:05 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -105,6 +105,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncursestw.sym
-Prereq:  1.23 
---- ncurses-6.0-20150822+/package/ncursestw.sym	2015-07-11 23:33:35.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursestw.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursestw.sym,v 1.23 2015/07/11 23:33:35 tom Exp $
-+# $Id: ncursestw.sym,v 1.24 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -238,6 +238,7 @@
- _nc_warning
- _nc_wcrtomb
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracecchar_t
-Index: package/ncursesw.map
-Prereq:  1.36 
---- ncurses-6.0-20150822+/package/ncursesw.map	2015-06-27 22:26:52.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursesw.map	2015-09-05 19:33:48.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursesw.map,v 1.36 2015/06/27 22:26:52 tom Exp $
-+# $Id: ncursesw.map,v 1.37 2015/09/05 19:33:48 tom Exp $
- # script for shared library symbol-versioning using ld
- #
- # This file was generated by ncu-mapsyms
-@@ -114,6 +114,13 @@
- 		_nc_strict_bsd;
- } NCURSES_TIC_5.7.20081102;
- 
-+NCURSES_TIC_6.0.current {
-+	global:
-+		_nc_write_object;
-+	local:
-+		_*;
-+} NCURSES_TIC_5.9.20150530;
-+
- NCURSES_TINFO_5.0.19991023 {
- 	global:
- 		BC;
-Index: package/ncursesw.sym
-Prereq:  1.24 
---- ncurses-6.0-20150822+/package/ncursesw.sym	2015-06-27 22:30:29.000000000 +0000
-+++ ncurses-6.0-20150905/package/ncursesw.sym	2015-09-05 19:36:49.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: ncursesw.sym,v 1.24 2015/06/27 22:30:29 tom Exp $
-+# $Id: ncursesw.sym,v 1.25 2015/09/05 19:36:49 tom Exp $
- # script for shared library symbol-visibility using libtool
- #
- # This file was generated by ncu-mapsyms
-@@ -233,6 +233,7 @@
- _nc_wchstrlen
- _nc_wcrtomb
- _nc_write_entry
-+_nc_write_object
- _traceattr
- _traceattr2
- _tracecchar_t
-Index: progs/dump_entry.c
-Prereq:  1.118 
---- ncurses-6.0-20150822+/progs/dump_entry.c	2015-07-07 08:06:39.000000000 +0000
-+++ ncurses-6.0-20150905/progs/dump_entry.c	2015-09-05 23:31:12.000000000 +0000
-@@ -39,9 +39,8 @@
- #include "termsort.c"		/* this C file is generated */
- #include <parametrized.h>	/* so is this */
- 
--MODULE_ID("$Id: dump_entry.c,v 1.118 2015/07/07 08:06:39 Werner.Fink Exp $")
-+MODULE_ID("$Id: dump_entry.c,v 1.123 2015/09/05 23:31:12 tom Exp $")
- 
--#define INDENT			8
- #define DISCARD(string) string = ABSENT_STRING
- #define PRINTF (void) printf
- 
-@@ -62,6 +61,7 @@
- static int oldcol;		/* last value of column before wrap */
- static bool pretty;		/* true if we format if-then-else strings */
- static bool checking;		/* true if we are checking for tic */
-+static int quickdump;		/* true if we are dumping compiled data */
- 
- static char *save_sgr;
- 
-@@ -75,6 +75,7 @@
- static NCURSES_CONST char *const *str_names;
- 
- static const char *separator = "", *trailer = "";
-+static int indent = 8;
- 
- /* cover various ports and variants of terminfo */
- #define V_ALLCAPS	0	/* all capabilities (SVr4, XSI, ncurses) */
-@@ -193,13 +194,15 @@
- 	  int theight,
- 	  unsigned traceval,
- 	  bool formatted,
--	  bool check)
-+	  bool check,
-+	  int quick)
- /* set up for entry display */
- {
-     width = twidth;
-     height = theight;
-     pretty = formatted;
-     checking = check;
-+    quickdump = (quick & 3);
- 
-     /* versions */
-     if (version == 0)
-@@ -244,6 +247,7 @@
- 	trailer = "\\\n\t:";
- 	break;
-     }
-+    indent = 8;
- 
-     /* implement sort modes */
-     switch (sortmode = sort) {
-@@ -413,7 +417,7 @@
-     oldcol = column;
-     trim_trailing();
-     strcpy_DYN(&outbuf, trailer);
--    column = INDENT;
-+    column = indent;
- }
- 
- static void
-@@ -422,7 +426,7 @@
-     size_t need = strlen(src);
-     size_t want = strlen(separator) + need;
- 
--    if (column > INDENT
-+    if (column > indent
- 	&& column + (int) want > width) {
- 	force_wrap();
-     }
-@@ -628,7 +632,7 @@
- 
-     strcpy_DYN(&outbuf, 0);
-     if (content_only) {
--	column = INDENT;	/* FIXME: workaround to prevent empty lines */
-+	column = indent;	/* FIXME: workaround to prevent empty lines */
-     } else {
- 	strcpy_DYN(&outbuf, tterm->term_names);
- 
-@@ -671,7 +675,7 @@
- 	}
-     }
- 
--    if (column != INDENT && height > 1)
-+    if (column != indent && height > 1)
- 	force_wrap();
- 
-     for_each_number(j, tterm) {
-@@ -699,7 +703,7 @@
- 	}
-     }
- 
--    if (column != INDENT && height > 1)
-+    if (column != indent && height > 1)
- 	force_wrap();
- 
-     len += (int) (num_bools
-@@ -1112,6 +1116,34 @@
-     return result;
- }
- 
-+static void
-+encode_b64(char *target, char *source, unsigned state, int *saved)
-+{
-+    /* RFC-4648 */
-+    static const char data[] =
-+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-+    "abcdefghijklmnopqrstuvwxyz"
-+    "0123456789" "-_";
-+    int ch = UChar(source[state]);
-+
-+    switch (state % 3) {
-+    case 0:
-+	*target++ = data[ch & 077];
-+	*saved = (ch >> 6) & 3;
-+	break;
-+    case 1:
-+	*target++ = data[((ch << 2) | *saved) & 077];
-+	*saved = (ch >> 4) & 017;
-+	break;
-+    case 2:
-+	*target++ = data[((ch << 4) | *saved) & 077];
-+	*target++ = data[(ch >> 2) & 077];
-+	*saved = 0;
-+	break;
-+    }
-+    *target = '\0';
-+}
-+
- /*
-  * Dump a single entry.
-  */
-@@ -1127,6 +1159,48 @@
-     const char *legend;
-     bool infodump;
- 
-+    if (quickdump) {
-+	char bigbuf[65536];
-+	unsigned n;
-+	unsigned offset = 0;
-+	separator = "";
-+	trailer = "\n";
-+	indent = 0;
-+	if (_nc_write_object(tterm, bigbuf, &offset, sizeof(bigbuf)) == OK) {
-+	    char numbuf[80];
-+	    if (quickdump & 1) {
-+		if (outbuf.used)
-+		    wrap_concat("\n");
-+		wrap_concat("hex:");
-+		for (n = 0; n < offset; ++n) {
-+		    sprintf(numbuf, "%02X", UChar(bigbuf[n]));
-+		    wrap_concat(numbuf);
-+		}
-+	    }
-+	    if (quickdump & 2) {
-+		int value = 0;
-+		if (outbuf.used)
-+		    wrap_concat("\n");
-+		wrap_concat("b64:");
-+		for (n = 0; n < offset; ++n) {
-+		    encode_b64(numbuf, bigbuf, n, &value);
-+		    wrap_concat(numbuf);
-+		}
-+		switch (n % 3) {
-+		case 0:
-+		    break;
-+		case 1:
-+		    wrap_concat("===");
-+		    break;
-+		case 2:
-+		    wrap_concat("==");
-+		    break;
-+		}
-+	    }
-+	}
-+	return;
-+    }
-+
-     if (outform == F_TERMCAP || outform == F_TCONVERR) {
- 	critlen = MAX_TERMCAP_LENGTH;
- 	legend = "older termcap";
-@@ -1276,8 +1350,10 @@
- 	}
- 	outbuf.text[outbuf.used] = '\0';
-     }
--    (void) fputs(outbuf.text, stdout);
--    putchar('\n');
-+    if (outbuf.text != 0) {
-+	(void) fputs(outbuf.text, stdout);
-+	putchar('\n');
-+    }
-     return (int) outbuf.used;
- }
- 
-Index: progs/dump_entry.h
-Prereq:  1.35 
---- ncurses-6.0-20150822+/progs/dump_entry.h	2015-05-27 00:56:54.000000000 +0000
-+++ ncurses-6.0-20150905/progs/dump_entry.h	2015-09-05 15:49:58.000000000 +0000
-@@ -33,7 +33,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: dump_entry.h,v 1.35 2015/05/27 00:56:54 tom Exp $
-+ * $Id: dump_entry.h,v 1.37 2015/09/05 15:49:58 tom Exp $
-  *
-  * Dump control definitions and variables
-  */
-@@ -72,7 +72,8 @@
- extern int show_entry(void);
- extern void compare_entry(PredHook, TERMTYPE *, bool);
- extern void dump_entry(TERMTYPE *, int, int, int, PredFunc);
--extern void dump_init(const char *, int, int, int, int, unsigned, bool, bool);
-+extern void dump_init(const char *, int, int, int, int, unsigned, bool,
-+		      bool, int);
- extern void dump_uses(const char *, bool);
- extern void repair_acsc(TERMTYPE *tp);
- 
-Index: progs/infocmp.c
-Prereq:  1.134 
---- ncurses-6.0-20150822+/progs/infocmp.c	2015-08-22 23:54:25.000000000 +0000
-+++ ncurses-6.0-20150905/progs/infocmp.c	2015-09-05 15:49:57.000000000 +0000
-@@ -42,7 +42,7 @@
- 
- #include <dump_entry.h>
- 
--MODULE_ID("$Id: infocmp.c,v 1.134 2015/08/22 23:54:25 tom Exp $")
-+MODULE_ID("$Id: infocmp.c,v 1.136 2015/09/05 15:49:57 tom Exp $")
- 
- #define L_CURL "{"
- #define R_CURL "}"
-@@ -989,7 +989,8 @@
-     int i, n;
- 
-     memset(heads, 0, sizeof(heads));
--    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE, FALSE);
-+    dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE,
-+	      FALSE, FALSE);
- 
-     for (n = 0; n < argc && n < MAXCOMPARE; n++) {
- 	if (freopen(argv[n], "r", stdin) == 0)
-@@ -1197,6 +1198,7 @@
- 	,"  -l    output terminfo names"
- 	,"  -n    list capabilities in neither"
- 	,"  -p    ignore padding specifiers"
-+	,"  -Q number  dump compiled description"
- 	,"  -q    brief listing, removes headers"
- 	,"  -r    with -C, output in termcap form"
- 	,"  -r    with -F, resolve use-references"
-@@ -1506,6 +1508,7 @@
-     int initdump = 0;
-     bool init_analyze = FALSE;
-     bool suppress_untranslatable = FALSE;
-+    int quickdump = 0;
- 
-     /* where is the terminfo database location going to default to? */
-     restdir = firstdir = 0;
-@@ -1527,7 +1530,7 @@
- 
-     while ((c = getopt(argc,
- 		       argv,
--		       "01A:aB:CcDdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) {
-+		       "01A:aB:CcDdEeFfGgIiKLlnpQ:qR:rs:TtUuVv:w:x")) != -1) {
- 	switch (c) {
- 	case '0':
- 	    mwidth = 65535;
-@@ -1628,6 +1631,10 @@
- 	    ignorepads = TRUE;
- 	    break;
- 
-+	case 'Q':
-+	    quickdump = optarg_to_number();
-+	    break;
-+
- 	case 'q':
- 	    quiet = TRUE;
- 	    s_absent = "-";
-@@ -1751,7 +1758,7 @@
- 
-     /* set up for display */
-     dump_init(tversion, outform, sortmode, mwidth, mheight, itrace,
--	      formatted, FALSE);
-+	      formatted, FALSE, quickdump);
- 
-     if (!filecompare) {
- 	/* grab the entries */
-@@ -1852,8 +1859,10 @@
- 				   "%s: about to dump %s\n",
- 				   _nc_progname,
- 				   tname[0]);
--		(void) printf("#\tReconstructed via infocmp from file: %s\n",
--			      tfile[0]);
-+		if (!quiet)
-+		    (void)
-+				  printf("#\tReconstructed via infocmp from file: %s\n",
-+				  tfile[0]);
- 		dump_entry(&entries[0].tterm,
- 			   suppress_untranslatable,
- 			   limited,
-Index: progs/tic.c
-Prereq:  1.213 
---- ncurses-6.0-20150822+/progs/tic.c	2015-08-22 23:49:57.000000000 +0000
-+++ ncurses-6.0-20150905/progs/tic.c	2015-09-05 19:22:49.000000000 +0000
-@@ -48,7 +48,7 @@
- #include <parametrized.h>
- #include <transform.h>
- 
--MODULE_ID("$Id: tic.c,v 1.213 2015/08/22 23:49:57 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.216 2015/09/05 19:22:49 tom Exp $")
- 
- #define STDIN_NAME "<stdin>"
- 
-@@ -159,6 +159,8 @@
- 	DATA("  -L         translate entries to full terminfo source form")
- 	DATA("  -N         disable smart defaults for source translation")
- 	DATA("  -o<dir>    set output directory for compiled entry writes")
-+	DATA("  -Q[n]      dump compiled description")
-+	DATA("  -q    brief listing, removes headers")
- 	DATA("  -R<name>   restrict translation to given terminfo/termcap version")
- 	DATA("  -r         force resolution of all use entries in source translation")
- 	DATA("  -s         print summary statistics")
-@@ -660,6 +662,12 @@
-     }
- }
- 
-+static void
-+add_digit(int *target, int source)
-+{
-+    *target = (*target * 10) + (source - '0');
-+}
-+
- #define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0))
- 
- int
-@@ -690,6 +698,8 @@
-     char *outdir = (char *) NULL;
-     bool check_only = FALSE;
-     bool suppress_untranslatable = FALSE;
-+    int quickdump = 0;
-+    bool quiet = FALSE;
- 
-     log_fp = stderr;
- 
-@@ -715,14 +725,17 @@
-      * be optional.
-      */
-     while ((this_opt = getopt(argc, argv,
--			      "0123456789CDIKLNR:TUVace:fGgo:rstvwx")) != -1) {
-+			      "0123456789CDIKLNQR:TUVace:fGgo:qrstvwx")) != -1) {
- 	if (isdigit(this_opt)) {
- 	    switch (last_opt) {
-+	    case 'Q':
-+		add_digit(&quickdump, this_opt);
-+		break;
- 	    case 'v':
--		v_opt = (v_opt * 10) + (this_opt - '0');
-+		add_digit(&v_opt, this_opt);
- 		break;
- 	    case 'w':
--		width = (width * 10) + (this_opt - '0');
-+		add_digit(&width, this_opt);
- 		break;
- 	    default:
- 		switch (this_opt) {
-@@ -773,6 +786,9 @@
- 	    smart_defaults = FALSE;
- 	    literal = TRUE;
- 	    break;
-+	case 'Q':
-+	    quickdump = 0;
-+	    break;
- 	case 'R':
- 	    tversion = optarg;
- 	    break;
-@@ -803,6 +819,9 @@
- 	case 'o':
- 	    outdir = optarg;
- 	    break;
-+	case 'q':
-+	    quiet = TRUE;
-+	    break;
- 	case 'r':
- 	    forceresolve = TRUE;
- 	    break;
-@@ -914,11 +933,11 @@
- 		  ? outform
- 		  : F_LITERAL,
- 		  sortmode, width, height, debug_level, formatted ||
--		  check_only, check_only);
-+		  check_only, check_only, quickdump);
-     } else if (capdump) {
- 	dump_init(tversion,
- 		  outform,
--		  sortmode, width, height, debug_level, FALSE, FALSE);
-+		  sortmode, width, height, debug_level, FALSE, FALSE, FALSE);
-     }
- 
-     /* parse entries out of the source file */
-@@ -989,12 +1008,14 @@
- 		    /* this is in case infotocap() generates warnings */
- 		    _nc_set_type(_nc_first_name(qp->tterm.term_names));
- 
--		    (void) fseek(tmp_fp, qp->cstart, SEEK_SET);
--		    while (j-- > 0) {
--			if (infodump)
--			    (void) putchar(fgetc(tmp_fp));
--			else
--			    put_translate(fgetc(tmp_fp));
-+		    if (!quiet) {
-+			(void) fseek(tmp_fp, qp->cstart, SEEK_SET);
-+			while (j-- > 0) {
-+			    if (infodump)
-+				(void) putchar(fgetc(tmp_fp));
-+			    else
-+				put_translate(fgetc(tmp_fp));
-+			}
- 		    }
- 
- 		    repair_acsc(&qp->tterm);
-@@ -1007,7 +1028,7 @@
- 			printf("# length=%d\n", len);
- 		}
- 	    }
--	    if (!namelst && _nc_tail) {
-+	    if (!namelst && _nc_tail && !quiet) {
- 		int c, oldc = '\0';
- 		bool in_comment = FALSE;
- 		bool trailing_comment = FALSE;
diff --git a/patches/ncurses/6.0/140-ncurses-6.0-20150912.patch b/patches/ncurses/6.0/140-ncurses-6.0-20150912.patch
deleted file mode 100644
index 4d698f4..0000000
--- a/patches/ncurses/6.0/140-ncurses-6.0-20150912.patch
+++ /dev/null
@@ -1,10769 +0,0 @@
-# ncurses 6.0 - patch 20150912 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150912.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Sep 13 00:36:49 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |   16 
-# VERSION                          |    2 
-# aclocal.m4                       |   68 
-# configure                        | 3106 ++++++++++++++++++-------------------
-# dist.mk                          |    4 
-# include/ncurses_cfg.hin          |    8 
-# ncurses/base/lib_screen.c        |    3 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# 13 files changed, 1651 insertions(+), 1576 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2490 
---- ncurses-6.0-20150905+/NEWS	2015-09-05 21:14:36.000000000 +0000
-+++ ncurses-6.0-20150912/NEWS	2015-09-12 19:52:57.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2490 2015/09/05 21:14:36 tom Exp $
-+-- $Id: NEWS,v 1.2493 2015/09/12 19:52:57 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,18 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150912
-+	+ fixes for configure/build using clang on OSX (prompted by report by
-+	  William Gallafent).
-+	  + do not redefine "inline" in ncurses_cfg.h; this was originally to
-+	    solve a problem with gcc/g++, but is aggravated by clang's misuse
-+	    of symbols to pretend it is gcc.
-+	  + add braces to configure script to prevent unwanted add of
-+	    "-lstdc++" to the CXXLIBS symbol.
-+	  + improve/update test-program used for checking existence of stdc++
-+	    library.
-+	  + if $CXXLIBS is set, the linkage test uses that in addition to $LIBS
-+
- 20150905
- 	+ add note in curs_addch.3x about line-drawing when it depends upon
- 	  UTF-8.
-@@ -62,7 +74,7 @@
- 	+ documented differences in ESCDELAY versus AIX's implementation.
- 	+ fix some compiler warnings from ports.
- 	+ modify --with-pkg-config-libdir option to make it possible to install
--	  ".pc" files even if pkg-config is not found (adapted by patch by
-+	  ".pc" files even if pkg-config is not found (adapted from patch by
- 	  Joshua Root).
- 
- 20150815
-Index: VERSION
---- ncurses-6.0-20150905+/VERSION	2015-09-05 21:14:02.000000000 +0000
-+++ ncurses-6.0-20150912/VERSION	2015-09-12 16:17:30.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150905
-+5:0:9	6.0	20150912
-Index: aclocal.m4
-Prereq:  1.765 
---- ncurses-6.0-20150905+/aclocal.m4	2015-08-22 21:12:39.000000000 +0000
-+++ ncurses-6.0-20150912/aclocal.m4	2015-09-12 20:00:59.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.765 2015/08/22 21:12:39 tom Exp $
-+dnl $Id: aclocal.m4,v 1.767 2015/09/12 20:00:59 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -1693,7 +1693,7 @@
- unset $1
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_DLSYM version: 3 updated: 2012/10/06 11:17:15
-+dnl CF_FUNC_DLSYM version: 4 updated: 2015/09/12 14:46:44
- dnl -------------
- dnl Test for dlsym() and related functions, as well as libdl.
- dnl
-@@ -1710,7 +1710,7 @@
- 	cf_have_libdl=yes])])
- 
- if test "$cf_have_dlsym" = yes ; then
--	test "$cf_have_libdl" = yes && CF_ADD_LIB(dl)
-+	test "$cf_have_libdl" = yes && { CF_ADD_LIB(dl) }
- 
- 	AC_MSG_CHECKING(whether able to link to dl*() functions)
- 	AC_TRY_LINK([#include <dlfcn.h>],[
-@@ -1793,7 +1793,7 @@
- test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_OPENPTY version: 4 updated: 2015/04/18 08:56:57
-+dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
- dnl ---------------
- dnl Check for openpty() function, along with <pty.h> header.  It may need the
- dnl "util" library as well.
-@@ -1802,7 +1802,7 @@
- AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
- AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
- 	cf_save_LIBS="$LIBS"
--	test $cf_cv_lib_util = yes && CF_ADD_LIB(util)
-+	test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	AC_TRY_LINK([
-@@ -6247,33 +6247,51 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_STDCPP_LIBRARY version: 8 updated: 2015/04/17 21:13:04
-+dnl CF_STDCPP_LIBRARY version: 10 updated: 2015/09/12 15:53:39
- dnl -----------------
- dnl Check for -lstdc++, which is GNU's standard C++ library.
-+dnl If $CXXLIBS is set, add that to the libraries used for test-linking.
-+dnl If -lstdc++ was not already added to $LIBS or $CXXLIBS, and is needed,
-+dnl add it to $CXXLIBS.
- AC_DEFUN([CF_STDCPP_LIBRARY],
- [
- if test -n "$GXX" ; then
--case $cf_cv_system_name in
--(os2*)
--	cf_stdcpp_libname=stdcpp
--	;;
--(*)
--	cf_stdcpp_libname=stdc++
--	;;
--esac
--AC_CACHE_CHECK(for library $cf_stdcpp_libname,cf_cv_libstdcpp,[
-+
- 	cf_save="$LIBS"
--	CF_ADD_LIB($cf_stdcpp_libname)
--AC_TRY_LINK([
--#include <strstream.h>],[
--char buf[80];
--strstreambuf foo(buf, sizeof(buf))
--],
--	[cf_cv_libstdcpp=yes],
--	[cf_cv_libstdcpp=no])
-+	LIBS="$LIBS $CXXLIBS"
-+	AC_MSG_CHECKING(if we already have C++ library)
-+	AC_TRY_LINK([
-+			#include <iostream>],[
-+			std::cout << "Hello World!" << std::endl;],
-+		[cf_have_libstdcpp=yes],
-+		[cf_have_libstdcpp=no])
-+	AC_MSG_RESULT($cf_have_libstdcpp)
- 	LIBS="$cf_save"
--])
--test "$cf_cv_libstdcpp" = yes && CF_ADD_LIB($cf_stdcpp_libname,CXXLIBS)
-+
-+	if test $cf_have_libstdcpp != yes
-+	then
-+		case $cf_cv_system_name in
-+		(os2*)
-+			cf_stdcpp_libname=stdcpp
-+			;;
-+		(*)
-+			cf_stdcpp_libname=stdc++
-+			;;
-+		esac
-+
-+		AC_CACHE_CHECK(for library $cf_stdcpp_libname,cf_cv_libstdcpp,[
-+			cf_save="$LIBS"
-+			LIBS="$LIBS $CXXLIBS"
-+			CF_ADD_LIB($cf_stdcpp_libname)
-+		AC_TRY_LINK([
-+				#include <iostream>],[
-+				std::cout << "Hello World!" << std::endl;],
-+			[cf_cv_libstdcpp=yes],
-+			[cf_cv_libstdcpp=no])
-+			LIBS="$cf_save"
-+		])
-+		test "$cf_cv_libstdcpp" = yes && { CF_ADD_LIB($cf_stdcpp_libname,CXXLIBS) }
-+	fi
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-Index: configure
---- ncurses-6.0-20150905+/configure	2015-08-22 21:08:03.000000000 +0000
-+++ ncurses-6.0-20150912/configure	2015-09-12 20:01:47.000000000 +0000
-@@ -5456,7 +5456,7 @@
- fi
- 
- if test "$cf_have_dlsym" = yes ; then
--	test "$cf_have_libdl" = yes &&
-+	test "$cf_have_libdl" = yes && {
- cf_add_libs="-ldl"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
- for cf_add_1lib in $LIBS
-@@ -5472,11 +5472,12 @@
- 	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
- done
- LIBS="$cf_add_libs"
-+ }
- 
--	echo "$as_me:5476: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:5477: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5479 "configure"
-+#line 5480 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- int
-@@ -5494,16 +5495,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5497: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5498: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5500: \$? = $ac_status" >&5
-+  echo "$as_me:5501: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5503: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5504: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5506: \$? = $ac_status" >&5
-+  echo "$as_me:5507: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -5514,15 +5515,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:5517: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:5518: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5522: result: ok" >&5
-+	echo "$as_me:5523: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:5525: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:5526: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5530,12 +5531,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:5533: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5534: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5538: checking for soname of gpm library" >&5
-+echo "$as_me:5539: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5569,15 +5570,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:5572: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5573: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5575: \$? = $ac_status" >&5
-+  echo "$as_me:5576: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5577: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5578: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5580: \$? = $ac_status" >&5
-+  echo "$as_me:5581: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5588,7 +5589,7 @@
- fi
- 
- fi
--echo "$as_me:5591: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5592: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -5623,7 +5624,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5626: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5627: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5631,7 +5632,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5634 "configure"
-+#line 5635 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5650,16 +5651,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5653: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5654: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5656: \$? = $ac_status" >&5
-+  echo "$as_me:5657: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5659: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5660: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5662: \$? = $ac_status" >&5
-+  echo "$as_me:5663: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -5670,11 +5671,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5673: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5674: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:5677: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5678: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5698,15 +5699,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5702: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5704: \$? = $ac_status" >&5
-+  echo "$as_me:5705: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5706: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5709: \$? = $ac_status" >&5
-+  echo "$as_me:5710: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5718,11 +5719,11 @@
- fi
- 
- fi
--echo "$as_me:5721: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5722: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:5725: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5726: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -5732,7 +5733,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:5735: checking if you want to use sysmouse" >&5
-+echo "$as_me:5736: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5744,7 +5745,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5747 "configure"
-+#line 5748 "configure"
- #include "confdefs.h"
- 
- #include <osreldate.h>
-@@ -5767,16 +5768,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5771: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5773: \$? = $ac_status" >&5
-+  echo "$as_me:5774: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5777: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5779: \$? = $ac_status" >&5
-+  echo "$as_me:5780: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -5786,7 +5787,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:5789: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5790: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -5805,7 +5806,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5808: checking for default loader flags" >&5
-+echo "$as_me:5809: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (libtool) LD_MODEL=''   ;;
-@@ -5814,13 +5815,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5817: result: $LD_MODEL" >&5
-+echo "$as_me:5818: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5823: checking if rpath option should be used" >&5
-+echo "$as_me:5824: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5830,10 +5831,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5833: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5834: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5836: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5837: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -5843,7 +5844,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5846: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5847: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5852,7 +5853,7 @@
- rel_builddir=..
- 
- LD_RPATH_OPT=
--echo "$as_me:5855: checking for an rpath option" >&5
-+echo "$as_me:5856: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -5883,12 +5884,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:5886: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5887: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:5891: checking if we need a space after rpath option" >&5
-+	echo "$as_me:5892: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -5909,7 +5910,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5912 "configure"
-+#line 5913 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5921,16 +5922,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5924: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5927: \$? = $ac_status" >&5
-+  echo "$as_me:5928: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5930: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5933: \$? = $ac_status" >&5
-+  echo "$as_me:5934: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5940,7 +5941,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:5943: result: $cf_rpath_space" >&5
-+	echo "$as_me:5944: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -5961,7 +5962,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5964: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5965: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5976,9 +5977,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5979: result: $withval" >&5
-+		echo "$as_me:5980: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5981: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5982: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5987,7 +5988,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5990: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5991: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -5997,14 +5998,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:6000: checking which $CC option to use" >&5
-+		echo "$as_me:6001: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6007 "configure"
-+#line 6008 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6016,16 +6017,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6019: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6020: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6022: \$? = $ac_status" >&5
-+  echo "$as_me:6023: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6026: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6028: \$? = $ac_status" >&5
-+  echo "$as_me:6029: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6034,7 +6035,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6037: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6038: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6105,7 +6106,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6108: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6109: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6114,7 +6115,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6117 "configure"
-+#line 6118 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6126,16 +6127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6129: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6132: \$? = $ac_status" >&5
-+  echo "$as_me:6133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6138: \$? = $ac_status" >&5
-+  echo "$as_me:6139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6146,7 +6147,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6149: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6150: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6371,7 +6372,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6374 "configure"
-+#line 6375 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6383,16 +6384,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6386: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6387: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6389: \$? = $ac_status" >&5
-+  echo "$as_me:6390: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6392: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6393: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6395: \$? = $ac_status" >&5
-+  echo "$as_me:6396: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6429,7 +6430,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6432: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6433: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6439,7 +6440,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 6442 "${as_me:-configure}"
-+#line 6443 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -6451,18 +6452,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6454: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6455: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6459: \$? = $ac_status" >&5
-+  echo "$as_me:6460: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6461: result: yes" >&5
-+				echo "$as_me:6462: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6465: result: no" >&5
-+				echo "$as_me:6466: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6477,17 +6478,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6480: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6481: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6484: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6485: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6490: checking for additional libtool options" >&5
-+echo "$as_me:6491: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6497,7 +6498,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6500: result: $with_libtool_opts" >&5
-+echo "$as_me:6501: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6508,7 +6509,7 @@
- 	;;
- esac
- 
--echo "$as_me:6511: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6512: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6523,7 +6524,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6526: result: $with_export_syms" >&5
-+echo "$as_me:6527: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6534,12 +6535,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6537: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6538: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6542: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6543: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6554,7 +6555,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6557: result: $with_versioned_syms" >&5
-+echo "$as_me:6558: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6570,7 +6571,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6573: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6574: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6578,11 +6579,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6581: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6582: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6585: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6586: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6594,7 +6595,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6597: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6598: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6631,7 +6632,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <<EOF
--#line 6634 "configure"
-+#line 6635 "configure"
- int	_ismissing(void) { return 1; }
- int	_localf1(void) { return 1; }
- int	_localf2(void) { return 2; }
-@@ -6662,7 +6663,7 @@
- 			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6665: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6666: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6673,7 +6674,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6676: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6677: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6690,13 +6691,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6693: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6694: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6699: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6700: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -6713,21 +6714,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6716: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6717: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:6720: checking for updated LDFLAGS" >&5
-+echo "$as_me:6721: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:6723: result: maybe" >&5
-+	echo "$as_me:6724: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:6730: checking for $ac_word" >&5
-+echo "$as_me:6731: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6742,7 +6743,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:6745: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6746: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6750,10 +6751,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6753: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6754: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6756: result: no" >&5
-+  echo "$as_me:6757: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6767,7 +6768,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6770 "configure"
-+#line 6771 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6779,16 +6780,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6782: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6783: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6785: \$? = $ac_status" >&5
-+  echo "$as_me:6786: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6788: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6789: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6791: \$? = $ac_status" >&5
-+  echo "$as_me:6792: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -6816,7 +6817,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6819: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6820: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6828,11 +6829,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6831: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6832: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6835: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6836: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6869,7 +6870,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6872: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6873: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6882,11 +6883,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6885: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6886: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6889: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6890: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6923,7 +6924,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6926: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6927: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6936,14 +6937,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6939: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6940: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6943: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6944: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6946: result: no" >&5
-+	echo "$as_me:6947: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6954,7 +6955,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6957: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6958: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6973,11 +6974,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6976: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6977: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6980: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6981: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6987,10 +6988,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6990: result: $with_overwrite" >&5
-+echo "$as_me:6991: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6993: checking if external terminfo-database is used" >&5
-+echo "$as_me:6994: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -7000,7 +7001,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:7003: result: $use_database" >&5
-+echo "$as_me:7004: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7016,7 +7017,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7019: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7020: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7024,10 +7025,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7027: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7028: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7030: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7031: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7037,13 +7038,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7040: result: $with_hashed_db" >&5
-+	echo "$as_me:7041: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7046: checking for list of fallback descriptions" >&5
-+echo "$as_me:7047: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7053,11 +7054,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7056: result: $with_fallback" >&5
-+echo "$as_me:7057: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7060: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7061: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7071,11 +7072,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7074: result: $with_xterm_new" >&5
-+echo "$as_me:7075: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7078: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7079: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7096,7 +7097,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7099: result: $with_xterm_kbs" >&5
-+echo "$as_me:7100: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7106,7 +7107,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7109: checking for list of terminfo directories" >&5
-+echo "$as_me:7110: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7146,7 +7147,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7149: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7150: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7169,14 +7170,14 @@
- 	;;
- esac
- 
--echo "$as_me:7172: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7173: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <<EOF
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:7179: checking for default terminfo directory" >&5
-+echo "$as_me:7180: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7212,7 +7213,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7215: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7216: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7221,7 +7222,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7224: result: $TERMINFO" >&5
-+echo "$as_me:7225: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -7232,7 +7233,7 @@
- 
- ###	use option --disable-big-core to make tic run on small machines
- ###	We need 4Mb, check if we can allocate 50% more than that.
--echo "$as_me:7235: checking if big-core option selected" >&5
-+echo "$as_me:7236: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7244,7 +7245,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7247 "configure"
-+#line 7248 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7258,15 +7259,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7261: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7264: \$? = $ac_status" >&5
-+  echo "$as_me:7265: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7266: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7267: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7269: \$? = $ac_status" >&5
-+  echo "$as_me:7270: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7278,7 +7279,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:7281: result: $with_big_core" >&5
-+echo "$as_me:7282: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7288,7 +7289,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7291: checking if big-strings option selected" >&5
-+echo "$as_me:7292: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7312,14 +7313,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7315: result: $with_big_strings" >&5
-+echo "$as_me:7316: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7322: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7323: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7329,14 +7330,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7332: result: $with_termcap" >&5
-+echo "$as_me:7333: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7339: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7340: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7349,13 +7350,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7352: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7353: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7358: checking for list of termcap files" >&5
-+	echo "$as_me:7359: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7395,7 +7396,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7398: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7399: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7418,7 +7419,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7421: result: $TERMPATH" >&5
-+	echo "$as_me:7422: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <<EOF
-@@ -7426,7 +7427,7 @@
- EOF
- 
- 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
--	echo "$as_me:7429: checking if fast termcap-loader is needed" >&5
-+	echo "$as_me:7430: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7436,14 +7437,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7439: result: $with_getcap" >&5
-+	echo "$as_me:7440: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7446: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7447: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7453,7 +7454,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7456: result: $with_getcap_cache" >&5
-+	echo "$as_me:7457: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7463,7 +7464,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7466: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7467: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7473,14 +7474,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7476: result: $with_home_terminfo" >&5
-+echo "$as_me:7477: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7483: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7484: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7490,7 +7491,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7493: result: $with_root_environ" >&5
-+echo "$as_me:7494: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7505,13 +7506,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7508: checking for $ac_func" >&5
-+echo "$as_me:7509: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7514 "configure"
-+#line 7515 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7542,16 +7543,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7545: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7546: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7548: \$? = $ac_status" >&5
-+  echo "$as_me:7549: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7551: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7552: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7554: \$? = $ac_status" >&5
-+  echo "$as_me:7555: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7561,7 +7562,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7564: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7565: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7578,13 +7579,13 @@
- 		symlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7581: checking for $ac_func" >&5
-+echo "$as_me:7582: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7587 "configure"
-+#line 7588 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7615,16 +7616,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7618: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7619: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7621: \$? = $ac_status" >&5
-+  echo "$as_me:7622: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7624: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7625: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7627: \$? = $ac_status" >&5
-+  echo "$as_me:7628: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7634,7 +7635,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7637: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7638: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7645,7 +7646,7 @@
- done
- 
- else
--	echo "$as_me:7648: checking if link/symlink functions work" >&5
-+	echo "$as_me:7649: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7658,7 +7659,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7661 "configure"
-+#line 7662 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -7688,15 +7689,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7691: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7692: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7694: \$? = $ac_status" >&5
-+  echo "$as_me:7695: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7697: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7699: \$? = $ac_status" >&5
-+  echo "$as_me:7700: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7714,7 +7715,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:7717: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7718: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7734,7 +7735,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7737: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7738: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7744,21 +7745,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:7747: result: $with_symlinks" >&5
-+	echo "$as_me:7748: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--	echo "$as_me:7754: checking if tic should use hard links" >&5
-+	echo "$as_me:7755: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:7761: result: $with_links" >&5
-+	echo "$as_me:7762: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7773,7 +7774,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7776: checking if you want broken-linker support code" >&5
-+echo "$as_me:7777: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7783,7 +7784,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7786: result: $with_broken_linker" >&5
-+echo "$as_me:7787: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -7805,14 +7806,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:7808: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7809: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7815: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7816: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7822,7 +7823,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:7825: result: $with_bsdpad" >&5
-+echo "$as_me:7826: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7879,14 +7880,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:7882: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7883: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7889 "configure"
-+#line 7890 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7901,16 +7902,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7904: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7905: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7907: \$? = $ac_status" >&5
-+  echo "$as_me:7908: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7910: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7911: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7913: \$? = $ac_status" >&5
-+  echo "$as_me:7914: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7919,7 +7920,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7922 "configure"
-+#line 7923 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7934,16 +7935,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7937: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7938: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7940: \$? = $ac_status" >&5
-+  echo "$as_me:7941: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7943: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7944: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7946: \$? = $ac_status" >&5
-+  echo "$as_me:7947: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7958,7 +7959,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7961: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7962: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -7983,16 +7984,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:7986: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7987: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:7992: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7993: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7995 "configure"
-+#line 7996 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8007,16 +8008,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8010: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8013: \$? = $ac_status" >&5
-+  echo "$as_me:8014: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8019: \$? = $ac_status" >&5
-+  echo "$as_me:8020: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8037,7 +8038,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8040 "configure"
-+#line 8041 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8052,16 +8053,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8056: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8058: \$? = $ac_status" >&5
-+  echo "$as_me:8059: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8064: \$? = $ac_status" >&5
-+  echo "$as_me:8065: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8072,15 +8073,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8075: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8076: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8080: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8081: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8083 "configure"
-+#line 8084 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8095,16 +8096,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8098: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8099: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8101: \$? = $ac_status" >&5
-+  echo "$as_me:8102: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8105: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8107: \$? = $ac_status" >&5
-+  echo "$as_me:8108: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8120,7 +8121,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8123: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8124: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8238,14 +8239,14 @@
- 	;;
- (*)
- 
--echo "$as_me:8241: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8242: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8248 "configure"
-+#line 8249 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8264,16 +8265,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8267: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8270: \$? = $ac_status" >&5
-+  echo "$as_me:8271: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8273: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8276: \$? = $ac_status" >&5
-+  echo "$as_me:8277: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8282,7 +8283,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8285 "configure"
-+#line 8286 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8301,16 +8302,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8304: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8305: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8307: \$? = $ac_status" >&5
-+  echo "$as_me:8308: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8310: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8313: \$? = $ac_status" >&5
-+  echo "$as_me:8314: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8325,7 +8326,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8328: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8329: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -8433,16 +8434,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:8436: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8437: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:8442: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8443: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8445 "configure"
-+#line 8446 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8457,16 +8458,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8460: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8463: \$? = $ac_status" >&5
-+  echo "$as_me:8464: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8466: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8467: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8469: \$? = $ac_status" >&5
-+  echo "$as_me:8470: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8487,7 +8488,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8490 "configure"
-+#line 8491 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8502,16 +8503,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8505: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8508: \$? = $ac_status" >&5
-+  echo "$as_me:8509: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8511: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8512: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8514: \$? = $ac_status" >&5
-+  echo "$as_me:8515: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8522,15 +8523,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8525: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8530: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8531: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8533 "configure"
-+#line 8534 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8545,16 +8546,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8551: \$? = $ac_status" >&5
-+  echo "$as_me:8552: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8554: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8557: \$? = $ac_status" >&5
-+  echo "$as_me:8558: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8570,7 +8571,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8573: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8574: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8728,7 +8729,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:8731: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8732: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -8736,7 +8737,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8739: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8740: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -8744,7 +8745,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8747: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8748: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -8752,10 +8753,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8755: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8756: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8758 "configure"
-+#line 8759 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8770,16 +8771,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8774: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8776: \$? = $ac_status" >&5
-+  echo "$as_me:8777: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8782: \$? = $ac_status" >&5
-+  echo "$as_me:8783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8788,12 +8789,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8791: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8792: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8796 "configure"
-+#line 8797 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8808,16 +8809,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8811: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8812: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8814: \$? = $ac_status" >&5
-+  echo "$as_me:8815: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8817: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8818: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8820: \$? = $ac_status" >&5
-+  echo "$as_me:8821: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -8828,19 +8829,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:8831: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8832: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:8836: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8837: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8843 "configure"
-+#line 8844 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8859,16 +8860,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8865: \$? = $ac_status" >&5
-+  echo "$as_me:8866: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8868: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8871: \$? = $ac_status" >&5
-+  echo "$as_me:8872: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8877,7 +8878,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8880 "configure"
-+#line 8881 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8896,16 +8897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8899: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8900: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8902: \$? = $ac_status" >&5
-+  echo "$as_me:8903: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8905: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8908: \$? = $ac_status" >&5
-+  echo "$as_me:8909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8920,7 +8921,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8923: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8924: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9022,14 +9023,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:9025: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9026: checking if SIGWINCH is defined" >&5
- echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
- if test "${cf_cv_define_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9032 "configure"
-+#line 9033 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9044,23 +9045,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9047: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9050: \$? = $ac_status" >&5
-+  echo "$as_me:9051: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9053: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9054: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9056: \$? = $ac_status" >&5
-+  echo "$as_me:9057: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 9063 "configure"
-+#line 9064 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9078,16 +9079,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9081: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9082: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9084: \$? = $ac_status" >&5
-+  echo "$as_me:9085: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9087: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9088: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9090: \$? = $ac_status" >&5
-+  echo "$as_me:9091: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9101,11 +9102,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9104: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9105: result: $cf_cv_define_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
- 
- if test "$cf_cv_define_sigwinch" = maybe ; then
--echo "$as_me:9108: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9109: checking for actual SIGWINCH definition" >&5
- echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
- if test "${cf_cv_fixup_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9116,7 +9117,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9119 "configure"
-+#line 9120 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9138,16 +9139,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9141: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9142: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9144: \$? = $ac_status" >&5
-+  echo "$as_me:9145: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9148: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9150: \$? = $ac_status" >&5
-+  echo "$as_me:9151: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -9161,7 +9162,7 @@
- done
- 
- fi
--echo "$as_me:9164: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9165: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9171,13 +9172,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:9174: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9175: checking for nl_langinfo and CODESET" >&5
- echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
- if test "${am_cv_langinfo_codeset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9180 "configure"
-+#line 9181 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -9189,16 +9190,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9192: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9193: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9195: \$? = $ac_status" >&5
-+  echo "$as_me:9196: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9201: \$? = $ac_status" >&5
-+  echo "$as_me:9202: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9209,7 +9210,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9212: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9213: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -9223,7 +9224,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:9226: checking if you want wide-character code" >&5
-+echo "$as_me:9227: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -9233,7 +9234,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9236: result: $with_widec" >&5
-+echo "$as_me:9237: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9248,14 +9249,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9251: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9252: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9258 "configure"
-+#line 9259 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9272,16 +9273,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9278: \$? = $ac_status" >&5
-+  echo "$as_me:9279: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9281: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9284: \$? = $ac_status" >&5
-+  echo "$as_me:9285: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9291,16 +9292,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9294: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9295: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9300: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9301: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9303 "configure"
-+#line 9304 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9316,16 +9317,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9319: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9320: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9322: \$? = $ac_status" >&5
-+  echo "$as_me:9323: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9325: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9328: \$? = $ac_status" >&5
-+  echo "$as_me:9329: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9334,16 +9335,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9337: result: $cf_result" >&5
-+echo "$as_me:9338: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9343: checking checking for compatible value versus " >&5
-+	echo "$as_me:9344: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9346 "configure"
-+#line 9347 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9359,16 +9360,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9362: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9365: \$? = $ac_status" >&5
-+  echo "$as_me:9366: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9368: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9369: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9371: \$? = $ac_status" >&5
-+  echo "$as_me:9372: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9377,7 +9378,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9380: result: $cf_result" >&5
-+	echo "$as_me:9381: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9393,13 +9394,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9396: checking for $ac_func" >&5
-+echo "$as_me:9397: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9402 "configure"
-+#line 9403 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9430,16 +9431,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9433: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9434: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9436: \$? = $ac_status" >&5
-+  echo "$as_me:9437: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9439: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9440: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9442: \$? = $ac_status" >&5
-+  echo "$as_me:9443: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9449,7 +9450,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9452: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9453: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9461,7 +9462,7 @@
- 
- 	if test "x$ac_cv_func_putwc" != xyes ; then
- 
--echo "$as_me:9464: checking for multibyte character support" >&5
-+echo "$as_me:9465: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9469,7 +9470,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9472 "configure"
-+#line 9473 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9482,16 +9483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9485: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9486: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9488: \$? = $ac_status" >&5
-+  echo "$as_me:9489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9491: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9494: \$? = $ac_status" >&5
-+  echo "$as_me:9495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9503,12 +9504,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9506: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9507: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9511 "configure"
-+#line 9512 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9521,16 +9522,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9524: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9525: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9527: \$? = $ac_status" >&5
-+  echo "$as_me:9528: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9530: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9531: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9533: \$? = $ac_status" >&5
-+  echo "$as_me:9534: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9544,7 +9545,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9547 "configure"
-+#line 9548 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9557,16 +9558,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9560: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9563: \$? = $ac_status" >&5
-+  echo "$as_me:9564: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9566: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9569: \$? = $ac_status" >&5
-+  echo "$as_me:9570: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9583,9 +9584,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9586: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9587: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9588: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9589: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9676,11 +9677,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9679: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9680: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9683 "configure"
-+#line 9684 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9693,21 +9694,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9697: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9699: \$? = $ac_status" >&5
-+  echo "$as_me:9700: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9702: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9703: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9705: \$? = $ac_status" >&5
-+  echo "$as_me:9706: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9710: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9711: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9725,7 +9726,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9728: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9729: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9800,13 +9801,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9803: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9804: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 9809 "configure"
-+#line 9810 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9819,21 +9820,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9822: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9823: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9825: \$? = $ac_status" >&5
-+  echo "$as_me:9826: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9828: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9829: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9831: \$? = $ac_status" >&5
-+  echo "$as_me:9832: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9836: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9837: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9875,7 +9876,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9878: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9879: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -9910,7 +9911,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9913 "configure"
-+#line 9914 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9922,16 +9923,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9925: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9928: \$? = $ac_status" >&5
-+  echo "$as_me:9929: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9932: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9934: \$? = $ac_status" >&5
-+  echo "$as_me:9935: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9948,7 +9949,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9951: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9952: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9984,7 +9985,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9987: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9988: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10016,14 +10017,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10019: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10020: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10026 "configure"
-+#line 10027 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10041,23 +10042,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10045: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10047: \$? = $ac_status" >&5
-+  echo "$as_me:10048: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10053: \$? = $ac_status" >&5
-+  echo "$as_me:10054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10060 "configure"
-+#line 10061 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10076,16 +10077,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10079: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10080: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10082: \$? = $ac_status" >&5
-+  echo "$as_me:10083: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10085: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10086: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10088: \$? = $ac_status" >&5
-+  echo "$as_me:10089: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10097,7 +10098,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10100: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10101: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10115,14 +10116,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10118: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10119: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10125 "configure"
-+#line 10126 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10140,23 +10141,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10144: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10146: \$? = $ac_status" >&5
-+  echo "$as_me:10147: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10149: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10150: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10152: \$? = $ac_status" >&5
-+  echo "$as_me:10153: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10159 "configure"
-+#line 10160 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10175,16 +10176,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10178: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10181: \$? = $ac_status" >&5
-+  echo "$as_me:10182: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10184: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10187: \$? = $ac_status" >&5
-+  echo "$as_me:10188: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10196,7 +10197,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10199: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10200: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10219,14 +10220,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10222: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10223: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10229 "configure"
-+#line 10230 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10244,23 +10245,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10247: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10250: \$? = $ac_status" >&5
-+  echo "$as_me:10251: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10253: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10256: \$? = $ac_status" >&5
-+  echo "$as_me:10257: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10263 "configure"
-+#line 10264 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10279,16 +10280,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10282: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10283: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10285: \$? = $ac_status" >&5
-+  echo "$as_me:10286: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10289: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10291: \$? = $ac_status" >&5
-+  echo "$as_me:10292: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10300,7 +10301,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10303: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10304: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10332,7 +10333,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10335: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10336: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10342,7 +10343,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10345: result: $with_lp64" >&5
-+echo "$as_me:10346: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10358,7 +10359,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10361: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10362: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10370,7 +10371,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10373 "configure"
-+#line 10374 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10390,16 +10391,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10393: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10394: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10396: \$? = $ac_status" >&5
-+  echo "$as_me:10397: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10399: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10400: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10402: \$? = $ac_status" >&5
-+  echo "$as_me:10403: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10409,16 +10410,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10412: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10415: \$? = $ac_status" >&5
-+  echo "$as_me:10416: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10418: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10421: \$? = $ac_status" >&5
-+  echo "$as_me:10422: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10432,13 +10433,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10435: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10436: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10441: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10442: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10446,7 +10447,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10449 "configure"
-+#line 10450 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10466,16 +10467,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10469: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10470: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10472: \$? = $ac_status" >&5
-+  echo "$as_me:10473: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10475: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10476: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10478: \$? = $ac_status" >&5
-+  echo "$as_me:10479: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10484,7 +10485,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10487 "configure"
-+#line 10488 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -10505,16 +10506,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10509: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10511: \$? = $ac_status" >&5
-+  echo "$as_me:10512: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10515: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10517: \$? = $ac_status" >&5
-+  echo "$as_me:10518: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10525,7 +10526,7 @@
-   break
- done
- fi
--echo "$as_me:10528: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10529: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -10535,7 +10536,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10538: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10539: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10543,7 +10544,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10546 "configure"
-+#line 10547 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10563,16 +10564,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10566: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10567: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10569: \$? = $ac_status" >&5
-+  echo "$as_me:10570: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10572: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10573: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10575: \$? = $ac_status" >&5
-+  echo "$as_me:10576: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10581,7 +10582,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10584 "configure"
-+#line 10585 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -10602,16 +10603,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10606: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10608: \$? = $ac_status" >&5
-+  echo "$as_me:10609: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10612: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10614: \$? = $ac_status" >&5
-+  echo "$as_me:10615: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10622,7 +10623,7 @@
-   break
- done
- fi
--echo "$as_me:10625: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10626: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -10635,7 +10636,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10638: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10639: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10643,7 +10644,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10646 "configure"
-+#line 10647 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10655,16 +10656,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10661: \$? = $ac_status" >&5
-+  echo "$as_me:10662: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10667: \$? = $ac_status" >&5
-+  echo "$as_me:10668: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10673,7 +10674,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10676 "configure"
-+#line 10677 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -10686,16 +10687,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10689: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10692: \$? = $ac_status" >&5
-+  echo "$as_me:10693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10698: \$? = $ac_status" >&5
-+  echo "$as_me:10699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10706,7 +10707,7 @@
-   break
- done
- fi
--echo "$as_me:10709: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10710: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -10720,13 +10721,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:10723: checking for fseeko" >&5
-+echo "$as_me:10724: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10729 "configure"
-+#line 10730 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10738,16 +10739,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10741: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10744: \$? = $ac_status" >&5
-+  echo "$as_me:10745: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10747: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10750: \$? = $ac_status" >&5
-+  echo "$as_me:10751: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10757,7 +10758,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10760: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10761: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10778,14 +10779,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:10781: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10782: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10788 "configure"
-+#line 10789 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10806,16 +10807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10809: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10812: \$? = $ac_status" >&5
-+  echo "$as_me:10813: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10815: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10818: \$? = $ac_status" >&5
-+  echo "$as_me:10819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10826,7 +10827,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10829: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10830: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10836,7 +10837,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10839: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10840: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10846,14 +10847,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10849: result: $with_tparm_varargs" >&5
-+echo "$as_me:10850: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10856: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10857: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10863,14 +10864,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10866: result: $with_tic_depends" >&5
-+echo "$as_me:10867: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10873: checking for type of bool" >&5
-+echo "$as_me:10874: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10880,10 +10881,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10883: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10884: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10886: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10887: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10894,11 +10895,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10897: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10898: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10901: checking for type of chtype" >&5
-+echo "$as_me:10902: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10908,11 +10909,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10911: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10912: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10915: checking for type of ospeed" >&5
-+echo "$as_me:10916: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10922,11 +10923,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10925: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10926: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10929: checking for type of mmask_t" >&5
-+echo "$as_me:10930: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10936,11 +10937,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10939: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10940: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10943: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10944: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10950,11 +10951,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10953: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10954: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10957: checking for type of tparm args" >&5
-+echo "$as_me:10958: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10964,11 +10965,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10967: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10968: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10971: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10972: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10978,7 +10979,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10981: result: $with_rcs_ids" >&5
-+echo "$as_me:10982: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10987,7 +10988,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10990: checking format of man-pages" >&5
-+echo "$as_me:10991: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11076,14 +11077,14 @@
- 	;;
- esac
- 
--echo "$as_me:11079: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11080: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11082: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11083: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11086: checking for manpage renaming" >&5
-+echo "$as_me:11087: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11111,7 +11112,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11114: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11115: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11125,10 +11126,10 @@
- 	fi
- fi
- 
--echo "$as_me:11128: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11129: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11131: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11132: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11139,7 +11140,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11142: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11143: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11153,7 +11154,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11156: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11157: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11166,17 +11167,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11169: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11170: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11175: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11176: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11179: checking for manpage tbl" >&5
-+echo "$as_me:11180: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11187,7 +11188,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11190: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11191: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11520,7 +11521,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11523: checking if you want to build with function extensions" >&5
-+echo "$as_me:11524: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11530,7 +11531,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11533: result: $with_ext_funcs" >&5
-+echo "$as_me:11534: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11585,7 +11586,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11588: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11589: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11595,7 +11596,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11598: result: $with_sp_funcs" >&5
-+echo "$as_me:11599: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11610,7 +11611,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11613: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11614: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11620,7 +11621,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11623: result: $with_term_driver" >&5
-+echo "$as_me:11624: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11629,19 +11630,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11632: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11633: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11637: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11638: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11644: checking for extended use of const keyword" >&5
-+echo "$as_me:11645: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11651,7 +11652,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11654: result: $with_ext_const" >&5
-+echo "$as_me:11655: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11659,7 +11660,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11662: checking if you want to use extended colors" >&5
-+echo "$as_me:11663: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11669,12 +11670,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11672: result: $with_ext_colors" >&5
-+echo "$as_me:11673: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11677: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11678: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11684,7 +11685,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11687: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11688: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11700,7 +11701,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11703: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11704: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11710,7 +11711,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11713: result: $with_ext_mouse" >&5
-+echo "$as_me:11714: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11721,7 +11722,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11724: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11725: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11730,7 +11731,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11733: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11734: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11740,7 +11741,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11743: result: $with_ext_putwin" >&5
-+echo "$as_me:11744: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11750,7 +11751,7 @@
- 
- fi
- 
--echo "$as_me:11753: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11754: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11760,20 +11761,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11763: result: $with_no_padding" >&5
-+echo "$as_me:11764: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11770: checking for ANSI C header files" >&5
-+echo "$as_me:11771: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11776 "configure"
-+#line 11777 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -11781,13 +11782,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:11784: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11785: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11790: \$? = $ac_status" >&5
-+  echo "$as_me:11791: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11809,7 +11810,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11812 "configure"
-+#line 11813 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -11827,7 +11828,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11830 "configure"
-+#line 11831 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -11848,7 +11849,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11851 "configure"
-+#line 11852 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11874,15 +11875,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11877: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11878: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11880: \$? = $ac_status" >&5
-+  echo "$as_me:11881: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11882: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11883: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11885: \$? = $ac_status" >&5
-+  echo "$as_me:11886: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11895,7 +11896,7 @@
- fi
- fi
- fi
--echo "$as_me:11898: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11899: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11911,28 +11912,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11914: checking for $ac_header" >&5
-+echo "$as_me:11915: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11920 "configure"
-+#line 11921 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11929: \$? = $ac_status" >&5
-+  echo "$as_me:11930: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11932: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11935: \$? = $ac_status" >&5
-+  echo "$as_me:11936: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11942,7 +11943,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11945: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11946: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11952,13 +11953,13 @@
- fi
- done
- 
--echo "$as_me:11955: checking for signed char" >&5
-+echo "$as_me:11956: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11961 "configure"
-+#line 11962 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11973,16 +11974,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11976: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11977: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11979: \$? = $ac_status" >&5
-+  echo "$as_me:11980: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11982: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11983: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11985: \$? = $ac_status" >&5
-+  echo "$as_me:11986: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -11992,10 +11993,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11995: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:11996: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:11998: checking size of signed char" >&5
-+echo "$as_me:11999: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12004,7 +12005,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12007 "configure"
-+#line 12008 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12016,21 +12017,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12019: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12020: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12022: \$? = $ac_status" >&5
-+  echo "$as_me:12023: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12026: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12028: \$? = $ac_status" >&5
-+  echo "$as_me:12029: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12033 "configure"
-+#line 12034 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12042,16 +12043,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12045: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12048: \$? = $ac_status" >&5
-+  echo "$as_me:12049: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12054: \$? = $ac_status" >&5
-+  echo "$as_me:12055: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12067,7 +12068,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12070 "configure"
-+#line 12071 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12079,16 +12080,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12082: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12085: \$? = $ac_status" >&5
-+  echo "$as_me:12086: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12088: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12089: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12091: \$? = $ac_status" >&5
-+  echo "$as_me:12092: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12104,7 +12105,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12107 "configure"
-+#line 12108 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12116,16 +12117,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12120: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12122: \$? = $ac_status" >&5
-+  echo "$as_me:12123: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12125: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12126: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12128: \$? = $ac_status" >&5
-+  echo "$as_me:12129: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12138,12 +12139,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12141: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12142: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12146 "configure"
-+#line 12147 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12159,15 +12160,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12162: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12163: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12165: \$? = $ac_status" >&5
-+  echo "$as_me:12166: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12167: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12168: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12170: \$? = $ac_status" >&5
-+  echo "$as_me:12171: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12183,7 +12184,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12186: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12187: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -12194,7 +12195,7 @@
- else
- 	NCURSES_SBOOL="char"
- fi
--echo "$as_me:12197: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:12198: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12204,12 +12205,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12207: result: $with_signed_char" >&5
-+echo "$as_me:12208: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12212: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12213: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12219,7 +12220,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12222: result: $with_sigwinch" >&5
-+echo "$as_me:12223: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12227,7 +12228,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12230: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12231: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12237,7 +12238,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12240: result: $with_tcap_names" >&5
-+echo "$as_me:12241: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12245,7 +12246,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12248: checking if you want all development code" >&5
-+echo "$as_me:12249: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12255,11 +12256,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12258: result: $with_develop" >&5
-+echo "$as_me:12259: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12262: checking if you want hard-tabs code" >&5
-+echo "$as_me:12263: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12269,7 +12270,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12272: result: $enable_hard_tabs" >&5
-+echo "$as_me:12273: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12277,7 +12278,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12280: checking if you want limited support for xmc" >&5
-+echo "$as_me:12281: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12287,7 +12288,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12290: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12291: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12297,7 +12298,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12300: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12301: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12307,7 +12308,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12310: result: $with_assumed_color" >&5
-+echo "$as_me:12311: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12315,7 +12316,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12318: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12319: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12325,7 +12326,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12328: result: $with_hashmap" >&5
-+echo "$as_me:12329: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12333,7 +12334,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12336: checking if you want colorfgbg code" >&5
-+echo "$as_me:12337: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12343,7 +12344,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12346: result: $with_colorfgbg" >&5
-+echo "$as_me:12347: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12351,7 +12352,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12354: checking if you want interop bindings" >&5
-+echo "$as_me:12355: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12361,7 +12362,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12364: result: $with_exp_interop" >&5
-+echo "$as_me:12365: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12370,7 +12371,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12373: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12374: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12380,27 +12381,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12383: result: $with_pthread" >&5
-+echo "$as_me:12384: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12387: checking for pthread.h" >&5
-+	echo "$as_me:12388: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12393 "configure"
-+#line 12394 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:12397: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12398: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12403: \$? = $ac_status" >&5
-+  echo "$as_me:12404: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12419,7 +12420,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12422: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12423: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12429,7 +12430,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12432: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12433: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12450,7 +12451,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12453 "configure"
-+#line 12454 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -12467,16 +12468,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12470: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12471: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12473: \$? = $ac_status" >&5
-+  echo "$as_me:12474: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12479: \$? = $ac_status" >&5
-+  echo "$as_me:12480: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12486,7 +12487,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12489: result: $with_pthread" >&5
-+	    echo "$as_me:12490: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12514,7 +12515,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12517: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12518: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12524,13 +12525,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12527: checking for pthread_kill" >&5
-+	echo "$as_me:12528: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12533 "configure"
-+#line 12534 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12561,16 +12562,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12564: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12565: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12567: \$? = $ac_status" >&5
-+  echo "$as_me:12568: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12570: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12571: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12573: \$? = $ac_status" >&5
-+  echo "$as_me:12574: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12580,11 +12581,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12583: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12584: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12587: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12588: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12594,7 +12595,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12597: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12598: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12605,7 +12606,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12608: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12609: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12615,18 +12616,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12618: result: $use_weak_symbols" >&5
-+	echo "$as_me:12619: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12622: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12623: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12629 "configure"
-+#line 12630 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -12652,16 +12653,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12655: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12658: \$? = $ac_status" >&5
-+  echo "$as_me:12659: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12661: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12664: \$? = $ac_status" >&5
-+  echo "$as_me:12665: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12672,7 +12673,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12675: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12676: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12705,7 +12706,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12708: checking if you want reentrant code" >&5
-+echo "$as_me:12709: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12715,7 +12716,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12718: result: $with_reentrant" >&5
-+echo "$as_me:12719: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12788,7 +12789,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12791: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12792: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12803,7 +12804,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12806: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12807: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12813,7 +12814,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12816: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12817: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12823,7 +12824,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12826: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12827: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12833,7 +12834,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12836: result: $with_safe_sprintf" >&5
-+echo "$as_me:12837: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12843,7 +12844,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12846: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12847: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12853,7 +12854,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12856: result: $with_scroll_hints" >&5
-+echo "$as_me:12857: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12862,7 +12863,7 @@
- 
- fi
- 
--echo "$as_me:12865: checking if you want wgetch-events code" >&5
-+echo "$as_me:12866: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12872,7 +12873,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12875: result: $with_wgetch_events" >&5
-+echo "$as_me:12876: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12883,7 +12884,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12886: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12887: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -12917,7 +12918,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12920: result: $enableval" >&5
-+echo "$as_me:12921: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12929,7 +12930,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12932: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12933: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12937,7 +12938,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12940: result: $with_warnings" >&5
-+echo "$as_me:12941: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12949,12 +12950,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12952: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12953: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 12957 "configure"
-+#line 12958 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12971,16 +12972,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12974: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12975: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12977: \$? = $ac_status" >&5
-+  echo "$as_me:12978: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12980: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12983: \$? = $ac_status" >&5
-+  echo "$as_me:12984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12991,7 +12992,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:12994: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:12995: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -13000,12 +13001,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13003: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13004: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13008 "configure"
-+#line 13009 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13022,16 +13023,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13025: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13028: \$? = $ac_status" >&5
-+  echo "$as_me:13029: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13031: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13034: \$? = $ac_status" >&5
-+  echo "$as_me:13035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13042,12 +13043,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13045: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13046: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 13050 "${as_me:-configure}"
-+#line 13051 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13064,7 +13065,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:13067: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13068: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13080,12 +13081,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13083: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13084: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13086: \$? = $ac_status" >&5
-+  echo "$as_me:13087: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13088: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13089: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13094,7 +13095,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13097: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13098: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13118,12 +13119,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13121: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13122: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13124: \$? = $ac_status" >&5
-+  echo "$as_me:13125: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13126: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13127: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13134,7 +13135,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13138: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13144,7 +13145,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13147: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13148: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13164,12 +13165,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13167: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13168: checking if this is really Intel C++ compiler" >&5
- echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13172 "configure"
-+#line 13173 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13186,16 +13187,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13189: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13192: \$? = $ac_status" >&5
-+  echo "$as_me:13193: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13195: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13198: \$? = $ac_status" >&5
-+  echo "$as_me:13199: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13206,7 +13207,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13209: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13210: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13215,12 +13216,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13218: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13219: checking if this is really Clang C++ compiler" >&5
- echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13223 "configure"
-+#line 13224 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13237,16 +13238,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13240: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13243: \$? = $ac_status" >&5
-+  echo "$as_me:13244: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13246: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13249: \$? = $ac_status" >&5
-+  echo "$as_me:13250: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13257,7 +13258,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13260: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13261: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13269,7 +13270,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <<EOF
--#line 13272 "configure"
-+#line 13273 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13287,7 +13288,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:13290: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13291: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13304,12 +13305,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13307: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13308: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13310: \$? = $ac_status" >&5
-+  echo "$as_me:13311: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13312: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13313: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13318,7 +13319,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13321: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13322: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13348,16 +13349,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13351: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13352: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13354: \$? = $ac_status" >&5
-+  echo "$as_me:13355: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13356: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13357: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13360: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13361: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13393,10 +13394,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13396: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13397: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 13399 "${as_me:-configure}"
-+#line 13400 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -13445,12 +13446,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:13448: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13451: \$? = $ac_status" >&5
-+  echo "$as_me:13452: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13453: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13454: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13509,7 +13510,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13512: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13513: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13519,7 +13520,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13522: result: $with_string_hacks" >&5
-+echo "$as_me:13523: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13528,19 +13529,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13531: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13532: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13537: checking for $ac_func" >&5
-+echo "$as_me:13538: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13543 "configure"
-+#line 13544 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13571,16 +13572,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13574: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13575: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13577: \$? = $ac_status" >&5
-+  echo "$as_me:13578: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13580: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13583: \$? = $ac_status" >&5
-+  echo "$as_me:13584: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13590,7 +13591,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13593: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13594: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13603,7 +13604,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:13606: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:13607: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13613,7 +13614,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13616: result: $with_assertions" >&5
-+echo "$as_me:13617: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13629,7 +13630,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13632: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13633: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -13646,7 +13647,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13649: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13650: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13740,23 +13741,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13743: checking for dmalloc.h" >&5
-+	echo "$as_me:13744: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13749 "configure"
-+#line 13750 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13753: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13754: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13759: \$? = $ac_status" >&5
-+  echo "$as_me:13760: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13775,11 +13776,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13778: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13779: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:13782: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13783: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13787,7 +13788,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13790 "configure"
-+#line 13791 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13806,16 +13807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13809: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13810: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13812: \$? = $ac_status" >&5
-+  echo "$as_me:13813: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13815: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13818: \$? = $ac_status" >&5
-+  echo "$as_me:13819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13826,7 +13827,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13829: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13830: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13841,7 +13842,7 @@
- 
- fi
- 
--echo "$as_me:13844: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:13845: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -13858,7 +13859,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13861: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13862: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13952,23 +13953,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13955: checking for dbmalloc.h" >&5
-+	echo "$as_me:13956: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13961 "configure"
-+#line 13962 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13965: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13966: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13971: \$? = $ac_status" >&5
-+  echo "$as_me:13972: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13987,11 +13988,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13990: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13991: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:13994: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:13995: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13999,7 +14000,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14002 "configure"
-+#line 14003 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14018,16 +14019,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14021: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14022: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14024: \$? = $ac_status" >&5
-+  echo "$as_me:14025: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14027: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14028: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14030: \$? = $ac_status" >&5
-+  echo "$as_me:14031: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14038,7 +14039,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14041: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14042: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14053,7 +14054,7 @@
- 
- fi
- 
--echo "$as_me:14056: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:14057: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14070,7 +14071,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14073: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14074: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14163,7 +14164,7 @@
- 	;;
- esac
- 
--echo "$as_me:14166: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14167: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14173,7 +14174,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14176: result: $with_no_leaks" >&5
-+echo "$as_me:14177: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14225,7 +14226,7 @@
- 	;;
- esac
- 
--echo "$as_me:14228: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14229: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14235,7 +14236,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14238: result: $cf_with_trace" >&5
-+echo "$as_me:14239: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14325,7 +14326,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14328: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14329: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14342,7 +14343,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14345: result: $enable_gnat_projects" >&5
-+echo "$as_me:14346: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14352,13 +14353,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14355: checking for gettimeofday" >&5
-+echo "$as_me:14356: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14361 "configure"
-+#line 14362 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14389,16 +14390,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14392: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14393: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14395: \$? = $ac_status" >&5
-+  echo "$as_me:14396: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14398: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14399: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14401: \$? = $ac_status" >&5
-+  echo "$as_me:14402: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14408,7 +14409,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14411: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14412: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14418,7 +14419,7 @@
- 
- else
- 
--echo "$as_me:14421: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14422: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14426,7 +14427,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14429 "configure"
-+#line 14430 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14445,16 +14446,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14448: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14449: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14451: \$? = $ac_status" >&5
-+  echo "$as_me:14452: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14454: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14457: \$? = $ac_status" >&5
-+  echo "$as_me:14458: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14465,7 +14466,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14468: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14469: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14495,14 +14496,14 @@
- 	;;
- esac
- 
--echo "$as_me:14498: checking if -lm needed for math functions" >&5
-+echo "$as_me:14499: checking if -lm needed for math functions" >&5
- echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
- if test "${cf_cv_need_libm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14505 "configure"
-+#line 14506 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -14517,16 +14518,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14520: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14521: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14523: \$? = $ac_status" >&5
-+  echo "$as_me:14524: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14526: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14529: \$? = $ac_status" >&5
-+  echo "$as_me:14530: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14536,7 +14537,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14539: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14540: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14544,13 +14545,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14547: checking for ANSI C header files" >&5
-+echo "$as_me:14548: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14553 "configure"
-+#line 14554 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -14558,13 +14559,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:14561: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14562: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14567: \$? = $ac_status" >&5
-+  echo "$as_me:14568: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14586,7 +14587,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14589 "configure"
-+#line 14590 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -14604,7 +14605,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14607 "configure"
-+#line 14608 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -14625,7 +14626,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14628 "configure"
-+#line 14629 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14651,15 +14652,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14654: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14655: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14657: \$? = $ac_status" >&5
-+  echo "$as_me:14658: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14659: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14662: \$? = $ac_status" >&5
-+  echo "$as_me:14663: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14672,7 +14673,7 @@
- fi
- fi
- fi
--echo "$as_me:14675: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14676: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14685,13 +14686,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:14688: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14689: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14694 "configure"
-+#line 14695 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -14706,16 +14707,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14709: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14712: \$? = $ac_status" >&5
-+  echo "$as_me:14713: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14715: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14716: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14718: \$? = $ac_status" >&5
-+  echo "$as_me:14719: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14725,7 +14726,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14728: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14729: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14738,7 +14739,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:14741: checking for opendir in -ldir" >&5
-+  echo "$as_me:14742: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14746,7 +14747,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14749 "configure"
-+#line 14750 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14765,16 +14766,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14768: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14769: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14771: \$? = $ac_status" >&5
-+  echo "$as_me:14772: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14774: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14777: \$? = $ac_status" >&5
-+  echo "$as_me:14778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14785,14 +14786,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14788: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14789: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:14795: checking for opendir in -lx" >&5
-+  echo "$as_me:14796: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14800,7 +14801,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14803 "configure"
-+#line 14804 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14819,16 +14820,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14822: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14823: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14825: \$? = $ac_status" >&5
-+  echo "$as_me:14826: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14828: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14829: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14831: \$? = $ac_status" >&5
-+  echo "$as_me:14832: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14839,7 +14840,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14842: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14843: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -14847,13 +14848,13 @@
- 
- fi
- 
--echo "$as_me:14850: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14851: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14856 "configure"
-+#line 14857 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -14869,16 +14870,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14872: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14873: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14875: \$? = $ac_status" >&5
-+  echo "$as_me:14876: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14878: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14879: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14881: \$? = $ac_status" >&5
-+  echo "$as_me:14882: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14888,7 +14889,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14891: result: $ac_cv_header_time" >&5
-+echo "$as_me:14892: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14907,13 +14908,13 @@
- 	;;
- esac
- 
--echo "$as_me:14910: checking for regcomp" >&5
-+echo "$as_me:14911: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14916 "configure"
-+#line 14917 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14944,16 +14945,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14947: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14948: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14950: \$? = $ac_status" >&5
-+  echo "$as_me:14951: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14953: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14954: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14956: \$? = $ac_status" >&5
-+  echo "$as_me:14957: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14963,7 +14964,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14966: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14967: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14972,7 +14973,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14975: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14976: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14980,7 +14981,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14983 "configure"
-+#line 14984 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14999,16 +15000,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15002: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15003: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15005: \$? = $ac_status" >&5
-+  echo "$as_me:15006: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15009: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15011: \$? = $ac_status" >&5
-+  echo "$as_me:15012: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15019,7 +15020,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15022: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15023: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -15048,13 +15049,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15051: checking for compile" >&5
-+	echo "$as_me:15052: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15057 "configure"
-+#line 15058 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15085,16 +15086,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15088: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15089: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15091: \$? = $ac_status" >&5
-+  echo "$as_me:15092: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15094: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15095: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15097: \$? = $ac_status" >&5
-+  echo "$as_me:15098: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15104,13 +15105,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15107: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15108: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15113: checking for compile in -lgen" >&5
-+		echo "$as_me:15114: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15118,7 +15119,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15121 "configure"
-+#line 15122 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15137,16 +15138,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15141: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15143: \$? = $ac_status" >&5
-+  echo "$as_me:15144: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15149: \$? = $ac_status" >&5
-+  echo "$as_me:15150: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15157,7 +15158,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15160: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15161: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15185,11 +15186,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15188: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15189: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15192: checking for regular-expression headers" >&5
-+echo "$as_me:15193: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15201,7 +15202,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15204 "configure"
-+#line 15205 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15216,16 +15217,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15219: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15220: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15222: \$? = $ac_status" >&5
-+  echo "$as_me:15223: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15225: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15228: \$? = $ac_status" >&5
-+  echo "$as_me:15229: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15242,7 +15243,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15245 "configure"
-+#line 15246 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$cf_regex_hdr>
-@@ -15260,16 +15261,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15263: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15266: \$? = $ac_status" >&5
-+  echo "$as_me:15267: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15269: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15272: \$? = $ac_status" >&5
-+  echo "$as_me:15273: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15285,11 +15286,11 @@
- esac
- 
- fi
--echo "$as_me:15288: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15289: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15292: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15293: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15328,23 +15329,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15331: checking for $ac_header" >&5
-+echo "$as_me:15332: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15337 "configure"
-+#line 15338 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15341: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15347: \$? = $ac_status" >&5
-+  echo "$as_me:15348: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15363,7 +15364,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15366: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15367: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15376,23 +15377,23 @@
- for ac_header in unistd.h getopt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15379: checking for $ac_header" >&5
-+echo "$as_me:15380: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15385 "configure"
-+#line 15386 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15389: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15390: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15395: \$? = $ac_status" >&5
-+  echo "$as_me:15396: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15411,7 +15412,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15414: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15415: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15421,7 +15422,7 @@
- fi
- done
- 
--echo "$as_me:15424: checking for header declaring getopt variables" >&5
-+echo "$as_me:15425: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15431,7 +15432,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15434 "configure"
-+#line 15435 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15444,16 +15445,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15447: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15450: \$? = $ac_status" >&5
-+  echo "$as_me:15451: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15453: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15454: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15456: \$? = $ac_status" >&5
-+  echo "$as_me:15457: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15465,7 +15466,7 @@
- done
- 
- fi
--echo "$as_me:15468: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15469: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15486,7 +15487,7 @@
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15489: checking for main in -lcposix" >&5
-+echo "$as_me:15490: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15494,7 +15495,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15497 "configure"
-+#line 15498 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15506,16 +15507,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15509: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15510: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15512: \$? = $ac_status" >&5
-+  echo "$as_me:15513: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15518: \$? = $ac_status" >&5
-+  echo "$as_me:15519: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15526,7 +15527,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15529: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15530: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15537,7 +15538,7 @@
- 
- fi
- 
--	echo "$as_me:15540: checking for bzero in -linet" >&5
-+	echo "$as_me:15541: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15545,7 +15546,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15548 "configure"
-+#line 15549 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15564,16 +15565,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15568: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15570: \$? = $ac_status" >&5
-+  echo "$as_me:15571: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15574: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15576: \$? = $ac_status" >&5
-+  echo "$as_me:15577: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15584,7 +15585,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15587: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15588: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15607,14 +15608,14 @@
- fi
- fi
- 
--echo "$as_me:15610: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15611: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15617 "configure"
-+#line 15618 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15634,16 +15635,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15637: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15638: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15640: \$? = $ac_status" >&5
-+  echo "$as_me:15641: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15644: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15646: \$? = $ac_status" >&5
-+  echo "$as_me:15647: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15655,7 +15656,7 @@
- 
- fi
- 
--echo "$as_me:15658: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15659: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15670,13 +15671,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15673: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15674: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15679 "configure"
-+#line 15680 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15734,16 +15735,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15738: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15740: \$? = $ac_status" >&5
-+  echo "$as_me:15741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15746: \$? = $ac_status" >&5
-+  echo "$as_me:15747: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15753,7 +15754,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15756: result: $ac_cv_c_const" >&5
-+echo "$as_me:15757: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15763,7 +15764,7 @@
- 
- fi
- 
--echo "$as_me:15766: checking for inline" >&5
-+echo "$as_me:15767: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15771,7 +15772,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15774 "configure"
-+#line 15775 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15780,16 +15781,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15783: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15784: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15786: \$? = $ac_status" >&5
-+  echo "$as_me:15787: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15789: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15790: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15792: \$? = $ac_status" >&5
-+  echo "$as_me:15793: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15800,7 +15801,7 @@
- done
- 
- fi
--echo "$as_me:15803: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15804: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15826,7 +15827,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15829: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15830: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15835,7 +15836,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15838 "configure"
-+#line 15839 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15847,16 +15848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15850: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15853: \$? = $ac_status" >&5
-+  echo "$as_me:15854: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15856: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15859: \$? = $ac_status" >&5
-+  echo "$as_me:15860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15868,7 +15869,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15871: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15872: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15954,7 +15955,7 @@
- 	fi
- fi
- 
--echo "$as_me:15957: checking for signal global datatype" >&5
-+echo "$as_me:15958: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15966,7 +15967,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15969 "configure"
-+#line 15970 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15989,16 +15990,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15992: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15995: \$? = $ac_status" >&5
-+  echo "$as_me:15996: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15998: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16001: \$? = $ac_status" >&5
-+  echo "$as_me:16002: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16012,7 +16013,7 @@
- 
- fi
- 
--echo "$as_me:16015: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16016: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <<EOF
-@@ -16021,7 +16022,7 @@
- 
- if test $NCURSES_CHTYPE = auto ; then
- 
--echo "$as_me:16024: checking for type of chtype" >&5
-+echo "$as_me:16025: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16031,7 +16032,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16034 "configure"
-+#line 16035 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16066,15 +16067,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16072: \$? = $ac_status" >&5
-+  echo "$as_me:16073: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16077: \$? = $ac_status" >&5
-+  echo "$as_me:16078: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16089,7 +16090,7 @@
- 
- fi
- 
--echo "$as_me:16092: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16093: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -16101,14 +16102,14 @@
- fi
- test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- 
--echo "$as_me:16104: checking if unsigned literals are legal" >&5
-+echo "$as_me:16105: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16111 "configure"
-+#line 16112 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16120,16 +16121,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16123: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16124: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16126: \$? = $ac_status" >&5
-+  echo "$as_me:16127: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16130: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16132: \$? = $ac_status" >&5
-+  echo "$as_me:16133: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16141,7 +16142,7 @@
- 
- fi
- 
--echo "$as_me:16144: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16145: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16157,14 +16158,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16160: checking if external errno is declared" >&5
-+echo "$as_me:16161: checking if external errno is declared" >&5
- echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16167 "configure"
-+#line 16168 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16182,16 +16183,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16185: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16186: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16188: \$? = $ac_status" >&5
-+  echo "$as_me:16189: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16191: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16192: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16194: \$? = $ac_status" >&5
-+  echo "$as_me:16195: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16202,7 +16203,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16205: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16206: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16217,14 +16218,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16220: checking if external errno exists" >&5
-+echo "$as_me:16221: checking if external errno exists" >&5
- echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
- if test "${cf_cv_have_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16227 "configure"
-+#line 16228 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16239,16 +16240,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16242: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16243: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16245: \$? = $ac_status" >&5
-+  echo "$as_me:16246: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16248: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16249: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16251: \$? = $ac_status" >&5
-+  echo "$as_me:16252: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16259,7 +16260,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16262: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16263: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16272,7 +16273,7 @@
- 
- fi
- 
--echo "$as_me:16275: checking if data-only library module links" >&5
-+echo "$as_me:16276: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16280,20 +16281,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 16283 "configure"
-+#line 16284 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:16286: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16287: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16289: \$? = $ac_status" >&5
-+  echo "$as_me:16290: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 16296 "configure"
-+#line 16297 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -16306,10 +16307,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:16309: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16310: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16312: \$? = $ac_status" >&5
-+  echo "$as_me:16313: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16322,7 +16323,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16325 "configure"
-+#line 16326 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16333,15 +16334,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16336: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16337: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16339: \$? = $ac_status" >&5
-+  echo "$as_me:16340: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16341: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16342: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16344: \$? = $ac_status" >&5
-+  echo "$as_me:16345: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16356,7 +16357,7 @@
- 
- fi
- 
--echo "$as_me:16359: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16360: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16395,13 +16396,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16398: checking for $ac_func" >&5
-+echo "$as_me:16399: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16404 "configure"
-+#line 16405 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16432,16 +16433,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16435: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16436: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16438: \$? = $ac_status" >&5
-+  echo "$as_me:16439: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16442: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16444: \$? = $ac_status" >&5
-+  echo "$as_me:16445: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16451,7 +16452,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16454: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16455: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16463,21 +16464,21 @@
- 
- if test "x$ac_cv_func_getopt" = xno &&
-    test "x$cf_with_progs$cf_with_tests" != xnono; then
--	{ { echo "$as_me:16466: error: getopt is required for building programs" >&5
-+	{ { echo "$as_me:16467: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16473: checking for terminal-capability database functions" >&5
-+echo "$as_me:16474: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16480 "configure"
-+#line 16481 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16497,16 +16498,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16500: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16501: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16503: \$? = $ac_status" >&5
-+  echo "$as_me:16504: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16506: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16507: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16509: \$? = $ac_status" >&5
-+  echo "$as_me:16510: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16517,7 +16518,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16520: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16521: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16527,14 +16528,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16530: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16531: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16537 "configure"
-+#line 16538 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16556,16 +16557,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16559: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16560: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16562: \$? = $ac_status" >&5
-+  echo "$as_me:16563: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16565: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16566: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16568: \$? = $ac_status" >&5
-+  echo "$as_me:16569: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16576,7 +16577,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16579: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16580: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16590,14 +16591,14 @@
- 
- fi
- 
--echo "$as_me:16593: checking for isascii" >&5
-+echo "$as_me:16594: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16600 "configure"
-+#line 16601 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -16609,16 +16610,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16612: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16613: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16615: \$? = $ac_status" >&5
-+  echo "$as_me:16616: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16618: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16619: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16621: \$? = $ac_status" >&5
-+  echo "$as_me:16622: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16629,7 +16630,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16632: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16633: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16637,10 +16638,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16640: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16641: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16643 "configure"
-+#line 16644 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16654,16 +16655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16657: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16658: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16660: \$? = $ac_status" >&5
-+  echo "$as_me:16661: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16663: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16666: \$? = $ac_status" >&5
-+  echo "$as_me:16667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16671,7 +16672,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16674 "configure"
-+#line 16675 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16686,16 +16687,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16689: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16690: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16692: \$? = $ac_status" >&5
-+  echo "$as_me:16693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16695: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16698: \$? = $ac_status" >&5
-+  echo "$as_me:16699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16711,11 +16712,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16714: result: $sigact_bad" >&5
-+echo "$as_me:16715: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16718: checking if nanosleep really works" >&5
-+echo "$as_me:16719: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16725,7 +16726,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16728 "configure"
-+#line 16729 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -16750,15 +16751,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16753: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16756: \$? = $ac_status" >&5
-+  echo "$as_me:16757: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16758: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16761: \$? = $ac_status" >&5
-+  echo "$as_me:16762: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16770,7 +16771,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16773: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16774: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16785,23 +16786,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16788: checking for $ac_header" >&5
-+echo "$as_me:16789: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16794 "configure"
-+#line 16795 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16798: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16799: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16804: \$? = $ac_status" >&5
-+  echo "$as_me:16805: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16820,7 +16821,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16823: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16824: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16835,23 +16836,23 @@
- for ac_header in sys/termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16838: checking for $ac_header" >&5
-+echo "$as_me:16839: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16844 "configure"
-+#line 16845 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16848: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16849: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16854: \$? = $ac_status" >&5
-+  echo "$as_me:16855: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16870,7 +16871,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16873: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16874: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16888,10 +16889,10 @@
- 	(*)	termios_bad=maybe ;;
- 	esac
- 	if test "$termios_bad" = maybe ; then
--	echo "$as_me:16891: checking whether termios.h needs _POSIX_SOURCE" >&5
-+	echo "$as_me:16892: checking whether termios.h needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16894 "configure"
-+#line 16895 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -16903,16 +16904,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16906: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16907: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16909: \$? = $ac_status" >&5
-+  echo "$as_me:16910: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16912: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16913: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16915: \$? = $ac_status" >&5
-+  echo "$as_me:16916: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16920,7 +16921,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16923 "configure"
-+#line 16924 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16934,16 +16935,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16937: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16938: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16940: \$? = $ac_status" >&5
-+  echo "$as_me:16941: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16943: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16944: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16946: \$? = $ac_status" >&5
-+  echo "$as_me:16947: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16959,19 +16960,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16962: result: $termios_bad" >&5
-+	echo "$as_me:16963: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16967: checking for tcgetattr" >&5
-+echo "$as_me:16968: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16974 "configure"
-+#line 16975 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16999,16 +17000,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17002: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17003: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17005: \$? = $ac_status" >&5
-+  echo "$as_me:17006: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17008: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17009: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17011: \$? = $ac_status" >&5
-+  echo "$as_me:17012: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17018,21 +17019,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17021: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17022: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17028: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17029: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17035 "configure"
-+#line 17036 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17048,16 +17049,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17051: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17052: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17054: \$? = $ac_status" >&5
-+  echo "$as_me:17055: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17057: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17060: \$? = $ac_status" >&5
-+  echo "$as_me:17061: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17065,7 +17066,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17068 "configure"
-+#line 17069 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17087,16 +17088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17090: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17091: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17093: \$? = $ac_status" >&5
-+  echo "$as_me:17094: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17096: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17097: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17099: \$? = $ac_status" >&5
-+  echo "$as_me:17100: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17104,7 +17105,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17107 "configure"
-+#line 17108 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17126,16 +17127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17129: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17132: \$? = $ac_status" >&5
-+  echo "$as_me:17133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17135: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17138: \$? = $ac_status" >&5
-+  echo "$as_me:17139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17150,7 +17151,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17153: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17154: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17171,7 +17172,7 @@
- ;;
- esac
- 
--echo "$as_me:17174: checking for working mkstemp" >&5
-+echo "$as_me:17175: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17182,7 +17183,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17185 "configure"
-+#line 17186 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -17220,15 +17221,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17223: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17226: \$? = $ac_status" >&5
-+  echo "$as_me:17227: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17228: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17229: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17231: \$? = $ac_status" >&5
-+  echo "$as_me:17232: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17243,16 +17244,16 @@
- fi
- 
- fi
--echo "$as_me:17246: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17247: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17249: checking for mkstemp" >&5
-+	echo "$as_me:17250: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17255 "configure"
-+#line 17256 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17283,16 +17284,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17286: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17287: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17289: \$? = $ac_status" >&5
-+  echo "$as_me:17290: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17292: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17295: \$? = $ac_status" >&5
-+  echo "$as_me:17296: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17302,7 +17303,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17305: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17306: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17323,21 +17324,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17326: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17327: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17329: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17330: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17335: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17336: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17340 "configure"
-+#line 17341 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17354,15 +17355,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17357: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17358: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17360: \$? = $ac_status" >&5
-+  echo "$as_me:17361: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17362: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17363: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17365: \$? = $ac_status" >&5
-+  echo "$as_me:17366: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17375,7 +17376,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17378: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17379: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17386,13 +17387,13 @@
- fi
- 
- fi
--echo "$as_me:17389: checking for intptr_t" >&5
-+echo "$as_me:17390: checking for intptr_t" >&5
- echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
- if test "${ac_cv_type_intptr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17395 "configure"
-+#line 17396 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17407,16 +17408,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17410: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17411: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17413: \$? = $ac_status" >&5
-+  echo "$as_me:17414: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17416: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17417: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17419: \$? = $ac_status" >&5
-+  echo "$as_me:17420: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17426,7 +17427,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17429: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17430: result: $ac_cv_type_intptr_t" >&5
- echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
- if test $ac_cv_type_intptr_t = yes; then
-   :
-@@ -17438,13 +17439,13 @@
- 
- fi
- 
--echo "$as_me:17441: checking for ssize_t" >&5
-+echo "$as_me:17442: checking for ssize_t" >&5
- echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17447 "configure"
-+#line 17448 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17459,16 +17460,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17462: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17463: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17465: \$? = $ac_status" >&5
-+  echo "$as_me:17466: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17468: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17471: \$? = $ac_status" >&5
-+  echo "$as_me:17472: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17478,7 +17479,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17481: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17482: result: $ac_cv_type_ssize_t" >&5
- echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
- if test $ac_cv_type_ssize_t = yes; then
-   :
-@@ -17490,14 +17491,14 @@
- 
- fi
- 
--echo "$as_me:17493: checking for type sigaction_t" >&5
-+echo "$as_me:17494: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17500 "configure"
-+#line 17501 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -17510,16 +17511,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17513: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17514: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17516: \$? = $ac_status" >&5
-+  echo "$as_me:17517: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17520: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17522: \$? = $ac_status" >&5
-+  echo "$as_me:17523: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17530,14 +17531,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17533: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17534: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17540: checking declaration of size-change" >&5
-+echo "$as_me:17541: checking declaration of size-change" >&5
- echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
- if test "${cf_cv_sizechange+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17552,7 +17553,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17555 "configure"
-+#line 17556 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -17596,16 +17597,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17599: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17602: \$? = $ac_status" >&5
-+  echo "$as_me:17603: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17605: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17606: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17608: \$? = $ac_status" >&5
-+  echo "$as_me:17609: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17624,7 +17625,7 @@
- done
- 
- fi
--echo "$as_me:17627: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17628: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17642,13 +17643,13 @@
- 	esac
- fi
- 
--echo "$as_me:17645: checking for memmove" >&5
-+echo "$as_me:17646: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17651 "configure"
-+#line 17652 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17679,16 +17680,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17682: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17683: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17685: \$? = $ac_status" >&5
-+  echo "$as_me:17686: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17688: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17689: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17691: \$? = $ac_status" >&5
-+  echo "$as_me:17692: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17698,19 +17699,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17701: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17702: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17707: checking for bcopy" >&5
-+echo "$as_me:17708: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17713 "configure"
-+#line 17714 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17741,16 +17742,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17744: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17747: \$? = $ac_status" >&5
-+  echo "$as_me:17748: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17750: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17753: \$? = $ac_status" >&5
-+  echo "$as_me:17754: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17760,11 +17761,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17763: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17764: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17767: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17768: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17774,7 +17775,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17777 "configure"
-+#line 17778 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17788,15 +17789,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17791: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17792: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17794: \$? = $ac_status" >&5
-+  echo "$as_me:17795: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17796: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17797: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17799: \$? = $ac_status" >&5
-+  echo "$as_me:17800: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17809,7 +17810,7 @@
- fi
- 
- fi
--echo "$as_me:17812: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17813: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17832,7 +17833,7 @@
- 
- fi
- 
--echo "$as_me:17835: checking if poll really works" >&5
-+echo "$as_me:17836: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17842,7 +17843,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17845 "configure"
-+#line 17846 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17889,15 +17890,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17892: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17893: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17895: \$? = $ac_status" >&5
-+  echo "$as_me:17896: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17897: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17898: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17900: \$? = $ac_status" >&5
-+  echo "$as_me:17901: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17909,21 +17910,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17912: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17913: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:17919: checking for va_copy" >&5
-+echo "$as_me:17920: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17926 "configure"
-+#line 17927 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17940,16 +17941,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17943: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17944: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17946: \$? = $ac_status" >&5
-+  echo "$as_me:17947: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17949: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17950: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17952: \$? = $ac_status" >&5
-+  echo "$as_me:17953: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -17959,7 +17960,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17962: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:17963: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -17967,14 +17968,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:17970: checking for __va_copy" >&5
-+echo "$as_me:17971: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17977 "configure"
-+#line 17978 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17991,16 +17992,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17994: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17995: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17997: \$? = $ac_status" >&5
-+  echo "$as_me:17998: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18001: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18003: \$? = $ac_status" >&5
-+  echo "$as_me:18004: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18010,7 +18011,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18013: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18014: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18018,13 +18019,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18021: checking for pid_t" >&5
-+echo "$as_me:18022: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18027 "configure"
-+#line 18028 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18039,16 +18040,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18042: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18043: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18045: \$? = $ac_status" >&5
-+  echo "$as_me:18046: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18048: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18049: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18051: \$? = $ac_status" >&5
-+  echo "$as_me:18052: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18058,7 +18059,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18061: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18062: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -18073,23 +18074,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18076: checking for $ac_header" >&5
-+echo "$as_me:18077: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18082 "configure"
-+#line 18083 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18086: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18087: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18092: \$? = $ac_status" >&5
-+  echo "$as_me:18093: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18108,7 +18109,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18111: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18112: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18121,13 +18122,13 @@
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18124: checking for $ac_func" >&5
-+echo "$as_me:18125: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18130 "configure"
-+#line 18131 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18158,16 +18159,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18161: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18162: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18164: \$? = $ac_status" >&5
-+  echo "$as_me:18165: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18168: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18170: \$? = $ac_status" >&5
-+  echo "$as_me:18171: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18177,7 +18178,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18180: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18181: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18189,7 +18190,7 @@
- 
- ac_cv_func_fork_works=$ac_cv_func_fork
- if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:18192: checking for working fork" >&5
-+  echo "$as_me:18193: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18212,15 +18213,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18215: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18218: \$? = $ac_status" >&5
-+  echo "$as_me:18219: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18220: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18221: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18223: \$? = $ac_status" >&5
-+  echo "$as_me:18224: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18232,7 +18233,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18235: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18236: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18246,12 +18247,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18249: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18250: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:18254: checking for working vfork" >&5
-+  echo "$as_me:18255: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18260,7 +18261,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18263 "configure"
-+#line 18264 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -18357,15 +18358,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18360: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18361: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18363: \$? = $ac_status" >&5
-+  echo "$as_me:18364: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18365: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18366: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18368: \$? = $ac_status" >&5
-+  echo "$as_me:18369: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18377,13 +18378,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18380: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18381: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:18386: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18387: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -18410,7 +18411,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18413: checking for openpty in -lutil" >&5
-+echo "$as_me:18414: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18418,7 +18419,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18421 "configure"
-+#line 18422 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18437,16 +18438,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18440: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18441: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18443: \$? = $ac_status" >&5
-+  echo "$as_me:18444: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18446: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18449: \$? = $ac_status" >&5
-+  echo "$as_me:18450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18457,7 +18458,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18460: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18461: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18465,14 +18466,14 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18468: checking for openpty header" >&5
-+echo "$as_me:18469: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cf_save_LIBS="$LIBS"
--	test $cf_cv_lib_util = yes &&
-+	test $cf_cv_lib_util = yes && {
- cf_add_libs="-lutil"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
- for cf_add_1lib in $LIBS
-@@ -18488,11 +18489,11 @@
- 	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
- done
- LIBS="$cf_add_libs"
--
-+ }
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18495 "configure"
-+#line 18496 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18509,16 +18510,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18512: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18513: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18515: \$? = $ac_status" >&5
-+  echo "$as_me:18516: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18518: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18519: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18521: \$? = $ac_status" >&5
-+  echo "$as_me:18522: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18536,7 +18537,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18539: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18540: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18606,7 +18607,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18609 "configure"
-+#line 18610 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18618,16 +18619,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18621: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18624: \$? = $ac_status" >&5
-+  echo "$as_me:18625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18627: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18630: \$? = $ac_status" >&5
-+  echo "$as_me:18631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18644,7 +18645,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18647: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18648: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18680,7 +18681,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18683: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18684: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18691,7 +18692,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18694: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18695: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18760,7 +18761,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18763 "configure"
-+#line 18764 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18772,16 +18773,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18775: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18776: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18778: \$? = $ac_status" >&5
-+  echo "$as_me:18779: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18781: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18784: \$? = $ac_status" >&5
-+  echo "$as_me:18785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18798,7 +18799,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18801: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18802: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18878,7 +18879,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18881: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18882: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18895,23 +18896,23 @@
- 	fi
- esac
- 
--echo "$as_me:18898: checking for db.h" >&5
-+echo "$as_me:18899: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18904 "configure"
-+#line 18905 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:18908: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18909: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18914: \$? = $ac_status" >&5
-+  echo "$as_me:18915: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18930,11 +18931,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18933: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:18934: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:18937: checking for version of db" >&5
-+echo "$as_me:18938: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18945,10 +18946,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:18948: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:18949: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18951 "configure"
-+#line 18952 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -18978,16 +18979,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18981: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18984: \$? = $ac_status" >&5
-+  echo "$as_me:18985: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18987: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18990: \$? = $ac_status" >&5
-+  echo "$as_me:18991: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19001,16 +19002,16 @@
- done
- 
- fi
--echo "$as_me:19004: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19005: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19008: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19009: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19013: checking for db libraries" >&5
-+echo "$as_me:19014: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19040,10 +19041,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19043: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19044: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19046 "configure"
-+#line 19047 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19098,16 +19099,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19102: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19104: \$? = $ac_status" >&5
-+  echo "$as_me:19105: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19108: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19110: \$? = $ac_status" >&5
-+  echo "$as_me:19111: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19127,11 +19128,11 @@
- done
- 
- fi
--echo "$as_me:19130: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19131: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19134: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19135: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19157,7 +19158,7 @@
- 
- else
- 
--	{ { echo "$as_me:19160: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19161: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19172,7 +19173,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19175: checking if we should include stdbool.h" >&5
-+echo "$as_me:19176: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19180,7 +19181,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19183 "configure"
-+#line 19184 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19192,23 +19193,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19195: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19196: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19198: \$? = $ac_status" >&5
-+  echo "$as_me:19199: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19202: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19204: \$? = $ac_status" >&5
-+  echo "$as_me:19205: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19211 "configure"
-+#line 19212 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19224,16 +19225,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19228: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19230: \$? = $ac_status" >&5
-+  echo "$as_me:19231: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19234: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19236: \$? = $ac_status" >&5
-+  echo "$as_me:19237: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19247,13 +19248,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19250: result: yes" >&5
-+then	echo "$as_me:19251: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19252: result: no" >&5
-+else	echo "$as_me:19253: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19256: checking for builtin bool type" >&5
-+echo "$as_me:19257: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19261,7 +19262,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19264 "configure"
-+#line 19265 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -19276,16 +19277,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19279: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19282: \$? = $ac_status" >&5
-+  echo "$as_me:19283: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19285: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19286: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19288: \$? = $ac_status" >&5
-+  echo "$as_me:19289: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19298,9 +19299,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19301: result: yes" >&5
-+then	echo "$as_me:19302: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19303: result: no" >&5
-+else	echo "$as_me:19304: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19314,21 +19315,67 @@
- ac_main_return=return
- 
- if test -n "$GXX" ; then
--case $cf_cv_system_name in
--(os2*)
--	cf_stdcpp_libname=stdcpp
--	;;
--(*)
--	cf_stdcpp_libname=stdc++
--	;;
--esac
--echo "$as_me:19325: checking for library $cf_stdcpp_libname" >&5
-+
-+	cf_save="$LIBS"
-+	LIBS="$LIBS $CXXLIBS"
-+	echo "$as_me:19321: checking if we already have C++ library" >&5
-+echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 19324 "configure"
-+#include "confdefs.h"
-+
-+			#include <iostream>
-+int
-+main ()
-+{
-+
-+			std::cout << "Hello World!" << std::endl;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:19338: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:19341: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:19344: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:19347: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_have_libstdcpp=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_have_libstdcpp=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+	echo "$as_me:19356: result: $cf_have_libstdcpp" >&5
-+echo "${ECHO_T}$cf_have_libstdcpp" >&6
-+	LIBS="$cf_save"
-+
-+	if test $cf_have_libstdcpp != yes
-+	then
-+		case $cf_cv_system_name in
-+		(os2*)
-+			cf_stdcpp_libname=stdcpp
-+			;;
-+		(*)
-+			cf_stdcpp_libname=stdc++
-+			;;
-+		esac
-+
-+		echo "$as_me:19371: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--	cf_save="$LIBS"
-+			cf_save="$LIBS"
-+			LIBS="$LIBS $CXXLIBS"
- 
- cf_add_libs="-l$cf_stdcpp_libname"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
-@@ -19346,33 +19393,31 @@
- done
- LIBS="$cf_add_libs"
- 
--cat >conftest.$ac_ext <<_ACEOF
--#line 19350 "configure"
-+		cat >conftest.$ac_ext <<_ACEOF
-+#line 19397 "configure"
- #include "confdefs.h"
- 
--#include <strstream.h>
-+				#include <iostream>
- int
- main ()
- {
- 
--char buf[80];
--strstreambuf foo(buf, sizeof(buf))
--
-+				std::cout << "Hello World!" << std::endl;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19366: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19411: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19369: \$? = $ac_status" >&5
-+  echo "$as_me:19414: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19417: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19375: \$? = $ac_status" >&5
-+  echo "$as_me:19420: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19381,12 +19426,12 @@
- cf_cv_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	LIBS="$cf_save"
-+			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19387: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19432: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
--test "$cf_cv_libstdcpp" = yes &&
-+		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
- # Filter out duplicates - this happens with badly-designed ".pc" files...
- for cf_add_1lib in $CXXLIBS
-@@ -19402,10 +19447,11 @@
- 	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
- done
- CXXLIBS="$cf_add_libs"
--
-+ }
-+	fi
- fi
- 
--	echo "$as_me:19408: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19454: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19421,15 +19467,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19424: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19470: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19427: \$? = $ac_status" >&5
-+  echo "$as_me:19473: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19429: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19475: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19432: \$? = $ac_status" >&5
-+  echo "$as_me:19478: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19440,10 +19486,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19443: result: yes" >&5
-+  echo "$as_me:19489: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19446: result: no" >&5
-+  echo "$as_me:19492: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19463,7 +19509,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19466: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19512: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19484,7 +19530,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19487 "configure"
-+#line 19533 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19498,16 +19544,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19547: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19504: \$? = $ac_status" >&5
-+  echo "$as_me:19550: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19553: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19510: \$? = $ac_status" >&5
-+  echo "$as_me:19556: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19544,7 +19590,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19547 "configure"
-+#line 19593 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -19558,16 +19604,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19607: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19564: \$? = $ac_status" >&5
-+  echo "$as_me:19610: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19613: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19570: \$? = $ac_status" >&5
-+  echo "$as_me:19616: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19600,7 +19646,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19603: result: $cf_cxx_library" >&5
-+	echo "$as_me:19649: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19616,7 +19662,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19619: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19665: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19633,18 +19679,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19636 "configure"
-+#line 19682 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19641: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19687: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19647: \$? = $ac_status" >&5
-+  echo "$as_me:19693: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19667,17 +19713,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19670 "configure"
-+#line 19716 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19674: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19720: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19680: \$? = $ac_status" >&5
-+  echo "$as_me:19726: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19714,7 +19760,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19717: result: $CXXCPP" >&5
-+echo "$as_me:19763: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19724,18 +19770,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19727 "configure"
-+#line 19773 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19732: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19778: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19738: \$? = $ac_status" >&5
-+  echo "$as_me:19784: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19758,17 +19804,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19761 "configure"
-+#line 19807 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19765: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19811: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19771: \$? = $ac_status" >&5
-+  echo "$as_me:19817: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19796,7 +19842,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19799: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19845: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19811,23 +19857,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19814: checking for $ac_header" >&5
-+echo "$as_me:19860: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19820 "configure"
-+#line 19866 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19824: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19870: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19830: \$? = $ac_status" >&5
-+  echo "$as_me:19876: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19846,7 +19892,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19849: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19895: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19859,23 +19905,23 @@
- for ac_header in iostream
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19862: checking for $ac_header" >&5
-+echo "$as_me:19908: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19868 "configure"
-+#line 19914 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19872: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19918: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19878: \$? = $ac_status" >&5
-+  echo "$as_me:19924: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19894,7 +19940,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19897: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19943: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19905,10 +19951,10 @@
- done
- 
- if test x"$ac_cv_header_iostream" = xyes ; then
--	echo "$as_me:19908: checking if iostream uses std-namespace" >&5
-+	echo "$as_me:19954: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19911 "configure"
-+#line 19957 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -19925,16 +19971,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19928: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19974: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19931: \$? = $ac_status" >&5
-+  echo "$as_me:19977: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19934: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19980: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19937: \$? = $ac_status" >&5
-+  echo "$as_me:19983: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -19943,7 +19989,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19946: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:19992: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -19954,7 +20000,7 @@
- 	fi
- fi
- 
--echo "$as_me:19957: checking if we should include stdbool.h" >&5
-+echo "$as_me:20003: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19962,7 +20008,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19965 "configure"
-+#line 20011 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19974,23 +20020,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19977: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20023: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19980: \$? = $ac_status" >&5
-+  echo "$as_me:20026: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19983: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19986: \$? = $ac_status" >&5
-+  echo "$as_me:20032: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19993 "configure"
-+#line 20039 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20006,16 +20052,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20009: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20012: \$? = $ac_status" >&5
-+  echo "$as_me:20058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20018: \$? = $ac_status" >&5
-+  echo "$as_me:20064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20029,13 +20075,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20032: result: yes" >&5
-+then	echo "$as_me:20078: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20034: result: no" >&5
-+else	echo "$as_me:20080: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20038: checking for builtin bool type" >&5
-+echo "$as_me:20084: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20043,7 +20089,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20046 "configure"
-+#line 20092 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -20058,16 +20104,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20061: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20107: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20064: \$? = $ac_status" >&5
-+  echo "$as_me:20110: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20067: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20113: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20070: \$? = $ac_status" >&5
-+  echo "$as_me:20116: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20080,13 +20126,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20083: result: yes" >&5
-+then	echo "$as_me:20129: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20085: result: no" >&5
-+else	echo "$as_me:20131: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20089: checking for size of bool" >&5
-+echo "$as_me:20135: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20097,7 +20143,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20100 "configure"
-+#line 20146 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20139,15 +20185,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20142: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20188: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20145: \$? = $ac_status" >&5
-+  echo "$as_me:20191: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20193: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20150: \$? = $ac_status" >&5
-+  echo "$as_me:20196: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20165,18 +20211,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20168: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20214: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20174: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20220: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20179: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20225: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20194,7 +20240,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20197 "configure"
-+#line 20243 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -20208,16 +20254,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20211: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20257: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20214: \$? = $ac_status" >&5
-+  echo "$as_me:20260: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20220: \$? = $ac_status" >&5
-+  echo "$as_me:20266: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -20238,12 +20284,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:20241: result: $cf_result" >&5
-+echo "$as_me:20287: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20246: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20292: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20260,7 +20306,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20263 "configure"
-+#line 20309 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20279,15 +20325,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20282: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20328: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20285: \$? = $ac_status" >&5
-+  echo "$as_me:20331: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20287: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20290: \$? = $ac_status" >&5
-+  echo "$as_me:20336: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20306,7 +20352,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20309: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20355: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20316,7 +20362,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20319: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20365: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20330,7 +20376,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20333 "configure"
-+#line 20379 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20374,16 +20420,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20377: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20423: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20380: \$? = $ac_status" >&5
-+  echo "$as_me:20426: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20383: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20386: \$? = $ac_status" >&5
-+  echo "$as_me:20432: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20401,7 +20447,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20404: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20450: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20450,7 +20496,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20453: checking for size of bool" >&5
-+echo "$as_me:20499: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20461,7 +20507,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20464 "configure"
-+#line 20510 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20503,15 +20549,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20506: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20552: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20509: \$? = $ac_status" >&5
-+  echo "$as_me:20555: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20511: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20514: \$? = $ac_status" >&5
-+  echo "$as_me:20560: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20529,25 +20575,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20532: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20578: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20538: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20584: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20544: checking for fallback type of bool" >&5
-+			echo "$as_me:20590: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20550: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20596: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20576,7 +20622,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20579: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20625: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20587,7 +20633,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20590: checking for $ac_word" >&5
-+echo "$as_me:20636: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20602,7 +20648,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20605: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20651: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20611,10 +20657,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20614: result: $gnat_exists" >&5
-+  echo "$as_me:20660: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20617: result: no" >&5
-+  echo "$as_me:20663: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20623,12 +20669,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20626: checking for gnat version" >&5
-+echo "$as_me:20672: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20631: result: $cf_gnat_version" >&5
-+echo "$as_me:20677: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20636,7 +20682,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20639: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20685: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20644,7 +20690,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20647: checking for $ac_word" >&5
-+echo "$as_me:20693: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20659,7 +20705,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20662: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20708: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20668,10 +20714,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20671: result: $M4_exists" >&5
-+  echo "$as_me:20717: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20674: result: no" >&5
-+  echo "$as_me:20720: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20680,7 +20726,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20683: checking if GNAT works" >&5
-+		echo "$as_me:20729: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20708,7 +20754,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20711: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20757: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20717,7 +20763,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20720: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20766: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20734,10 +20780,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20737: result: $ADAFLAGS" >&5
-+	echo "$as_me:20783: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20740: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20786: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20747,11 +20793,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20750: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20796: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20754: checking if GNAT supports generics" >&5
-+echo "$as_me:20800: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20761,7 +20807,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20764: result: $cf_gnat_generics" >&5
-+echo "$as_me:20810: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20773,7 +20819,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20776: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20822: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20821,7 +20867,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20824: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20870: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20834,7 +20880,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20837: checking if GNAT supports project files" >&5
-+echo "$as_me:20883: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -20894,15 +20940,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:20897: result: $cf_gnat_projects" >&5
-+echo "$as_me:20943: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:20903: checking if GNAT supports libraries" >&5
-+	echo "$as_me:20949: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:20905: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:20951: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -20922,7 +20968,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:20925: checking for ada-compiler" >&5
-+echo "$as_me:20971: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -20933,12 +20979,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:20936: result: $cf_ada_compiler" >&5
-+echo "$as_me:20982: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:20941: checking for ada-include" >&5
-+echo "$as_me:20987: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -20974,7 +21020,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:20977: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21023: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -20983,10 +21029,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:20986: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21032: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:20989: checking for ada-objects" >&5
-+echo "$as_me:21035: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21022,7 +21068,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21025: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21071: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21031,10 +21077,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21034: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21080: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21037: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21083: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21044,7 +21090,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21047: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21093: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21067,13 +21113,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21070: checking for wchar_t" >&5
-+	echo "$as_me:21116: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21076 "configure"
-+#line 21122 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21088,16 +21134,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21091: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21137: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21094: \$? = $ac_status" >&5
-+  echo "$as_me:21140: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21097: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21143: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21100: \$? = $ac_status" >&5
-+  echo "$as_me:21146: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21107,10 +21153,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21110: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21156: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21113: checking size of wchar_t" >&5
-+echo "$as_me:21159: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21119,7 +21165,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21122 "configure"
-+#line 21168 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21131,21 +21177,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21180: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21137: \$? = $ac_status" >&5
-+  echo "$as_me:21183: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21186: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21143: \$? = $ac_status" >&5
-+  echo "$as_me:21189: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21148 "configure"
-+#line 21194 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21157,16 +21203,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21160: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21206: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21163: \$? = $ac_status" >&5
-+  echo "$as_me:21209: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21212: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21169: \$? = $ac_status" >&5
-+  echo "$as_me:21215: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21182,7 +21228,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21185 "configure"
-+#line 21231 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21194,16 +21240,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21197: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21200: \$? = $ac_status" >&5
-+  echo "$as_me:21246: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21206: \$? = $ac_status" >&5
-+  echo "$as_me:21252: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21219,7 +21265,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21222 "configure"
-+#line 21268 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21231,16 +21277,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21234: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21280: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21237: \$? = $ac_status" >&5
-+  echo "$as_me:21283: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21240: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21286: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21243: \$? = $ac_status" >&5
-+  echo "$as_me:21289: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21253,12 +21299,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21256: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21302: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21261 "configure"
-+#line 21307 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21274,15 +21320,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21277: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21323: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21280: \$? = $ac_status" >&5
-+  echo "$as_me:21326: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21282: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21328: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21285: \$? = $ac_status" >&5
-+  echo "$as_me:21331: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21298,7 +21344,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21301: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21347: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-@@ -21316,7 +21362,7 @@
- ### chooses to split module lists into libraries.
- ###
- ### (see CF_LIB_RULES).
--echo "$as_me:21319: checking for library subsets" >&5
-+echo "$as_me:21365: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21358,7 +21404,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21361: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21407: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21389,7 +21435,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21392: checking default library suffix" >&5
-+echo "$as_me:21438: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21400,10 +21446,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21403: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21449: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21406: checking default library-dependency suffix" >&5
-+echo "$as_me:21452: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21461,10 +21507,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21464: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21510: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21467: checking default object directory" >&5
-+echo "$as_me:21513: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21480,11 +21526,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21483: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21529: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21487: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21533: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21552,7 +21598,7 @@
- 	fi
- 
- fi
--echo "$as_me:21555: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21601: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21725,19 +21771,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21728: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21774: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 21733 "configure"
-+#line 21779 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21737: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21783: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21740: \$? = $ac_status" >&5
-+  echo "$as_me:21786: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21748,10 +21794,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21751 "configure"
-+#line 21797 "configure"
- #include "confdefs.h"
- 
--#line 21754 "configure"
-+#line 21800 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21766,16 +21812,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21769: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21772: \$? = $ac_status" >&5
-+  echo "$as_me:21818: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21778: \$? = $ac_status" >&5
-+  echo "$as_me:21824: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21798,7 +21844,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21801: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21847: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21814,7 +21860,7 @@
- 	;;
- esac
- 
--echo "$as_me:21817: checking where we will install curses.h" >&5
-+echo "$as_me:21863: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21824,7 +21870,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21827: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21873: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21832,7 +21878,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21835: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21881: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21850,7 +21896,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21853: checking for src modules" >&5
-+echo "$as_me:21899: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -21915,7 +21961,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:21918: result: $cf_cv_src_modules" >&5
-+echo "$as_me:21964: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22135,7 +22181,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22138: checking for $ac_word" >&5
-+echo "$as_me:22184: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22152,7 +22198,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22155: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22201: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22164,10 +22210,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22167: result: $TIC_PATH" >&5
-+  echo "$as_me:22213: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22170: result: no" >&5
-+  echo "$as_me:22216: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22175,7 +22221,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22178: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22224: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22201,7 +22247,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22204: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22250: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22212,7 +22258,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22215: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22261: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22228,7 +22274,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22231: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22277: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22285,7 +22331,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22288: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22334: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22387,7 +22433,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22390: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22436: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22563,7 +22609,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22566: error: ambiguous option: $1
-+    { { echo "$as_me:22612: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22582,7 +22628,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22585: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22631: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22700,7 +22746,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22703: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22749: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23155,7 +23201,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23158: creating $ac_file" >&5
-+    { echo "$as_me:23204: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23173,7 +23219,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23176: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23222: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23186,7 +23232,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23189: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23235: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23202,7 +23248,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23205: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23251: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -23211,7 +23257,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23214: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23260: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -23248,7 +23294,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:23251: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23297: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -23259,7 +23305,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:23262: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23308: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23308,7 +23354,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23311: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23357: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23319,7 +23365,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23322: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23368: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23332,7 +23378,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23335: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23381: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23390,7 +23436,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:23393: $ac_file is unchanged" >&5
-+      { echo "$as_me:23439: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23728,7 +23774,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23731: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23777: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: dist.mk
-Prereq:  1.1069 
---- ncurses-6.0-20150905+/dist.mk	2015-09-05 21:14:02.000000000 +0000
-+++ ncurses-6.0-20150912/dist.mk	2015-09-12 16:17:30.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1069 2015/09/05 21:14:02 tom Exp $
-+# $Id: dist.mk,v 1.1070 2015/09/12 16:17:30 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150905
-+NCURSES_PATCH = 20150912
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: include/ncurses_cfg.hin
-Prereq:  1.7 
---- ncurses-6.0-20150905+/include/ncurses_cfg.hin	2005-01-02 01:26:58.000000000 +0000
-+++ ncurses-6.0-20150912/include/ncurses_cfg.hin	2015-09-12 20:49:54.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,10 +27,10 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
-+ *  Author: Thomas E. Dickey      1997-on                                   *
-  ****************************************************************************/
- /*
-- * $Id: ncurses_cfg.hin,v 1.7 2005/01/02 01:26:58 tom Exp $
-+ * $Id: ncurses_cfg.hin,v 1.8 2015/09/12 20:49:54 tom Exp $
-  *
-  * This is a template-file used to generate the "ncurses_cfg.h" file.
-  *
-@@ -52,7 +52,7 @@
- #ifdef __cplusplus
- #undef const
- #undef inline
--#else
-+#elif !defined(__clang__)
- #if defined(lint) || defined(TRACE)
- #undef inline
- #define inline /* nothing */
-Index: ncurses/base/lib_screen.c
-Prereq:  1.77 
---- ncurses-6.0-20150905+/ncurses/base/lib_screen.c	2015-07-04 22:54:14.000000000 +0000
-+++ ncurses-6.0-20150912/ncurses/base/lib_screen.c	2015-09-12 20:47:43.000000000 +0000
-@@ -41,7 +41,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_screen.c,v 1.77 2015/07/04 22:54:14 tom Exp $")
-+MODULE_ID("$Id: lib_screen.c,v 1.78 2015/09/12 20:47:43 tom Exp $")
- 
- #define MAX_SIZE 0x3fff		/* 16k is big enough for a window or pad */
- 
-@@ -751,7 +751,6 @@
- 	    break;
- 	}
-     }
--    target += strlen(target);
- #endif
- }
- #endif
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150905+/package/debian-mingw/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian-mingw/changelog	2015-09-12 16:17:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150905) unstable; urgency=low
-+ncurses6 (6.0+20150912) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Sep 2015 17:14:03 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Sep 2015 12:17:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150905+/package/debian-mingw64/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian-mingw64/changelog	2015-09-12 16:17:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150905) unstable; urgency=low
-+ncurses6 (6.0+20150912) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Sep 2015 17:14:03 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Sep 2015 12:17:30 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150905+/package/debian/changelog	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/debian/changelog	2015-09-12 16:17:30.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150905) unstable; urgency=low
-+ncurses6 (6.0+20150912) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Sep 2015 17:14:03 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Sep 2015 12:17:30 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.122 
---- ncurses-6.0-20150905+/package/mingw-ncurses.nsi	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/mingw-ncurses.nsi	2015-09-12 16:17:30.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.122 2015/09/05 21:14:03 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.123 2015/09/12 16:17:30 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0905"

-+!define VERSION_MMDD  "0912"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150905+/package/mingw-ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/mingw-ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150905
-+Release: 20150912
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150905+/package/ncurses.spec	2015-09-05 21:14:03.000000000 +0000
-+++ ncurses-6.0-20150912/package/ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150905
-+Release: 20150912
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/patches/ncurses/6.0/150-ncurses-6.0-20150919.patch b/patches/ncurses/6.0/150-ncurses-6.0-20150919.patch
deleted file mode 100644
index 13646a7..0000000
--- a/patches/ncurses/6.0/150-ncurses-6.0-20150919.patch
+++ /dev/null
@@ -1,9184 +0,0 @@
-# ncurses 6.0 - patch 20150919 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 are in the subdirectory
-# 	ftp://invisible-island.net/ncurses/6.0
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150919.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Sep 20 01:24:12 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/configure                   | 2807 ++++++++++++++++++++----------------
-# Ada95/configure.in                |   13 
-# NEWS                              |   10 
-# VERSION                           |    2 
-# dist.mk                           |    4 
-# doc/html/man/captoinfo.1m.html    |    2 
-# doc/html/man/clear.1.html         |    2 
-# doc/html/man/curs_addch.3x.html   |    2 
-# doc/html/man/curs_getch.3x.html   |  113 -
-# doc/html/man/curs_threads.3x.html |    2 
-# doc/html/man/form.3x.html         |    2 
-# doc/html/man/infocmp.1m.html      |    2 
-# doc/html/man/infotocap.1m.html    |    2 
-# doc/html/man/menu.3x.html         |    2 
-# doc/html/man/ncurses.3x.html      |    2 
-# doc/html/man/panel.3x.html        |    2 
-# doc/html/man/resizeterm.3x.html   |   35 
-# doc/html/man/tabs.1.html          |    2 
-# doc/html/man/terminfo.5.html      |    2 
-# doc/html/man/tic.1m.html          |    2 
-# doc/html/man/toe.1m.html          |    2 
-# doc/html/man/tput.1.html          |    2 
-# doc/html/man/tset.1.html          |    2 
-# man/curs_getch.3x                 |   14 
-# man/resizeterm.3x                 |   24 
-# package/debian-mingw/changelog    |    4 
-# package/debian-mingw64/changelog  |    4 
-# package/debian/changelog          |    4 
-# package/mingw-ncurses.nsi         |    4 
-# package/mingw-ncurses.spec        |    2 
-# package/ncurses.spec              |    2 
-# 31 files changed, 1806 insertions(+), 1268 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/configure
---- ncurses-6.0-20150912+/Ada95/configure	2015-08-22 21:14:42.000000000 +0000
-+++ ncurses-6.0-20150919/Ada95/configure	2015-09-19 20:50:21.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.60 .
-+# From configure.in Revision: 1.61 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20141204.
- #
-@@ -106,6 +106,42 @@
- : ${ac_max_here_lines=38}
- 
- ac_unique_file="gen/gen.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#if STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# if HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#if HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#else
-+# if HAVE_STDINT_H
-+#  include <stdint.h>
-+# endif
-+#endif
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -892,7 +928,7 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:895: loading site script $ac_site_file" >&5
-+    { echo "$as_me:931: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-     cat "$ac_site_file" >&5
-     . "$ac_site_file"
-@@ -903,7 +939,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:906: loading cache $cache_file" >&5
-+    { echo "$as_me:942: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -911,7 +947,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:914: creating cache $cache_file" >&5
-+  { echo "$as_me:950: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -927,21 +963,21 @@
-   eval ac_new_val="\$ac_env_${ac_var}_value"
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:966: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:934: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:970: error: \`$ac_var' was not set in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:940: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:976: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:942:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:978:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:944:   current value: $ac_new_val" >&5
-+        { echo "$as_me:980:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -960,9 +996,9 @@
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:963: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:999: error: changes in the environment can compromise the build" >&5
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:1001: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -983,10 +1019,10 @@
- echo "#! $SHELL" >conftest.sh
- echo  "exit 0"   >>conftest.sh
- chmod +x conftest.sh
--if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:1022: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:989: \$? = $ac_status" >&5
-+  echo "$as_me:1025: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -1016,7 +1052,7 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:1019: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1055: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1026,11 +1062,11 @@
- 
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:1029: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1065: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:1033: checking build system type" >&5
-+echo "$as_me:1069: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1039,23 +1075,23 @@
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:1042: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1078: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:1046: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1082: error: $ac_config_sub $ac_cv_build_alias failed." >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1051: result: $ac_cv_build" >&5
-+echo "$as_me:1087: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:1058: checking host system type" >&5
-+echo "$as_me:1094: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1064,12 +1100,12 @@
- test -z "$ac_cv_host_alias" &&
-   ac_cv_host_alias=$ac_cv_build_alias
- ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:1067: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1103: error: $ac_config_sub $ac_cv_host_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1072: result: $ac_cv_host" >&5
-+echo "$as_me:1108: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
- host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1077,7 +1113,7 @@
- host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
- if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
--	echo "$as_me:1080: checking target system type" >&5
-+	echo "$as_me:1116: checking target system type" >&5
- echo $ECHO_N "checking target system type... $ECHO_C" >&6
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1086,12 +1122,12 @@
- test "x$ac_cv_target_alias" = "x" &&
-   ac_cv_target_alias=$ac_cv_host_alias
- ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:1089: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1125: error: $ac_config_sub $ac_cv_target_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1094: result: $ac_cv_target" >&5
-+echo "$as_me:1130: result: $ac_cv_target" >&5
- echo "${ECHO_T}$ac_cv_target" >&6
- target=$ac_cv_target
- target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1123,13 +1159,13 @@
- fi
- 
- test -z "$system_name" && system_name="$cf_cv_system_name"
--test -n "$cf_cv_system_name" && echo "$as_me:1126: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1162: result: Configuring for $cf_cv_system_name" >&5
- echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
- 
- if test ".$system_name" != ".$cf_cv_system_name" ; then
--	echo "$as_me:1130: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+	echo "$as_me:1166: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
- echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
--	{ { echo "$as_me:1132: error: \"Please remove config.cache and try again.\"" >&5
-+	{ { echo "$as_me:1168: error: \"Please remove config.cache and try again.\"" >&5
- echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1137,7 +1173,7 @@
- # Check whether --with-system-type or --without-system-type was given.
- if test "${with_system_type+set}" = set; then
-   withval="$with_system_type"
--  { echo "$as_me:1140: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1176: WARNING: overriding system type to $withval" >&5
- echo "$as_me: WARNING: overriding system type to $withval" >&2;}
- 	cf_cv_system_name=$withval
- 	host_os=$withval
-@@ -1149,7 +1185,7 @@
- 
- ###	Default install-location
- 
--echo "$as_me:1152: checking for prefix" >&5
-+echo "$as_me:1188: checking for prefix" >&5
- echo $ECHO_N "checking for prefix... $ECHO_C" >&6
- if test "x$prefix" = "xNONE" ; then
- 	case "$cf_cv_system_name" in
-@@ -1161,11 +1197,11 @@
- 		;;
- 	esac
- fi
--echo "$as_me:1164: result: $prefix" >&5
-+echo "$as_me:1200: result: $prefix" >&5
- echo "${ECHO_T}$prefix" >&6
- 
- if test "x$prefix" = "xNONE" ; then
--echo "$as_me:1168: checking for default include-directory" >&5
-+echo "$as_me:1204: checking for default include-directory" >&5
- echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
- test -n "$verbose" && echo 1>&6
- for cf_symbol in \
-@@ -1188,7 +1224,7 @@
- 	fi
- 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
- done
--echo "$as_me:1191: result: $includedir" >&5
-+echo "$as_me:1227: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
- 
-@@ -1205,7 +1241,7 @@
-   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
--echo "$as_me:1208: checking for $ac_word" >&5
-+echo "$as_me:1244: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1220,7 +1256,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--echo "$as_me:1223: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1259: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1228,10 +1264,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1231: result: $CC" >&5
-+  echo "$as_me:1267: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1234: result: no" >&5
-+  echo "$as_me:1270: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1244,7 +1280,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:1247: checking for $ac_word" >&5
-+echo "$as_me:1283: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1259,7 +1295,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="$ac_prog"
--echo "$as_me:1262: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1298: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1267,10 +1303,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1270: result: $ac_ct_CC" >&5
-+  echo "$as_me:1306: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1273: result: no" >&5
-+  echo "$as_me:1309: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1280,32 +1316,32 @@
-   CC=$ac_ct_CC
- fi
- 
--test -z "$CC" && { { echo "$as_me:1283: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1319: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1288:" \
-+echo "$as_me:1324:" \
-      "checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:1291: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1327: \"$ac_compiler --version </dev/null >&5\"") >&5
-   (eval $ac_compiler --version </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1294: \$? = $ac_status" >&5
-+  echo "$as_me:1330: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1296: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1332: \"$ac_compiler -v </dev/null >&5\"") >&5
-   (eval $ac_compiler -v </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1299: \$? = $ac_status" >&5
-+  echo "$as_me:1335: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1301: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1337: \"$ac_compiler -V </dev/null >&5\"") >&5
-   (eval $ac_compiler -V </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1304: \$? = $ac_status" >&5
-+  echo "$as_me:1340: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1308 "configure"
-+#line 1344 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1321,13 +1357,13 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:1324: checking for C compiler default output" >&5
-+echo "$as_me:1360: checking for C compiler default output" >&5
- echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:1327: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1363: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1330: \$? = $ac_status" >&5
-+  echo "$as_me:1366: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Find the output, starting from the most likely.  This scheme is
- # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-@@ -1350,34 +1386,34 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1353: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1389: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1359: result: $ac_file" >&5
-+echo "$as_me:1395: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1364: checking whether the C compiler works" >&5
-+echo "$as_me:1400: checking whether the C compiler works" >&5
- echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1370: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1406: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1373: \$? = $ac_status" >&5
-+  echo "$as_me:1409: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1380: error: cannot run C compiled programs.
-+	{ { echo "$as_me:1416: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&5
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&2;}
-@@ -1385,24 +1421,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1388: result: yes" >&5
-+echo "$as_me:1424: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1395: checking whether we are cross compiling" >&5
-+echo "$as_me:1431: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:1397: result: $cross_compiling" >&5
-+echo "$as_me:1433: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1400: checking for executable suffix" >&5
-+echo "$as_me:1436: checking for executable suffix" >&5
- echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
--if { (eval echo "$as_me:1402: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1438: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1405: \$? = $ac_status" >&5
-+  echo "$as_me:1441: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -1418,25 +1454,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1421: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1457: error: cannot compute EXEEXT: cannot compile and link" >&5
- echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1427: result: $ac_cv_exeext" >&5
-+echo "$as_me:1463: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1433: checking for object suffix" >&5
-+echo "$as_me:1469: checking for object suffix" >&5
- echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1439 "configure"
-+#line 1475 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1448,10 +1484,10 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1451: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1487: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1454: \$? = $ac_status" >&5
-+  echo "$as_me:1490: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-   case $ac_file in
-@@ -1463,24 +1499,24 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1466: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1502: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1473: result: $ac_cv_objext" >&5
-+echo "$as_me:1509: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:1477: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1513: checking whether we are using the GNU C compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1483 "configure"
-+#line 1519 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1495,16 +1531,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1498: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1534: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1501: \$? = $ac_status" >&5
-+  echo "$as_me:1537: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1504: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1540: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1507: \$? = $ac_status" >&5
-+  echo "$as_me:1543: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -1516,19 +1552,19 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:1519: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1555: result: $ac_cv_c_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="-g"
--echo "$as_me:1525: checking whether $CC accepts -g" >&5
-+echo "$as_me:1561: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1531 "configure"
-+#line 1567 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1540,16 +1576,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1543: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1579: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1546: \$? = $ac_status" >&5
-+  echo "$as_me:1582: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1549: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1585: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1552: \$? = $ac_status" >&5
-+  echo "$as_me:1588: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -1559,7 +1595,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:1562: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1598: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -1586,16 +1622,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1589: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1625: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1592: \$? = $ac_status" >&5
-+  echo "$as_me:1628: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1595: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1631: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1598: \$? = $ac_status" >&5
-+  echo "$as_me:1634: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -1607,7 +1643,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1610 "configure"
-+#line 1646 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -1620,16 +1656,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1623: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1659: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1626: \$? = $ac_status" >&5
-+  echo "$as_me:1662: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1665: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1632: \$? = $ac_status" >&5
-+  echo "$as_me:1668: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -1639,7 +1675,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1642 "configure"
-+#line 1678 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -1651,16 +1687,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1654: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1690: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1657: \$? = $ac_status" >&5
-+  echo "$as_me:1693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1660: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1663: \$? = $ac_status" >&5
-+  echo "$as_me:1699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -1690,15 +1726,15 @@
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:1693: checking version of $CC" >&5
-+	echo "$as_me:1729: checking version of $CC" >&5
- echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
- 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
--	echo "$as_me:1697: result: $GCC_VERSION" >&5
-+	echo "$as_me:1733: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
--echo "$as_me:1701: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:1737: checking for $CC option to accept ANSI C" >&5
- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1706,7 +1742,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 1709 "configure"
-+#line 1745 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -1755,16 +1791,16 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1794: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1761: \$? = $ac_status" >&5
-+  echo "$as_me:1797: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1764: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1800: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1767: \$? = $ac_status" >&5
-+  echo "$as_me:1803: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -1781,10 +1817,10 @@
- 
- case "x$ac_cv_prog_cc_stdc" in
-   x|xno)
--    echo "$as_me:1784: result: none needed" >&5
-+    echo "$as_me:1820: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6 ;;
-   *)
--    echo "$as_me:1787: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:1823: result: $ac_cv_prog_cc_stdc" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-     CC="$CC $ac_cv_prog_cc_stdc" ;;
- esac
-@@ -1792,13 +1828,13 @@
- # This should have been defined by AC_PROG_CC
- : ${CC:=cc}
- 
--echo "$as_me:1795: checking \$CC variable" >&5
-+echo "$as_me:1831: checking \$CC variable" >&5
- echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
- case "$CC" in
- (*[\ \	]-[IUD]*)
--	echo "$as_me:1799: result: broken" >&5
-+	echo "$as_me:1835: result: broken" >&5
- echo "${ECHO_T}broken" >&6
--	{ echo "$as_me:1801: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
-+	{ echo "$as_me:1837: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
- echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
- 	# humor him...
- 	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
-@@ -1884,7 +1920,7 @@
- 
- 	;;
- (*)
--	echo "$as_me:1887: result: ok" >&5
-+	echo "$as_me:1923: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- 	;;
- esac
-@@ -1895,7 +1931,7 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
--echo "$as_me:1898: checking how to run the C preprocessor" >&5
-+echo "$as_me:1934: checking how to run the C preprocessor" >&5
- echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-@@ -1916,18 +1952,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1919 "configure"
-+#line 1955 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1960: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1930: \$? = $ac_status" >&5
-+  echo "$as_me:1966: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1950,17 +1986,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1953 "configure"
-+#line 1989 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:1957: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:1993: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1963: \$? = $ac_status" >&5
-+  echo "$as_me:1999: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1997,7 +2033,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:2000: result: $CPP" >&5
-+echo "$as_me:2036: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -2007,18 +2043,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2010 "configure"
-+#line 2046 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2015: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2051: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2021: \$? = $ac_status" >&5
-+  echo "$as_me:2057: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2041,17 +2077,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2044 "configure"
-+#line 2080 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:2048: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2084: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2054: \$? = $ac_status" >&5
-+  echo "$as_me:2090: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2079,7 +2115,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2082: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2118: error: C preprocessor \"$CPP\" fails sanity check" >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -2092,14 +2128,14 @@
- ac_main_return=return
- 
- if test $ac_cv_c_compiler_gnu = yes; then
--    echo "$as_me:2095: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2131: checking whether $CC needs -traditional" >&5
- echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
- if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2102 "configure"
-+#line 2138 "configure"
- #include "confdefs.h"
- #include <sgtty.h>
- int Autoconf = TIOCGETP;
-@@ -2114,7 +2150,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line 2117 "configure"
-+#line 2153 "configure"
- #include "confdefs.h"
- #include <termio.h>
- int Autoconf = TCGETA;
-@@ -2127,14 +2163,14 @@
- 
-   fi
- fi
--echo "$as_me:2130: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2166: result: $ac_cv_prog_gcc_traditional" >&5
- echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-   if test $ac_cv_prog_gcc_traditional = yes; then
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo "$as_me:2137: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2173: checking whether $CC understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CC_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2150,15 +2186,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:2153: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2189: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2156: \$? = $ac_status" >&5
-+  echo "$as_me:2192: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:2158: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2194: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2161: \$? = $ac_status" >&5
-+  echo "$as_me:2197: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CC_c_o=yes
-@@ -2169,10 +2205,10 @@
- 
- fi
- if test $cf_cv_prog_CC_c_o = yes; then
--  echo "$as_me:2172: result: yes" >&5
-+  echo "$as_me:2208: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2175: result: no" >&5
-+  echo "$as_me:2211: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2193,7 +2229,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2196: checking for $ac_word" >&5
-+echo "$as_me:2232: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2208,7 +2244,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AWK="$ac_prog"
--echo "$as_me:2211: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2247: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2216,21 +2252,21 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:2219: result: $AWK" >&5
-+  echo "$as_me:2255: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:2222: result: no" >&5
-+  echo "$as_me:2258: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$AWK" && break
- done
- 
--test -z "$AWK" && { { echo "$as_me:2229: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:2265: error: No awk program found" >&5
- echo "$as_me: error: No awk program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:2233: checking for egrep" >&5
-+echo "$as_me:2269: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6
- if test "${ac_cv_prog_egrep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2240,11 +2276,11 @@
- 		else ac_cv_prog_egrep='egrep'
- 	fi
- fi
--echo "$as_me:2243: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:2279: result: $ac_cv_prog_egrep" >&5
- echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- 	EGREP=$ac_cv_prog_egrep
- 
--	test -z "$EGREP" && { { echo "$as_me:2247: error: No egrep program found" >&5
-+	test -z "$EGREP" && { { echo "$as_me:2283: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -2260,7 +2296,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:2263: checking for a BSD compatible install" >&5
-+echo "$as_me:2299: checking for a BSD compatible install" >&5
- echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-@@ -2309,7 +2345,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:2312: result: $INSTALL" >&5
-+echo "$as_me:2348: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2320,18 +2356,18 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--echo "$as_me:2323: checking whether ln -s works" >&5
-+echo "$as_me:2359: checking whether ln -s works" >&5
- echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:2327: result: yes" >&5
-+  echo "$as_me:2363: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2330: result: no, using $LN_S" >&5
-+  echo "$as_me:2366: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6
- fi
- 
--echo "$as_me:2334: checking if $LN_S -f options work" >&5
-+echo "$as_me:2370: checking if $LN_S -f options work" >&5
- echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
- 
- rm -f conf$$.src conf$$dst
-@@ -2343,12 +2379,12 @@
- 	cf_prog_ln_sf=no
- fi
- rm -f conf$$.dst conf$$src
--echo "$as_me:2346: result: $cf_prog_ln_sf" >&5
-+echo "$as_me:2382: result: $cf_prog_ln_sf" >&5
- echo "${ECHO_T}$cf_prog_ln_sf" >&6
- 
- test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
- 
--echo "$as_me:2351: checking for long file names" >&5
-+echo "$as_me:2387: checking for long file names" >&5
- echo $ECHO_N "checking for long file names... $ECHO_C" >&6
- if test "${ac_cv_sys_long_file_names+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2387,7 +2423,7 @@
-   rm -rf $ac_xdir 2>/dev/null
- done
- fi
--echo "$as_me:2390: result: $ac_cv_sys_long_file_names" >&5
-+echo "$as_me:2426: result: $ac_cv_sys_long_file_names" >&5
- echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
- if test $ac_cv_sys_long_file_names = yes; then
- 
-@@ -2399,7 +2435,7 @@
- 
- # if we find pkg-config, check if we should install the ".pc" files.
- 
--echo "$as_me:2402: checking if you want to use pkg-config" >&5
-+echo "$as_me:2438: checking if you want to use pkg-config" >&5
- echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
- 
- # Check whether --with-pkg-config or --without-pkg-config was given.
-@@ -2409,7 +2445,7 @@
- else
-   cf_pkg_config=yes
- fi;
--echo "$as_me:2412: result: $cf_pkg_config" >&5
-+echo "$as_me:2448: result: $cf_pkg_config" >&5
- echo "${ECHO_T}$cf_pkg_config" >&6
- 
- case $cf_pkg_config in
-@@ -2421,7 +2457,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--echo "$as_me:2424: checking for $ac_word" >&5
-+echo "$as_me:2460: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2438,7 +2474,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:2441: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2477: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2449,10 +2485,10 @@
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- 
- if test -n "$PKG_CONFIG"; then
--  echo "$as_me:2452: result: $PKG_CONFIG" >&5
-+  echo "$as_me:2488: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
--  echo "$as_me:2455: result: no" >&5
-+  echo "$as_me:2491: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2461,7 +2497,7 @@
-   ac_pt_PKG_CONFIG=$PKG_CONFIG
-   # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:2464: checking for $ac_word" >&5
-+echo "$as_me:2500: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2478,7 +2514,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:2481: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2517: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2490,10 +2526,10 @@
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- 
- if test -n "$ac_pt_PKG_CONFIG"; then
--  echo "$as_me:2493: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:2529: result: $ac_pt_PKG_CONFIG" >&5
- echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
- else
--  echo "$as_me:2496: result: no" >&5
-+  echo "$as_me:2532: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2536,24 +2572,24 @@
- 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:2539: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+	{ { echo "$as_me:2575: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
- echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
- esac
- 
- elif test "x$cf_pkg_config" != xno ; then
--	{ echo "$as_me:2546: WARNING: pkg-config is not installed" >&5
-+	{ echo "$as_me:2582: WARNING: pkg-config is not installed" >&5
- echo "$as_me: WARNING: pkg-config is not installed" >&2;}
- fi
- 
- case $PKG_CONFIG in
- (no|none|yes)
--	echo "$as_me:2552: checking for pkg-config library directory" >&5
-+	echo "$as_me:2588: checking for pkg-config library directory" >&5
- echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
- 	;;
- (*)
--	echo "$as_me:2556: checking for $PKG_CONFIG library directory" >&5
-+	echo "$as_me:2592: checking for $PKG_CONFIG library directory" >&5
- echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
- 	;;
- esac
-@@ -2608,18 +2644,18 @@
- 
- 	test -n "$verbose" && echo "	list..." 1>&6
- 
--echo "${as_me:-configure}:2611: testing list... ..." 1>&5
-+echo "${as_me:-configure}:2647: testing list... ..." 1>&5
- 
- 	for cf_config in $cf_search_path
- 	do
- 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
- 
--echo "${as_me:-configure}:2617: testing checking $cf_config/pkgconfig ..." 1>&5
-+echo "${as_me:-configure}:2653: testing checking $cf_config/pkgconfig ..." 1>&5
- 
- 		if test -d $cf_config/pkgconfig
- 		then
- 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
--			echo "$as_me:2622: checking done" >&5
-+			echo "$as_me:2658: checking done" >&5
- echo $ECHO_N "checking done... $ECHO_C" >&6
- 			break
- 		fi
-@@ -2630,11 +2666,11 @@
- esac
- 
- if test "x$PKG_CONFIG_LIBDIR" != xno ; then
--	echo "$as_me:2633: result: $PKG_CONFIG_LIBDIR" >&5
-+	echo "$as_me:2669: result: $PKG_CONFIG_LIBDIR" >&5
- echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
- fi
- 
--echo "$as_me:2637: checking if you want to build test-programs" >&5
-+echo "$as_me:2673: checking if you want to build test-programs" >&5
- echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
- 
- # Check whether --with-tests or --without-tests was given.
-@@ -2644,10 +2680,10 @@
- else
-   cf_with_tests=yes
- fi;
--echo "$as_me:2647: result: $cf_with_tests" >&5
-+echo "$as_me:2683: result: $cf_with_tests" >&5
- echo "${ECHO_T}$cf_with_tests" >&6
- 
--echo "$as_me:2650: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:2686: checking if we should assume mixed-case filenames" >&5
- echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
- 
- # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -2657,11 +2693,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:2660: result: $enable_mixedcase" >&5
-+echo "$as_me:2696: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:2664: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:2700: checking if filesystem supports mixed-case filenames" >&5
- echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
- if test "${cf_cv_mixedcase+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2688,7 +2724,7 @@
- fi
- 
- fi
--echo "$as_me:2691: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:2727: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -2706,7 +2742,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:2709: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:2745: checking whether ${MAKE-make} sets \${MAKE}" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-@@ -2726,11 +2762,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:2729: result: yes" >&5
-+  echo "$as_me:2765: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:2733: result: no" >&5
-+  echo "$as_me:2769: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -2739,7 +2775,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2742: checking for $ac_word" >&5
-+echo "$as_me:2778: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CTAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2754,7 +2790,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CTAGS="$ac_prog"
--echo "$as_me:2757: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2793: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2762,10 +2798,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
--  echo "$as_me:2765: result: $CTAGS" >&5
-+  echo "$as_me:2801: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:2768: result: no" >&5
-+  echo "$as_me:2804: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2776,7 +2812,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2779: checking for $ac_word" >&5
-+echo "$as_me:2815: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ETAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2791,7 +2827,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ETAGS="$ac_prog"
--echo "$as_me:2794: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2830: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2799,10 +2835,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
--  echo "$as_me:2802: result: $ETAGS" >&5
-+  echo "$as_me:2838: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:2805: result: no" >&5
-+  echo "$as_me:2841: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2811,7 +2847,7 @@
- 
- # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
- set dummy ${CTAGS:-ctags}; ac_word=$2
--echo "$as_me:2814: checking for $ac_word" >&5
-+echo "$as_me:2850: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2826,7 +2862,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:2829: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2865: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2835,17 +2871,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:2838: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:2874: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:2841: result: no" >&5
-+  echo "$as_me:2877: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:2848: checking for $ac_word" >&5
-+echo "$as_me:2884: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2860,7 +2896,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:2863: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2899: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2869,10 +2905,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:2872: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:2908: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:2875: result: no" >&5
-+  echo "$as_me:2911: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2892,7 +2928,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:2895: checking for makeflags variable" >&5
-+echo "$as_me:2931: checking for makeflags variable" >&5
- echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
- if test "${cf_cv_makeflags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2926,13 +2962,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:2929: result: $cf_cv_makeflags" >&5
-+echo "$as_me:2965: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:2935: checking for $ac_word" >&5
-+echo "$as_me:2971: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2947,7 +2983,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:2950: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2986: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2955,10 +2991,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:2958: result: $RANLIB" >&5
-+  echo "$as_me:2994: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:2961: result: no" >&5
-+  echo "$as_me:2997: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2967,7 +3003,7 @@
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:2970: checking for $ac_word" >&5
-+echo "$as_me:3006: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2982,7 +3018,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:2985: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3021: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2991,10 +3027,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:2994: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:3030: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:2997: result: no" >&5
-+  echo "$as_me:3033: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3006,7 +3042,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:3009: checking for $ac_word" >&5
-+echo "$as_me:3045: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3021,7 +3057,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:3024: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3060: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3029,10 +3065,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:3032: result: $LD" >&5
-+  echo "$as_me:3068: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:3035: result: no" >&5
-+  echo "$as_me:3071: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3041,7 +3077,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:3044: checking for $ac_word" >&5
-+echo "$as_me:3080: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3056,7 +3092,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:3059: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3095: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3065,10 +3101,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:3068: result: $ac_ct_LD" >&5
-+  echo "$as_me:3104: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:3071: result: no" >&5
-+  echo "$as_me:3107: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3080,7 +3116,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:3083: checking for $ac_word" >&5
-+echo "$as_me:3119: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3095,7 +3131,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:3098: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3134: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3103,10 +3139,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3106: result: $AR" >&5
-+  echo "$as_me:3142: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3109: result: no" >&5
-+  echo "$as_me:3145: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3115,7 +3151,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:3118: checking for $ac_word" >&5
-+echo "$as_me:3154: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3130,7 +3166,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3133: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3169: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3139,10 +3175,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3142: result: $ac_ct_AR" >&5
-+  echo "$as_me:3178: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3145: result: no" >&5
-+  echo "$as_me:3181: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3154,7 +3190,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:3157: checking for $ac_word" >&5
-+echo "$as_me:3193: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3169,7 +3205,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:3172: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3208: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3177,10 +3213,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3180: result: $AR" >&5
-+  echo "$as_me:3216: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3183: result: no" >&5
-+  echo "$as_me:3219: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3189,7 +3225,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:3192: checking for $ac_word" >&5
-+echo "$as_me:3228: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3204,7 +3240,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3207: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3243: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3213,10 +3249,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3216: result: $ac_ct_AR" >&5
-+  echo "$as_me:3252: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3219: result: no" >&5
-+  echo "$as_me:3255: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3225,7 +3261,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:3228: checking for options to update archives" >&5
-+echo "$as_me:3264: checking for options to update archives" >&5
- echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
- if test "${cf_cv_ar_flags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3248,13 +3284,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <<EOF
--#line 3251 "configure"
-+#line 3287 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--		if { (eval echo "$as_me:3254: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:3290: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3257: \$? = $ac_status" >&5
-+  echo "$as_me:3293: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
- 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -3265,7 +3301,7 @@
- 		else
- 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--echo "${as_me:-configure}:3268: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:3304: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -3273,7 +3309,7 @@
- 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
--echo "$as_me:3276: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:3312: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -3284,17 +3320,17 @@
- 	ARFLAGS=$cf_cv_ar_flags
- fi
- 
--	echo "$as_me:3287: checking for PATH separator" >&5
-+	echo "$as_me:3323: checking for PATH separator" >&5
- echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(os2*)	PATH_SEPARATOR=';'  ;;
- 	(*)	${PATH_SEPARATOR:=':'}  ;;
- 	esac
- 
--	echo "$as_me:3294: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:3330: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
--echo "$as_me:3297: checking if you have specified an install-prefix" >&5
-+echo "$as_me:3333: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -3307,7 +3343,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:3310: result: $DESTDIR" >&5
-+echo "$as_me:3346: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -3335,7 +3371,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3338: checking for $ac_word" >&5
-+echo "$as_me:3374: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3350,7 +3386,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:3353: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3389: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3358,10 +3394,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:3361: result: $BUILD_CC" >&5
-+  echo "$as_me:3397: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:3364: result: no" >&5
-+  echo "$as_me:3400: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3369,12 +3405,12 @@
- done
- 
- fi;
--	echo "$as_me:3372: checking for native build C compiler" >&5
-+	echo "$as_me:3408: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:3374: result: $BUILD_CC" >&5
-+	echo "$as_me:3410: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:3377: checking for native build C preprocessor" >&5
-+	echo "$as_me:3413: checking for native build C preprocessor" >&5
- echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
- 
- # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -3384,10 +3420,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:3387: result: $BUILD_CPP" >&5
-+	echo "$as_me:3423: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:3390: checking for native build C flags" >&5
-+	echo "$as_me:3426: checking for native build C flags" >&5
- echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -3395,10 +3431,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:3398: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:3434: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:3401: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:3437: checking for native build C preprocessor-flags" >&5
- echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -3406,10 +3442,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:3409: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:3445: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:3412: checking for native build linker-flags" >&5
-+	echo "$as_me:3448: checking for native build linker-flags" >&5
- echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -3417,10 +3453,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:3420: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:3456: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:3423: checking for native build linker-libraries" >&5
-+	echo "$as_me:3459: checking for native build linker-libraries" >&5
- echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
- 
- # Check whether --with-build-libs or --without-build-libs was given.
-@@ -3428,7 +3464,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:3431: result: $BUILD_LIBS" >&5
-+	echo "$as_me:3467: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -3438,7 +3474,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:3441: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:3477: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&5
- echo "$as_me: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&2;}
-@@ -3463,7 +3499,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:3466: checking if you want to build shared C-objects" >&5
-+echo "$as_me:3502: checking if you want to build shared C-objects" >&5
- echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -3473,27 +3509,27 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:3476: result: $with_shared" >&5
-+echo "$as_me:3512: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:3480: checking for specified models" >&5
-+echo "$as_me:3516: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
--echo "$as_me:3483: result: $cf_list_models" >&5
-+echo "$as_me:3519: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:3488: checking for default model" >&5
-+echo "$as_me:3524: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:3491: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:3527: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--echo "$as_me:3496: checking for specific curses-directory" >&5
-+echo "$as_me:3532: checking for specific curses-directory" >&5
- echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
- 
- # Check whether --with-curses-dir or --without-curses-dir was given.
-@@ -3503,7 +3539,7 @@
- else
-   cf_cv_curses_dir=no
- fi;
--echo "$as_me:3506: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:3542: result: $cf_cv_curses_dir" >&5
- echo "${ECHO_T}$cf_cv_curses_dir" >&6
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
-@@ -3534,7 +3570,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:3537: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:3573: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -3567,7 +3603,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 3570 "configure"
-+#line 3606 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -3579,16 +3615,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3582: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3585: \$? = $ac_status" >&5
-+  echo "$as_me:3621: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3591: \$? = $ac_status" >&5
-+  echo "$as_me:3627: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3605,7 +3641,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:3608: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:3644: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -3641,7 +3677,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:3644: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:3680: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -3656,13 +3692,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:3659: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:3695: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:3662: result: yes" >&5
-+		echo "$as_me:3698: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:3665: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:3701: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -3688,7 +3724,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3691 "configure"
-+#line 3727 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -3700,37 +3736,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3703: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3739: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3706: \$? = $ac_status" >&5
-+  echo "$as_me:3742: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3745: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3712: \$? = $ac_status" >&5
-+  echo "$as_me:3748: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3718 "configure"
-+#line 3754 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:3725: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:3761: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3728: \$? = $ac_status" >&5
-+  echo "$as_me:3764: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:3730: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3766: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3733: \$? = $ac_status" >&5
-+  echo "$as_me:3769: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -3747,7 +3783,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:3750: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:3786: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -3765,7 +3801,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:3768: result: no" >&5
-+		echo "$as_me:3804: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -3781,7 +3817,7 @@
-   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
--echo "$as_me:3784: checking for $ac_word" >&5
-+echo "$as_me:3820: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3796,7 +3832,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:3799: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3835: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3804,10 +3840,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:3807: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:3843: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:3810: result: no" >&5
-+  echo "$as_me:3846: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3820,7 +3856,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3823: checking for $ac_word" >&5
-+echo "$as_me:3859: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3835,7 +3871,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:3838: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3874: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3843,10 +3879,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:3846: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:3882: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:3849: result: no" >&5
-+  echo "$as_me:3885: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3879,7 +3915,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:3882: checking if we have identified curses headers" >&5
-+echo "$as_me:3918: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3891,7 +3927,7 @@
- 	curses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 3894 "configure"
-+#line 3930 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -3903,16 +3939,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3906: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3942: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3909: \$? = $ac_status" >&5
-+  echo "$as_me:3945: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3912: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3948: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3915: \$? = $ac_status" >&5
-+  echo "$as_me:3951: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -3923,11 +3959,11 @@
- done
- 
- fi
--echo "$as_me:3926: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:3962: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:3930: error: No curses header-files found" >&5
-+	{ { echo "$as_me:3966: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -3937,23 +3973,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:3940: checking for $ac_header" >&5
-+echo "$as_me:3976: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3946 "configure"
-+#line 3982 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:3950: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:3986: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:3956: \$? = $ac_status" >&5
-+  echo "$as_me:3992: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -3972,7 +4008,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:3975: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:4011: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -4025,7 +4061,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4028 "configure"
-+#line 4064 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4037,16 +4073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4040: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4076: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4043: \$? = $ac_status" >&5
-+  echo "$as_me:4079: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4046: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4049: \$? = $ac_status" >&5
-+  echo "$as_me:4085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4063,7 +4099,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4066: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4102: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4082,7 +4118,7 @@
- 
- }
- 
--echo "$as_me:4085: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:4121: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4094,7 +4130,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4097 "configure"
-+#line 4133 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -4118,16 +4154,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4157: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4124: \$? = $ac_status" >&5
-+  echo "$as_me:4160: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4127: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4163: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4130: \$? = $ac_status" >&5
-+  echo "$as_me:4166: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -4142,14 +4178,14 @@
- 	done
- 
- fi
--echo "$as_me:4145: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:4181: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:4152: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:4188: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4267,7 +4303,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4270 "configure"
-+#line 4306 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4279,16 +4315,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4282: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4318: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4285: \$? = $ac_status" >&5
-+  echo "$as_me:4321: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4324: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4291: \$? = $ac_status" >&5
-+  echo "$as_me:4327: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4305,7 +4341,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4308: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4344: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4328,7 +4364,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4331 "configure"
-+#line 4367 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -4352,16 +4388,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4391: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4358: \$? = $ac_status" >&5
-+  echo "$as_me:4394: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4397: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4364: \$? = $ac_status" >&5
-+  echo "$as_me:4400: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -4382,12 +4418,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4385: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4421: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:4390: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:4426: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -4420,7 +4456,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4423 "configure"
-+#line 4459 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4432,16 +4468,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4435: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4471: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4438: \$? = $ac_status" >&5
-+  echo "$as_me:4474: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4444: \$? = $ac_status" >&5
-+  echo "$as_me:4480: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4458,7 +4494,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4461: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4497: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4506,7 +4542,7 @@
- 	;;
- esac
- 
--echo "$as_me:4509: checking for terminfo header" >&5
-+echo "$as_me:4545: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4524,7 +4560,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 4527 "configure"
-+#line 4563 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4539,16 +4575,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4542: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4578: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4545: \$? = $ac_status" >&5
-+  echo "$as_me:4581: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4548: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4584: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4551: \$? = $ac_status" >&5
-+  echo "$as_me:4587: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -4564,7 +4600,7 @@
- done
- 
- fi
--echo "$as_me:4567: result: $cf_cv_term_header" >&5
-+echo "$as_me:4603: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -4602,7 +4638,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:4605: checking for ncurses version" >&5
-+echo "$as_me:4641: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4628,10 +4664,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:4631: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:4667: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4634: \$? = $ac_status" >&5
-+  echo "$as_me:4670: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -4641,7 +4677,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4644 "configure"
-+#line 4680 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4666,15 +4702,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:4669: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4705: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4672: \$? = $ac_status" >&5
-+  echo "$as_me:4708: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:4674: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4710: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4677: \$? = $ac_status" >&5
-+  echo "$as_me:4713: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -4688,7 +4724,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:4691: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:4727: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -4701,7 +4737,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:4704: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:4740: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4709,7 +4745,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4712 "configure"
-+#line 4748 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4728,16 +4764,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4731: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4767: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4734: \$? = $ac_status" >&5
-+  echo "$as_me:4770: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4737: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4773: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4740: \$? = $ac_status" >&5
-+  echo "$as_me:4776: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -4748,10 +4784,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4751: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:4787: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:4754: checking for initscr in -lgpm" >&5
-+  echo "$as_me:4790: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4759,7 +4795,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4762 "configure"
-+#line 4798 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4778,16 +4814,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4781: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4817: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4784: \$? = $ac_status" >&5
-+  echo "$as_me:4820: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4787: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4823: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4790: \$? = $ac_status" >&5
-+  echo "$as_me:4826: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -4798,7 +4834,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4801: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:4837: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -4813,7 +4849,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:4816: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:4852: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4821,7 +4857,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4824 "configure"
-+#line 4860 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4840,16 +4876,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4843: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4879: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4846: \$? = $ac_status" >&5
-+  echo "$as_me:4882: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4885: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4852: \$? = $ac_status" >&5
-+  echo "$as_me:4888: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -4860,7 +4896,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4863: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:4899: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -4909,13 +4945,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:4912: checking for initscr" >&5
-+	echo "$as_me:4948: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4918 "configure"
-+#line 4954 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -4946,16 +4982,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4985: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4952: \$? = $ac_status" >&5
-+  echo "$as_me:4988: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4991: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4958: \$? = $ac_status" >&5
-+  echo "$as_me:4994: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -4965,18 +5001,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:4968: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:5004: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:4975: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:5011: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 4979 "configure"
-+#line 5015 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -4988,25 +5024,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4991: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5027: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4994: \$? = $ac_status" >&5
-+  echo "$as_me:5030: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4997: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5033: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5000: \$? = $ac_status" >&5
-+  echo "$as_me:5036: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5002: result: yes" >&5
-+  echo "$as_me:5038: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5009: result: no" >&5
-+echo "$as_me:5045: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -5074,11 +5110,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:5077: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:5113: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 5081 "configure"
-+#line 5117 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5090,25 +5126,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5129: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5096: \$? = $ac_status" >&5
-+  echo "$as_me:5132: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5099: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5135: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5102: \$? = $ac_status" >&5
-+  echo "$as_me:5138: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5104: result: yes" >&5
-+  echo "$as_me:5140: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5111: result: no" >&5
-+echo "$as_me:5147: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -5123,7 +5159,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:5126: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:5162: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5131,7 +5167,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:5134: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:5170: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -5141,7 +5177,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5144 "configure"
-+#line 5180 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5153,23 +5189,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5156: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5192: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5159: \$? = $ac_status" >&5
-+  echo "$as_me:5195: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5162: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5165: \$? = $ac_status" >&5
-+  echo "$as_me:5201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:5167: result: yes" >&5
-+  echo "$as_me:5203: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:5172: result: no" >&5
-+echo "$as_me:5208: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -5187,7 +5223,7 @@
- 	NCURSES_CONFIG=none
- fi
- 
--echo "$as_me:5190: checking if you want wide-character code" >&5
-+echo "$as_me:5226: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -5197,11 +5233,11 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:5200: result: $with_widec" >&5
-+echo "$as_me:5236: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "$with_widec" = yes ; then
- 
--echo "$as_me:5204: checking for multibyte character support" >&5
-+echo "$as_me:5240: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5209,7 +5245,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5212 "configure"
-+#line 5248 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5222,16 +5258,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5225: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5261: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5228: \$? = $ac_status" >&5
-+  echo "$as_me:5264: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5231: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5267: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5234: \$? = $ac_status" >&5
-+  echo "$as_me:5270: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -5243,12 +5279,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:5246: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5282: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5251 "configure"
-+#line 5287 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5261,16 +5297,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5264: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5300: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5267: \$? = $ac_status" >&5
-+  echo "$as_me:5303: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5270: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5306: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5273: \$? = $ac_status" >&5
-+  echo "$as_me:5309: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5284,7 +5320,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5287 "configure"
-+#line 5323 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5297,16 +5333,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5300: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5336: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5303: \$? = $ac_status" >&5
-+  echo "$as_me:5339: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5306: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5342: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5309: \$? = $ac_status" >&5
-+  echo "$as_me:5345: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5323,9 +5359,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:5326: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:5362: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:5328: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5364: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5416,11 +5452,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5419: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5455: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5423 "configure"
-+#line 5459 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5433,21 +5469,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5436: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5472: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5439: \$? = $ac_status" >&5
-+  echo "$as_me:5475: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5478: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5445: \$? = $ac_status" >&5
-+  echo "$as_me:5481: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5450: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5486: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5465,7 +5501,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:5468: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5504: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -5540,13 +5576,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5543: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5579: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 5549 "configure"
-+#line 5585 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5559,21 +5595,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5562: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5598: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5565: \$? = $ac_status" >&5
-+  echo "$as_me:5601: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5568: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5604: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5571: \$? = $ac_status" >&5
-+  echo "$as_me:5607: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5576: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5612: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -5615,7 +5651,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5618: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:5654: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -5650,7 +5686,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 5653 "configure"
-+#line 5689 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -5662,16 +5698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5665: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5701: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5668: \$? = $ac_status" >&5
-+  echo "$as_me:5704: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5671: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5674: \$? = $ac_status" >&5
-+  echo "$as_me:5710: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -5688,7 +5724,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:5691: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:5727: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -5724,7 +5760,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:5727: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5763: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -5754,13 +5790,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:5757: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:5793: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:5760: result: yes" >&5
-+		echo "$as_me:5796: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:5763: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:5799: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -5786,7 +5822,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5789 "configure"
-+#line 5825 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5798,37 +5834,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5801: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5837: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5804: \$? = $ac_status" >&5
-+  echo "$as_me:5840: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5843: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5810: \$? = $ac_status" >&5
-+  echo "$as_me:5846: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5816 "configure"
-+#line 5852 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5823: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5859: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5826: \$? = $ac_status" >&5
-+  echo "$as_me:5862: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5828: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5864: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5831: \$? = $ac_status" >&5
-+  echo "$as_me:5867: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -5845,7 +5881,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:5848: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:5884: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -5863,7 +5899,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:5866: result: no" >&5
-+		echo "$as_me:5902: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -5879,7 +5915,7 @@
-   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
--echo "$as_me:5882: checking for $ac_word" >&5
-+echo "$as_me:5918: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5894,7 +5930,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:5897: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5933: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5902,10 +5938,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:5905: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:5941: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:5908: result: no" >&5
-+  echo "$as_me:5944: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5918,7 +5954,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:5921: checking for $ac_word" >&5
-+echo "$as_me:5957: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5933,7 +5969,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:5936: found $ac_dir/$ac_word" >&5
-+echo "$as_me:5972: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -5941,10 +5977,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:5944: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:5980: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:5947: result: no" >&5
-+  echo "$as_me:5983: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -5977,7 +6013,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:5980: checking if we have identified curses headers" >&5
-+echo "$as_me:6016: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5989,7 +6025,7 @@
- 	curses.h ncursesw/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 5992 "configure"
-+#line 6028 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -6001,16 +6037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6004: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6040: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6007: \$? = $ac_status" >&5
-+  echo "$as_me:6043: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6010: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6046: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6013: \$? = $ac_status" >&5
-+  echo "$as_me:6049: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -6021,11 +6057,11 @@
- done
- 
- fi
--echo "$as_me:6024: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6060: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:6028: error: No curses header-files found" >&5
-+	{ { echo "$as_me:6064: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -6035,23 +6071,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:6038: checking for $ac_header" >&5
-+echo "$as_me:6074: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6044 "configure"
-+#line 6080 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:6048: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6084: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:6054: \$? = $ac_status" >&5
-+  echo "$as_me:6090: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -6070,7 +6106,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:6073: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6109: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -6123,7 +6159,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6126 "configure"
-+#line 6162 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6135,16 +6171,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6138: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6174: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6141: \$? = $ac_status" >&5
-+  echo "$as_me:6177: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6180: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6147: \$? = $ac_status" >&5
-+  echo "$as_me:6183: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6161,7 +6197,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6164: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6200: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6180,7 +6216,7 @@
- 
- }
- 
--echo "$as_me:6183: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6219: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6192,7 +6228,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6195 "configure"
-+#line 6231 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -6224,16 +6260,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6263: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6230: \$? = $ac_status" >&5
-+  echo "$as_me:6266: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6269: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6236: \$? = $ac_status" >&5
-+  echo "$as_me:6272: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -6248,14 +6284,14 @@
- 	done
- 
- fi
--echo "$as_me:6251: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6287: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:6258: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6294: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6373,7 +6409,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6376 "configure"
-+#line 6412 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6385,16 +6421,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6424: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6391: \$? = $ac_status" >&5
-+  echo "$as_me:6427: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6394: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6397: \$? = $ac_status" >&5
-+  echo "$as_me:6433: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6411,7 +6447,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6414: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6450: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6434,7 +6470,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6437 "configure"
-+#line 6473 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6458,16 +6494,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6497: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6464: \$? = $ac_status" >&5
-+  echo "$as_me:6500: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6467: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6503: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6470: \$? = $ac_status" >&5
-+  echo "$as_me:6506: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -6488,12 +6524,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6491: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6527: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:6496: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:6532: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -6526,7 +6562,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6529 "configure"
-+#line 6565 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6538,16 +6574,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6541: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6577: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6544: \$? = $ac_status" >&5
-+  echo "$as_me:6580: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6547: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6583: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6550: \$? = $ac_status" >&5
-+  echo "$as_me:6586: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6564,7 +6600,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6567: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6603: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6612,7 +6648,7 @@
- 	;;
- esac
- 
--echo "$as_me:6615: checking for terminfo header" >&5
-+echo "$as_me:6651: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6630,7 +6666,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6633 "configure"
-+#line 6669 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6645,16 +6681,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6648: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6684: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6651: \$? = $ac_status" >&5
-+  echo "$as_me:6687: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6654: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6690: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6657: \$? = $ac_status" >&5
-+  echo "$as_me:6693: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -6670,7 +6706,7 @@
- done
- 
- fi
--echo "$as_me:6673: result: $cf_cv_term_header" >&5
-+echo "$as_me:6709: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -6708,7 +6744,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:6711: checking for ncurses version" >&5
-+echo "$as_me:6747: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6734,10 +6770,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:6737: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:6773: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6740: \$? = $ac_status" >&5
-+  echo "$as_me:6776: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -6747,7 +6783,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6750 "configure"
-+#line 6786 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6772,15 +6808,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6775: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6811: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6778: \$? = $ac_status" >&5
-+  echo "$as_me:6814: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6783: \$? = $ac_status" >&5
-+  echo "$as_me:6819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -6794,7 +6830,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:6797: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:6833: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -6807,7 +6843,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:6810: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:6846: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6815,7 +6851,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6818 "configure"
-+#line 6854 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6834,16 +6870,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6873: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6840: \$? = $ac_status" >&5
-+  echo "$as_me:6876: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6843: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6879: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6846: \$? = $ac_status" >&5
-+  echo "$as_me:6882: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -6854,10 +6890,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6857: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:6893: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:6860: checking for initscr in -lgpm" >&5
-+  echo "$as_me:6896: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6865,7 +6901,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6868 "configure"
-+#line 6904 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6884,16 +6920,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6887: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6923: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6890: \$? = $ac_status" >&5
-+  echo "$as_me:6926: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6893: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6929: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6896: \$? = $ac_status" >&5
-+  echo "$as_me:6932: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -6904,7 +6940,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6907: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:6943: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -6919,7 +6955,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:6922: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:6958: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6927,7 +6963,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6930 "configure"
-+#line 6966 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6946,16 +6982,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6985: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6952: \$? = $ac_status" >&5
-+  echo "$as_me:6988: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6991: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6958: \$? = $ac_status" >&5
-+  echo "$as_me:6994: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -6966,7 +7002,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6969: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:7005: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -7015,13 +7051,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:7018: checking for initscr" >&5
-+	echo "$as_me:7054: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7024 "configure"
-+#line 7060 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -7052,16 +7088,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7055: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7091: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7058: \$? = $ac_status" >&5
-+  echo "$as_me:7094: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7097: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7064: \$? = $ac_status" >&5
-+  echo "$as_me:7100: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -7071,18 +7107,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7074: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7110: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:7081: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:7117: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7085 "configure"
-+#line 7121 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7094,25 +7130,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7097: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7133: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7100: \$? = $ac_status" >&5
-+  echo "$as_me:7136: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7103: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7139: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7106: \$? = $ac_status" >&5
-+  echo "$as_me:7142: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7108: result: yes" >&5
-+  echo "$as_me:7144: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7115: result: no" >&5
-+echo "$as_me:7151: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -7180,11 +7216,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:7183: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:7219: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 7187 "configure"
-+#line 7223 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7196,25 +7232,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7199: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7235: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7202: \$? = $ac_status" >&5
-+  echo "$as_me:7238: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7205: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7241: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7208: \$? = $ac_status" >&5
-+  echo "$as_me:7244: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7210: result: yes" >&5
-+  echo "$as_me:7246: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7217: result: no" >&5
-+echo "$as_me:7253: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -7229,7 +7265,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:7232: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:7268: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7237,7 +7273,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:7240: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:7276: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -7247,7 +7283,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7250 "configure"
-+#line 7286 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7259,23 +7295,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7298: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7265: \$? = $ac_status" >&5
-+  echo "$as_me:7301: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7268: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7304: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7271: \$? = $ac_status" >&5
-+  echo "$as_me:7307: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7273: result: yes" >&5
-+  echo "$as_me:7309: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7278: result: no" >&5
-+echo "$as_me:7314: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -7299,13 +7335,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:7302: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:7338: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:7305: result: yes" >&5
-+		echo "$as_me:7341: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:7308: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:7344: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -7331,7 +7367,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7334 "configure"
-+#line 7370 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7343,37 +7379,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7346: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7382: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7349: \$? = $ac_status" >&5
-+  echo "$as_me:7385: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7352: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7388: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7355: \$? = $ac_status" >&5
-+  echo "$as_me:7391: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7361 "configure"
-+#line 7397 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7368: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7404: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7371: \$? = $ac_status" >&5
-+  echo "$as_me:7407: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7373: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7409: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7376: \$? = $ac_status" >&5
-+  echo "$as_me:7412: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -7390,7 +7426,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:7393: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:7429: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -7408,7 +7444,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:7411: result: no" >&5
-+		echo "$as_me:7447: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -7424,7 +7460,7 @@
-   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
--echo "$as_me:7427: checking for $ac_word" >&5
-+echo "$as_me:7463: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7439,7 +7475,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:7442: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7478: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7447,10 +7483,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:7450: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:7486: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7453: result: no" >&5
-+  echo "$as_me:7489: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7463,7 +7499,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:7466: checking for $ac_word" >&5
-+echo "$as_me:7502: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7478,7 +7514,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:7481: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7517: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7486,10 +7522,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:7489: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:7525: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7492: result: no" >&5
-+  echo "$as_me:7528: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7522,7 +7558,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:7525: checking if we have identified curses headers" >&5
-+echo "$as_me:7561: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7534,7 +7570,7 @@
- 	curses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 7537 "configure"
-+#line 7573 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -7546,16 +7582,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7549: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7552: \$? = $ac_status" >&5
-+  echo "$as_me:7588: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7558: \$? = $ac_status" >&5
-+  echo "$as_me:7594: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -7566,11 +7602,11 @@
- done
- 
- fi
--echo "$as_me:7569: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:7605: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:7573: error: No curses header-files found" >&5
-+	{ { echo "$as_me:7609: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7580,23 +7616,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:7583: checking for $ac_header" >&5
-+echo "$as_me:7619: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7589 "configure"
-+#line 7625 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:7593: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:7629: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:7599: \$? = $ac_status" >&5
-+  echo "$as_me:7635: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -7615,7 +7651,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:7618: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:7654: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7668,7 +7704,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7671 "configure"
-+#line 7707 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7680,16 +7716,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7683: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7719: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7686: \$? = $ac_status" >&5
-+  echo "$as_me:7722: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7725: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7692: \$? = $ac_status" >&5
-+  echo "$as_me:7728: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7706,7 +7742,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:7709: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:7745: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -7725,7 +7761,7 @@
- 
- }
- 
--echo "$as_me:7728: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:7764: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7737,7 +7773,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7740 "configure"
-+#line 7776 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7761,16 +7797,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7764: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7800: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7767: \$? = $ac_status" >&5
-+  echo "$as_me:7803: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7770: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7806: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7773: \$? = $ac_status" >&5
-+  echo "$as_me:7809: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -7785,14 +7821,14 @@
- 	done
- 
- fi
--echo "$as_me:7788: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:7824: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:7795: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:7831: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7910,7 +7946,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7913 "configure"
-+#line 7949 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7922,16 +7958,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7925: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7961: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7928: \$? = $ac_status" >&5
-+  echo "$as_me:7964: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7967: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7934: \$? = $ac_status" >&5
-+  echo "$as_me:7970: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -7948,7 +7984,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:7951: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:7987: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -7971,7 +8007,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7974 "configure"
-+#line 8010 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -7995,16 +8031,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7998: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8001: \$? = $ac_status" >&5
-+  echo "$as_me:8037: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8004: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8040: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8007: \$? = $ac_status" >&5
-+  echo "$as_me:8043: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -8025,12 +8061,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8028: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8064: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:8033: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:8069: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -8063,7 +8099,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8066 "configure"
-+#line 8102 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8075,16 +8111,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8114: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8081: \$? = $ac_status" >&5
-+  echo "$as_me:8117: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8084: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8120: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8087: \$? = $ac_status" >&5
-+  echo "$as_me:8123: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8101,7 +8137,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:8104: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8140: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8149,7 +8185,7 @@
- 	;;
- esac
- 
--echo "$as_me:8152: checking for terminfo header" >&5
-+echo "$as_me:8188: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8167,7 +8203,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 8170 "configure"
-+#line 8206 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8182,16 +8218,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8185: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8221: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8188: \$? = $ac_status" >&5
-+  echo "$as_me:8224: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8227: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8194: \$? = $ac_status" >&5
-+  echo "$as_me:8230: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -8207,7 +8243,7 @@
- done
- 
- fi
--echo "$as_me:8210: result: $cf_cv_term_header" >&5
-+echo "$as_me:8246: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -8245,7 +8281,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:8248: checking for ncurses version" >&5
-+echo "$as_me:8284: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8271,10 +8307,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:8274: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:8310: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8277: \$? = $ac_status" >&5
-+  echo "$as_me:8313: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -8284,7 +8320,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8287 "configure"
-+#line 8323 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8309,15 +8345,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8312: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8348: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8315: \$? = $ac_status" >&5
-+  echo "$as_me:8351: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8317: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8353: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8320: \$? = $ac_status" >&5
-+  echo "$as_me:8356: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -8331,7 +8367,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:8334: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:8370: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -8344,7 +8380,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:8347: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:8383: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8352,7 +8388,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8355 "configure"
-+#line 8391 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8371,16 +8407,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8374: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8410: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8377: \$? = $ac_status" >&5
-+  echo "$as_me:8413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8380: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8383: \$? = $ac_status" >&5
-+  echo "$as_me:8419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -8391,10 +8427,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8394: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:8430: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:8397: checking for initscr in -lgpm" >&5
-+  echo "$as_me:8433: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8402,7 +8438,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8405 "configure"
-+#line 8441 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8421,16 +8457,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8424: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8460: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8427: \$? = $ac_status" >&5
-+  echo "$as_me:8463: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8430: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8466: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8433: \$? = $ac_status" >&5
-+  echo "$as_me:8469: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -8441,7 +8477,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8444: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:8480: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -8456,7 +8492,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:8459: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:8495: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8464,7 +8500,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8467 "configure"
-+#line 8503 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8483,16 +8519,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8522: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8489: \$? = $ac_status" >&5
-+  echo "$as_me:8525: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8528: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8495: \$? = $ac_status" >&5
-+  echo "$as_me:8531: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -8503,7 +8539,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8506: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:8542: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -8552,13 +8588,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:8555: checking for initscr" >&5
-+	echo "$as_me:8591: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8561 "configure"
-+#line 8597 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -8589,16 +8625,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8592: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8628: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8595: \$? = $ac_status" >&5
-+  echo "$as_me:8631: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8598: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8634: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8601: \$? = $ac_status" >&5
-+  echo "$as_me:8637: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -8608,18 +8644,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8611: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:8647: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:8618: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:8654: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8622 "configure"
-+#line 8658 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8631,25 +8667,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8634: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8670: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8637: \$? = $ac_status" >&5
-+  echo "$as_me:8673: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8640: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8676: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8643: \$? = $ac_status" >&5
-+  echo "$as_me:8679: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8645: result: yes" >&5
-+  echo "$as_me:8681: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8652: result: no" >&5
-+echo "$as_me:8688: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -8717,11 +8753,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:8720: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:8756: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 8724 "configure"
-+#line 8760 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8733,25 +8769,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8736: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8772: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8739: \$? = $ac_status" >&5
-+  echo "$as_me:8775: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8742: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8778: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8745: \$? = $ac_status" >&5
-+  echo "$as_me:8781: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8747: result: yes" >&5
-+  echo "$as_me:8783: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8754: result: no" >&5
-+echo "$as_me:8790: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -8766,7 +8802,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:8769: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:8805: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -8774,7 +8810,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:8777: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:8813: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -8784,7 +8820,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8787 "configure"
-+#line 8823 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8796,23 +8832,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8799: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8835: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8802: \$? = $ac_status" >&5
-+  echo "$as_me:8838: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8805: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8841: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8808: \$? = $ac_status" >&5
-+  echo "$as_me:8844: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8810: result: yes" >&5
-+  echo "$as_me:8846: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8815: result: no" >&5
-+echo "$as_me:8851: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -8865,10 +8901,10 @@
- 	AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
- CF_EOF
- 		cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
--		{ (eval echo "$as_me:8868: \"$cf_try\"") >&5
-+		{ (eval echo "$as_me:8904: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8871: \$? = $ac_status" >&5
-+  echo "$as_me:8907: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 		if test -f conftest.out ; then
- 			cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ 	][ 	]*//"`
-@@ -8886,10 +8922,10 @@
- 
- cf_cv_timestamp=`date`
- 
--echo "$as_me:8889: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:8925: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
- echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
- 
--echo "$as_me:8892: checking if you want to have a library-prefix" >&5
-+echo "$as_me:8928: checking if you want to have a library-prefix" >&5
- echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
- 
- # Check whether --with-lib-prefix or --without-lib-prefix was given.
-@@ -8899,7 +8935,7 @@
- else
-   with_lib_prefix=auto
- fi;
--echo "$as_me:8902: result: $with_lib_prefix" >&5
-+echo "$as_me:8938: result: $with_lib_prefix" >&5
- echo "${ECHO_T}$with_lib_prefix" >&6
- 
- if test $with_lib_prefix = auto
-@@ -8930,7 +8966,7 @@
- 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
- fi
- 
--echo "$as_me:8933: checking for default loader flags" >&5
-+echo "$as_me:8969: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (normal)  LD_MODEL=''   ;;
-@@ -8938,11 +8974,11 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:8941: result: $LD_MODEL" >&5
-+echo "$as_me:8977: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- LD_RPATH_OPT=
--echo "$as_me:8945: checking for an rpath option" >&5
-+echo "$as_me:8981: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -8973,12 +9009,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:8976: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:9012: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:8981: checking if we need a space after rpath option" >&5
-+	echo "$as_me:9017: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -8999,7 +9035,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9002 "configure"
-+#line 9038 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9011,16 +9047,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9014: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9017: \$? = $ac_status" >&5
-+  echo "$as_me:9053: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9020: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9056: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9023: \$? = $ac_status" >&5
-+  echo "$as_me:9059: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -9030,7 +9066,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:9033: result: $cf_rpath_space" >&5
-+	echo "$as_me:9069: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -9051,7 +9087,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:9054: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:9090: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -9066,9 +9102,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:9069: result: $withval" >&5
-+		echo "$as_me:9105: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:9071: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:9107: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -9077,7 +9113,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:9080: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:9116: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -9087,14 +9123,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:9090: checking which $CC option to use" >&5
-+		echo "$as_me:9126: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9097 "configure"
-+#line 9133 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9106,16 +9142,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9109: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9112: \$? = $ac_status" >&5
-+  echo "$as_me:9148: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9115: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9151: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9118: \$? = $ac_status" >&5
-+  echo "$as_me:9154: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9124,7 +9160,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:9127: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:9163: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -9195,7 +9231,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:9198: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:9234: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9204,7 +9240,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9207 "configure"
-+#line 9243 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9216,16 +9252,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9219: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9255: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9222: \$? = $ac_status" >&5
-+  echo "$as_me:9258: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9225: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9261: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9228: \$? = $ac_status" >&5
-+  echo "$as_me:9264: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -9236,7 +9272,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:9239: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:9275: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -9461,7 +9497,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 9464 "configure"
-+#line 9500 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9473,16 +9509,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9476: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9512: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9479: \$? = $ac_status" >&5
-+  echo "$as_me:9515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9482: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9485: \$? = $ac_status" >&5
-+  echo "$as_me:9521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9519,7 +9555,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:9522: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:9558: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -9529,7 +9565,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 9532 "${as_me:-configure}"
-+#line 9568 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -9541,18 +9577,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:9544: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:9580: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:9546: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:9582: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9549: \$? = $ac_status" >&5
-+  echo "$as_me:9585: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:9551: result: yes" >&5
-+				echo "$as_me:9587: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:9555: result: no" >&5
-+				echo "$as_me:9591: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -9567,17 +9603,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:9570: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:9606: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:9574: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:9610: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- # The test/sample programs in the original tree link using rpath option.
- # Make it optional for packagers.
- if test -n "$LOCAL_LDFLAGS"
- then
--	echo "$as_me:9580: checking if you want to link sample programs with rpath option" >&5
-+	echo "$as_me:9616: checking if you want to link sample programs with rpath option" >&5
- echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-link or --disable-rpath-link was given.
-@@ -9587,7 +9623,7 @@
- else
-   with_rpath_link=yes
- fi;
--	echo "$as_me:9590: result: $with_rpath_link" >&5
-+	echo "$as_me:9626: result: $with_rpath_link" >&5
- echo "${ECHO_T}$with_rpath_link" >&6
- 	if test "$with_rpath_link" = no
- 	then
-@@ -9599,7 +9635,7 @@
- ###############################################################################
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:9602: checking if you want broken-linker support code" >&5
-+echo "$as_me:9638: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -9609,7 +9645,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:9612: result: $with_broken_linker" >&5
-+echo "$as_me:9648: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -9629,7 +9665,7 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:9632: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:9668: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
-@@ -9675,14 +9711,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:9678: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:9714: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9685 "configure"
-+#line 9721 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9697,16 +9733,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9700: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9703: \$? = $ac_status" >&5
-+  echo "$as_me:9739: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9706: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9709: \$? = $ac_status" >&5
-+  echo "$as_me:9745: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9715,7 +9751,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9718 "configure"
-+#line 9754 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9730,16 +9766,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9733: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9736: \$? = $ac_status" >&5
-+  echo "$as_me:9772: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9739: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9742: \$? = $ac_status" >&5
-+  echo "$as_me:9778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9754,7 +9790,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9757: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:9793: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -9779,16 +9815,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:9782: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:9818: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:9788: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:9824: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9791 "configure"
-+#line 9827 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9803,16 +9839,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9806: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9842: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9809: \$? = $ac_status" >&5
-+  echo "$as_me:9845: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9812: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9848: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9815: \$? = $ac_status" >&5
-+  echo "$as_me:9851: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -9833,7 +9869,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9836 "configure"
-+#line 9872 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9848,16 +9884,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9854: \$? = $ac_status" >&5
-+  echo "$as_me:9890: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9860: \$? = $ac_status" >&5
-+  echo "$as_me:9896: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9868,15 +9904,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:9871: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:9907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:9876: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:9912: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9879 "configure"
-+#line 9915 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9891,16 +9927,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9894: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9897: \$? = $ac_status" >&5
-+  echo "$as_me:9933: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9900: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9903: \$? = $ac_status" >&5
-+  echo "$as_me:9939: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9916,7 +9952,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9919: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:9955: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -10034,14 +10070,14 @@
- 	;;
- (*)
- 
--echo "$as_me:10037: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10073: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10044 "configure"
-+#line 10080 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10060,16 +10096,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10063: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10099: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10066: \$? = $ac_status" >&5
-+  echo "$as_me:10102: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10069: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10105: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10072: \$? = $ac_status" >&5
-+  echo "$as_me:10108: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10078,7 +10114,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10081 "configure"
-+#line 10117 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10097,16 +10133,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10100: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10136: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10103: \$? = $ac_status" >&5
-+  echo "$as_me:10139: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10106: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10142: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10109: \$? = $ac_status" >&5
-+  echo "$as_me:10145: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10121,7 +10157,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10124: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10160: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10229,16 +10265,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:10232: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:10268: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:10238: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:10274: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10241 "configure"
-+#line 10277 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10253,16 +10289,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10256: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10292: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10259: \$? = $ac_status" >&5
-+  echo "$as_me:10295: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10262: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10298: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10265: \$? = $ac_status" >&5
-+  echo "$as_me:10301: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -10283,7 +10319,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10286 "configure"
-+#line 10322 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10298,16 +10334,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10301: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10337: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10304: \$? = $ac_status" >&5
-+  echo "$as_me:10340: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10307: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10310: \$? = $ac_status" >&5
-+  echo "$as_me:10346: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10318,15 +10354,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:10321: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:10357: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:10326: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:10362: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10329 "configure"
-+#line 10365 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10341,16 +10377,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10380: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10347: \$? = $ac_status" >&5
-+  echo "$as_me:10383: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10350: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10386: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10353: \$? = $ac_status" >&5
-+  echo "$as_me:10389: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10366,7 +10402,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10369: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:10405: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -10524,7 +10560,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:10527: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:10563: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -10532,7 +10568,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10535: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -10540,7 +10576,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10543: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10579: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -10548,10 +10584,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:10551: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:10587: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10554 "configure"
-+#line 10590 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -10566,16 +10602,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10569: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10572: \$? = $ac_status" >&5
-+  echo "$as_me:10608: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10575: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10578: \$? = $ac_status" >&5
-+  echo "$as_me:10614: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -10584,12 +10620,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:10587: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:10623: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10592 "configure"
-+#line 10628 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -10604,16 +10640,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10607: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10643: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10610: \$? = $ac_status" >&5
-+  echo "$as_me:10646: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10613: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10649: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10616: \$? = $ac_status" >&5
-+  echo "$as_me:10652: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -10624,19 +10660,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:10627: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:10663: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:10632: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10668: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10639 "configure"
-+#line 10675 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10655,16 +10691,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10694: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10661: \$? = $ac_status" >&5
-+  echo "$as_me:10697: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10700: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10667: \$? = $ac_status" >&5
-+  echo "$as_me:10703: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10673,7 +10709,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10676 "configure"
-+#line 10712 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10692,16 +10728,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10731: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10698: \$? = $ac_status" >&5
-+  echo "$as_me:10734: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10737: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10704: \$? = $ac_status" >&5
-+  echo "$as_me:10740: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10716,7 +10752,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10719: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10755: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10821,7 +10857,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10824: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10860: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10833,7 +10869,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10836 "configure"
-+#line 10872 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10853,16 +10889,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10856: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10892: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10859: \$? = $ac_status" >&5
-+  echo "$as_me:10895: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10865: \$? = $ac_status" >&5
-+  echo "$as_me:10901: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10872,16 +10908,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10875: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10878: \$? = $ac_status" >&5
-+  echo "$as_me:10914: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10917: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10884: \$? = $ac_status" >&5
-+  echo "$as_me:10920: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10895,13 +10931,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10898: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10934: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10904: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10940: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10909,7 +10945,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10912 "configure"
-+#line 10948 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10929,16 +10965,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10932: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10968: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10935: \$? = $ac_status" >&5
-+  echo "$as_me:10971: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10938: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10974: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10941: \$? = $ac_status" >&5
-+  echo "$as_me:10977: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10947,7 +10983,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10950 "configure"
-+#line 10986 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -10968,16 +11004,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10971: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10974: \$? = $ac_status" >&5
-+  echo "$as_me:11010: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10977: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10980: \$? = $ac_status" >&5
-+  echo "$as_me:11016: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10988,7 +11024,7 @@
-   break
- done
- fi
--echo "$as_me:10991: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:11027: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -10998,7 +11034,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:11001: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:11037: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11006,7 +11042,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11009 "configure"
-+#line 11045 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -11026,16 +11062,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11029: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11032: \$? = $ac_status" >&5
-+  echo "$as_me:11068: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11035: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11038: \$? = $ac_status" >&5
-+  echo "$as_me:11074: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11044,7 +11080,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11047 "configure"
-+#line 11083 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -11065,16 +11101,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11068: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11104: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11071: \$? = $ac_status" >&5
-+  echo "$as_me:11107: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11110: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11077: \$? = $ac_status" >&5
-+  echo "$as_me:11113: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -11085,7 +11121,7 @@
-   break
- done
- fi
--echo "$as_me:11088: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:11124: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -11098,7 +11134,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:11101: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:11137: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11106,7 +11142,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11109 "configure"
-+#line 11145 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -11118,16 +11154,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11121: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11124: \$? = $ac_status" >&5
-+  echo "$as_me:11160: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11127: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11130: \$? = $ac_status" >&5
-+  echo "$as_me:11166: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11136,7 +11172,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11139 "configure"
-+#line 11175 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -11149,16 +11185,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11152: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11155: \$? = $ac_status" >&5
-+  echo "$as_me:11191: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11158: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11194: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11161: \$? = $ac_status" >&5
-+  echo "$as_me:11197: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -11169,7 +11205,7 @@
-   break
- done
- fi
--echo "$as_me:11172: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:11208: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -11183,13 +11219,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:11186: checking for fseeko" >&5
-+echo "$as_me:11222: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11192 "configure"
-+#line 11228 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -11201,16 +11237,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11204: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11240: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11207: \$? = $ac_status" >&5
-+  echo "$as_me:11243: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11210: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11246: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11213: \$? = $ac_status" >&5
-+  echo "$as_me:11249: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -11220,7 +11256,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11223: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:11259: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -11241,14 +11277,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:11244: checking whether to use struct dirent64" >&5
-+	echo "$as_me:11280: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11251 "configure"
-+#line 11287 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -11269,16 +11305,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11272: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11275: \$? = $ac_status" >&5
-+  echo "$as_me:11311: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11278: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11281: \$? = $ac_status" >&5
-+  echo "$as_me:11317: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -11289,7 +11325,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11292: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:11328: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11299,7 +11335,7 @@
- 	fi
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:11302: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:11338: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -11309,7 +11345,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:11312: result: $with_rcs_ids" >&5
-+echo "$as_me:11348: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "$with_rcs_ids" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11319,7 +11355,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11322: checking if you want to build with function extensions" >&5
-+echo "$as_me:11358: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11329,7 +11365,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11332: result: $with_ext_funcs" >&5
-+echo "$as_me:11368: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "$with_ext_funcs" = yes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11347,7 +11383,7 @@
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11350: checking for extended use of const keyword" >&5
-+echo "$as_me:11386: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11357,7 +11393,7 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:11360: result: $with_ext_const" >&5
-+echo "$as_me:11396: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "$with_ext_const" = yes ; then
-@@ -11367,7 +11403,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:11370: checking if you want all development code" >&5
-+echo "$as_me:11406: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -11377,7 +11413,7 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:11380: result: $with_develop" >&5
-+echo "$as_me:11416: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###############################################################################
-@@ -11386,7 +11422,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:11389: checking if you want to link with the pthread library" >&5
-+echo "$as_me:11425: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -11396,27 +11432,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:11399: result: $with_pthread" >&5
-+echo "$as_me:11435: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:11403: checking for pthread.h" >&5
-+	echo "$as_me:11439: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11409 "configure"
-+#line 11445 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:11413: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11449: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11419: \$? = $ac_status" >&5
-+  echo "$as_me:11455: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11435,7 +11471,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:11438: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:11474: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -11445,7 +11481,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:11448: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:11484: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -11466,7 +11502,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 11469 "configure"
-+#line 11505 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -11483,16 +11519,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11522: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11489: \$? = $ac_status" >&5
-+  echo "$as_me:11525: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11528: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11495: \$? = $ac_status" >&5
-+  echo "$as_me:11531: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -11502,7 +11538,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:11505: result: $with_pthread" >&5
-+	    echo "$as_me:11541: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -11530,7 +11566,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:11533: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:11569: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11539,7 +11575,7 @@
- 
- fi
- 
--echo "$as_me:11542: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:11578: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -11549,18 +11585,18 @@
- else
-   use_weak_symbols=no
- fi;
--echo "$as_me:11552: result: $use_weak_symbols" >&5
-+echo "$as_me:11588: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- if test "$use_weak_symbols" = yes ; then
- 
--echo "$as_me:11556: checking if $CC supports weak symbols" >&5
-+echo "$as_me:11592: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11563 "configure"
-+#line 11599 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -11586,16 +11622,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11589: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11625: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11592: \$? = $ac_status" >&5
-+  echo "$as_me:11628: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11595: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11631: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11598: \$? = $ac_status" >&5
-+  echo "$as_me:11634: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -11606,7 +11642,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11609: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:11645: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- else
-@@ -11635,13 +11671,13 @@
- fi
- 
- # OpenSUSE is installing ncurses6, using reentrant option.
--echo "$as_me:11638: checking for _nc_TABSIZE" >&5
-+echo "$as_me:11674: checking for _nc_TABSIZE" >&5
- echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
- if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11644 "configure"
-+#line 11680 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char _nc_TABSIZE (); below.  */
-@@ -11672,16 +11708,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11675: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11711: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11678: \$? = $ac_status" >&5
-+  echo "$as_me:11714: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11681: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11717: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11684: \$? = $ac_status" >&5
-+  echo "$as_me:11720: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func__nc_TABSIZE=yes
- else
-@@ -11691,7 +11727,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11694: result: $ac_cv_func__nc_TABSIZE" >&5
-+echo "$as_me:11730: result: $ac_cv_func__nc_TABSIZE" >&5
- echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
- if test $ac_cv_func__nc_TABSIZE = yes; then
-   assume_reentrant=yes
-@@ -11703,7 +11739,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:11706: checking if you want experimental reentrant code" >&5
-+echo "$as_me:11742: checking if you want experimental reentrant code" >&5
- echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -11713,7 +11749,7 @@
- else
-   with_reentrant=$assume_reentrant
- fi;
--echo "$as_me:11716: result: $with_reentrant" >&5
-+echo "$as_me:11752: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "$with_reentrant" = yes ; then
- 	cf_cv_enable_reentrant=1
-@@ -11736,7 +11772,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:11739: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:11775: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -11746,7 +11782,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:11749: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:11785: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -11760,7 +11796,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:11763: checking if you want to see long compiling messages" >&5
-+echo "$as_me:11799: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -11794,11 +11830,11 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:11797: result: $enableval" >&5
-+echo "$as_me:11833: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:11801: checking if you want to see compiler warnings" >&5
-+echo "$as_me:11837: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -11806,7 +11842,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:11809: result: $with_warnings" >&5
-+echo "$as_me:11845: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -11818,12 +11854,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:11821: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:11857: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11826 "configure"
-+#line 11862 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11840,16 +11876,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11843: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11879: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11846: \$? = $ac_status" >&5
-+  echo "$as_me:11882: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11885: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11852: \$? = $ac_status" >&5
-+  echo "$as_me:11888: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -11860,7 +11896,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:11863: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:11899: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -11869,12 +11905,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:11872: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:11908: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11877 "configure"
-+#line 11913 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11891,16 +11927,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11897: \$? = $ac_status" >&5
-+  echo "$as_me:11933: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11903: \$? = $ac_status" >&5
-+  echo "$as_me:11939: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -11911,12 +11947,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:11914: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:11950: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 11919 "${as_me:-configure}"
-+#line 11955 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -11933,7 +11969,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:11936: checking for $CC warning options..." >&5
-+	{ echo "$as_me:11972: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -11949,12 +11985,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11952: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11955: \$? = $ac_status" >&5
-+  echo "$as_me:11991: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11957: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:11993: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -11963,7 +11999,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:11966: checking for $CC warning options..." >&5
-+	{ echo "$as_me:12002: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -11987,12 +12023,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11993: \$? = $ac_status" >&5
-+  echo "$as_me:12029: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11995: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:12031: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -12003,7 +12039,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:12006: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12042: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12013,7 +12049,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:12016: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12052: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12046,10 +12082,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:12049: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:12085: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 12052 "${as_me:-configure}"
-+#line 12088 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -12098,12 +12134,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:12101: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12104: \$? = $ac_status" >&5
-+  echo "$as_me:12140: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:12106: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:12142: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -12163,7 +12199,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:12166: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:12202: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -12173,7 +12209,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:12176: result: $with_assertions" >&5
-+echo "$as_me:12212: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -12226,7 +12262,7 @@
- 	;;
- esac
- 
--echo "$as_me:12229: checking whether to add trace feature to all models" >&5
-+echo "$as_me:12265: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -12236,7 +12272,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:12239: result: $cf_with_trace" >&5
-+echo "$as_me:12275: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "$cf_with_trace" = yes ; then
-@@ -12324,7 +12360,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:12327: checking if we want to use GNAT projects" >&5
-+echo "$as_me:12363: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -12341,7 +12377,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:12344: result: $enable_gnat_projects" >&5
-+echo "$as_me:12380: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -12349,13 +12385,13 @@
- (*mingw32*)
- 	;;
- (*)
--echo "$as_me:12352: checking for gettimeofday" >&5
-+echo "$as_me:12388: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12358 "configure"
-+#line 12394 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -12386,16 +12422,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12389: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12392: \$? = $ac_status" >&5
-+  echo "$as_me:12428: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12398: \$? = $ac_status" >&5
-+  echo "$as_me:12434: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -12405,7 +12441,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12408: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:12444: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -12414,7 +12450,7 @@
- 
- else
- 
--echo "$as_me:12417: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:12453: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12422,7 +12458,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12425 "configure"
-+#line 12461 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12441,16 +12477,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12444: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12480: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12447: \$? = $ac_status" >&5
-+  echo "$as_me:12483: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12450: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12486: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12453: \$? = $ac_status" >&5
-+  echo "$as_me:12489: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -12461,7 +12497,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12464: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:12500: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -12477,13 +12513,13 @@
- esac
- 
- ###	Checks for header files.
--echo "$as_me:12480: checking for ANSI C header files" >&5
-+echo "$as_me:12516: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12486 "configure"
-+#line 12522 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -12491,13 +12527,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:12494: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12530: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12500: \$? = $ac_status" >&5
-+  echo "$as_me:12536: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12519,7 +12555,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12522 "configure"
-+#line 12558 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -12537,7 +12573,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12540 "configure"
-+#line 12576 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -12558,7 +12594,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12561 "configure"
-+#line 12597 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12584,15 +12620,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12587: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12623: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12590: \$? = $ac_status" >&5
-+  echo "$as_me:12626: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12592: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12595: \$? = $ac_status" >&5
-+  echo "$as_me:12631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12605,7 +12641,429 @@
- fi
- fi
- fi
--echo "$as_me:12608: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:12644: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\EOF
-+#define STDC_HEADERS 1
-+EOF
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+                  inttypes.h stdint.h unistd.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:12660: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12666 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12675: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12681: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_Header=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:12691: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+EOF
-+
-+fi
-+done
-+
-+echo "$as_me:12701: checking for signed char" >&5
-+echo $ECHO_N "checking for signed char... $ECHO_C" >&6
-+if test "${ac_cv_type_signed_char+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12707 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((signed char *) 0)
-+  return 0;
-+if (sizeof (signed char))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12722: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12725: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12731: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_signed_char=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_type_signed_char=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:12741: result: $ac_cv_type_signed_char" >&5
-+echo "${ECHO_T}$ac_cv_type_signed_char" >&6
-+
-+echo "$as_me:12744: checking size of signed char" >&5
-+echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
-+if test "${ac_cv_sizeof_signed_char+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$ac_cv_type_signed_char" = yes; then
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 12753 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12765: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12768: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12771: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12774: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line 12779 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12794: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12800: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line 12816 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12828: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12831: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12834: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12837: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+  done
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12853 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12868: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12874: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_lo=`expr $ac_mid + 1`
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+ac_cv_sizeof_signed_char=$ac_lo
-+else
-+  if test "$cross_compiling" = yes; then
-+  { { echo "$as_me:12887: error: cannot run test program while cross compiling" >&5
-+echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+   { (exit 1); exit 1; }; }
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12892 "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.val", "w");
-+if (!f)
-+  $ac_main_return (1);
-+fprintf (f, "%d", (sizeof (signed char)));
-+fclose (f);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:12908: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12911: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:12916: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_sizeof_signed_char=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+rm -f conftest.val
-+else
-+  ac_cv_sizeof_signed_char=0
-+fi
-+fi
-+echo "$as_me:12932: result: $ac_cv_sizeof_signed_char" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
-+cat >>confdefs.h <<EOF
-+#define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-+EOF
-+
-+echo "$as_me:12938: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12944 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+_ACEOF
-+if { (eval echo "$as_me:12952: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:12958: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_cv_header_stdc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12980 "configure"
-+#include "confdefs.h"
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -rf conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 12998 "configure"
-+#include "confdefs.h"
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  egrep "free" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -rf conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 13019 "configure"
-+#include "confdefs.h"
-+#include <ctype.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-+                     || ('j' <= (c) && (c) <= 'r') \
-+                     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+        || toupper (i) != TOUPPER (i))
-+      $ac_main_return(2);
-+  $ac_main_return (0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13048: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (eval echo "$as_me:13050: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13053: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_header_stdc=no
-+fi
-+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+fi
-+echo "$as_me:13066: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -12618,13 +13076,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:12621: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:13079: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12627 "configure"
-+#line 13085 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -12639,16 +13097,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12642: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13100: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12645: \$? = $ac_status" >&5
-+  echo "$as_me:13103: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12648: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13106: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12651: \$? = $ac_status" >&5
-+  echo "$as_me:13109: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -12658,7 +13116,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12661: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13119: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -12671,7 +13129,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:12674: checking for opendir in -ldir" >&5
-+  echo "$as_me:13132: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12679,7 +13137,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12682 "configure"
-+#line 13140 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12698,16 +13156,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12701: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12704: \$? = $ac_status" >&5
-+  echo "$as_me:13162: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12707: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12710: \$? = $ac_status" >&5
-+  echo "$as_me:13168: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -12718,14 +13176,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12721: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:13179: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:12728: checking for opendir in -lx" >&5
-+  echo "$as_me:13186: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12733,7 +13191,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12736 "configure"
-+#line 13194 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12752,16 +13210,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12755: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12758: \$? = $ac_status" >&5
-+  echo "$as_me:13216: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12761: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13219: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12764: \$? = $ac_status" >&5
-+  echo "$as_me:13222: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -12772,7 +13230,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12775: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:13233: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -12780,13 +13238,13 @@
- 
- fi
- 
--echo "$as_me:12783: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13241: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12789 "configure"
-+#line 13247 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -12802,16 +13260,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13263: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12808: \$? = $ac_status" >&5
-+  echo "$as_me:13266: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13269: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12814: \$? = $ac_status" >&5
-+  echo "$as_me:13272: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -12821,7 +13279,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12824: result: $ac_cv_header_time" >&5
-+echo "$as_me:13282: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -12839,13 +13297,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:12842: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:13300: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12848 "configure"
-+#line 13306 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12903,16 +13361,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12906: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12909: \$? = $ac_status" >&5
-+  echo "$as_me:13367: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12912: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12915: \$? = $ac_status" >&5
-+  echo "$as_me:13373: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -12922,7 +13380,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12925: result: $ac_cv_c_const" >&5
-+echo "$as_me:13383: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -12934,7 +13392,7 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:12937: checking if data-only library module links" >&5
-+echo "$as_me:13395: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12942,20 +13400,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 12945 "configure"
-+#line 13403 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:13406: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12951: \$? = $ac_status" >&5
-+  echo "$as_me:13409: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 12958 "configure"
-+#line 13416 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -12968,10 +13426,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:12971: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12974: \$? = $ac_status" >&5
-+  echo "$as_me:13432: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -12984,7 +13442,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12987 "configure"
-+#line 13445 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -12995,15 +13453,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12998: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13456: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13001: \$? = $ac_status" >&5
-+  echo "$as_me:13459: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13003: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13006: \$? = $ac_status" >&5
-+  echo "$as_me:13464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -13018,7 +13476,7 @@
- 
- fi
- 
--echo "$as_me:13021: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:13479: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -13032,7 +13490,7 @@
- 
- ###	Checks for library functions.
- 
--echo "$as_me:13035: checking for working mkstemp" >&5
-+echo "$as_me:13493: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13043,7 +13501,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13046 "configure"
-+#line 13504 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -13081,15 +13539,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13084: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13542: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13087: \$? = $ac_status" >&5
-+  echo "$as_me:13545: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13092: \$? = $ac_status" >&5
-+  echo "$as_me:13550: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -13104,16 +13562,16 @@
- fi
- 
- fi
--echo "$as_me:13107: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:13565: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:13110: checking for mkstemp" >&5
-+	echo "$as_me:13568: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13116 "configure"
-+#line 13574 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -13144,16 +13602,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13147: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13605: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13150: \$? = $ac_status" >&5
-+  echo "$as_me:13608: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13611: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13156: \$? = $ac_status" >&5
-+  echo "$as_me:13614: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -13163,7 +13621,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13166: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:13624: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -13186,7 +13644,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:13189: checking for $ac_word" >&5
-+echo "$as_me:13647: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13201,7 +13659,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:13204: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13662: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13210,10 +13668,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:13213: result: $gnat_exists" >&5
-+  echo "$as_me:13671: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:13216: result: no" >&5
-+  echo "$as_me:13674: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13222,12 +13680,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:13225: checking for gnat version" >&5
-+echo "$as_me:13683: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:13230: result: $cf_gnat_version" >&5
-+echo "$as_me:13688: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -13235,7 +13693,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:13238: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:13696: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -13243,7 +13701,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:13246: checking for $ac_word" >&5
-+echo "$as_me:13704: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13258,7 +13716,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:13261: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13719: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13267,10 +13725,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:13270: result: $M4_exists" >&5
-+  echo "$as_me:13728: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:13273: result: no" >&5
-+  echo "$as_me:13731: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13279,7 +13737,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:13282: checking if GNAT works" >&5
-+		echo "$as_me:13740: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -13307,14 +13765,14 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:13310: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:13768: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
- 
- 	if test	"$cf_cv_prog_gnat_correct" = yes; then
- 
--	echo "$as_me:13317: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:13775: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -13331,10 +13789,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:13334: result: $ADAFLAGS" >&5
-+	echo "$as_me:13792: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:13337: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:13795: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13344,11 +13802,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:13347: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:13805: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:13351: checking if GNAT supports generics" >&5
-+echo "$as_me:13809: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -13358,7 +13816,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:13361: result: $cf_gnat_generics" >&5
-+echo "$as_me:13819: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -13370,7 +13828,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:13373: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:13831: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13418,7 +13876,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:13421: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:13879: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -13431,7 +13889,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:13434: checking if GNAT supports project files" >&5
-+echo "$as_me:13892: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -13491,15 +13949,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:13494: result: $cf_gnat_projects" >&5
-+echo "$as_me:13952: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:13500: checking if GNAT supports libraries" >&5
-+	echo "$as_me:13958: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:13502: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:13960: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -13519,7 +13977,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:13522: checking for ada-compiler" >&5
-+echo "$as_me:13980: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -13530,12 +13988,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:13533: result: $cf_ada_compiler" >&5
-+echo "$as_me:13991: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 		cf_ada_package=terminal_interface
- 
--echo "$as_me:13538: checking for ada-include" >&5
-+echo "$as_me:13996: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -13571,7 +14029,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:13574: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14032: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -13580,10 +14038,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:13583: result: $ADA_INCLUDE" >&5
-+echo "$as_me:14041: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:13586: checking for ada-objects" >&5
-+echo "$as_me:14044: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -13619,7 +14077,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:13622: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14080: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -13628,10 +14086,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:13631: result: $ADA_OBJECTS" >&5
-+echo "$as_me:14089: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:13634: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:14092: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -13641,7 +14099,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:13644: result: $with_ada_sharedlib" >&5
-+echo "$as_me:14102: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -13657,12 +14115,12 @@
- fi
- 
- 	else
--		{ { echo "$as_me:13660: error: No usable Ada compiler found" >&5
-+		{ { echo "$as_me:14118: error: No usable Ada compiler found" >&5
- echo "$as_me: error: No usable Ada compiler found" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:13665: error: The Ada compiler is needed for this package" >&5
-+	{ { echo "$as_me:14123: error: The Ada compiler is needed for this package" >&5
- echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -13702,7 +14160,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:13705: checking default library suffix" >&5
-+echo "$as_me:14163: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -13713,10 +14171,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:13716: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:14174: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:13719: checking default library-dependency suffix" >&5
-+echo "$as_me:14177: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -13774,10 +14232,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:13777: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:14235: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:13780: checking default object directory" >&5
-+echo "$as_me:14238: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -13793,7 +14251,7 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:13796: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:14254: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- ### Set up low-level terminfo dependencies for makefiles.
-@@ -13924,6 +14382,12 @@
- # match layout used by make-tar.sh
- ADAHTML_DIR=../doc/ada
- 
-+if test "x$cross_compiling" = xyes ; then
-+	ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)'
-+else
-+	ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)'
-+fi
-+
- ac_config_files="$ac_config_files $SUB_MAKEFILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile"
- ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
-@@ -14005,7 +14469,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:14008: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:14472: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -14181,7 +14645,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:14184: error: ambiguous option: $1
-+    { { echo "$as_me:14648: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -14200,7 +14664,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:14203: error: unrecognized option: $1
-+  -*) { { echo "$as_me:14667: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -14271,7 +14735,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:14274: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:14738: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -14481,6 +14945,7 @@
- s,@NCURSES_TREE@,$NCURSES_TREE,;t t
- s,@EXTERNAL_TREE@,$EXTERNAL_TREE,;t t
- s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
-+s,@ADAGEN_LDFLAGS@,$ADAGEN_LDFLAGS,;t t
- CEOF
- 
- EOF
-@@ -14595,7 +15060,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:14598: creating $ac_file" >&5
-+    { echo "$as_me:15063: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -14613,7 +15078,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:14616: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15081: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -14626,7 +15091,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:14629: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15094: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -14642,7 +15107,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:14645: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:15110: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -14651,7 +15116,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:14654: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:15119: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -14688,7 +15153,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:14691: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:15156: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -14699,7 +15164,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:14702: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:15167: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -14748,7 +15213,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:14751: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:15216: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -14759,7 +15224,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:14762: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15227: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -14772,7 +15237,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:14775: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15240: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -14830,7 +15295,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:14833: $ac_file is unchanged" >&5
-+      { echo "$as_me:15298: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: Ada95/configure.in
-Prereq:  1.60 
---- ncurses-6.0-20150912+/Ada95/configure.in	2015-04-18 18:49:57.000000000 +0000
-+++ ncurses-6.0-20150919/Ada95/configure.in	2015-09-19 20:33:36.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: configure.in,v 1.60 2015/04/18 18:49:57 tom Exp $
-+dnl $Id: configure.in,v 1.61 2015/09/19 20:33:36 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.60 $)
-+AC_REVISION($Revision: 1.61 $)
- AC_INIT(gen/gen.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -448,6 +448,7 @@
- esac
- 
- ###	Checks for header files.
-+AC_CHECK_SIZEOF([signed char], 0)
- AC_STDC_HEADERS
- AC_HEADER_DIRENT
- AC_HEADER_TIME
-@@ -584,6 +585,14 @@
- ADAHTML_DIR=../doc/ada
- AC_SUBST(ADAHTML_DIR)
- 
-+if test "x$cross_compiling" = xyes ; then
-+	ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)'
-+else
-+	ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)'
-+fi
-+
-+AC_SUBST(ADAGEN_LDFLAGS)
-+
- AC_OUTPUT( \
- 	$SUB_MAKEFILES \
- 	doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \
-Index: NEWS
-Prereq:  1.2493 
---- ncurses-6.0-20150912+/NEWS	2015-09-12 19:52:57.000000000 +0000
-+++ ncurses-6.0-20150919/NEWS	2015-09-19 23:04:21.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2493 2015/09/12 19:52:57 tom Exp $
-+-- $Id: NEWS,v 1.2496 2015/09/19 23:04:21 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,14 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150919
-+	+ clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input
-+	  stream.
-+	+ clarify in curs_getch.3x that the keypad mode affects ability to
-+	  read KEY_MOUSE codes, but does not affect KEY_RESIZE.
-+	+ add overlooked build-fix needed with Cygwin for separate Ada95
-+	  configure script, cf: 20150606 (report by Nicolas Boulenguez)
-+
- 20150912
- 	+ fixes for configure/build using clang on OSX (prompted by report by
- 	  William Gallafent).
-Index: VERSION
---- ncurses-6.0-20150912+/VERSION	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/VERSION	2015-09-19 19:40:14.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150912
-+5:0:9	6.0	20150919
-Index: dist.mk
-Prereq:  1.1070 
---- ncurses-6.0-20150912+/dist.mk	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/dist.mk	2015-09-19 19:40:14.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1070 2015/09/12 16:17:30 tom Exp $
-+# $Id: dist.mk,v 1.1071 2015/09/19 19:40:14 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150912
-+NCURSES_PATCH = 20150919
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150912+/doc/html/man/captoinfo.1m.html	2015-09-05 21:19:32.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/captoinfo.1m.html	2015-09-19 23:18:49.000000000 +0000
-@@ -205,7 +205,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150912+/doc/html/man/clear.1.html	2015-09-05 21:19:32.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/clear.1.html	2015-09-19 23:18:49.000000000 +0000
-@@ -71,7 +71,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/curs_addch.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_addch.3x.html	2015-09-05 21:19:33.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_addch.3x.html	2015-09-19 23:18:49.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_addch.3x,v 1.36 2015/07/16 09:14:44 tom Exp @
-+  * @Id: curs_addch.3x,v 1.37 2015/09/05 21:13:25 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-Index: doc/html/man/curs_getch.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_getch.3x.html	2015-07-22 00:49:56.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_getch.3x.html	2015-09-19 23:18:50.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_getch.3x,v 1.42 2015/07/21 08:44:04 tom Exp @
-+  * @Id: curs_getch.3x,v 1.43 2015/09/19 22:25:05 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -247,32 +247,37 @@
-        real key:
- 
-        <STRONG>o</STRONG>   <STRONG>KEY_RESIZE</STRONG>  is  returned  when the <STRONG>SIGWINCH</STRONG> signal has
--           been detected (see <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG> and <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>).
-+           been detected (see  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>  and  <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>).
-+           This  code  is returned whether or not <STRONG>keypad</STRONG> has been
-+           enabled.
- 
-        <STRONG>o</STRONG>   <STRONG>KEY_MOUSE</STRONG>   is   returned   for   mouse-events    (see
--           <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>).
-+           <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>).  This code relies upon whether or not
-+           <STRONG><A HREF="keypad.3x.html">keypad(3x)</A></STRONG> has been enabled, because (e.g., with <EM>xterm</EM>
-+           mouse  prototocol) ncurses must read escape sequences,
-+           just like a function key.
- 
- 
- </PRE>
- <H3><a name="h3-Testing-key-codes">Testing key-codes</a></H3><PRE>
--       The  <STRONG>has_key</STRONG> routine takes a key-code value from the above
--       list, and returns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG> according to  whether  the
-+       The <STRONG>has_key</STRONG> routine takes a key-code value from the  above
-+       list,  and  returns <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG> according to whether the
-        current terminal type recognizes a key with that value.
- 
-        The library also supports these extensions:
- 
-           <STRONG>define_key</STRONG>
--               defines  a  key-code  for  a given string (see <STRONG>de-</STRONG>
-+               defines a key-code for a  given  string  (see  <STRONG>de-</STRONG>
-                <STRONG><A HREF="define_key.3x.html">fine_key(3x)</A></STRONG>).
- 
-           <STRONG>key_defined</STRONG>
--               checks if there is a key-code defined for a  given
-+               checks  if there is a key-code defined for a given
-                string (see <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>).
- 
- 
- </PRE>
- <H2><a name="h2-RETURN-VALUE">RETURN VALUE</a></H2><PRE>
--       All  routines  return  the integer <STRONG>ERR</STRONG> upon failure and an
-+       All routines return the integer <STRONG>ERR</STRONG> upon  failure  and  an
-        integer value other than <STRONG>ERR</STRONG> (<STRONG>OK</STRONG> in the case of ungetch())
-        upon successful completion.
- 
-@@ -280,94 +285,102 @@
-                returns ERR if there is no more room in the FIFO.
- 
-           <STRONG>wgetch</STRONG>
--               returns  ERR  if the window pointer is null, or if
-+               returns ERR if the window pointer is null,  or  if
-                its timeout expires without having any data.
- 
--       Functions with a "mv" prefix first perform a cursor  move-
--       ment  using  <STRONG>wmove</STRONG>, and return an error if the position is
-+       Functions  with a "mv" prefix first perform a cursor move-
-+       ment using <STRONG>wmove</STRONG>, and return an error if the  position  is
-        outside the window, or if the window pointer is null.
- 
- 
- </PRE>
- <H2><a name="h2-NOTES">NOTES</a></H2><PRE>
-        Use of the escape key by a programmer for a single charac-
--       ter  function  is discouraged, as it will cause a delay of
-+       ter function is discouraged, as it will cause a  delay  of
-        up to one second while the keypad code looks for a follow-
-        ing function-key sequence.
- 
--       Some  keys  may be the same as commonly used control keys,
--       e.g., <STRONG>KEY_ENTER</STRONG>  versus  control/M,  <STRONG>KEY_BACKSPACE</STRONG>  versus
-+       Some keys may be the same as commonly used  control  keys,
-+       e.g.,  <STRONG>KEY_ENTER</STRONG>  versus  control/M,  <STRONG>KEY_BACKSPACE</STRONG> versus
-        control/H.  Some curses implementations may differ accord-
--       ing to whether they treat  these  control  keys  specially
--       (and  ignore  the  terminfo),  or use the terminfo defini-
--       tions.  <STRONG>Ncurses</STRONG> uses the terminfo definition.  If it  says
--       that  <STRONG>KEY_ENTER</STRONG>  is control/M, <STRONG>getch</STRONG> will return <STRONG>KEY_ENTER</STRONG>
-+       ing  to  whether  they  treat these control keys specially
-+       (and ignore the terminfo), or  use  the  terminfo  defini-
-+       tions.   <STRONG>Ncurses</STRONG> uses the terminfo definition.  If it says
-+       that <STRONG>KEY_ENTER</STRONG> is control/M, <STRONG>getch</STRONG> will  return  <STRONG>KEY_ENTER</STRONG>
-        when you press control/M.
- 
--       Generally, <STRONG>KEY_ENTER</STRONG> denotes the character(s) sent by  the
-+       Generally,  <STRONG>KEY_ENTER</STRONG> denotes the character(s) sent by the
-        <EM>Enter</EM> key on the numeric keypad:
- 
-        <STRONG>o</STRONG>   the terminal description lists the most useful keys,
- 
--       <STRONG>o</STRONG>   the  <EM>Enter</EM> key on the regular keyboard is already han-
-+       <STRONG>o</STRONG>   the <EM>Enter</EM> key on the regular keyboard is already  han-
-            dled by the standard ASCII characters for carriage-re-
-            turn and line-feed,
- 
--       <STRONG>o</STRONG>   depending  on  whether <STRONG>nl</STRONG> or <STRONG>nonl</STRONG> was called, pressing
--           "Enter" on the regular keyboard may  return  either  a
-+       <STRONG>o</STRONG>   depending on whether <STRONG>nl</STRONG> or <STRONG>nonl</STRONG> was  called,  pressing
-+           "Enter"  on  the  regular keyboard may return either a
-            carriage-return or line-feed, and finally
- 
--       <STRONG>o</STRONG>   "Enter  or  send" is the standard description for this
-+       <STRONG>o</STRONG>   "Enter or send" is the standard description  for  this
-            key.
- 
--       When using <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, or  <STRONG>mvwgetch</STRONG>,  nocbreak
-+       When  using  <STRONG>getch</STRONG>, <STRONG>wgetch</STRONG>, <STRONG>mvgetch</STRONG>, or <STRONG>mvwgetch</STRONG>, nocbreak
-        mode (<STRONG>nocbreak</STRONG>) and echo mode (<STRONG>echo</STRONG>) should not be used at
--       the same time.  Depending on the state of the  tty  driver
--       when  each character is typed, the program may produce un-
-+       the  same  time.  Depending on the state of the tty driver
-+       when each character is typed, the program may produce  un-
-        desirable results.
- 
-        Note that <STRONG>getch</STRONG>, <STRONG>mvgetch</STRONG>, and <STRONG>mvwgetch</STRONG> may be macros.
- 
-        Historically, the set of keypad macros was largely defined
--       by  the  extremely  function-key-rich keyboard of the AT&amp;T
--       7300, aka 3B1, aka Safari 4.   Modern  personal  computers
--       usually  have  only a small subset of these.  IBM PC-style
--       consoles  typically  support  little  more  than   <STRONG>KEY_UP</STRONG>,
--       <STRONG>KEY_DOWN</STRONG>,    <STRONG>KEY_LEFT</STRONG>,   <STRONG>KEY_RIGHT</STRONG>,   <STRONG>KEY_HOME</STRONG>,   <STRONG>KEY_END</STRONG>,
-+       by the extremely function-key-rich keyboard  of  the  AT&amp;T
-+       7300,  aka  3B1,  aka Safari 4.  Modern personal computers
-+       usually have only a small subset of these.   IBM  PC-style
-+       consoles   typically  support  little  more  than  <STRONG>KEY_UP</STRONG>,
-+       <STRONG>KEY_DOWN</STRONG>,   <STRONG>KEY_LEFT</STRONG>,   <STRONG>KEY_RIGHT</STRONG>,   <STRONG>KEY_HOME</STRONG>,    <STRONG>KEY_END</STRONG>,
-        <STRONG>KEY_NPAGE</STRONG>, <STRONG>KEY_PPAGE</STRONG>, and function keys 1 through 12.  The
-        Ins key is usually mapped to <STRONG>KEY_IC</STRONG>.
- 
- 
- </PRE>
- <H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
--       The  *get* functions are described in the XSI Curses stan-
--       dard, Issue 4.  They  read  single-byte  characters  only.
--       The  standard  specifies  that they return <STRONG>ERR</STRONG> on failure,
-+       The *get* functions are described in the XSI Curses  stan-
-+       dard,  Issue  4.   They  read single-byte characters only.
-+       The standard specifies that they return  <STRONG>ERR</STRONG>  on  failure,
-        but specifies no error conditions.
- 
--       The echo behavior of these functions on input of  <STRONG>KEY_</STRONG>  or
--       backspace  characters  was not specified in the SVr4 docu-
-+       The  echo  behavior of these functions on input of <STRONG>KEY_</STRONG> or
-+       backspace characters was not specified in the  SVr4  docu-
-        mentation.  This description is adopted from the XSI Curs-
-        es standard.
- 
--       The  behavior of <STRONG>getch</STRONG> and friends in the presence of han-
--       dled signals is unspecified in the  SVr4  and  XSI  Curses
--       documentation.   Under  historical curses implementations,
--       it varied depending on whether the operating system's  im-
--       plementation   of  handled  signal  receipt  interrupts  a
--       <STRONG>read(2)</STRONG> call in progress or not, and also (in some  imple-
--       mentations)  depending on whether an input timeout or non-
-+       The behavior of <STRONG>getch</STRONG> and friends in the presence of  han-
-+       dled  signals  is  unspecified  in the SVr4 and XSI Curses
-+       documentation.  Under historical  curses  implementations,
-+       it  varied depending on whether the operating system's im-
-+       plementation  of  handled  signal  receipt  interrupts   a
-+       <STRONG>read(2)</STRONG>  call in progress or not, and also (in some imple-
-+       mentations) depending on whether an input timeout or  non-
-        blocking mode has been set.
- 
-+       <STRONG>KEY_MOUSE</STRONG> is mentioned in XSI Curses, along with a few re-
-+       lated terminfo capabilities, but no higher-level functions
-+       use  the feature.  The implementation in ncurses is an ex-
-+       tension.
-+
-+       <STRONG>KEY_RESIZE</STRONG> is an extension first implemented for  ncurses.
-+       NetBSD curses later added this extension.
-+
-        Programmers concerned about portability should be prepared
--       for  either  of two cases: (a) signal receipt does not in-
--       terrupt <STRONG>getch</STRONG>; (b) signal  receipt  interrupts  <STRONG>getch</STRONG>  and
--       causes  it  to  return ERR with <STRONG>errno</STRONG> set to <STRONG>EINTR</STRONG>.  Under
--       the <STRONG>ncurses</STRONG> implementation, handled signals  never  inter-
-+       for either of two cases: (a) signal receipt does  not  in-
-+       terrupt  <STRONG>getch</STRONG>;  (b)  signal  receipt interrupts <STRONG>getch</STRONG> and
-+       causes it to return ERR with <STRONG>errno</STRONG> set  to  <STRONG>EINTR</STRONG>.   Under
-+       the  <STRONG>ncurses</STRONG>  implementation, handled signals never inter-
-        rupt <STRONG>getch</STRONG>.
- 
--       The  <STRONG>has_key</STRONG>  function is unique to <STRONG>ncurses</STRONG>.  We recommend
--       that any code using it be conditionalized  on  the  <STRONG>NCURS-</STRONG>
-+       The <STRONG>has_key</STRONG> function is unique to <STRONG>ncurses</STRONG>.   We  recommend
-+       that  any  code  using it be conditionalized on the <STRONG>NCURS-</STRONG>
-        <STRONG>ES_VERSION</STRONG> feature macro.
- 
- 
-@@ -377,7 +390,7 @@
-        <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,   <STRONG><A HREF="curs_move.3x.html">curs_move(3x)</A></STRONG>,   <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,   <STRONG>re-</STRONG>
-        <STRONG><A HREF="resizeterm.3x.html">sizeterm(3x)</A></STRONG>.
- 
--       Comparable  functions in the wide-character (ncursesw) li-
-+       Comparable functions in the wide-character (ncursesw)  li-
-        brary are described in <STRONG><A HREF="curs_get_wch.3x.html">curs_get_wch(3x)</A></STRONG>.
- 
- 
-Index: doc/html/man/curs_threads.3x.html
---- ncurses-6.0-20150912+/doc/html/man/curs_threads.3x.html	2015-05-13 19:27:46.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/curs_threads.3x.html	2015-09-19 23:18:52.000000000 +0000
-@@ -26,7 +26,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_threads.3x,v 1.21 2015/04/11 10:23:49 tom Exp @
-+  * @Id: curs_threads.3x,v 1.22 2015/09/05 21:13:25 tom Exp @
-   * ***************************************************************************
-   * ***************************************************************************
- -->
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150912+/doc/html/man/form.3x.html	2015-09-05 21:19:36.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/form.3x.html	2015-09-19 23:18:53.000000000 +0000
-@@ -245,7 +245,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150912+/doc/html/man/infocmp.1m.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/infocmp.1m.html	2015-09-19 23:18:54.000000000 +0000
-@@ -487,7 +487,7 @@
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150912+/doc/html/man/infotocap.1m.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/infotocap.1m.html	2015-09-19 23:18:54.000000000 +0000
-@@ -94,7 +94,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150912+/doc/html/man/menu.3x.html	2015-09-05 21:19:38.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/menu.3x.html	2015-09-19 23:18:55.000000000 +0000
-@@ -227,7 +227,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150912+/doc/html/man/ncurses.3x.html	2015-09-05 21:19:39.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/ncurses.3x.html	2015-09-19 23:18:56.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
-        The <STRONG>ncurses</STRONG> library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150912+/doc/html/man/panel.3x.html	2015-09-05 21:19:39.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/panel.3x.html	2015-09-19 23:18:56.000000000 +0000
-@@ -218,7 +218,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- </PRE>
-Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.0-20150912+/doc/html/man/resizeterm.3x.html	2015-06-06 23:47:48.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/resizeterm.3x.html	2015-09-19 23:18:56.000000000 +0000
-@@ -27,7 +27,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey 1996-on
--  * @Id: resizeterm.3x,v 1.19 2015/06/06 23:38:18 tom Exp @
-+  * @Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -116,15 +116,30 @@
-        tions.
- 
-        If  ncurses  is configured to supply its own SIGWINCH han-
--       dler, the <STRONG>resizeterm</STRONG> function <STRONG>ungetch</STRONG>'s a <STRONG>KEY_RESIZE</STRONG> which
--       will  be  read on the next call to <STRONG>getch</STRONG>.  This is used to
--       alert an application that the screen size has changed, and
--       that  it should repaint special features such as pads that
--       cannot be done automatically.
--
--       If the environment variables <STRONG>LINES</STRONG>  or  <STRONG>COLUMNS</STRONG>  are  set,
--       this  overrides  the  library's  use  of  the  window size
--       obtained from the operating system.  Thus, even if a  SIG-
-+       dler,
-+
-+       <STRONG>o</STRONG>   on receipt of a SIGWINCH, the handler sets a flag
-+
-+       <STRONG>o</STRONG>   which is tested in <STRONG>wgetch</STRONG> and <STRONG>doupdate</STRONG>,
-+
-+       <STRONG>o</STRONG>   in turn, calling the <STRONG>resizeterm</STRONG> function,
-+
-+       <STRONG>o</STRONG>   which <STRONG>ungetch</STRONG>'s a <STRONG>KEY_RESIZE</STRONG> which will be read on the
-+           next call to <STRONG>wgetch</STRONG>.
-+
-+           The  <STRONG>KEY_RESIZE</STRONG>  alerts an application that the screen
-+           size has changed, and that it should  repaint  special
-+           features  such  as  pads that cannot be done automati-
-+           cally.
-+
-+           Calling <STRONG>resizeterm</STRONG> or <STRONG>resize_term</STRONG> directly from a sig-
-+           nal  handler  is unsafe.  This indirect method is used
-+           to provide a safe  way  to  resize  the  ncurses  data
-+           structures.
-+
-+       If  the  environment  variables  <STRONG>LINES</STRONG> or <STRONG>COLUMNS</STRONG> are set,
-+       this overrides  the  library's  use  of  the  window  size
-+       obtained  from the operating system.  Thus, even if a SIG-
-        WINCH is received, no screen size change may be recorded.
- 
- 
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150912+/doc/html/man/tabs.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tabs.1.html	2015-09-19 23:18:56.000000000 +0000
-@@ -168,7 +168,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150912+/doc/html/man/terminfo.5.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/terminfo.5.html	2015-09-19 23:18:56.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
-        Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150912+/doc/html/man/tic.1m.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tic.1m.html	2015-09-19 23:18:57.000000000 +0000
-@@ -408,7 +408,7 @@
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150912+/doc/html/man/toe.1m.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/toe.1m.html	2015-09-19 23:18:57.000000000 +0000
-@@ -122,7 +122,7 @@
-        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150912+/doc/html/man/tput.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tput.1.html	2015-09-19 23:18:57.000000000 +0000
-@@ -338,7 +338,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150912+/doc/html/man/tset.1.html	2015-09-05 21:19:40.000000000 +0000
-+++ ncurses-6.0-20150919/doc/html/man/tset.1.html	2015-09-19 23:18:57.000000000 +0000
-@@ -319,7 +319,7 @@
-        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
-        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150905).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
- 
- 
- 
-Index: man/curs_getch.3x
-Prereq:  1.42 
---- ncurses-6.0-20150912+/man/curs_getch.3x	2015-07-21 08:44:04.000000000 +0000
-+++ ncurses-6.0-20150919/man/curs_getch.3x	2015-09-19 22:25:05.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_getch.3x,v 1.42 2015/07/21 08:44:04 tom Exp $
-+.\" $Id: curs_getch.3x,v 1.43 2015/09/19 22:25:05 tom Exp $
- .TH curs_getch 3X ""
- .na
- .hy 0
-@@ -240,9 +240,14 @@
- .B KEY_RESIZE
- is returned when the \fBSIGWINCH\fP signal has been detected
- (see \fBinitscr\fP(3X) and \fBresizeterm\fR(3X)).
-+This code is returned whether or not \fBkeypad\fP has been enabled.
- .bP
- .B KEY_MOUSE
- is returned for mouse-events (see \fBcurs_mouse\fR(3X)).
-+This code relies upon whether or not \fBkeypad\fP(3X) has been enabled,
-+because (e.g., with \fIxterm\fP mouse prototocol) ncurses must
-+read escape sequences,
-+just like a function key.
- .SS Testing key-codes
- .PP
- The \fBhas_key\fR routine takes a key-code value from the above list, and
-@@ -347,6 +352,13 @@
- progress or not, and also (in some implementations) depending on whether an
- input timeout or non-blocking mode has been set.
- .PP
-+\fBKEY_MOUSE\fP is mentioned in XSI Curses, along with a few related
-+terminfo capabilities, but no higher-level functions use the feature.
-+The implementation in ncurses is an extension.
-+.PP
-+\fBKEY_RESIZE\fP is an extension first implemented for ncurses. 
-+NetBSD curses later added this extension.
-+.PP
- Programmers concerned about portability should be prepared for either of two
- cases: (a) signal receipt does not interrupt \fBgetch\fR; (b) signal receipt
- interrupts \fBgetch\fR and causes it to return ERR with \fBerrno\fR set to
-Index: man/resizeterm.3x
-Prereq:  1.19 
---- ncurses-6.0-20150912+/man/resizeterm.3x	2015-06-06 23:38:18.000000000 +0000
-+++ ncurses-6.0-20150919/man/resizeterm.3x	2015-09-19 22:53:26.000000000 +0000
-@@ -28,8 +28,11 @@
- .\"
- .\" Author: Thomas E. Dickey 1996-on
- .\"
--.\" $Id: resizeterm.3x,v 1.19 2015/06/06 23:38:18 tom Exp $
-+.\" $Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp $
- .TH resizeterm 3X ""
-+.de bP
-+.IP \(bu 4
-+..
- .SH NAME
- \fBis_term_resized\fR,
- \fBresize_term\fR,
-@@ -81,11 +84,24 @@
- since it uses those functions.
- .PP
- If ncurses is configured to supply its own SIGWINCH handler,
--the \fBresizeterm\fR function \fBungetch\fP's a \fBKEY_RESIZE\fR which
--will be read on the next call to \fBgetch\fR.
--This is used to alert an application that the screen size has changed,
-+.bP
-+on receipt of a SIGWINCH, the handler sets a flag
-+.bP
-+which is tested in \fBwgetch\fP and \fBdoupdate\fP,
-+.bP
-+in turn, calling the \fBresizeterm\fR function,
-+.bP
-+which \fBungetch\fP's a \fBKEY_RESIZE\fR which
-+will be read on the next call to \fBwgetch\fR.
-+.IP
-+The \fBKEY_RESIZE\fP alerts an application that the screen size has changed,
- and that it should repaint special features such as pads that cannot
- be done automatically.
-+.IP
-+Calling \fBresizeterm\fP or \fBresize_term\fP
-+directly from a signal handler is unsafe.
-+This indirect method is used to provide a safe way to resize the ncurses
-+data structures.
- .PP
- If the environment variables \fBLINES\fP or \fBCOLUMNS\fP are set,
- this overrides the library's use of the window size obtained from
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150912+/package/debian-mingw/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian-mingw/changelog	2015-09-19 19:40:14.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150912) unstable; urgency=low
-+ncurses6 (6.0+20150919) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Sep 2015 12:17:30 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Sep 2015 15:40:14 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150912+/package/debian-mingw64/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian-mingw64/changelog	2015-09-19 19:40:14.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150912) unstable; urgency=low
-+ncurses6 (6.0+20150919) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Sep 2015 12:17:30 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Sep 2015 15:40:14 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150912+/package/debian/changelog	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/debian/changelog	2015-09-19 19:40:14.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150912) unstable; urgency=low
-+ncurses6 (6.0+20150919) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 12 Sep 2015 12:17:30 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Sep 2015 15:40:14 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.123 
---- ncurses-6.0-20150912+/package/mingw-ncurses.nsi	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/mingw-ncurses.nsi	2015-09-19 19:40:14.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.123 2015/09/12 16:17:30 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0912"

-+!define VERSION_MMDD  "0919"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150912+/package/mingw-ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/mingw-ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150912
-+Release: 20150919
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150912+/package/ncurses.spec	2015-09-12 16:17:30.000000000 +0000
-+++ ncurses-6.0-20150919/package/ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150912
-+Release: 20150919
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/patches/ncurses/6.0/160-ncurses-6.0-20150926.patch b/patches/ncurses/6.0/160-ncurses-6.0-20150926.patch
deleted file mode 100644
index d675a26..0000000
--- a/patches/ncurses/6.0/160-ncurses-6.0-20150926.patch
+++ /dev/null
@@ -1,596 +0,0 @@
-# ncurses 6.0 - patch 20150926 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20150926.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Sep 27 01:08:16 UTC 2015
-# ------------------------------------------------------------------------------
-# INSTALL                          |    5 ++++-
-# NEWS                             |    8 +++++++-
-# VERSION                          |    2 +-
-# aclocal.m4                       |    6 +++---
-# configure                        |    2 +-
-# dist.mk                          |    4 ++--
-# doc/html/man/captoinfo.1m.html   |    2 +-
-# doc/html/man/clear.1.html        |    2 +-
-# doc/html/man/curs_attr.3x.html   |    2 +-
-# doc/html/man/form.3x.html        |    2 +-
-# doc/html/man/infocmp.1m.html     |    2 +-
-# doc/html/man/infotocap.1m.html   |    2 +-
-# doc/html/man/menu.3x.html        |    2 +-
-# doc/html/man/ncurses.3x.html     |    2 +-
-# doc/html/man/panel.3x.html       |    2 +-
-# doc/html/man/resizeterm.3x.html  |   17 ++++++++++++++++-
-# doc/html/man/tabs.1.html         |    2 +-
-# doc/html/man/terminfo.5.html     |    2 +-
-# doc/html/man/tic.1m.html         |    2 +-
-# doc/html/man/toe.1m.html         |    2 +-
-# doc/html/man/tput.1.html         |    2 +-
-# doc/html/man/tset.1.html         |    2 +-
-# doc/html/man/wresize.3x.html     |   13 +++++++++++--
-# man/resizeterm.3x                |   15 ++++++++++++++-
-# man/wresize.3x                   |   10 ++++++++--
-# package/debian-mingw/changelog   |    4 ++--
-# package/debian-mingw64/changelog |    4 ++--
-# package/debian/changelog         |    4 ++--
-# package/debian/rules             |    1 +
-# package/mingw-ncurses.nsi        |    4 ++--
-# package/mingw-ncurses.spec       |    2 +-
-# package/ncurses.spec             |    2 +-
-# 32 files changed, 93 insertions(+), 40 deletions(-)
-# ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.192 
---- ncurses-6.0-20150919+/INSTALL	2015-08-15 20:11:48.000000000 +0000
-+++ ncurses-6.0-20150926/INSTALL	2015-09-26 21:34:14.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.192 2015/08/15 20:11:48 tom Exp $
-+-- $Id: INSTALL,v 1.193 2015/09/26 21:34:14 tom Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -1093,6 +1093,9 @@
- 	Specify a search-list of terminfo directories which will be compiled
- 	into the ncurses library (default: DATADIR/terminfo)
- 
-+	This is a colon-separated list, like the TERMINFO_DIRS environment
-+	variable.
-+
-     --with-termlib[=XXX]
- 	When building the ncurses library, organize this as two parts:  the
- 	curses library (libncurses) and the low-level terminfo library
-Index: NEWS
-Prereq:  1.2496 
---- ncurses-6.0-20150919+/NEWS	2015-09-19 23:04:21.000000000 +0000
-+++ ncurses-6.0-20150926/NEWS	2015-09-26 21:58:14.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2496 2015/09/19 23:04:21 tom Exp $
-+-- $Id: NEWS,v 1.2499 2015/09/26 21:58:14 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,12 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20150926
-+	+ change makefile rule for removing resulting.map to distclean rather
-+	  than clean.
-+	+ add /lib/terminfo to terminfo-dirs in ".deb" test-package.
-+	+ add note on portability of resizeterm and wresize to manual pages.
-+
- 20150919
- 	+ clarify in resizeterm.3x how KEY_RESIZE is pushed onto the input
- 	  stream.
-Index: VERSION
---- ncurses-6.0-20150919+/VERSION	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/VERSION	2015-09-26 18:50:05.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150919
-+5:0:9	6.0	20150926
-Index: aclocal.m4
-Prereq:  1.767 
---- ncurses-6.0-20150919+/aclocal.m4	2015-09-12 20:00:59.000000000 +0000
-+++ ncurses-6.0-20150926/aclocal.m4	2015-09-26 21:56:12.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.767 2015/09/12 20:00:59 tom Exp $
-+dnl $Id: aclocal.m4,v 1.768 2015/09/26 21:56:12 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -3228,7 +3228,7 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 83 updated: 2015/08/05 20:44:28
-+dnl CF_LIB_RULES version: 84 updated: 2015/09/26 17:54:46
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -3301,7 +3301,7 @@
- resulting.map: $UNALTERED_SYMS
- 	sed $cf_sed_options < $UNALTERED_SYMS >\[$]@
- 
--clean::
-+distclean::
- 	rm -f resulting.map
- CF_EOF
- 		fi
-Index: configure
---- ncurses-6.0-20150919+/configure	2015-09-12 20:01:47.000000000 +0000
-+++ ncurses-6.0-20150926/configure	2015-09-26 21:56:47.000000000 +0000
-@@ -23555,7 +23555,7 @@
- resulting.map: $UNALTERED_SYMS
- 	sed $cf_sed_options < $UNALTERED_SYMS >\$@
- 
--clean::
-+distclean::
- 	rm -f resulting.map
- CF_EOF
- 		fi
-Index: dist.mk
-Prereq:  1.1071 
---- ncurses-6.0-20150919+/dist.mk	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/dist.mk	2015-09-26 18:50:05.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1071 2015/09/19 19:40:14 tom Exp $
-+# $Id: dist.mk,v 1.1072 2015/09/26 18:50:05 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150919
-+NCURSES_PATCH = 20150926
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20150919+/doc/html/man/captoinfo.1m.html	2015-09-19 23:18:49.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/captoinfo.1m.html	2015-09-26 22:08:45.000000000 +0000
-@@ -205,7 +205,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20150919+/doc/html/man/clear.1.html	2015-09-19 23:18:49.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/clear.1.html	2015-09-26 22:08:45.000000000 +0000
-@@ -71,7 +71,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20150919+/doc/html/man/curs_attr.3x.html	2015-09-05 23:05:55.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/curs_attr.3x.html	2015-09-26 23:25:17.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_attr.3x,v 1.40 2015/07/20 23:35:38 tom Exp @
-+  * @Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20150919+/doc/html/man/form.3x.html	2015-09-19 23:18:53.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/form.3x.html	2015-09-26 22:08:49.000000000 +0000
-@@ -245,7 +245,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20150919+/doc/html/man/infocmp.1m.html	2015-09-19 23:18:54.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/infocmp.1m.html	2015-09-26 22:08:50.000000000 +0000
-@@ -487,7 +487,7 @@
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20150919+/doc/html/man/infotocap.1m.html	2015-09-19 23:18:54.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/infotocap.1m.html	2015-09-26 22:08:50.000000000 +0000
-@@ -94,7 +94,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20150919+/doc/html/man/menu.3x.html	2015-09-19 23:18:55.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/menu.3x.html	2015-09-26 22:08:51.000000000 +0000
-@@ -227,7 +227,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20150919+/doc/html/man/ncurses.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/ncurses.3x.html	2015-09-26 22:08:52.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
-        The <STRONG>ncurses</STRONG> library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20150919+/doc/html/man/panel.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/panel.3x.html	2015-09-26 22:08:52.000000000 +0000
-@@ -218,7 +218,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- </PRE>
-Index: doc/html/man/resizeterm.3x.html
---- ncurses-6.0-20150919+/doc/html/man/resizeterm.3x.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/resizeterm.3x.html	2015-09-26 22:08:52.000000000 +0000
-@@ -27,7 +27,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey 1996-on
--  * @Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp @
-+  * @Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -144,6 +144,20 @@
- 
- 
- </PRE>
-+<H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-+       It is possible to resize the screen with SVr4 curses, by
-+
-+       <STRONG>o</STRONG>   exiting curses with <STRONG><A HREF="endwin.3x.html">endwin(3x)</A></STRONG> and
-+
-+       <STRONG>o</STRONG>   resuming using <STRONG><A HREF="refresh.3x.html">refresh(3x)</A></STRONG>.
-+
-+       Doing that clears the screen and is visually distracting.
-+
-+       This extension of ncurses was introduced in mid-1995.   It
-+       was adopted in NetBSD curses (2001) and PDCurses (2003).
-+
-+
-+</PRE>
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
- 
-@@ -170,6 +184,7 @@
- </li>
- <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
- <li><a href="#h2-NOTES">NOTES</a></li>
-+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
- <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
- <li><a href="#h2-AUTHOR">AUTHOR</a></li>
- </ul>
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20150919+/doc/html/man/tabs.1.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tabs.1.html	2015-09-26 22:08:52.000000000 +0000
-@@ -168,7 +168,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20150919+/doc/html/man/terminfo.5.html	2015-09-19 23:18:56.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/terminfo.5.html	2015-09-26 22:08:53.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
-        Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20150919+/doc/html/man/tic.1m.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tic.1m.html	2015-09-26 22:08:53.000000000 +0000
-@@ -408,7 +408,7 @@
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20150919+/doc/html/man/toe.1m.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/toe.1m.html	2015-09-26 22:08:53.000000000 +0000
-@@ -122,7 +122,7 @@
-        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20150919+/doc/html/man/tput.1.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tput.1.html	2015-09-26 22:08:53.000000000 +0000
-@@ -338,7 +338,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20150919+/doc/html/man/tset.1.html	2015-09-19 23:18:57.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/tset.1.html	2015-09-26 22:08:53.000000000 +0000
-@@ -319,7 +319,7 @@
-        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
-        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150919).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
- 
- 
- 
-Index: doc/html/man/wresize.3x.html
---- ncurses-6.0-20150919+/doc/html/man/wresize.3x.html	2015-05-13 19:27:50.000000000 +0000
-+++ ncurses-6.0-20150926/doc/html/man/wresize.3x.html	2015-09-26 22:08:53.000000000 +0000
-@@ -1,6 +1,6 @@
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey 1996
--  * @Id: wresize.3x,v 1.13 2010/12/04 18:40:45 tom Exp @
-+  * @Id: wresize.3x,v 1.14 2015/09/26 19:57:24 tom Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -86,6 +86,14 @@
- 
- 
- </PRE>
-+<H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE>
-+       It is not possible to resize windows with SVr4 curses.
-+
-+       This  extension of ncurses was introduced in mid-1995.  It
-+       was adopted in NetBSD curses (2001) and PDCurses (2003).
-+
-+
-+</PRE>
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>.
- 
-@@ -106,6 +114,7 @@
- <li><a href="#h2-DESCRIPTION">DESCRIPTION</a></li>
- <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li>
- <li><a href="#h2-NOTES">NOTES</a></li>
-+<li><a href="#h2-PORTABILITY">PORTABILITY</a></li>
- <li><a href="#h2-SEE-ALSO">SEE ALSO</a></li>
- <li><a href="#h2-AUTHOR">AUTHOR</a></li>
- </ul>
-Index: man/resizeterm.3x
-Prereq:  1.20 
---- ncurses-6.0-20150919+/man/resizeterm.3x	2015-09-19 22:53:26.000000000 +0000
-+++ ncurses-6.0-20150926/man/resizeterm.3x	2015-09-26 19:55:32.000000000 +0000
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey 1996-on
- .\"
--.\" $Id: resizeterm.3x,v 1.20 2015/09/19 22:53:26 tom Exp $
-+.\" $Id: resizeterm.3x,v 1.21 2015/09/26 19:55:32 tom Exp $
- .TH resizeterm 3X ""
- .de bP
- .IP \(bu 4
-@@ -108,6 +108,19 @@
- the operating system.
- Thus, even if a SIGWINCH is received,
- no screen size change may be recorded.
-+.SH PORTABILITY
-+.PP
-+It is possible to resize the screen with SVr4 curses,
-+by
-+.bP
-+exiting curses with \fBendwin\fP(3X) and
-+.bP
-+resuming using \fBrefresh\fP(3X).
-+.PP
-+Doing that clears the screen and is visually distracting.
-+.PP
-+This extension of ncurses was introduced in mid-1995.
-+It was adopted in NetBSD curses (2001) and PDCurses (2003).
- .SH SEE ALSO
- \fBcurs_getch\fR(3X),
- \fBcurs_variables\fR(3X),
-Index: man/wresize.3x
-Prereq:  1.13 
---- ncurses-6.0-20150919+/man/wresize.3x	2010-12-04 18:40:45.000000000 +0000
-+++ ncurses-6.0-20150926/man/wresize.3x	2015-09-26 19:57:24.000000000 +0000
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey 1996
- .\"
--.\" $Id: wresize.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
-+.\" $Id: wresize.3x,v 1.14 2015/09/26 19:57:24 tom Exp $
- .TH wresize 3X ""
- .SH NAME
- \fBwresize\fR \- resize a curses window
-@@ -53,6 +53,12 @@
- simplify the logic of \fBresizeterm\fR.
- The caller must ensure that the window's dimensions fit within the
- actual screen dimensions.
-+.SH PORTABILITY
-+.PP
-+It is not possible to resize windows with SVr4 curses.
-+.PP
-+This extension of ncurses was introduced in mid-1995.
-+It was adopted in NetBSD curses (2001) and PDCurses (2003).
- .SH SEE ALSO
- \fBresizeterm\fR(3X).
- .SH AUTHOR
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150919+/package/debian-mingw/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian-mingw/changelog	2015-09-26 18:50:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150919) unstable; urgency=low
-+ncurses6 (6.0+20150926) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Sep 2015 15:40:14 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Sep 2015 14:50:05 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150919+/package/debian-mingw64/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian-mingw64/changelog	2015-09-26 18:50:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150919) unstable; urgency=low
-+ncurses6 (6.0+20150926) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Sep 2015 15:40:14 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Sep 2015 14:50:05 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150919+/package/debian/changelog	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian/changelog	2015-09-26 18:50:05.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150919) unstable; urgency=low
-+ncurses6 (6.0+20150926) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 19 Sep 2015 15:40:14 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Sep 2015 14:50:05 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/debian/rules
---- ncurses-6.0-20150919+/package/debian/rules	2015-07-11 22:42:03.000000000 +0000
-+++ ncurses-6.0-20150926/package/debian/rules	2015-09-26 21:29:58.000000000 +0000
-@@ -78,6 +78,7 @@
- 		--with-ticlib \
- 		--with-trace \
- 		--with-cxx-shared \
-+		--with-terminfo-dirs=/lib/terminfo:/usr/share/terminfo \
- 		--with-versioned-syms \
- 		--with-xterm-kbs=DEL \
- 		--without-ada \
-Index: package/mingw-ncurses.nsi
-Prereq:  1.124 
---- ncurses-6.0-20150919+/package/mingw-ncurses.nsi	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/mingw-ncurses.nsi	2015-09-26 18:50:05.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.124 2015/09/19 19:40:14 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0919"

-+!define VERSION_MMDD  "0926"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150919+/package/mingw-ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/mingw-ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150919
-+Release: 20150926
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150919+/package/ncurses.spec	2015-09-19 19:40:14.000000000 +0000
-+++ ncurses-6.0-20150926/package/ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150919
-+Release: 20150926
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
diff --git a/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch b/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch
deleted file mode 100644
index 1f9e949..0000000
--- a/patches/ncurses/6.0/170-ncurses-6.0-20151010.patch
+++ /dev/null
@@ -1,5485 +0,0 @@
-# ncurses 6.0 - patch 20151010 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151010.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Oct 11 01:01:49 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   10 
-# Ada95/configure                  |   54 +-
-# NEWS                             |   12 
-# VERSION                          |    2 
-# aclocal.m4                       |   20 
-# configure                        |  861 ++++++++++++++++++++-----------------
-# dist.mk                          |    4 
-# ncurses/base/MKlib_gen.sh        |    3 
-# ncurses/base/resizeterm.c        |   12 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/aclocal.m4                  |   30 +
-# test/configure                   |  722 +++++++++++++++++++------------
-# test/configure.in                |   13 
-# test/demo_termcap.c              |    4 
-# test/demo_terminfo.c             |    6 
-# test/view.c                      |   26 -
-# 21 files changed, 1085 insertions(+), 714 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.106 
---- ncurses-6.0-20150926+/Ada95/aclocal.m4	2015-08-22 21:14:14.000000000 +0000
-+++ ncurses-6.0-20151010/Ada95/aclocal.m4	2015-10-10 19:52:33.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.106 2015/08/22 21:14:14 tom Exp $
-+dnl $Id: aclocal.m4,v 1.107 2015/10/10 19:52:33 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -365,15 +365,19 @@
- ])dnl
- ])])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
-+dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
- dnl -----------
- dnl Check for suitable "ar" (archiver) options for updating an archive.
-+dnl
-+dnl In particular, handle some obsolete cases where the "-" might be omitted,
-+dnl as well as a workaround for breakage of make's archive rules by the GNU
-+dnl binutils "ar" program.
- AC_DEFUN([CF_AR_FLAGS],[
- AC_REQUIRE([CF_PROG_AR])
- 
- AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-Index: Ada95/configure
---- ncurses-6.0-20150926+/Ada95/configure	2015-09-19 20:50:21.000000000 +0000
-+++ ncurses-6.0-20151010/Ada95/configure	2015-10-10 19:53:00.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # From configure.in Revision: 1.61 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20141204.
-+# Generated by Autoconf 2.52.20150926.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -804,7 +804,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20141204.  Invocation command line was
-+generated by GNU Autoconf 2.52.20150926.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -3268,7 +3268,7 @@
- else
- 
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-@@ -14601,7 +14601,7 @@
- cat >>$CONFIG_STATUS <<EOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.52.20141204,
-+configured by $0, generated by GNU Autoconf 2.52.20150926,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -14683,7 +14683,7 @@
- ## Running config.status.  ##
- ## ----------------------- ##
- 
--This file was extended by $as_me 2.52.20141204, executed with
-+This file was extended by $as_me 2.52.20150926, executed with
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-   CONFIG_LINKS    = $CONFIG_LINKS
-@@ -14974,10 +14974,28 @@
-       # These are the two extra sed commands mentioned above.
-       (echo ':t
-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+      # It is possible to make a multiline substitution using escaped newlines.
-+      # Ensure that we do not split the substitution between script fragments.
-+      ac_BEG=$ac_end
-+      ac_END=`expr $ac_end + $ac_max_sed_lines`
-+      sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
-+      if test -s $tmp/subs.next; then
-+        grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
-+        if test ! -s $tmp/subs.edit; then
-+          grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
-+          if test ! -s $tmp/subs.edit; then
-+            if test $ac_beg -gt 1; then
-+              ac_end=`expr $ac_end - 1`
-+              continue
-+            fi
-+          fi
-+        fi
-+      fi
-+
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -15060,7 +15078,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:15063: creating $ac_file" >&5
-+    { echo "$as_me:15081: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -15078,7 +15096,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15081: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15099: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -15091,7 +15109,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15094: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15112: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -15107,7 +15125,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:15110: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:15128: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -15116,7 +15134,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:15119: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:15137: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -15153,7 +15171,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:15156: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:15174: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -15164,7 +15182,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:15167: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:15185: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -15213,7 +15231,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:15216: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:15234: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -15224,7 +15242,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15227: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15245: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -15237,7 +15255,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15240: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15258: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -15295,7 +15313,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:15298: $ac_file is unchanged" >&5
-+      { echo "$as_me:15316: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: NEWS
-Prereq:  1.2499 
---- ncurses-6.0-20150926+/NEWS	2015-09-26 21:58:14.000000000 +0000
-+++ ncurses-6.0-20151010/NEWS	2015-10-10 20:24:26.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2499 2015/09/26 21:58:14 tom Exp $
-+-- $Id: NEWS,v 1.2505 2015/10/10 20:24:26 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,16 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151010
-+	+ add configure check for openpty to test/configure script, for ditto.
-+	+ minor fixes to test/view.c in investigating Debian #790847.
-+	+ update autoconf patch to 2.52.20150926, incorporates a fix for Cdk.
-+	+ add workaround for breakage of POSIX makefiles by recent binutils
-+	  change.
-+	+ improve check for working poll() by using posix_openpt() as a
-+	  fallback in case there is no valid terminal on the standard input
-+	  (prompted by discussion on bug-ncurses mailing list, Debian #676461).
-+
- 20150926
- 	+ change makefile rule for removing resulting.map to distclean rather
- 	  than clean.
-Index: VERSION
---- ncurses-6.0-20150926+/VERSION	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/VERSION	2015-10-10 17:06:12.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20150926
-+5:0:9	6.0	20151010
-Index: aclocal.m4
-Prereq:  1.768 
---- ncurses-6.0-20150926+/aclocal.m4	2015-09-26 21:56:12.000000000 +0000
-+++ ncurses-6.0-20151010/aclocal.m4	2015-10-10 19:27:07.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.768 2015/09/26 21:56:12 tom Exp $
-+dnl $Id: aclocal.m4,v 1.770 2015/10/10 19:27:07 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -423,15 +423,19 @@
- ])dnl
- ])])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
-+dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
- dnl -----------
- dnl Check for suitable "ar" (archiver) options for updating an archive.
-+dnl
-+dnl In particular, handle some obsolete cases where the "-" might be omitted,
-+dnl as well as a workaround for breakage of make's archive rules by the GNU
-+dnl binutils "ar" program.
- AC_DEFUN([CF_AR_FLAGS],[
- AC_REQUIRE([CF_PROG_AR])
- 
- AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-@@ -1821,11 +1825,12 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_POLL version: 8 updated: 2012/10/04 05:24:07
-+dnl CF_FUNC_POLL version: 9 updated: 2015/10/10 13:27:32
- dnl ------------
- dnl See if the poll function really works.  Some platforms have poll(), but
- dnl it does not work for terminals or files.
- AC_DEFUN([CF_FUNC_POLL],[
-+tty 2>&1 >/dev/null || { AC_CHECK_FUNCS(posix_openpt) }
- AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
- AC_TRY_RUN([
- #include <stdlib.h>
-@@ -1837,7 +1842,7 @@
- #else
- #include <sys/poll.h>
- #endif
--int main() {
-+int main(void) {
- 	struct pollfd myfds;
- 	int ret;
- 
-@@ -1857,6 +1862,11 @@
- 		if (!isatty(fd)) {
- 			fd = open("/dev/tty", 2);	/* O_RDWR */
- 		}
-+#ifdef HAVE_POSIX_OPENPT
-+		if (fd < 0) {
-+			fd = posix_openpt(O_RDWR);
-+		}
-+#endif
- 
- 		if (fd >= 0) {
- 			/* also check with standard input */
-Index: configure
---- ncurses-6.0-20150926+/configure	2015-09-26 21:56:47.000000000 +0000
-+++ ncurses-6.0-20151010/configure	2015-10-10 19:18:37.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # From configure.in Revision: 1.619 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20141204.
-+# Generated by Autoconf 2.52.20150926.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -907,7 +907,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20141204.  Invocation command line was
-+generated by GNU Autoconf 2.52.20150926.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -4408,7 +4408,7 @@
- else
- 
- 	cf_cv_ar_flags=unknown
--	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
-+	for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
- 	do
- 
- 		# check if $ARFLAGS already contains this choice
-@@ -17833,7 +17833,77 @@
- 
- fi
- 
--echo "$as_me:17836: checking if poll really works" >&5
-+tty 2>&1 >/dev/null || {
-+for ac_func in posix_openpt
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:17840: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 17846 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char $ac_func ();
-+char (*f) ();
-+
-+int
-+main ()
-+{
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:17877: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:17880: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:17883: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:17886: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:17896: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<EOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+EOF
-+
-+fi
-+done
-+ }
-+echo "$as_me:17906: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17843,7 +17913,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17846 "configure"
-+#line 17916 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17855,7 +17925,7 @@
- #else
- #include <sys/poll.h>
- #endif
--int main() {
-+int main(void) {
- 	struct pollfd myfds;
- 	int ret;
- 
-@@ -17875,6 +17945,11 @@
- 		if (!isatty(fd)) {
- 			fd = open("/dev/tty", 2);	/* O_RDWR */
- 		}
-+#ifdef HAVE_POSIX_OPENPT
-+		if (fd < 0) {
-+			fd = posix_openpt(O_RDWR);
-+		}
-+#endif
- 
- 		if (fd >= 0) {
- 			/* also check with standard input */
-@@ -17890,15 +17965,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17893: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17968: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17896: \$? = $ac_status" >&5
-+  echo "$as_me:17971: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17898: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17973: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17901: \$? = $ac_status" >&5
-+  echo "$as_me:17976: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17910,21 +17985,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17913: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17988: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:17920: checking for va_copy" >&5
-+echo "$as_me:17995: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17927 "configure"
-+#line 18002 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17941,16 +18016,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17944: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17947: \$? = $ac_status" >&5
-+  echo "$as_me:18022: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17950: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17953: \$? = $ac_status" >&5
-+  echo "$as_me:18028: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -17960,7 +18035,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17963: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:18038: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -17968,14 +18043,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:17971: checking for __va_copy" >&5
-+echo "$as_me:18046: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17978 "configure"
-+#line 18053 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17992,16 +18067,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17995: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17998: \$? = $ac_status" >&5
-+  echo "$as_me:18073: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18001: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18076: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18004: \$? = $ac_status" >&5
-+  echo "$as_me:18079: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18011,7 +18086,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18014: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18089: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18019,13 +18094,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18022: checking for pid_t" >&5
-+echo "$as_me:18097: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18028 "configure"
-+#line 18103 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18040,16 +18115,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18043: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18118: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18046: \$? = $ac_status" >&5
-+  echo "$as_me:18121: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18124: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18052: \$? = $ac_status" >&5
-+  echo "$as_me:18127: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18059,7 +18134,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18062: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18137: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -18074,23 +18149,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18077: checking for $ac_header" >&5
-+echo "$as_me:18152: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18083 "configure"
-+#line 18158 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18087: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18162: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18093: \$? = $ac_status" >&5
-+  echo "$as_me:18168: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18109,7 +18184,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18112: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18187: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18122,13 +18197,13 @@
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18125: checking for $ac_func" >&5
-+echo "$as_me:18200: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18131 "configure"
-+#line 18206 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18159,16 +18234,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18162: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18237: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18165: \$? = $ac_status" >&5
-+  echo "$as_me:18240: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18168: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18171: \$? = $ac_status" >&5
-+  echo "$as_me:18246: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18178,7 +18253,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18181: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18256: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18190,7 +18265,7 @@
- 
- ac_cv_func_fork_works=$ac_cv_func_fork
- if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:18193: checking for working fork" >&5
-+  echo "$as_me:18268: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18213,15 +18288,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18216: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18291: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18219: \$? = $ac_status" >&5
-+  echo "$as_me:18294: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18221: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18296: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18224: \$? = $ac_status" >&5
-+  echo "$as_me:18299: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18233,7 +18308,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18236: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18311: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18247,12 +18322,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18250: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18325: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:18255: checking for working vfork" >&5
-+  echo "$as_me:18330: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18261,7 +18336,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18264 "configure"
-+#line 18339 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -18358,15 +18433,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18361: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18436: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18364: \$? = $ac_status" >&5
-+  echo "$as_me:18439: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18366: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18369: \$? = $ac_status" >&5
-+  echo "$as_me:18444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18378,13 +18453,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18381: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18456: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:18387: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18462: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -18411,7 +18486,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18414: checking for openpty in -lutil" >&5
-+echo "$as_me:18489: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18419,7 +18494,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18422 "configure"
-+#line 18497 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18438,16 +18513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18441: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18444: \$? = $ac_status" >&5
-+  echo "$as_me:18519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18450: \$? = $ac_status" >&5
-+  echo "$as_me:18525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18458,7 +18533,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18461: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18536: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18466,7 +18541,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18469: checking for openpty header" >&5
-+echo "$as_me:18544: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18493,7 +18568,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18496 "configure"
-+#line 18571 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18510,16 +18585,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18513: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18588: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18516: \$? = $ac_status" >&5
-+  echo "$as_me:18591: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18594: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18522: \$? = $ac_status" >&5
-+  echo "$as_me:18597: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18537,7 +18612,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18540: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18615: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18607,7 +18682,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18610 "configure"
-+#line 18685 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18619,16 +18694,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18697: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18625: \$? = $ac_status" >&5
-+  echo "$as_me:18700: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18703: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18631: \$? = $ac_status" >&5
-+  echo "$as_me:18706: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18645,7 +18720,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18648: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18723: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18681,7 +18756,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18684: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18759: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18692,7 +18767,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18695: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18770: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18761,7 +18836,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18764 "configure"
-+#line 18839 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18773,16 +18848,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18776: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18779: \$? = $ac_status" >&5
-+  echo "$as_me:18854: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18782: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18785: \$? = $ac_status" >&5
-+  echo "$as_me:18860: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18799,7 +18874,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18802: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18877: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18879,7 +18954,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18882: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18957: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18896,23 +18971,23 @@
- 	fi
- esac
- 
--echo "$as_me:18899: checking for db.h" >&5
-+echo "$as_me:18974: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18905 "configure"
-+#line 18980 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:18909: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18984: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18915: \$? = $ac_status" >&5
-+  echo "$as_me:18990: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18931,11 +19006,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18934: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:19009: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:18938: checking for version of db" >&5
-+echo "$as_me:19013: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18946,10 +19021,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:18949: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:19024: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18952 "configure"
-+#line 19027 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -18979,16 +19054,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19057: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18985: \$? = $ac_status" >&5
-+  echo "$as_me:19060: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19063: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18991: \$? = $ac_status" >&5
-+  echo "$as_me:19066: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19002,16 +19077,16 @@
- done
- 
- fi
--echo "$as_me:19005: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19080: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19009: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19084: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19014: checking for db libraries" >&5
-+echo "$as_me:19089: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19041,10 +19116,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19044: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19119: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19047 "configure"
-+#line 19122 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19099,16 +19174,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19102: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19177: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19105: \$? = $ac_status" >&5
-+  echo "$as_me:19180: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19108: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19183: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19111: \$? = $ac_status" >&5
-+  echo "$as_me:19186: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19128,11 +19203,11 @@
- done
- 
- fi
--echo "$as_me:19131: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19206: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19135: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19210: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19158,7 +19233,7 @@
- 
- else
- 
--	{ { echo "$as_me:19161: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19236: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19173,7 +19248,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19176: checking if we should include stdbool.h" >&5
-+echo "$as_me:19251: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19181,7 +19256,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19184 "configure"
-+#line 19259 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19193,23 +19268,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19196: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19199: \$? = $ac_status" >&5
-+  echo "$as_me:19274: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19202: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19277: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19205: \$? = $ac_status" >&5
-+  echo "$as_me:19280: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19212 "configure"
-+#line 19287 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19225,16 +19300,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19228: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19231: \$? = $ac_status" >&5
-+  echo "$as_me:19306: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19234: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19237: \$? = $ac_status" >&5
-+  echo "$as_me:19312: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19248,13 +19323,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19251: result: yes" >&5
-+then	echo "$as_me:19326: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19253: result: no" >&5
-+else	echo "$as_me:19328: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19257: checking for builtin bool type" >&5
-+echo "$as_me:19332: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19262,7 +19337,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19265 "configure"
-+#line 19340 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -19277,16 +19352,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19355: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19283: \$? = $ac_status" >&5
-+  echo "$as_me:19358: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19286: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19361: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19289: \$? = $ac_status" >&5
-+  echo "$as_me:19364: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19299,9 +19374,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19302: result: yes" >&5
-+then	echo "$as_me:19377: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19304: result: no" >&5
-+else	echo "$as_me:19379: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19318,10 +19393,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:19321: checking if we already have C++ library" >&5
-+	echo "$as_me:19396: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19324 "configure"
-+#line 19399 "configure"
- #include "confdefs.h"
- 
- 			#include <iostream>
-@@ -19335,16 +19410,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19338: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19413: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19341: \$? = $ac_status" >&5
-+  echo "$as_me:19416: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19344: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19419: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19347: \$? = $ac_status" >&5
-+  echo "$as_me:19422: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19353,7 +19428,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:19356: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:19431: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -19368,7 +19443,7 @@
- 			;;
- 		esac
- 
--		echo "$as_me:19371: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:19446: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19394,7 +19469,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19397 "configure"
-+#line 19472 "configure"
- #include "confdefs.h"
- 
- 				#include <iostream>
-@@ -19408,16 +19483,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19411: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19414: \$? = $ac_status" >&5
-+  echo "$as_me:19489: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19417: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19492: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19420: \$? = $ac_status" >&5
-+  echo "$as_me:19495: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19429,7 +19504,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19432: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19507: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19451,7 +19526,7 @@
- 	fi
- fi
- 
--	echo "$as_me:19454: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19529: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19467,15 +19542,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19470: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19545: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19473: \$? = $ac_status" >&5
-+  echo "$as_me:19548: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19475: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19550: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19478: \$? = $ac_status" >&5
-+  echo "$as_me:19553: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19486,10 +19561,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19489: result: yes" >&5
-+  echo "$as_me:19564: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19492: result: no" >&5
-+  echo "$as_me:19567: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19509,7 +19584,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19512: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19587: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19530,7 +19605,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19533 "configure"
-+#line 19608 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19544,16 +19619,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19547: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19550: \$? = $ac_status" >&5
-+  echo "$as_me:19625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19553: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19556: \$? = $ac_status" >&5
-+  echo "$as_me:19631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19590,7 +19665,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19593 "configure"
-+#line 19668 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -19604,16 +19679,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19607: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19610: \$? = $ac_status" >&5
-+  echo "$as_me:19685: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19613: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19616: \$? = $ac_status" >&5
-+  echo "$as_me:19691: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19646,7 +19721,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19649: result: $cf_cxx_library" >&5
-+	echo "$as_me:19724: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19662,7 +19737,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19665: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19740: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19679,18 +19754,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19682 "configure"
-+#line 19757 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19687: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19762: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19693: \$? = $ac_status" >&5
-+  echo "$as_me:19768: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19713,17 +19788,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19716 "configure"
-+#line 19791 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19720: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19795: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19726: \$? = $ac_status" >&5
-+  echo "$as_me:19801: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19760,7 +19835,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19763: result: $CXXCPP" >&5
-+echo "$as_me:19838: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19770,18 +19845,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19773 "configure"
-+#line 19848 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19778: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19853: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19784: \$? = $ac_status" >&5
-+  echo "$as_me:19859: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19804,17 +19879,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19807 "configure"
-+#line 19882 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19811: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19886: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19817: \$? = $ac_status" >&5
-+  echo "$as_me:19892: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19842,7 +19917,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19845: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19920: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19857,23 +19932,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19860: checking for $ac_header" >&5
-+echo "$as_me:19935: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19866 "configure"
-+#line 19941 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19870: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19945: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19876: \$? = $ac_status" >&5
-+  echo "$as_me:19951: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19892,7 +19967,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19895: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19970: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19905,23 +19980,23 @@
- for ac_header in iostream
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19908: checking for $ac_header" >&5
-+echo "$as_me:19983: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19914 "configure"
-+#line 19989 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19918: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19993: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19924: \$? = $ac_status" >&5
-+  echo "$as_me:19999: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19940,7 +20015,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19943: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20018: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19951,10 +20026,10 @@
- done
- 
- if test x"$ac_cv_header_iostream" = xyes ; then
--	echo "$as_me:19954: checking if iostream uses std-namespace" >&5
-+	echo "$as_me:20029: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19957 "configure"
-+#line 20032 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -19971,16 +20046,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19974: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19977: \$? = $ac_status" >&5
-+  echo "$as_me:20052: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19980: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20055: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19983: \$? = $ac_status" >&5
-+  echo "$as_me:20058: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -19989,7 +20064,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:19992: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:20067: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -20000,7 +20075,7 @@
- 	fi
- fi
- 
--echo "$as_me:20003: checking if we should include stdbool.h" >&5
-+echo "$as_me:20078: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -20008,7 +20083,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20011 "configure"
-+#line 20086 "configure"
- #include "confdefs.h"
- 
- int
-@@ -20020,23 +20095,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20023: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20026: \$? = $ac_status" >&5
-+  echo "$as_me:20101: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20029: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20032: \$? = $ac_status" >&5
-+  echo "$as_me:20107: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 20039 "configure"
-+#line 20114 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20052,16 +20127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20130: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20058: \$? = $ac_status" >&5
-+  echo "$as_me:20133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20064: \$? = $ac_status" >&5
-+  echo "$as_me:20139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20075,13 +20150,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20078: result: yes" >&5
-+then	echo "$as_me:20153: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20080: result: no" >&5
-+else	echo "$as_me:20155: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20084: checking for builtin bool type" >&5
-+echo "$as_me:20159: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20089,7 +20164,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20092 "configure"
-+#line 20167 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -20104,16 +20179,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20107: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20182: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20110: \$? = $ac_status" >&5
-+  echo "$as_me:20185: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20113: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20188: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20116: \$? = $ac_status" >&5
-+  echo "$as_me:20191: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20126,13 +20201,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20129: result: yes" >&5
-+then	echo "$as_me:20204: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20131: result: no" >&5
-+else	echo "$as_me:20206: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20135: checking for size of bool" >&5
-+echo "$as_me:20210: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20143,7 +20218,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20146 "configure"
-+#line 20221 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20185,15 +20260,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20188: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20263: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20191: \$? = $ac_status" >&5
-+  echo "$as_me:20266: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20193: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20268: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20196: \$? = $ac_status" >&5
-+  echo "$as_me:20271: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20211,18 +20286,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20214: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20289: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20220: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20295: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20225: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20300: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20240,7 +20315,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20243 "configure"
-+#line 20318 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -20254,16 +20329,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20257: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20332: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20260: \$? = $ac_status" >&5
-+  echo "$as_me:20335: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20338: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20266: \$? = $ac_status" >&5
-+  echo "$as_me:20341: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -20284,12 +20359,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:20287: result: $cf_result" >&5
-+echo "$as_me:20362: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20292: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20367: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20306,7 +20381,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20309 "configure"
-+#line 20384 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20325,15 +20400,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20328: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20403: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20331: \$? = $ac_status" >&5
-+  echo "$as_me:20406: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20333: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20408: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20336: \$? = $ac_status" >&5
-+  echo "$as_me:20411: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20352,7 +20427,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20355: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20430: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20362,7 +20437,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20365: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20440: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20376,7 +20451,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20379 "configure"
-+#line 20454 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20420,16 +20495,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20423: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20498: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20426: \$? = $ac_status" >&5
-+  echo "$as_me:20501: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20429: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20504: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20432: \$? = $ac_status" >&5
-+  echo "$as_me:20507: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20447,7 +20522,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20450: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20525: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20496,7 +20571,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20499: checking for size of bool" >&5
-+echo "$as_me:20574: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20507,7 +20582,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20510 "configure"
-+#line 20585 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20549,15 +20624,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20552: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20627: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20555: \$? = $ac_status" >&5
-+  echo "$as_me:20630: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20557: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20632: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20560: \$? = $ac_status" >&5
-+  echo "$as_me:20635: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20575,25 +20650,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20578: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20653: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20584: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20659: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20590: checking for fallback type of bool" >&5
-+			echo "$as_me:20665: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20596: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20671: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20622,7 +20697,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20625: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20700: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20633,7 +20708,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20636: checking for $ac_word" >&5
-+echo "$as_me:20711: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20648,7 +20723,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20651: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20726: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20657,10 +20732,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20660: result: $gnat_exists" >&5
-+  echo "$as_me:20735: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20663: result: no" >&5
-+  echo "$as_me:20738: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20669,12 +20744,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20672: checking for gnat version" >&5
-+echo "$as_me:20747: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20677: result: $cf_gnat_version" >&5
-+echo "$as_me:20752: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20682,7 +20757,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20685: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20760: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20690,7 +20765,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20693: checking for $ac_word" >&5
-+echo "$as_me:20768: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20705,7 +20780,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20708: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20783: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20714,10 +20789,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20717: result: $M4_exists" >&5
-+  echo "$as_me:20792: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20720: result: no" >&5
-+  echo "$as_me:20795: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20726,7 +20801,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20729: checking if GNAT works" >&5
-+		echo "$as_me:20804: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20754,7 +20829,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20757: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20832: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20763,7 +20838,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20766: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20841: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20780,10 +20855,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20783: result: $ADAFLAGS" >&5
-+	echo "$as_me:20858: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20786: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20861: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20793,11 +20868,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20796: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20871: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20800: checking if GNAT supports generics" >&5
-+echo "$as_me:20875: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20807,7 +20882,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20810: result: $cf_gnat_generics" >&5
-+echo "$as_me:20885: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20819,7 +20894,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20822: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20897: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20867,7 +20942,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20870: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20945: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20880,7 +20955,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20883: checking if GNAT supports project files" >&5
-+echo "$as_me:20958: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -20940,15 +21015,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:20943: result: $cf_gnat_projects" >&5
-+echo "$as_me:21018: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:20949: checking if GNAT supports libraries" >&5
-+	echo "$as_me:21024: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:20951: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21026: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -20968,7 +21043,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:20971: checking for ada-compiler" >&5
-+echo "$as_me:21046: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -20979,12 +21054,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:20982: result: $cf_ada_compiler" >&5
-+echo "$as_me:21057: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:20987: checking for ada-include" >&5
-+echo "$as_me:21062: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -21020,7 +21095,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21023: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21098: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21029,10 +21104,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:21032: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21107: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:21035: checking for ada-objects" >&5
-+echo "$as_me:21110: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21068,7 +21143,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21071: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21146: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21077,10 +21152,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21080: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21155: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21083: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21158: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21090,7 +21165,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21093: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21168: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21113,13 +21188,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21116: checking for wchar_t" >&5
-+	echo "$as_me:21191: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21122 "configure"
-+#line 21197 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21134,16 +21209,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21137: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21140: \$? = $ac_status" >&5
-+  echo "$as_me:21215: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21146: \$? = $ac_status" >&5
-+  echo "$as_me:21221: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21153,10 +21228,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21156: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21231: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21159: checking size of wchar_t" >&5
-+echo "$as_me:21234: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21165,7 +21240,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21168 "configure"
-+#line 21243 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21177,21 +21252,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21180: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21255: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21183: \$? = $ac_status" >&5
-+  echo "$as_me:21258: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21186: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21261: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21189: \$? = $ac_status" >&5
-+  echo "$as_me:21264: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21194 "configure"
-+#line 21269 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21203,16 +21278,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21206: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21281: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21209: \$? = $ac_status" >&5
-+  echo "$as_me:21284: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21212: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21287: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21215: \$? = $ac_status" >&5
-+  echo "$as_me:21290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21228,7 +21303,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21231 "configure"
-+#line 21306 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21240,16 +21315,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21243: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21246: \$? = $ac_status" >&5
-+  echo "$as_me:21321: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21252: \$? = $ac_status" >&5
-+  echo "$as_me:21327: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21265,7 +21340,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21268 "configure"
-+#line 21343 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21277,16 +21352,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21280: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21283: \$? = $ac_status" >&5
-+  echo "$as_me:21358: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21286: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21289: \$? = $ac_status" >&5
-+  echo "$as_me:21364: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21299,12 +21374,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21302: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21377: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21307 "configure"
-+#line 21382 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21320,15 +21395,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21323: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21326: \$? = $ac_status" >&5
-+  echo "$as_me:21401: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21403: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21331: \$? = $ac_status" >&5
-+  echo "$as_me:21406: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21344,7 +21419,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21347: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21422: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-@@ -21362,7 +21437,7 @@
- ### chooses to split module lists into libraries.
- ###
- ### (see CF_LIB_RULES).
--echo "$as_me:21365: checking for library subsets" >&5
-+echo "$as_me:21440: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21404,7 +21479,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21407: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21482: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21435,7 +21510,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21438: checking default library suffix" >&5
-+echo "$as_me:21513: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21446,10 +21521,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21449: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21524: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21452: checking default library-dependency suffix" >&5
-+echo "$as_me:21527: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21507,10 +21582,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21510: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21585: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21513: checking default object directory" >&5
-+echo "$as_me:21588: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21526,11 +21601,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21529: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21604: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21533: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21608: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21598,7 +21673,7 @@
- 	fi
- 
- fi
--echo "$as_me:21601: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21676: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21771,19 +21846,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21774: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21849: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 21779 "configure"
-+#line 21854 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21783: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21858: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21786: \$? = $ac_status" >&5
-+  echo "$as_me:21861: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21794,10 +21869,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21797 "configure"
-+#line 21872 "configure"
- #include "confdefs.h"
- 
--#line 21800 "configure"
-+#line 21875 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21812,16 +21887,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21818: \$? = $ac_status" >&5
-+  echo "$as_me:21893: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21821: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21896: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21824: \$? = $ac_status" >&5
-+  echo "$as_me:21899: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21844,7 +21919,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21847: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21922: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21860,7 +21935,7 @@
- 	;;
- esac
- 
--echo "$as_me:21863: checking where we will install curses.h" >&5
-+echo "$as_me:21938: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21870,7 +21945,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21873: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21948: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21878,7 +21953,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21881: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21956: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21896,7 +21971,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21899: checking for src modules" >&5
-+echo "$as_me:21974: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -21961,7 +22036,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:21964: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22039: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22181,7 +22256,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22184: checking for $ac_word" >&5
-+echo "$as_me:22259: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22198,7 +22273,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22201: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22276: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22210,10 +22285,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22213: result: $TIC_PATH" >&5
-+  echo "$as_me:22288: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22216: result: no" >&5
-+  echo "$as_me:22291: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22221,7 +22296,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22224: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22299: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22247,7 +22322,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22250: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22325: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22258,7 +22333,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22261: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22336: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22274,7 +22349,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22277: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22352: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22331,7 +22406,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22334: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22409: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22433,7 +22508,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22436: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22511: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22565,7 +22640,7 @@
- cat >>$CONFIG_STATUS <<EOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.52.20141204,
-+configured by $0, generated by GNU Autoconf 2.52.20150926,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -22609,7 +22684,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22612: error: ambiguous option: $1
-+    { { echo "$as_me:22687: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22628,7 +22703,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22631: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22706: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22647,7 +22722,7 @@
- ## Running config.status.  ##
- ## ----------------------- ##
- 
--This file was extended by $as_me 2.52.20141204, executed with
-+This file was extended by $as_me 2.52.20150926, executed with
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-   CONFIG_LINKS    = $CONFIG_LINKS
-@@ -22746,7 +22821,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22749: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22824: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23115,10 +23190,28 @@
-       # These are the two extra sed commands mentioned above.
-       (echo ':t
-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+      # It is possible to make a multiline substitution using escaped newlines.
-+      # Ensure that we do not split the substitution between script fragments.
-+      ac_BEG=$ac_end
-+      ac_END=`expr $ac_end + $ac_max_sed_lines`
-+      sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
-+      if test -s $tmp/subs.next; then
-+        grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
-+        if test ! -s $tmp/subs.edit; then
-+          grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
-+          if test ! -s $tmp/subs.edit; then
-+            if test $ac_beg -gt 1; then
-+              ac_end=`expr $ac_end - 1`
-+              continue
-+            fi
-+          fi
-+        fi
-+      fi
-+
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -23201,7 +23294,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23204: creating $ac_file" >&5
-+    { echo "$as_me:23297: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23219,7 +23312,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23222: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23315: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23232,7 +23325,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23235: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23328: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23248,7 +23341,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23251: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23344: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -23257,7 +23350,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23260: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23353: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -23294,7 +23387,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:23297: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23390: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -23305,7 +23398,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:23308: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23401: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23354,7 +23447,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23357: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23450: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23365,7 +23458,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23368: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23461: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23378,7 +23471,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23381: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23474: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23436,7 +23529,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:23439: $ac_file is unchanged" >&5
-+      { echo "$as_me:23532: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23774,7 +23867,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23777: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23870: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: dist.mk
-Prereq:  1.1072 
---- ncurses-6.0-20150926+/dist.mk	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/dist.mk	2015-10-10 17:06:12.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1072 2015/09/26 18:50:05 tom Exp $
-+# $Id: dist.mk,v 1.1073 2015/10/10 17:06:12 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20150926
-+NCURSES_PATCH = 20151010
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/base/MKlib_gen.sh
-Prereq:  1.51 
---- ncurses-6.0-20150926+/ncurses/base/MKlib_gen.sh	2015-08-10 08:56:39.000000000 +0000
-+++ ncurses-6.0-20151010/ncurses/base/MKlib_gen.sh	2015-10-10 19:36:47.000000000 +0000
-@@ -2,7 +2,7 @@
- #
- # MKlib_gen.sh -- generate sources from curses.h macro definitions
- #
--# ($Id: MKlib_gen.sh,v 1.51 2015/08/10 08:56:39 tom Exp $)
-+# ($Id: MKlib_gen.sh,v 1.52 2015/10/10 19:36:47 tom Exp $)
- #
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
-@@ -177,6 +177,7 @@
- if test "$USE" = generated ; then
- cat >$ED4 <<EOF
- 	s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) (\2) (\3)/
-+	/attr_[sg]et.* z)/s,z),z GCC_UNUSED),
- EOF
- else
- cat >$ED4 <<EOF
-Index: ncurses/base/resizeterm.c
-Prereq:  1.47 
---- ncurses-6.0-20150926+/ncurses/base/resizeterm.c	2014-10-13 08:56:49.000000000 +0000
-+++ ncurses-6.0-20151010/ncurses/base/resizeterm.c	2015-10-10 19:47:25.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2011,2014 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -45,7 +45,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: resizeterm.c,v 1.47 2014/10/13 08:56:49 tom Exp $")
-+MODULE_ID("$Id: resizeterm.c,v 1.48 2015/10/10 19:47:25 tom Exp $")
- 
- /*
-  * If we're trying to be reentrant, do not want any local statics.
-@@ -62,6 +62,12 @@
- #define EXTRA_DCLS		/* nothing */
- #endif
- 
-+#if NCURSES_SP_FUNCS && !defined(USE_SP_WINDOWLIST)
-+#define UNUSED_SP  (void) sp
-+#else
-+#define UNUSED_SP		/* nothing */
-+#endif
-+
- #ifdef TRACE
- static void
- show_window_sizes(const char *name)
-@@ -276,6 +282,7 @@
-     WINDOWLIST *wp;
- 
-     T((T_CALLED("decrease_size(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols));
-+    UNUSED_SP;
- 
-     do {
- 	found = FALSE;
-@@ -310,6 +317,7 @@
-     WINDOWLIST *wp;
- 
-     T((T_CALLED("increase_size(%p, %d, %d)"), (void *) SP_PARM, ToLines, ToCols));
-+    UNUSED_SP;
- 
-     do {
- 	found = FALSE;
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20150926+/package/debian-mingw/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian-mingw/changelog	2015-10-10 17:06:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150926) unstable; urgency=low
-+ncurses6 (6.0+20151010) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Sep 2015 14:50:05 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Oct 2015 13:06:12 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20150926+/package/debian-mingw64/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian-mingw64/changelog	2015-10-10 17:06:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150926) unstable; urgency=low
-+ncurses6 (6.0+20151010) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Sep 2015 14:50:05 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Oct 2015 13:06:12 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20150926+/package/debian/changelog	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/debian/changelog	2015-10-10 17:06:12.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20150926) unstable; urgency=low
-+ncurses6 (6.0+20151010) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 26 Sep 2015 14:50:05 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Oct 2015 13:06:12 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.125 
---- ncurses-6.0-20150926+/package/mingw-ncurses.nsi	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/mingw-ncurses.nsi	2015-10-10 17:06:12.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.125 2015/09/26 18:50:05 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "0926"

-+!define VERSION_MMDD  "1010"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20150926+/package/mingw-ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/mingw-ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20150926
-+Release: 20151010
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20150926+/package/ncurses.spec	2015-09-26 18:50:05.000000000 +0000
-+++ ncurses-6.0-20151010/package/ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20150926
-+Release: 20151010
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/aclocal.m4
-Prereq:  1.120 
---- ncurses-6.0-20150926+/test/aclocal.m4	2015-08-08 14:27:27.000000000 +0000
-+++ ncurses-6.0-20151010/test/aclocal.m4	2015-10-10 20:30:48.000000000 +0000
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.120 2015/08/08 14:27:27 tom Exp $
-+dnl $Id: aclocal.m4,v 1.121 2015/10/10 20:30:48 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -1297,6 +1297,34 @@
- test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
- ])
- dnl ---------------------------------------------------------------------------
-+dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
-+dnl ---------------
-+dnl Check for openpty() function, along with <pty.h> header.  It may need the
-+dnl "util" library as well.
-+AC_DEFUN([CF_FUNC_OPENPTY],
-+[
-+AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
-+AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
-+	cf_save_LIBS="$LIBS"
-+	test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
-+	for cf_header in pty.h libutil.h util.h
-+	do
-+	AC_TRY_LINK([
-+#include <$cf_header>
-+],[
-+	int x = openpty((int *)0, (int *)0, (char *)0,
-+				   (struct termios *)0, (struct winsize *)0);
-+],[
-+		cf_cv_func_openpty=$cf_header
-+		break
-+],[
-+		cf_cv_func_openpty=no
-+])
-+	done
-+	LIBS="$cf_save_LIBS"
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
- dnl -----------------
- dnl Test for availability of useful gcc __attribute__ directives to quiet
-Index: test/configure
---- ncurses-6.0-20150926+/test/configure	2015-08-08 20:32:27.000000000 +0000
-+++ ncurses-6.0-20151010/test/configure	2015-10-10 20:30:58.000000000 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20141204.
-+# Generated by Autoconf 2.52.20150926.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -748,7 +748,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20141204.  Invocation command line was
-+generated by GNU Autoconf 2.52.20150926.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -14849,7 +14849,169 @@
- #define HAVE_SYS_TIME_SELECT 1
- EOF
- 
--echo "$as_me:14852: checking for function curses_version" >&5
-+# special check for test/ditto.c
-+
-+echo "$as_me:14854: checking for openpty in -lutil" >&5
-+echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
-+if test "${ac_cv_lib_util_openpty+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 14862 "configure"
-+#include "confdefs.h"
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char openpty ();
-+int
-+main ()
-+{
-+openpty ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14881: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14884: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:14887: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14890: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_util_openpty=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_util_openpty=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:14901: result: $ac_cv_lib_util_openpty" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
-+if test $ac_cv_lib_util_openpty = yes; then
-+  cf_cv_lib_util=yes
-+else
-+  cf_cv_lib_util=no
-+fi
-+
-+echo "$as_me:14909: checking for openpty header" >&5
-+echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
-+if test "${cf_cv_func_openpty+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	cf_save_LIBS="$LIBS"
-+	test $cf_cv_lib_util = yes && {
-+cf_add_libs="-lutil"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $LIBS
-+do
-+	for cf_add_2lib in $cf_add_libs
-+	do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+		then
-+			cf_add_1lib=
-+			break
-+		fi
-+	done
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+LIBS="$cf_add_libs"
-+ }
-+	for cf_header in pty.h libutil.h util.h
-+	do
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 14936 "configure"
-+#include "confdefs.h"
-+
-+#include <$cf_header>
-+
-+int
-+main ()
-+{
-+
-+	int x = openpty((int *)0, (int *)0, (char *)0,
-+				   (struct termios *)0, (struct winsize *)0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:14953: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14956: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:14959: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:14962: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+
-+		cf_cv_func_openpty=$cf_header
-+		break
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+
-+		cf_cv_func_openpty=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+	done
-+	LIBS="$cf_save_LIBS"
-+
-+fi
-+echo "$as_me:14980: result: $cf_cv_func_openpty" >&5
-+echo "${ECHO_T}$cf_cv_func_openpty" >&6
-+
-+if test "$cf_cv_func_openpty" != no ; then
-+
-+cat >>confdefs.h <<EOF
-+#define USE_OPENPTY_HEADER <$cf_cv_func_openpty>
-+EOF
-+
-+cat >>confdefs.h <<\EOF
-+#define USE_XTERM_PTY 1
-+EOF
-+
-+	if test "x$cf_cv_lib_util" = xyes ; then
-+
-+cf_add_libs="-lutil"
-+# Filter out duplicates - this happens with badly-designed ".pc" files...
-+for cf_add_1lib in $TEST_LIBS
-+do
-+	for cf_add_2lib in $cf_add_libs
-+	do
-+		if test "x$cf_add_1lib" = "x$cf_add_2lib"
-+		then
-+			cf_add_1lib=
-+			break
-+		fi
-+	done
-+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
-+done
-+TEST_LIBS="$cf_add_libs"
-+
-+	fi
-+fi
-+
-+echo "$as_me:15014: checking for function curses_version" >&5
- echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
- if test "${cf_cv_func_curses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14859,7 +15021,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14862 "configure"
-+#line 15024 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14872,15 +15034,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14875: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15037: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14878: \$? = $ac_status" >&5
-+  echo "$as_me:15040: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14880: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15042: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14883: \$? = $ac_status" >&5
-+  echo "$as_me:15045: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_curses_version=yes
- 
-@@ -14895,14 +15057,14 @@
- fi
- rm -f core
- fi
--echo "$as_me:14898: result: $cf_cv_func_curses_version" >&5
-+echo "$as_me:15060: result: $cf_cv_func_curses_version" >&5
- echo "${ECHO_T}$cf_cv_func_curses_version" >&6
- test "$cf_cv_func_curses_version" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_CURSES_VERSION 1
- EOF
- 
--echo "$as_me:14905: checking for alternate character set array" >&5
-+echo "$as_me:15067: checking for alternate character set array" >&5
- echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_acs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14912,7 +15074,7 @@
- for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 14915 "configure"
-+#line 15077 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14928,16 +15090,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14934: \$? = $ac_status" >&5
-+  echo "$as_me:15096: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14940: \$? = $ac_status" >&5
-+  echo "$as_me:15102: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_acs_map=$name; break
- else
-@@ -14948,7 +15110,7 @@
- done
- 
- fi
--echo "$as_me:14951: result: $cf_cv_curses_acs_map" >&5
-+echo "$as_me:15113: result: $cf_cv_curses_acs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
- 
- test "$cf_cv_curses_acs_map" != unknown &&
-@@ -14958,7 +15120,7 @@
- 
- if test "$cf_enable_widec" = yes; then
- 
--echo "$as_me:14961: checking for wide alternate character set array" >&5
-+echo "$as_me:15123: checking for wide alternate character set array" >&5
- echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14968,7 +15130,7 @@
- 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14971 "configure"
-+#line 15133 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -14984,16 +15146,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14987: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15149: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14990: \$? = $ac_status" >&5
-+  echo "$as_me:15152: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14993: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15155: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14996: \$? = $ac_status" >&5
-+  echo "$as_me:15158: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_map=$name
- 	 break
-@@ -15004,7 +15166,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	done
- fi
--echo "$as_me:15007: result: $cf_cv_curses_wacs_map" >&5
-+echo "$as_me:15169: result: $cf_cv_curses_wacs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
- 
- test "$cf_cv_curses_wacs_map" != unknown &&
-@@ -15012,7 +15174,7 @@
- #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
- EOF
- 
--echo "$as_me:15015: checking for wide alternate character constants" >&5
-+echo "$as_me:15177: checking for wide alternate character constants" >&5
- echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15022,7 +15184,7 @@
- if test "$cf_cv_curses_wacs_map" != unknown
- then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15025 "configure"
-+#line 15187 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15039,16 +15201,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15042: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15204: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15045: \$? = $ac_status" >&5
-+  echo "$as_me:15207: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15048: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15210: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15051: \$? = $ac_status" >&5
-+  echo "$as_me:15213: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15058,7 +15220,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- else
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15061 "configure"
-+#line 15223 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15074,16 +15236,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15239: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15080: \$? = $ac_status" >&5
-+  echo "$as_me:15242: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15083: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15245: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15086: \$? = $ac_status" >&5
-+  echo "$as_me:15248: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15094,7 +15256,7 @@
- fi
- 
- fi
--echo "$as_me:15097: result: $cf_cv_curses_wacs_symbols" >&5
-+echo "$as_me:15259: result: $cf_cv_curses_wacs_symbols" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
- 
- test "$cf_cv_curses_wacs_symbols" != no &&
-@@ -15104,10 +15266,10 @@
- 
- fi
- 
--echo "$as_me:15107: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15269: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15110 "configure"
-+#line 15272 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15125,16 +15287,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15128: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15131: \$? = $ac_status" >&5
-+  echo "$as_me:15293: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15134: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15296: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15137: \$? = $ac_status" >&5
-+  echo "$as_me:15299: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15143,7 +15305,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15146: result: $cf_result" >&5
-+echo "$as_me:15308: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15164,14 +15326,14 @@
- if test "$cf_enable_widec" = yes; then
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:15167: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:15329: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15174 "configure"
-+#line 15336 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15189,23 +15351,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15192: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15195: \$? = $ac_status" >&5
-+  echo "$as_me:15357: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15198: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15201: \$? = $ac_status" >&5
-+  echo "$as_me:15363: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15208 "configure"
-+#line 15370 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15224,16 +15386,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15227: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15389: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15230: \$? = $ac_status" >&5
-+  echo "$as_me:15392: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15395: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15236: \$? = $ac_status" >&5
-+  echo "$as_me:15398: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -15245,7 +15407,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15248: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:15410: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -15268,14 +15430,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:15271: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:15433: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15278 "configure"
-+#line 15440 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15293,23 +15455,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15296: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15458: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15299: \$? = $ac_status" >&5
-+  echo "$as_me:15461: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15302: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15464: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15305: \$? = $ac_status" >&5
-+  echo "$as_me:15467: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15312 "configure"
-+#line 15474 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15328,16 +15490,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15331: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15334: \$? = $ac_status" >&5
-+  echo "$as_me:15496: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15337: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15340: \$? = $ac_status" >&5
-+  echo "$as_me:15502: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -15349,7 +15511,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15352: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:15514: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -15372,14 +15534,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:15375: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:15537: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15382 "configure"
-+#line 15544 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15397,23 +15559,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15403: \$? = $ac_status" >&5
-+  echo "$as_me:15565: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15568: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15409: \$? = $ac_status" >&5
-+  echo "$as_me:15571: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15416 "configure"
-+#line 15578 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15432,16 +15594,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15435: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15597: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15438: \$? = $ac_status" >&5
-+  echo "$as_me:15600: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15603: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15444: \$? = $ac_status" >&5
-+  echo "$as_me:15606: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -15453,7 +15615,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15456: result: $cf_cv_wint_t" >&5
-+echo "$as_me:15618: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -15477,10 +15639,10 @@
- 
- 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
- 
--echo "$as_me:15480: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15642: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15483 "configure"
-+#line 15645 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15498,16 +15660,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15501: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15504: \$? = $ac_status" >&5
-+  echo "$as_me:15666: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15669: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15510: \$? = $ac_status" >&5
-+  echo "$as_me:15672: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15516,7 +15678,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15519: result: $cf_result" >&5
-+echo "$as_me:15681: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15538,10 +15700,10 @@
- 
- 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
- 
--echo "$as_me:15541: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15703: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15544 "configure"
-+#line 15706 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15559,16 +15721,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15724: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15565: \$? = $ac_status" >&5
-+  echo "$as_me:15727: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15568: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15730: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15571: \$? = $ac_status" >&5
-+  echo "$as_me:15733: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15577,7 +15739,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15580: result: $cf_result" >&5
-+echo "$as_me:15742: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15599,10 +15761,10 @@
- 
- 	if test "$NCURSES_OK_WINT_T" = 0 ; then
- 
--echo "$as_me:15602: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15764: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15605 "configure"
-+#line 15767 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15620,16 +15782,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15623: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15626: \$? = $ac_status" >&5
-+  echo "$as_me:15788: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15791: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15632: \$? = $ac_status" >&5
-+  echo "$as_me:15794: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15638,7 +15800,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15641: result: $cf_result" >&5
-+echo "$as_me:15803: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15659,11 +15821,11 @@
- 	fi
- fi
- 
--echo "$as_me:15662: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15824: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15666 "configure"
-+#line 15828 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15691,16 +15853,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15694: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15697: \$? = $ac_status" >&5
-+  echo "$as_me:15859: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15700: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15703: \$? = $ac_status" >&5
-+  echo "$as_me:15865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15709,7 +15871,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15712: result: $cf_result" >&5
-+echo "$as_me:15874: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -15721,14 +15883,14 @@
- EOF
- 
- else
--	echo "$as_me:15724: checking for data ospeed in library" >&5
-+	echo "$as_me:15886: checking for data ospeed in library" >&5
- echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15731 "configure"
-+#line 15893 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15761,16 +15923,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15764: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15767: \$? = $ac_status" >&5
-+  echo "$as_me:15929: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15770: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15773: \$? = $ac_status" >&5
-+  echo "$as_me:15935: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15782,7 +15944,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15785 "configure"
-+#line 15947 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15808,15 +15970,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15811: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15973: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15814: \$? = $ac_status" >&5
-+  echo "$as_me:15976: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15816: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15978: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15819: \$? = $ac_status" >&5
-+  echo "$as_me:15981: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15827,7 +15989,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:15830: result: $cf_result" >&5
-+	echo "$as_me:15992: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -15840,11 +16002,11 @@
- 	fi
- fi
- 
--echo "$as_me:15843: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16005: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15847 "configure"
-+#line 16009 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15872,16 +16034,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15875: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16037: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15878: \$? = $ac_status" >&5
-+  echo "$as_me:16040: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15881: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16043: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15884: \$? = $ac_status" >&5
-+  echo "$as_me:16046: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15890,7 +16052,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15893: result: $cf_result" >&5
-+echo "$as_me:16055: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -15902,14 +16064,14 @@
- EOF
- 
- else
--	echo "$as_me:15905: checking for data boolnames in library" >&5
-+	echo "$as_me:16067: checking for data boolnames in library" >&5
- echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15912 "configure"
-+#line 16074 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15942,16 +16104,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15945: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16107: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15948: \$? = $ac_status" >&5
-+  echo "$as_me:16110: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16113: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15954: \$? = $ac_status" >&5
-+  echo "$as_me:16116: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15963,7 +16125,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15966 "configure"
-+#line 16128 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15989,15 +16151,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15992: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16154: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15995: \$? = $ac_status" >&5
-+  echo "$as_me:16157: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15997: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16159: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16000: \$? = $ac_status" >&5
-+  echo "$as_me:16162: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16008,7 +16170,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16011: result: $cf_result" >&5
-+	echo "$as_me:16173: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16021,11 +16183,11 @@
- 	fi
- fi
- 
--echo "$as_me:16024: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16186: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16028 "configure"
-+#line 16190 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16053,16 +16215,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16056: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16218: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16059: \$? = $ac_status" >&5
-+  echo "$as_me:16221: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16062: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16224: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16065: \$? = $ac_status" >&5
-+  echo "$as_me:16227: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16071,7 +16233,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16074: result: $cf_result" >&5
-+echo "$as_me:16236: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -16083,14 +16245,14 @@
- EOF
- 
- else
--	echo "$as_me:16086: checking for data boolfnames in library" >&5
-+	echo "$as_me:16248: checking for data boolfnames in library" >&5
- echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16093 "configure"
-+#line 16255 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16123,16 +16285,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16126: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16129: \$? = $ac_status" >&5
-+  echo "$as_me:16291: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16132: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16135: \$? = $ac_status" >&5
-+  echo "$as_me:16297: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16144,7 +16306,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16147 "configure"
-+#line 16309 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16170,15 +16332,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16173: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16335: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16176: \$? = $ac_status" >&5
-+  echo "$as_me:16338: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16178: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16340: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16181: \$? = $ac_status" >&5
-+  echo "$as_me:16343: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16189,7 +16351,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16192: result: $cf_result" >&5
-+	echo "$as_me:16354: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16204,7 +16366,7 @@
- 
- if ( test "$GCC" = yes || test "$GXX" = yes )
- then
--echo "$as_me:16207: checking if you want to turn on gcc warnings" >&5
-+echo "$as_me:16369: checking if you want to turn on gcc warnings" >&5
- echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -16221,7 +16383,7 @@
- 	with_warnings=no
- 
- fi;
--echo "$as_me:16224: result: $with_warnings" >&5
-+echo "$as_me:16386: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- if test "$with_warnings" = "yes"
- then
-@@ -16244,10 +16406,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:16247: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:16409: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 16250 "${as_me:-configure}"
-+#line 16412 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -16296,12 +16458,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:16299: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16302: \$? = $ac_status" >&5
-+  echo "$as_me:16464: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16304: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:16466: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -16365,12 +16527,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:16368: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:16530: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16373 "configure"
-+#line 16535 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16387,16 +16549,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16390: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16393: \$? = $ac_status" >&5
-+  echo "$as_me:16555: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16396: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16558: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16399: \$? = $ac_status" >&5
-+  echo "$as_me:16561: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -16407,7 +16569,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:16410: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:16572: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -16416,12 +16578,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:16419: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:16581: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16424 "configure"
-+#line 16586 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16438,16 +16600,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16603: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16444: \$? = $ac_status" >&5
-+  echo "$as_me:16606: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16609: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16450: \$? = $ac_status" >&5
-+  echo "$as_me:16612: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -16458,12 +16620,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:16461: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:16623: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 16466 "${as_me:-configure}"
-+#line 16628 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -16480,7 +16642,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:16483: checking for $CC warning options..." >&5
-+	{ echo "$as_me:16645: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -16496,12 +16658,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16499: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16661: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16502: \$? = $ac_status" >&5
-+  echo "$as_me:16664: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16504: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16666: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -16510,7 +16672,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:16513: checking for $CC warning options..." >&5
-+	{ echo "$as_me:16675: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -16534,12 +16696,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16537: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16540: \$? = $ac_status" >&5
-+  echo "$as_me:16702: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16542: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16704: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -16550,7 +16712,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16553: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16715: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16560,7 +16722,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16563: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16725: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16576,7 +16738,7 @@
- fi
- fi
- 
--echo "$as_me:16579: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:16741: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -16593,7 +16755,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:16596: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:16758: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16687,23 +16849,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:16690: checking for dmalloc.h" >&5
-+	echo "$as_me:16852: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16696 "configure"
-+#line 16858 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:16700: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16862: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16706: \$? = $ac_status" >&5
-+  echo "$as_me:16868: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16722,11 +16884,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16725: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:16887: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:16729: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:16891: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16734,7 +16896,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16737 "configure"
-+#line 16899 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16753,16 +16915,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16756: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16918: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16759: \$? = $ac_status" >&5
-+  echo "$as_me:16921: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16762: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16924: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16765: \$? = $ac_status" >&5
-+  echo "$as_me:16927: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -16773,7 +16935,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16776: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:16938: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16788,7 +16950,7 @@
- 
- fi
- 
--echo "$as_me:16791: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:16953: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -16805,7 +16967,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:16808: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:16970: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16899,23 +17061,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:16902: checking for dbmalloc.h" >&5
-+	echo "$as_me:17064: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16908 "configure"
-+#line 17070 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:16912: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17074: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16918: \$? = $ac_status" >&5
-+  echo "$as_me:17080: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16934,11 +17096,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16937: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:17099: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:16941: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:17103: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16946,7 +17108,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16949 "configure"
-+#line 17111 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16965,16 +17127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16968: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16971: \$? = $ac_status" >&5
-+  echo "$as_me:17133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16977: \$? = $ac_status" >&5
-+  echo "$as_me:17139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -16985,7 +17147,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16988: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:17150: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -17000,7 +17162,7 @@
- 
- fi
- 
--echo "$as_me:17003: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:17165: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -17017,7 +17179,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:17020: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:17182: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -17110,7 +17272,7 @@
- 	;;
- esac
- 
--echo "$as_me:17113: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:17275: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -17120,7 +17282,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:17123: result: $with_no_leaks" >&5
-+echo "$as_me:17285: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -17136,7 +17298,7 @@
- fi
- 
- LD_RPATH_OPT=
--echo "$as_me:17139: checking for an rpath option" >&5
-+echo "$as_me:17301: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -17167,12 +17329,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:17170: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:17332: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:17175: checking if we need a space after rpath option" >&5
-+	echo "$as_me:17337: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -17193,7 +17355,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17196 "configure"
-+#line 17358 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17205,16 +17367,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17208: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17211: \$? = $ac_status" >&5
-+  echo "$as_me:17373: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17214: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17376: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17217: \$? = $ac_status" >&5
-+  echo "$as_me:17379: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -17224,13 +17386,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:17227: result: $cf_rpath_space" >&5
-+	echo "$as_me:17389: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
- esac
- 
--echo "$as_me:17233: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:17395: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -17247,21 +17409,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:17250: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:17412: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:17254: checking for updated LDFLAGS" >&5
-+echo "$as_me:17416: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:17257: result: maybe" >&5
-+	echo "$as_me:17419: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:17264: checking for $ac_word" >&5
-+echo "$as_me:17426: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17276,7 +17438,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:17279: found $ac_dir/$ac_word" >&5
-+echo "$as_me:17441: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -17284,10 +17446,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:17287: result: $cf_ldd_prog" >&5
-+  echo "$as_me:17449: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:17290: result: no" >&5
-+  echo "$as_me:17452: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17301,7 +17463,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17304 "configure"
-+#line 17466 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -17313,16 +17475,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17316: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17478: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17319: \$? = $ac_status" >&5
-+  echo "$as_me:17481: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17322: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17484: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17325: \$? = $ac_status" >&5
-+  echo "$as_me:17487: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -17350,7 +17512,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:17353: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:17515: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -17362,11 +17524,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17365: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17527: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17369: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17531: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -17403,7 +17565,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17406: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17568: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17416,11 +17578,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17419: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17581: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17423: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17585: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -17457,7 +17619,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17460: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17622: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17470,14 +17632,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17473: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17635: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17477: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17639: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:17480: result: no" >&5
-+	echo "$as_me:17642: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17567,7 +17729,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:17570: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:17732: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -17699,7 +17861,7 @@
- cat >>$CONFIG_STATUS <<EOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.52.20141204,
-+configured by $0, generated by GNU Autoconf 2.52.20150926,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -17743,7 +17905,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:17746: error: ambiguous option: $1
-+    { { echo "$as_me:17908: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -17762,7 +17924,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:17765: error: unrecognized option: $1
-+  -*) { { echo "$as_me:17927: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -17781,7 +17943,7 @@
- ## Running config.status.  ##
- ## ----------------------- ##
- 
--This file was extended by $as_me 2.52.20141204, executed with
-+This file was extended by $as_me 2.52.20150926, executed with
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-   CONFIG_LINKS    = $CONFIG_LINKS
-@@ -17812,7 +17974,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
--  *) { { echo "$as_me:17815: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:17977: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -17999,10 +18161,28 @@
-       # These are the two extra sed commands mentioned above.
-       (echo ':t
-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+      # It is possible to make a multiline substitution using escaped newlines.
-+      # Ensure that we do not split the substitution between script fragments.
-+      ac_BEG=$ac_end
-+      ac_END=`expr $ac_end + $ac_max_sed_lines`
-+      sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
-+      if test -s $tmp/subs.next; then
-+        grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
-+        if test ! -s $tmp/subs.edit; then
-+          grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
-+          if test ! -s $tmp/subs.edit; then
-+            if test $ac_beg -gt 1; then
-+              ac_end=`expr $ac_end - 1`
-+              continue
-+            fi
-+          fi
-+        fi
-+      fi
-+
-       if test -z "$ac_sed_cmds"; then
--  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-       else
--  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-       fi
-       ac_sed_frag=`expr $ac_sed_frag + 1`
-       ac_beg=$ac_end
-@@ -18085,7 +18265,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:18088: creating $ac_file" >&5
-+    { echo "$as_me:18268: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -18103,7 +18283,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18106: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18286: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18116,7 +18296,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18119: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18299: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18132,7 +18312,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:18135: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:18315: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -18141,7 +18321,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:18144: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:18324: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -18178,7 +18358,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:18181: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:18361: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -18189,7 +18369,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:18192: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:18372: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -18238,7 +18418,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:18241: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:18421: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -18249,7 +18429,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18252: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18432: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18262,7 +18442,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18265: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18445: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18320,7 +18500,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:18323: $ac_file is unchanged" >&5
-+      { echo "$as_me:18503: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: test/configure.in
-Prereq:  1.124 
---- ncurses-6.0-20150926+/test/configure.in	2015-08-08 20:24:49.000000000 +0000
-+++ ncurses-6.0-20151010/test/configure.in	2015-10-10 20:23:49.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1996, etc.
- dnl
--dnl $Id: configure.in,v 1.124 2015/08/08 20:24:49 tom Exp $
-+dnl $Id: configure.in,v 1.125 2015/10/10 20:23:49 tom Exp $
- dnl This is a simple configuration-script for the ncurses test programs that
- dnl allows the test-directory to be separately configured against a reference
- dnl system (i.e., sysvr4 curses)
-@@ -302,6 +302,17 @@
- test $cf_cv_use_pthreads = yes && AC_DEFINE(USE_PTHREADS)
- 
- CF_SYS_TIME_SELECT
-+
-+# special check for test/ditto.c
-+CF_FUNC_OPENPTY
-+if test "$cf_cv_func_openpty" != no ; then
-+	AC_DEFINE_UNQUOTED(USE_OPENPTY_HEADER,<$cf_cv_func_openpty>,[Define to actual header for openpty function])
-+	AC_DEFINE(USE_XTERM_PTY,1,[Define to 1 if we should assume xterm pseudoterminal interface])
-+	if test "x$cf_cv_lib_util" = xyes ; then
-+		CF_ADD_LIB(util,TEST_LIBS)
-+	fi
-+fi
-+
- CF_FUNC_CURSES_VERSION
- 
- CF_CURSES_ACS_MAP
-Index: test/demo_termcap.c
-Prereq:  1.48 
---- ncurses-6.0-20150926+/test/demo_termcap.c	2015-08-08 20:25:39.000000000 +0000
-+++ ncurses-6.0-20151010/test/demo_termcap.c	2015-10-10 20:41:16.000000000 +0000
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: demo_termcap.c,v 1.48 2015/08/08 20:25:39 tom Exp $
-+ * $Id: demo_termcap.c,v 1.49 2015/10/10 20:41:16 tom Exp $
-  *
-  * A simple demo of the termcap interface.
-  */
-@@ -50,6 +50,8 @@
- #include <termcap.h>
- #endif
- 
-+static void failed(const char *) GCC_NORETURN;
-+
- static void
- failed(const char *msg)
- {
-Index: test/demo_terminfo.c
-Prereq:  1.39 
---- ncurses-6.0-20150926+/test/demo_terminfo.c	2015-07-10 23:45:44.000000000 +0000
-+++ ncurses-6.0-20151010/test/demo_terminfo.c	2015-10-10 20:52:41.000000000 +0000
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: demo_terminfo.c,v 1.39 2015/07/10 23:45:44 tom Exp $
-+ * $Id: demo_terminfo.c,v 1.40 2015/10/10 20:52:41 tom Exp $
-  *
-  * A simple demo of the terminfo interface.
-  */
-@@ -46,6 +46,8 @@
- #endif
- #endif
- 
-+static void failed(const char *) GCC_NORETURN;
-+
- static void
- failed(const char *msg)
- {
-@@ -914,7 +916,7 @@
- int
- main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
- {
--    printf("This program requires the terminfo functions such as tigetstr\n");
-+    failed("This program requires the terminfo functions such as tigetstr");
-     ExitProgram(EXIT_FAILURE);
- }
- #endif /* HAVE_TIGETSTR */
-Index: test/view.c
-Prereq:  1.94 
---- ncurses-6.0-20150926+/test/view.c	2013-09-28 21:58:42.000000000 +0000
-+++ ncurses-6.0-20151010/test/view.c	2015-10-10 20:03:58.000000000 +0000
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -50,7 +50,7 @@
-  * scroll operation worked, and the refresh() code only had to do a
-  * partial repaint.
-  *
-- * $Id: view.c,v 1.94 2013/09/28 21:58:42 tom Exp $
-+ * $Id: view.c,v 1.95 2015/10/10 20:03:58 tom Exp $
-  */
- 
- #include <test.priv.h>
-@@ -188,20 +188,23 @@
-     for (j = k = 0; j < len; j++) {
- #if USE_WIDEC_SUPPORT
- 	rc = (size_t) check_mbytes(wch, src + j, len - j, state);
--	if (rc == (size_t) -1 || rc == (size_t) -2)
-+	if (rc == (size_t) -1 || rc == (size_t) -2) {
- 	    break;
-+	}
- 	j += rc - 1;
--	if ((width = wcwidth(wch)) < 0)
--	    break;
--	if ((width > 0 && l > 0) || l == CCHARW_MAX) {
-+	width = wcwidth(wch);
-+	if (width == 0) {
-+	    if (l == 0) {
-+		wstr[l++] = L' ';
-+	    }
-+	} else if ((l > 0) || (l == CCHARW_MAX)) {
- 	    wstr[l] = L'\0';
- 	    l = 0;
--	    if (setcchar(dst + k, wstr, 0, 0, NULL) != OK)
-+	    if (setcchar(dst + k, wstr, 0, 0, NULL) != OK) {
- 		break;
-+	    }
- 	    ++k;
- 	}
--	if (width == 0 && l == 0)
--	    wstr[l++] = L' ';
- 	wstr[l++] = wch;
- #else
- 	dst[k++] = (chtype) UChar(src[j]);
-@@ -329,10 +332,11 @@
- 	/* convert tabs and nonprinting chars so that shift will work properly */
- 	for (s = buf, d = temp, col = 0; (*d = *s) != '\0'; s++) {
- 	    if (*d == '\r') {
--		if (s[1] == '\n')
-+		if (s[1] == '\n') {
- 		    continue;
--		else
-+		} else {
- 		    break;
-+		}
- 	    }
- 	    if (*d == '\n') {
- 		*d = '\0';
diff --git a/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch b/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch
deleted file mode 100644
index 6bb1cd3..0000000
--- a/patches/ncurses/6.0/180-ncurses-6.0-20151017.patch
+++ /dev/null
@@ -1,23170 +0,0 @@
-# ncurses 6.0 - patch 20151017 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151017.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Oct 18 00:40:46 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   15 
-# Ada95/configure                  |  977 +++++------
-# NEWS                             |   16 
-# VERSION                          |    2 
-# aclocal.m4                       |   27 
-# c++/Makefile.in                  |    4 
-# configure                        | 3156 ++++++++++++++++++-------------------
-# configure.in                     |   15 
-# dist.mk                          |    4 
-# ncurses/Makefile.in              |    4 
-# ncurses/base/lib_color.c         |    4 
-# ncurses/base/lib_mouse.c         |    4 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/aclocal.m4                  |    7 
-# test/configure                   | 2585 +++++++++++++++---------------
-# 20 files changed, 3457 insertions(+), 3383 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.107 
---- ncurses-6.0-20151010+/Ada95/aclocal.m4	2015-10-10 19:52:33.000000000 +0000
-+++ ncurses-6.0-20151017/Ada95/aclocal.m4	2015-10-17 23:07:06.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.107 2015/10/10 19:52:33 tom Exp $
-+dnl $Id: aclocal.m4,v 1.108 2015/10/17 23:07:06 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -1755,7 +1755,7 @@
- $1="$cf_library_path_list [$]$1"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
-+dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
- dnl -------------
- dnl Compute the library-prefix for the given host system
- dnl $1 = variable to set
-@@ -1763,7 +1763,11 @@
- [
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -3849,7 +3853,7 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
-+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -3919,6 +3923,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[[45]]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-Index: Ada95/configure
---- ncurses-6.0-20151010+/Ada95/configure	2015-10-10 19:53:00.000000000 +0000
-+++ ncurses-6.0-20151017/Ada95/configure	2015-10-17 23:07:23.000000000 +0000
-@@ -8943,7 +8943,11 @@
- 
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -8966,7 +8970,7 @@
- 	test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
- fi
- 
--echo "$as_me:8969: checking for default loader flags" >&5
-+echo "$as_me:8973: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (normal)  LD_MODEL=''   ;;
-@@ -8974,11 +8978,11 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:8977: result: $LD_MODEL" >&5
-+echo "$as_me:8981: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- LD_RPATH_OPT=
--echo "$as_me:8981: checking for an rpath option" >&5
-+echo "$as_me:8985: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -9009,12 +9013,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:9012: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:9016: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:9017: checking if we need a space after rpath option" >&5
-+	echo "$as_me:9021: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -9035,7 +9039,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9038 "configure"
-+#line 9042 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9047,16 +9051,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9054: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9053: \$? = $ac_status" >&5
-+  echo "$as_me:9057: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9056: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9060: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9059: \$? = $ac_status" >&5
-+  echo "$as_me:9063: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -9066,7 +9070,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:9069: result: $cf_rpath_space" >&5
-+	echo "$as_me:9073: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -9087,7 +9091,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:9090: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:9094: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -9102,9 +9106,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:9105: result: $withval" >&5
-+		echo "$as_me:9109: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:9107: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:9111: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -9113,7 +9117,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:9116: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:9120: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -9123,14 +9127,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:9126: checking which $CC option to use" >&5
-+		echo "$as_me:9130: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9133 "configure"
-+#line 9137 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9142,16 +9146,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9148: \$? = $ac_status" >&5
-+  echo "$as_me:9152: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9151: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9155: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9154: \$? = $ac_status" >&5
-+  echo "$as_me:9158: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9160,7 +9164,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:9163: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:9167: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -9231,7 +9235,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:9234: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:9238: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9240,7 +9244,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9243 "configure"
-+#line 9247 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9252,16 +9256,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9255: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9259: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9258: \$? = $ac_status" >&5
-+  echo "$as_me:9262: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9261: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9265: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9264: \$? = $ac_status" >&5
-+  echo "$as_me:9268: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -9272,7 +9276,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:9275: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:9279: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -9497,7 +9501,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 9500 "configure"
-+#line 9504 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9509,16 +9513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9512: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9516: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9515: \$? = $ac_status" >&5
-+  echo "$as_me:9519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9518: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9521: \$? = $ac_status" >&5
-+  echo "$as_me:9525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -9555,7 +9559,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:9558: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:9562: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -9565,7 +9569,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 9568 "${as_me:-configure}"
-+#line 9572 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -9577,18 +9581,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:9580: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:9584: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:9582: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:9586: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9585: \$? = $ac_status" >&5
-+  echo "$as_me:9589: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:9587: result: yes" >&5
-+				echo "$as_me:9591: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:9591: result: no" >&5
-+				echo "$as_me:9595: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -9603,17 +9607,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:9606: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:9610: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:9610: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:9614: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- # The test/sample programs in the original tree link using rpath option.
- # Make it optional for packagers.
- if test -n "$LOCAL_LDFLAGS"
- then
--	echo "$as_me:9616: checking if you want to link sample programs with rpath option" >&5
-+	echo "$as_me:9620: checking if you want to link sample programs with rpath option" >&5
- echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-link or --disable-rpath-link was given.
-@@ -9623,7 +9627,7 @@
- else
-   with_rpath_link=yes
- fi;
--	echo "$as_me:9626: result: $with_rpath_link" >&5
-+	echo "$as_me:9630: result: $with_rpath_link" >&5
- echo "${ECHO_T}$with_rpath_link" >&6
- 	if test "$with_rpath_link" = no
- 	then
-@@ -9635,7 +9639,7 @@
- ###############################################################################
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:9638: checking if you want broken-linker support code" >&5
-+echo "$as_me:9642: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -9645,7 +9649,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:9648: result: $with_broken_linker" >&5
-+echo "$as_me:9652: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -9665,7 +9669,7 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:9668: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:9672: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
-@@ -9711,14 +9715,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:9714: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:9718: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9721 "configure"
-+#line 9725 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9733,16 +9737,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9736: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9739: \$? = $ac_status" >&5
-+  echo "$as_me:9743: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9745: \$? = $ac_status" >&5
-+  echo "$as_me:9749: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9751,7 +9755,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9754 "configure"
-+#line 9758 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9766,16 +9770,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9773: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9772: \$? = $ac_status" >&5
-+  echo "$as_me:9776: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9779: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9778: \$? = $ac_status" >&5
-+  echo "$as_me:9782: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -9790,7 +9794,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9793: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:9797: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -9815,16 +9819,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:9818: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:9822: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:9824: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:9828: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9827 "configure"
-+#line 9831 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9839,16 +9843,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9842: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9846: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9845: \$? = $ac_status" >&5
-+  echo "$as_me:9849: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9848: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9852: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9851: \$? = $ac_status" >&5
-+  echo "$as_me:9855: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -9869,7 +9873,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9872 "configure"
-+#line 9876 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9884,16 +9888,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9891: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9890: \$? = $ac_status" >&5
-+  echo "$as_me:9894: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9896: \$? = $ac_status" >&5
-+  echo "$as_me:9900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9904,15 +9908,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:9907: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:9911: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:9912: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:9916: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 9915 "configure"
-+#line 9919 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -9927,16 +9931,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9930: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9934: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9933: \$? = $ac_status" >&5
-+  echo "$as_me:9937: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9936: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9940: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9939: \$? = $ac_status" >&5
-+  echo "$as_me:9943: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9952,7 +9956,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9955: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:9959: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -10051,6 +10055,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[45]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-@@ -10070,14 +10077,14 @@
- 	;;
- (*)
- 
--echo "$as_me:10073: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10080: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10080 "configure"
-+#line 10087 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10096,16 +10103,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10099: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10106: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10102: \$? = $ac_status" >&5
-+  echo "$as_me:10109: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10105: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10112: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10108: \$? = $ac_status" >&5
-+  echo "$as_me:10115: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10114,7 +10121,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10117 "configure"
-+#line 10124 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10133,16 +10140,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10136: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10139: \$? = $ac_status" >&5
-+  echo "$as_me:10146: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10142: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10149: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10145: \$? = $ac_status" >&5
-+  echo "$as_me:10152: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10157,7 +10164,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10160: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10167: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10265,16 +10272,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:10268: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:10275: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:10274: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:10281: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10277 "configure"
-+#line 10284 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10289,16 +10296,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10292: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10299: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10295: \$? = $ac_status" >&5
-+  echo "$as_me:10302: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10298: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10305: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10301: \$? = $ac_status" >&5
-+  echo "$as_me:10308: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -10319,7 +10326,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10322 "configure"
-+#line 10329 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10334,16 +10341,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10337: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10340: \$? = $ac_status" >&5
-+  echo "$as_me:10347: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10343: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10350: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10346: \$? = $ac_status" >&5
-+  echo "$as_me:10353: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10354,15 +10361,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:10357: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:10364: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:10362: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:10369: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10365 "configure"
-+#line 10372 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -10377,16 +10384,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10380: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10387: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10383: \$? = $ac_status" >&5
-+  echo "$as_me:10390: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10386: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10393: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10389: \$? = $ac_status" >&5
-+  echo "$as_me:10396: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10402,7 +10409,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10405: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:10412: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -10560,7 +10567,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:10563: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:10570: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -10568,7 +10575,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10571: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10578: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -10576,7 +10583,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:10579: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:10586: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -10584,10 +10591,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:10587: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:10594: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10590 "configure"
-+#line 10597 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -10602,16 +10609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10608: \$? = $ac_status" >&5
-+  echo "$as_me:10615: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10614: \$? = $ac_status" >&5
-+  echo "$as_me:10621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -10620,12 +10627,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:10623: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:10630: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10628 "configure"
-+#line 10635 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -10640,16 +10647,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10643: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10650: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10646: \$? = $ac_status" >&5
-+  echo "$as_me:10653: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10649: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10656: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10652: \$? = $ac_status" >&5
-+  echo "$as_me:10659: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -10660,19 +10667,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:10663: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:10670: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:10668: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:10675: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10675 "configure"
-+#line 10682 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10691,16 +10698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10694: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10701: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10697: \$? = $ac_status" >&5
-+  echo "$as_me:10704: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10700: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10703: \$? = $ac_status" >&5
-+  echo "$as_me:10710: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10709,7 +10716,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 10712 "configure"
-+#line 10719 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10728,16 +10735,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10731: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10738: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10734: \$? = $ac_status" >&5
-+  echo "$as_me:10741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10737: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10740: \$? = $ac_status" >&5
-+  echo "$as_me:10747: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -10752,7 +10759,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10755: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:10762: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -10857,7 +10864,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10860: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10867: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10869,7 +10876,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10872 "configure"
-+#line 10879 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10889,16 +10896,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10892: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10899: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10895: \$? = $ac_status" >&5
-+  echo "$as_me:10902: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10905: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10901: \$? = $ac_status" >&5
-+  echo "$as_me:10908: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10908,16 +10915,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10918: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10914: \$? = $ac_status" >&5
-+  echo "$as_me:10921: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10917: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10924: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10920: \$? = $ac_status" >&5
-+  echo "$as_me:10927: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10931,13 +10938,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10934: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10941: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10940: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10947: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10945,7 +10952,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10948 "configure"
-+#line 10955 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10965,16 +10972,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10968: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10975: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10971: \$? = $ac_status" >&5
-+  echo "$as_me:10978: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10977: \$? = $ac_status" >&5
-+  echo "$as_me:10984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10983,7 +10990,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10986 "configure"
-+#line 10993 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -11004,16 +11011,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11007: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11014: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11010: \$? = $ac_status" >&5
-+  echo "$as_me:11017: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11020: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11016: \$? = $ac_status" >&5
-+  echo "$as_me:11023: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -11024,7 +11031,7 @@
-   break
- done
- fi
--echo "$as_me:11027: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:11034: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -11034,7 +11041,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:11037: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:11044: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11042,7 +11049,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11045 "configure"
-+#line 11052 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -11062,16 +11069,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11065: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11072: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11068: \$? = $ac_status" >&5
-+  echo "$as_me:11075: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11071: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11078: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11074: \$? = $ac_status" >&5
-+  echo "$as_me:11081: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11080,7 +11087,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11083 "configure"
-+#line 11090 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -11101,16 +11108,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11104: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11111: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11107: \$? = $ac_status" >&5
-+  echo "$as_me:11114: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11110: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11117: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11113: \$? = $ac_status" >&5
-+  echo "$as_me:11120: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -11121,7 +11128,7 @@
-   break
- done
- fi
--echo "$as_me:11124: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:11131: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -11134,7 +11141,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:11137: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:11144: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11142,7 +11149,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11145 "configure"
-+#line 11152 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -11154,16 +11161,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11157: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11164: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11160: \$? = $ac_status" >&5
-+  echo "$as_me:11167: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11163: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11170: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11166: \$? = $ac_status" >&5
-+  echo "$as_me:11173: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -11172,7 +11179,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11175 "configure"
-+#line 11182 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -11185,16 +11192,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11195: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11191: \$? = $ac_status" >&5
-+  echo "$as_me:11198: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11194: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11197: \$? = $ac_status" >&5
-+  echo "$as_me:11204: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -11205,7 +11212,7 @@
-   break
- done
- fi
--echo "$as_me:11208: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:11215: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -11219,13 +11226,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:11222: checking for fseeko" >&5
-+echo "$as_me:11229: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11228 "configure"
-+#line 11235 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -11237,16 +11244,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11240: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11247: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11243: \$? = $ac_status" >&5
-+  echo "$as_me:11250: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11246: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11253: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11249: \$? = $ac_status" >&5
-+  echo "$as_me:11256: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -11256,7 +11263,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11259: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:11266: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -11277,14 +11284,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:11280: checking whether to use struct dirent64" >&5
-+	echo "$as_me:11287: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11287 "configure"
-+#line 11294 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -11305,16 +11312,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11308: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11315: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11311: \$? = $ac_status" >&5
-+  echo "$as_me:11318: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11314: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11321: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11317: \$? = $ac_status" >&5
-+  echo "$as_me:11324: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -11325,7 +11332,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11328: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:11335: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11335,7 +11342,7 @@
- 	fi
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:11338: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:11345: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -11345,7 +11352,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:11348: result: $with_rcs_ids" >&5
-+echo "$as_me:11355: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "$with_rcs_ids" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -11355,7 +11362,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11358: checking if you want to build with function extensions" >&5
-+echo "$as_me:11365: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11365,7 +11372,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11368: result: $with_ext_funcs" >&5
-+echo "$as_me:11375: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "$with_ext_funcs" = yes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11383,7 +11390,7 @@
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11386: checking for extended use of const keyword" >&5
-+echo "$as_me:11393: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11393,7 +11400,7 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:11396: result: $with_ext_const" >&5
-+echo "$as_me:11403: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "$with_ext_const" = yes ; then
-@@ -11403,7 +11410,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:11406: checking if you want all development code" >&5
-+echo "$as_me:11413: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -11413,7 +11420,7 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:11416: result: $with_develop" >&5
-+echo "$as_me:11423: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###############################################################################
-@@ -11422,7 +11429,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:11425: checking if you want to link with the pthread library" >&5
-+echo "$as_me:11432: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -11432,27 +11439,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:11435: result: $with_pthread" >&5
-+echo "$as_me:11442: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:11439: checking for pthread.h" >&5
-+	echo "$as_me:11446: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11445 "configure"
-+#line 11452 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:11449: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11456: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11455: \$? = $ac_status" >&5
-+  echo "$as_me:11462: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11471,7 +11478,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:11474: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:11481: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -11481,7 +11488,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:11484: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:11491: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -11502,7 +11509,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 11505 "configure"
-+#line 11512 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -11519,16 +11526,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11522: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11529: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11525: \$? = $ac_status" >&5
-+  echo "$as_me:11532: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11528: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11535: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11531: \$? = $ac_status" >&5
-+  echo "$as_me:11538: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -11538,7 +11545,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:11541: result: $with_pthread" >&5
-+	    echo "$as_me:11548: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -11566,7 +11573,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:11569: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:11576: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11575,7 +11582,7 @@
- 
- fi
- 
--echo "$as_me:11578: checking if you want to use weak-symbols for pthreads" >&5
-+echo "$as_me:11585: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -11585,18 +11592,18 @@
- else
-   use_weak_symbols=no
- fi;
--echo "$as_me:11588: result: $use_weak_symbols" >&5
-+echo "$as_me:11595: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- if test "$use_weak_symbols" = yes ; then
- 
--echo "$as_me:11592: checking if $CC supports weak symbols" >&5
-+echo "$as_me:11599: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11599 "configure"
-+#line 11606 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -11622,16 +11629,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11625: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11632: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11628: \$? = $ac_status" >&5
-+  echo "$as_me:11635: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11631: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11638: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11634: \$? = $ac_status" >&5
-+  echo "$as_me:11641: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -11642,7 +11649,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11645: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:11652: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- else
-@@ -11671,13 +11678,13 @@
- fi
- 
- # OpenSUSE is installing ncurses6, using reentrant option.
--echo "$as_me:11674: checking for _nc_TABSIZE" >&5
-+echo "$as_me:11681: checking for _nc_TABSIZE" >&5
- echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6
- if test "${ac_cv_func__nc_TABSIZE+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11680 "configure"
-+#line 11687 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char _nc_TABSIZE (); below.  */
-@@ -11708,16 +11715,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11711: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11718: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11714: \$? = $ac_status" >&5
-+  echo "$as_me:11721: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11717: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11724: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11720: \$? = $ac_status" >&5
-+  echo "$as_me:11727: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func__nc_TABSIZE=yes
- else
-@@ -11727,7 +11734,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11730: result: $ac_cv_func__nc_TABSIZE" >&5
-+echo "$as_me:11737: result: $ac_cv_func__nc_TABSIZE" >&5
- echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6
- if test $ac_cv_func__nc_TABSIZE = yes; then
-   assume_reentrant=yes
-@@ -11739,7 +11746,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:11742: checking if you want experimental reentrant code" >&5
-+echo "$as_me:11749: checking if you want experimental reentrant code" >&5
- echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -11749,7 +11756,7 @@
- else
-   with_reentrant=$assume_reentrant
- fi;
--echo "$as_me:11752: result: $with_reentrant" >&5
-+echo "$as_me:11759: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "$with_reentrant" = yes ; then
- 	cf_cv_enable_reentrant=1
-@@ -11772,7 +11779,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:11775: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:11782: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -11782,7 +11789,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:11785: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:11792: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -11796,7 +11803,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:11799: checking if you want to see long compiling messages" >&5
-+echo "$as_me:11806: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -11830,11 +11837,11 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:11833: result: $enableval" >&5
-+echo "$as_me:11840: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:11837: checking if you want to see compiler warnings" >&5
-+echo "$as_me:11844: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -11842,7 +11849,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:11845: result: $with_warnings" >&5
-+echo "$as_me:11852: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -11854,12 +11861,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:11857: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:11864: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 11862 "configure"
-+#line 11869 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11876,16 +11883,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11879: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11886: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11882: \$? = $ac_status" >&5
-+  echo "$as_me:11889: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11885: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11892: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11888: \$? = $ac_status" >&5
-+  echo "$as_me:11895: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -11896,7 +11903,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:11899: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:11906: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -11905,12 +11912,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:11908: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:11915: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11913 "configure"
-+#line 11920 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11927,16 +11934,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11930: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11937: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11933: \$? = $ac_status" >&5
-+  echo "$as_me:11940: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11943: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11939: \$? = $ac_status" >&5
-+  echo "$as_me:11946: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -11947,12 +11954,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:11950: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:11957: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 11955 "${as_me:-configure}"
-+#line 11962 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -11969,7 +11976,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:11972: checking for $CC warning options..." >&5
-+	{ echo "$as_me:11979: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -11985,12 +11992,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:11988: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:11995: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11991: \$? = $ac_status" >&5
-+  echo "$as_me:11998: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:11993: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:12000: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -11999,7 +12006,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:12002: checking for $CC warning options..." >&5
-+	{ echo "$as_me:12009: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -12023,12 +12030,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12033: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12029: \$? = $ac_status" >&5
-+  echo "$as_me:12036: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:12031: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:12038: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -12039,7 +12046,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:12042: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12049: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12049,7 +12056,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:12052: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:12059: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -12082,10 +12089,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:12085: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:12092: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 12088 "${as_me:-configure}"
-+#line 12095 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -12134,12 +12141,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:12144: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12140: \$? = $ac_status" >&5
-+  echo "$as_me:12147: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:12142: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:12149: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -12199,7 +12206,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:12202: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:12209: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -12209,7 +12216,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:12212: result: $with_assertions" >&5
-+echo "$as_me:12219: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -12262,7 +12269,7 @@
- 	;;
- esac
- 
--echo "$as_me:12265: checking whether to add trace feature to all models" >&5
-+echo "$as_me:12272: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -12272,7 +12279,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:12275: result: $cf_with_trace" >&5
-+echo "$as_me:12282: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "$cf_with_trace" = yes ; then
-@@ -12360,7 +12367,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:12363: checking if we want to use GNAT projects" >&5
-+echo "$as_me:12370: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -12377,7 +12384,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:12380: result: $enable_gnat_projects" >&5
-+echo "$as_me:12387: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -12385,13 +12392,13 @@
- (*mingw32*)
- 	;;
- (*)
--echo "$as_me:12388: checking for gettimeofday" >&5
-+echo "$as_me:12395: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12394 "configure"
-+#line 12401 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -12422,16 +12429,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12432: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12428: \$? = $ac_status" >&5
-+  echo "$as_me:12435: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12438: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12434: \$? = $ac_status" >&5
-+  echo "$as_me:12441: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -12441,7 +12448,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12444: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:12451: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -12450,7 +12457,7 @@
- 
- else
- 
--echo "$as_me:12453: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:12460: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12458,7 +12465,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12461 "configure"
-+#line 12468 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12477,16 +12484,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12480: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12487: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12483: \$? = $ac_status" >&5
-+  echo "$as_me:12490: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12486: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12489: \$? = $ac_status" >&5
-+  echo "$as_me:12496: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -12497,7 +12504,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12500: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:12507: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -12513,13 +12520,13 @@
- esac
- 
- ###	Checks for header files.
--echo "$as_me:12516: checking for ANSI C header files" >&5
-+echo "$as_me:12523: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12522 "configure"
-+#line 12529 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -12527,13 +12534,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:12530: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12537: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12536: \$? = $ac_status" >&5
-+  echo "$as_me:12543: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12555,7 +12562,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12558 "configure"
-+#line 12565 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -12573,7 +12580,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12576 "configure"
-+#line 12583 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -12594,7 +12601,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12597 "configure"
-+#line 12604 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -12620,15 +12627,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12623: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12630: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12626: \$? = $ac_status" >&5
-+  echo "$as_me:12633: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12635: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12631: \$? = $ac_status" >&5
-+  echo "$as_me:12638: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12641,7 +12648,7 @@
- fi
- fi
- fi
--echo "$as_me:12644: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:12651: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -12657,28 +12664,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:12660: checking for $ac_header" >&5
-+echo "$as_me:12667: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12666 "configure"
-+#line 12673 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12675: \$? = $ac_status" >&5
-+  echo "$as_me:12682: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12678: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12681: \$? = $ac_status" >&5
-+  echo "$as_me:12688: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -12688,7 +12695,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12691: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:12698: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -12698,13 +12705,13 @@
- fi
- done
- 
--echo "$as_me:12701: checking for signed char" >&5
-+echo "$as_me:12708: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12707 "configure"
-+#line 12714 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12719,16 +12726,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12722: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12729: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12725: \$? = $ac_status" >&5
-+  echo "$as_me:12732: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12735: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12731: \$? = $ac_status" >&5
-+  echo "$as_me:12738: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -12738,10 +12745,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12741: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:12748: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:12744: checking size of signed char" >&5
-+echo "$as_me:12751: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12750,7 +12757,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12753 "configure"
-+#line 12760 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12762,21 +12769,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12765: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12772: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12768: \$? = $ac_status" >&5
-+  echo "$as_me:12775: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12778: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12774: \$? = $ac_status" >&5
-+  echo "$as_me:12781: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12779 "configure"
-+#line 12786 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12788,16 +12795,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12791: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12798: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12794: \$? = $ac_status" >&5
-+  echo "$as_me:12801: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12804: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12800: \$? = $ac_status" >&5
-+  echo "$as_me:12807: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12813,7 +12820,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12816 "configure"
-+#line 12823 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12825,16 +12832,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12828: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12835: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12831: \$? = $ac_status" >&5
-+  echo "$as_me:12838: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12834: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12841: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12837: \$? = $ac_status" >&5
-+  echo "$as_me:12844: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12850,7 +12857,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12853 "configure"
-+#line 12860 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12862,16 +12869,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12865: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12872: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12868: \$? = $ac_status" >&5
-+  echo "$as_me:12875: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12878: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12874: \$? = $ac_status" >&5
-+  echo "$as_me:12881: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12884,12 +12891,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12887: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12894: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12892 "configure"
-+#line 12899 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12905,15 +12912,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12908: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12915: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12911: \$? = $ac_status" >&5
-+  echo "$as_me:12918: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12920: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12916: \$? = $ac_status" >&5
-+  echo "$as_me:12923: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12929,19 +12936,19 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12932: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12939: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
- EOF
- 
--echo "$as_me:12938: checking for ANSI C header files" >&5
-+echo "$as_me:12945: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12944 "configure"
-+#line 12951 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -12949,13 +12956,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:12952: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12959: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12958: \$? = $ac_status" >&5
-+  echo "$as_me:12965: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12977,7 +12984,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12980 "configure"
-+#line 12987 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -12995,7 +13002,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12998 "configure"
-+#line 13005 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -13016,7 +13023,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13019 "configure"
-+#line 13026 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -13042,15 +13049,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13045: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13052: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13048: \$? = $ac_status" >&5
-+  echo "$as_me:13055: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13057: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13053: \$? = $ac_status" >&5
-+  echo "$as_me:13060: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -13063,7 +13070,7 @@
- fi
- fi
- fi
--echo "$as_me:13066: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:13073: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -13076,13 +13083,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:13079: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:13086: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13085 "configure"
-+#line 13092 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -13097,16 +13104,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13100: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13107: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13103: \$? = $ac_status" >&5
-+  echo "$as_me:13110: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13106: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13113: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13109: \$? = $ac_status" >&5
-+  echo "$as_me:13116: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -13116,7 +13123,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:13119: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13126: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13129,7 +13136,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:13132: checking for opendir in -ldir" >&5
-+  echo "$as_me:13139: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13137,7 +13144,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13140 "configure"
-+#line 13147 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13156,16 +13163,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13166: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13162: \$? = $ac_status" >&5
-+  echo "$as_me:13169: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13172: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13168: \$? = $ac_status" >&5
-+  echo "$as_me:13175: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -13176,14 +13183,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13179: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:13186: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:13186: checking for opendir in -lx" >&5
-+  echo "$as_me:13193: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13191,7 +13198,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13194 "configure"
-+#line 13201 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13210,16 +13217,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13220: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13216: \$? = $ac_status" >&5
-+  echo "$as_me:13223: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13219: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13226: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13222: \$? = $ac_status" >&5
-+  echo "$as_me:13229: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -13230,7 +13237,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13233: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:13240: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -13238,13 +13245,13 @@
- 
- fi
- 
--echo "$as_me:13241: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13248: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13247 "configure"
-+#line 13254 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -13260,16 +13267,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13263: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13270: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13266: \$? = $ac_status" >&5
-+  echo "$as_me:13273: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13269: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13276: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13272: \$? = $ac_status" >&5
-+  echo "$as_me:13279: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -13279,7 +13286,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:13282: result: $ac_cv_header_time" >&5
-+echo "$as_me:13289: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -13297,13 +13304,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:13300: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:13307: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13306 "configure"
-+#line 13313 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13361,16 +13368,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13371: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13367: \$? = $ac_status" >&5
-+  echo "$as_me:13374: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13377: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13373: \$? = $ac_status" >&5
-+  echo "$as_me:13380: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -13380,7 +13387,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:13383: result: $ac_cv_c_const" >&5
-+echo "$as_me:13390: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -13392,7 +13399,7 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:13395: checking if data-only library module links" >&5
-+echo "$as_me:13402: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13400,20 +13407,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 13403 "configure"
-+#line 13410 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:13406: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:13413: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13409: \$? = $ac_status" >&5
-+  echo "$as_me:13416: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 13416 "configure"
-+#line 13423 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -13426,10 +13433,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:13429: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:13436: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13432: \$? = $ac_status" >&5
-+  echo "$as_me:13439: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -13442,7 +13449,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13445 "configure"
-+#line 13452 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -13453,15 +13460,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13456: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13463: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13459: \$? = $ac_status" >&5
-+  echo "$as_me:13466: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13468: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13464: \$? = $ac_status" >&5
-+  echo "$as_me:13471: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -13476,7 +13483,7 @@
- 
- fi
- 
--echo "$as_me:13479: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:13486: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -13490,7 +13497,7 @@
- 
- ###	Checks for library functions.
- 
--echo "$as_me:13493: checking for working mkstemp" >&5
-+echo "$as_me:13500: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13501,7 +13508,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13504 "configure"
-+#line 13511 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -13539,15 +13546,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13542: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13549: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13545: \$? = $ac_status" >&5
-+  echo "$as_me:13552: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13547: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13554: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13550: \$? = $ac_status" >&5
-+  echo "$as_me:13557: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -13562,16 +13569,16 @@
- fi
- 
- fi
--echo "$as_me:13565: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:13572: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:13568: checking for mkstemp" >&5
-+	echo "$as_me:13575: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13574 "configure"
-+#line 13581 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -13602,16 +13609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13605: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13612: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13608: \$? = $ac_status" >&5
-+  echo "$as_me:13615: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13611: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13614: \$? = $ac_status" >&5
-+  echo "$as_me:13621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -13621,7 +13628,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13624: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:13631: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -13644,7 +13651,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:13647: checking for $ac_word" >&5
-+echo "$as_me:13654: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13659,7 +13666,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:13662: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13669: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13668,10 +13675,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:13671: result: $gnat_exists" >&5
-+  echo "$as_me:13678: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:13674: result: no" >&5
-+  echo "$as_me:13681: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13680,12 +13687,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:13683: checking for gnat version" >&5
-+echo "$as_me:13690: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:13688: result: $cf_gnat_version" >&5
-+echo "$as_me:13695: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -13693,7 +13700,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:13696: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:13703: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -13701,7 +13708,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:13704: checking for $ac_word" >&5
-+echo "$as_me:13711: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13716,7 +13723,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:13719: found $ac_dir/$ac_word" >&5
-+echo "$as_me:13726: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -13725,10 +13732,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:13728: result: $M4_exists" >&5
-+  echo "$as_me:13735: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:13731: result: no" >&5
-+  echo "$as_me:13738: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13737,7 +13744,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:13740: checking if GNAT works" >&5
-+		echo "$as_me:13747: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -13765,14 +13772,14 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:13768: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:13775: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
- 
- 	if test	"$cf_cv_prog_gnat_correct" = yes; then
- 
--	echo "$as_me:13775: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:13782: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -13789,10 +13796,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:13792: result: $ADAFLAGS" >&5
-+	echo "$as_me:13799: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:13795: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:13802: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13802,11 +13809,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:13805: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:13812: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:13809: checking if GNAT supports generics" >&5
-+echo "$as_me:13816: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -13816,7 +13823,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:13819: result: $cf_gnat_generics" >&5
-+echo "$as_me:13826: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -13828,7 +13835,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:13831: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:13838: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13876,7 +13883,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:13879: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:13886: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -13889,7 +13896,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:13892: checking if GNAT supports project files" >&5
-+echo "$as_me:13899: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -13949,15 +13956,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:13952: result: $cf_gnat_projects" >&5
-+echo "$as_me:13959: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:13958: checking if GNAT supports libraries" >&5
-+	echo "$as_me:13965: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:13960: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:13967: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -13977,7 +13984,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:13980: checking for ada-compiler" >&5
-+echo "$as_me:13987: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -13988,12 +13995,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:13991: result: $cf_ada_compiler" >&5
-+echo "$as_me:13998: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 		cf_ada_package=terminal_interface
- 
--echo "$as_me:13996: checking for ada-include" >&5
-+echo "$as_me:14003: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -14029,7 +14036,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:14032: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14039: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -14038,10 +14045,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:14041: result: $ADA_INCLUDE" >&5
-+echo "$as_me:14048: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:14044: checking for ada-objects" >&5
-+echo "$as_me:14051: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -14077,7 +14084,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:14080: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:14087: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -14086,10 +14093,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:14089: result: $ADA_OBJECTS" >&5
-+echo "$as_me:14096: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:14092: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:14099: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -14099,7 +14106,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:14102: result: $with_ada_sharedlib" >&5
-+echo "$as_me:14109: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -14115,12 +14122,12 @@
- fi
- 
- 	else
--		{ { echo "$as_me:14118: error: No usable Ada compiler found" >&5
-+		{ { echo "$as_me:14125: error: No usable Ada compiler found" >&5
- echo "$as_me: error: No usable Ada compiler found" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:14123: error: The Ada compiler is needed for this package" >&5
-+	{ { echo "$as_me:14130: error: The Ada compiler is needed for this package" >&5
- echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -14160,7 +14167,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:14163: checking default library suffix" >&5
-+echo "$as_me:14170: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -14171,10 +14178,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:14174: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:14181: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:14177: checking default library-dependency suffix" >&5
-+echo "$as_me:14184: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -14232,10 +14239,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:14235: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:14242: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:14238: checking default object directory" >&5
-+echo "$as_me:14245: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -14251,7 +14258,7 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:14254: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:14261: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- ### Set up low-level terminfo dependencies for makefiles.
-@@ -14469,7 +14476,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:14472: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:14479: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -14645,7 +14652,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:14648: error: ambiguous option: $1
-+    { { echo "$as_me:14655: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -14664,7 +14671,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:14667: error: unrecognized option: $1
-+  -*) { { echo "$as_me:14674: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -14735,7 +14742,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:14738: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:14745: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -15078,7 +15085,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:15081: creating $ac_file" >&5
-+    { echo "$as_me:15088: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -15096,7 +15103,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15099: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15106: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -15109,7 +15116,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15112: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15119: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -15125,7 +15132,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:15128: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:15135: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -15134,7 +15141,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:15137: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:15144: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -15171,7 +15178,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:15174: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:15181: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -15182,7 +15189,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:15185: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:15192: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -15231,7 +15238,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:15234: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:15241: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -15242,7 +15249,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:15245: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:15252: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -15255,7 +15262,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:15258: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:15265: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -15313,7 +15320,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:15316: $ac_file is unchanged" >&5
-+      { echo "$as_me:15323: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-Index: NEWS
-Prereq:  1.2505 
---- ncurses-6.0-20151010+/NEWS	2015-10-10 20:24:26.000000000 +0000
-+++ ncurses-6.0-20151017/NEWS	2015-10-17 22:02:46.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2505 2015/10/10 20:24:26 tom Exp $
-+-- $Id: NEWS,v 1.2509 2015/10/17 22:02:46 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,18 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151017
-+	+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
-+	  (Debian #801864, patch by Esa Peuha).
-+	+ remove an early-return from _nc_do_color, which can interfere with
-+	  data needed by bkgd when ncurses is configured with extended colors
-+	  (patch by Denis Tikhomirov).
-+	> fixes for OS/2 (patches by KO Myung-Hun)
-+	+ use button instead of kbuf[0] in EMX-specific part of lib_mouse.c
-+	+ support building with libtool on OS/2
-+	+ use stdc++ on OS/2 kLIBC
-+	+ clear cf_XOPEN_SOURCE on OS/2
-+
- 20151010
- 	+ add configure check for openpty to test/configure script, for ditto.
- 	+ minor fixes to test/view.c in investigating Debian #790847.
-@@ -1713,7 +1725,7 @@
- 	+ modify check_existence() in db_iterator.c to simply check if the
- 	  path is a directory or file, according to the need.  Checking for
- 	  directory size also gives no usable result with OS/2 (cf: 20120107).
--	+ support OS/2 kLIBC (patch by KO Myung-Han).
-+	+ support OS/2 kLIBC (patch by KO Myung-Hun).
- 
- 20120114
- 	+ several improvements to test/movewindow.c (prompted by discussion on
-Index: VERSION
---- ncurses-6.0-20151010+/VERSION	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/VERSION	2015-10-17 20:29:47.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151010
-+5:0:9	6.0	20151017
-Index: aclocal.m4
-Prereq:  1.770 
---- ncurses-6.0-20151010+/aclocal.m4	2015-10-10 19:27:07.000000000 +0000
-+++ ncurses-6.0-20151017/aclocal.m4	2015-10-17 23:05:09.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.770 2015/10/10 19:27:07 tom Exp $
-+dnl $Id: aclocal.m4,v 1.774 2015/10/17 23:05:09 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -3221,7 +3221,7 @@
- test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57
-+dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
- dnl -------------
- dnl Compute the library-prefix for the given host system
- dnl $1 = variable to set
-@@ -3229,7 +3229,11 @@
- [
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -6257,7 +6261,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_STDCPP_LIBRARY version: 10 updated: 2015/09/12 15:53:39
-+dnl CF_STDCPP_LIBRARY version: 11 updated: 2015/10/17 19:03:33
- dnl -----------------
- dnl Check for -lstdc++, which is GNU's standard C++ library.
- dnl If $CXXLIBS is set, add that to the libraries used for test-linking.
-@@ -6282,7 +6286,11 @@
- 	then
- 		case $cf_cv_system_name in
- 		(os2*)
--			cf_stdcpp_libname=stdcpp
-+			if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
-+				cf_stdcpp_libname=stdcpp
-+			else
-+				cf_stdcpp_libname=stdc++
-+			fi
- 			;;
- 		(*)
- 			cf_stdcpp_libname=stdc++
-@@ -7047,7 +7055,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_LIBTOOL version: 32 updated: 2015/04/17 21:13:04
-+dnl CF_WITH_LIBTOOL version: 33 updated: 2015/10/17 19:03:33
- dnl ---------------
- dnl Provide a configure option to incorporate libtool.  Define several useful
- dnl symbols for the makefile rules.
-@@ -7145,7 +7153,7 @@
- 	# special hack to add -no-undefined (which libtool should do for itself)
- 	LT_UNDEF=
- 	case "$cf_cv_system_name" in
--	(cygwin*|msys*|mingw32*|uwin*|aix[[4-7]])
-+	(cygwin*|msys*|mingw32*|os2*|uwin*|aix[[4-7]])
- 		LT_UNDEF=-no-undefined
- 		;;
- 	esac
-@@ -7643,7 +7651,7 @@
- AC_SUBST(WILDCARD_SYMS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
-+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -7713,6 +7721,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[[45]]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-Index: c++/Makefile.in
-Prereq:  1.111 
---- ncurses-6.0-20151010+/c++/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151017/c++/Makefile.in	2015-10-17 22:59:12.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.111 2015/08/05 23:15:41 tom Exp $
-+# $Id: Makefile.in,v 1.113 2015/10/17 22:59:12 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -58,7 +58,7 @@
- PACKAGE		= @PACKAGE@
- 
- LIBTOOL		= @LIBTOOL_CXX@
--LIBTOOL_OPTS	= @LIBTOOL_OPTS@
-+LIBTOOL_OPTS	= @LIBTOOL_OPTS@ @LIBTOOL_OPTS_CXX@
- LIBTOOL_CLEAN	= @LIB_CLEAN@
- LIBTOOL_COMPILE	= @LIB_COMPILE@
- LIBTOOL_LINK	= @LIB_LINK@
-Index: configure
---- ncurses-6.0-20151010+/configure	2015-10-10 19:18:37.000000000 +0000
-+++ ncurses-6.0-20151017/configure	2015-10-17 23:05:27.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.619 .
-+# From configure.in Revision: 1.620 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -4975,7 +4975,7 @@
- 	# special hack to add -no-undefined (which libtool should do for itself)
- 	LT_UNDEF=
- 	case "$cf_cv_system_name" in
--	(cygwin*|msys*|mingw32*|uwin*|aix[4-7])
-+	(cygwin*|msys*|mingw32*|os2*|uwin*|aix[4-7])
- 		LT_UNDEF=-no-undefined
- 		;;
- 	esac
-@@ -5124,7 +5124,11 @@
- 
- 	case $cf_cv_system_name in
- 	(OS/2*|os2*)
--		LIB_PREFIX=''
-+		if test "$DFT_LWR_MODEL" = libtool; then
-+			LIB_PREFIX='lib'
-+		else
-+			LIB_PREFIX=''
-+		fi
- 		;;
- 	(*)	LIB_PREFIX='lib'
- 		;;
-@@ -5140,19 +5144,19 @@
- 
- LIB_SUFFIX=
- 
--	echo "$as_me:5143: checking for PATH separator" >&5
-+	echo "$as_me:5147: checking for PATH separator" >&5
- echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(os2*)	PATH_SEPARATOR=';'  ;;
- 	(*)	${PATH_SEPARATOR:=':'}  ;;
- 	esac
- 
--	echo "$as_me:5150: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:5154: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
- ###############################################################################
- 
--echo "$as_me:5155: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:5159: checking if you want to build a separate terminfo library" >&5
- echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
- 
- # Check whether --with-termlib or --without-termlib was given.
-@@ -5162,10 +5166,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:5165: result: $with_termlib" >&5
-+echo "$as_me:5169: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
--echo "$as_me:5168: checking if you want to build a separate tic library" >&5
-+echo "$as_me:5172: checking if you want to build a separate tic library" >&5
- echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
- 
- # Check whether --with-ticlib or --without-ticlib was given.
-@@ -5175,13 +5179,13 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:5178: result: $with_ticlib" >&5
-+echo "$as_me:5182: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:5184: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:5188: checking if you want to link with the GPM mouse library" >&5
- echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
- 
- # Check whether --with-gpm or --without-gpm was given.
-@@ -5191,27 +5195,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:5194: result: $with_gpm" >&5
-+echo "$as_me:5198: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5198: checking for gpm.h" >&5
-+	echo "$as_me:5202: checking for gpm.h" >&5
- echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
- if test "${ac_cv_header_gpm_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5204 "configure"
-+#line 5208 "configure"
- #include "confdefs.h"
- #include <gpm.h>
- _ACEOF
--if { (eval echo "$as_me:5208: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:5212: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:5214: \$? = $ac_status" >&5
-+  echo "$as_me:5218: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5230,7 +5234,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:5233: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:5237: result: $ac_cv_header_gpm_h" >&5
- echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
- if test $ac_cv_header_gpm_h = yes; then
- 
-@@ -5241,14 +5245,14 @@
- 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
- 
--echo "${as_me:-configure}:5244: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:5248: testing assuming we really have GPM library ..." 1>&5
- 
- cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:5251: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:5255: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5256,7 +5260,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5259 "configure"
-+#line 5263 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5275,16 +5279,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5278: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5282: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5281: \$? = $ac_status" >&5
-+  echo "$as_me:5285: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5284: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5288: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5287: \$? = $ac_status" >&5
-+  echo "$as_me:5291: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -5295,13 +5299,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5298: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5302: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-   :
- else
- 
--				{ { echo "$as_me:5304: error: Cannot link with GPM library" >&5
-+				{ { echo "$as_me:5308: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5311,7 +5315,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:5314: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:5318: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -5320,7 +5324,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5323: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:5327: checking if you want to load GPM dynamically" >&5
- echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
- 
- # Check whether --with-dlsym or --without-dlsym was given.
-@@ -5330,18 +5334,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:5333: result: $with_dlsym" >&5
-+	echo "$as_me:5337: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "x$with_dlsym" = xyes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:5338: checking for dlsym" >&5
-+echo "$as_me:5342: checking for dlsym" >&5
- echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
- if test "${ac_cv_func_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5344 "configure"
-+#line 5348 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -5372,16 +5376,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5375: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5378: \$? = $ac_status" >&5
-+  echo "$as_me:5382: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5381: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5385: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5384: \$? = $ac_status" >&5
-+  echo "$as_me:5388: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -5391,14 +5395,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5394: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:5398: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:5401: checking for dlsym in -ldl" >&5
-+echo "$as_me:5405: checking for dlsym in -ldl" >&5
- echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5406,7 +5410,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5409 "configure"
-+#line 5413 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5425,16 +5429,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5428: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5432: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5431: \$? = $ac_status" >&5
-+  echo "$as_me:5435: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5434: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5438: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5437: \$? = $ac_status" >&5
-+  echo "$as_me:5441: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -5445,7 +5449,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5448: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:5452: result: $ac_cv_lib_dl_dlsym" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
- if test $ac_cv_lib_dl_dlsym = yes; then
- 
-@@ -5474,10 +5478,10 @@
- LIBS="$cf_add_libs"
-  }
- 
--	echo "$as_me:5477: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:5481: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5480 "configure"
-+#line 5484 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- int
-@@ -5495,16 +5499,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5498: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5502: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5501: \$? = $ac_status" >&5
-+  echo "$as_me:5505: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5504: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5508: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5507: \$? = $ac_status" >&5
-+  echo "$as_me:5511: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -5515,15 +5519,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:5518: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:5522: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5523: result: ok" >&5
-+	echo "$as_me:5527: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:5526: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:5530: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5531,12 +5535,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:5534: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5538: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5539: checking for soname of gpm library" >&5
-+echo "$as_me:5543: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5570,15 +5574,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:5573: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5577: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5576: \$? = $ac_status" >&5
-+  echo "$as_me:5580: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5578: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5581: \$? = $ac_status" >&5
-+  echo "$as_me:5585: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5589,7 +5593,7 @@
- fi
- 
- fi
--echo "$as_me:5592: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5596: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -5624,7 +5628,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5627: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5631: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5632,7 +5636,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5635 "configure"
-+#line 5639 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5651,16 +5655,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5654: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5658: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5657: \$? = $ac_status" >&5
-+  echo "$as_me:5661: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5660: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5663: \$? = $ac_status" >&5
-+  echo "$as_me:5667: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -5671,11 +5675,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5674: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5678: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:5678: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5682: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5699,15 +5703,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:5702: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5706: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5705: \$? = $ac_status" >&5
-+  echo "$as_me:5709: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5707: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5711: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5710: \$? = $ac_status" >&5
-+  echo "$as_me:5714: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5719,11 +5723,11 @@
- fi
- 
- fi
--echo "$as_me:5722: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5726: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:5726: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5730: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -5733,7 +5737,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:5736: checking if you want to use sysmouse" >&5
-+echo "$as_me:5740: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5745,7 +5749,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5748 "configure"
-+#line 5752 "configure"
- #include "confdefs.h"
- 
- #include <osreldate.h>
-@@ -5768,16 +5772,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5771: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5775: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5774: \$? = $ac_status" >&5
-+  echo "$as_me:5778: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5781: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5780: \$? = $ac_status" >&5
-+  echo "$as_me:5784: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -5787,7 +5791,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:5790: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5794: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -5806,7 +5810,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5809: checking for default loader flags" >&5
-+echo "$as_me:5813: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (libtool) LD_MODEL=''   ;;
-@@ -5815,13 +5819,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5818: result: $LD_MODEL" >&5
-+echo "$as_me:5822: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5824: checking if rpath option should be used" >&5
-+echo "$as_me:5828: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5831,10 +5835,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5834: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5838: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5837: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5841: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -5844,7 +5848,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5847: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5851: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5853,7 +5857,7 @@
- rel_builddir=..
- 
- LD_RPATH_OPT=
--echo "$as_me:5856: checking for an rpath option" >&5
-+echo "$as_me:5860: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -5884,12 +5888,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:5887: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5891: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:5892: checking if we need a space after rpath option" >&5
-+	echo "$as_me:5896: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -5910,7 +5914,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5913 "configure"
-+#line 5917 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5922,16 +5926,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5929: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5928: \$? = $ac_status" >&5
-+  echo "$as_me:5932: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5935: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5934: \$? = $ac_status" >&5
-+  echo "$as_me:5938: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5941,7 +5945,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:5944: result: $cf_rpath_space" >&5
-+	echo "$as_me:5948: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -5962,7 +5966,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5965: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5969: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5977,9 +5981,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5980: result: $withval" >&5
-+		echo "$as_me:5984: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5982: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5986: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5988,7 +5992,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5991: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5995: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -5998,14 +6002,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:6001: checking which $CC option to use" >&5
-+		echo "$as_me:6005: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6008 "configure"
-+#line 6012 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6017,16 +6021,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6020: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6023: \$? = $ac_status" >&5
-+  echo "$as_me:6027: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6026: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6029: \$? = $ac_status" >&5
-+  echo "$as_me:6033: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6035,7 +6039,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6038: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6042: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6106,7 +6110,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6109: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6113: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6115,7 +6119,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6118 "configure"
-+#line 6122 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6127,16 +6131,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6130: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6133: \$? = $ac_status" >&5
-+  echo "$as_me:6137: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6140: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6139: \$? = $ac_status" >&5
-+  echo "$as_me:6143: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6147,7 +6151,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6150: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6154: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6372,7 +6376,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6375 "configure"
-+#line 6379 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6384,16 +6388,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6387: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6390: \$? = $ac_status" >&5
-+  echo "$as_me:6394: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6393: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6397: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6396: \$? = $ac_status" >&5
-+  echo "$as_me:6400: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6430,7 +6434,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6433: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6437: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6440,7 +6444,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 6443 "${as_me:-configure}"
-+#line 6447 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -6452,18 +6456,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6455: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6459: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6460: \$? = $ac_status" >&5
-+  echo "$as_me:6464: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6462: result: yes" >&5
-+				echo "$as_me:6466: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6466: result: no" >&5
-+				echo "$as_me:6470: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6478,17 +6482,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6481: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6485: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6485: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6489: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6491: checking for additional libtool options" >&5
-+echo "$as_me:6495: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6498,7 +6502,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6501: result: $with_libtool_opts" >&5
-+echo "$as_me:6505: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6509,7 +6513,7 @@
- 	;;
- esac
- 
--echo "$as_me:6512: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6516: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6524,7 +6528,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6527: result: $with_export_syms" >&5
-+echo "$as_me:6531: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6535,12 +6539,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6538: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6542: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6543: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6547: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6555,7 +6559,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6558: result: $with_versioned_syms" >&5
-+echo "$as_me:6562: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6571,7 +6575,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6574: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6578: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6579,11 +6583,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6582: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6586: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6586: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6590: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6595,7 +6599,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6598: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6602: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6632,7 +6636,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <<EOF
--#line 6635 "configure"
-+#line 6639 "configure"
- int	_ismissing(void) { return 1; }
- int	_localf1(void) { return 1; }
- int	_localf2(void) { return 2; }
-@@ -6663,7 +6667,7 @@
- 			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6666: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6674,7 +6678,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6677: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6681: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6691,13 +6695,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6694: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6698: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6700: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6704: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -6714,21 +6718,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6717: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6721: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:6721: checking for updated LDFLAGS" >&5
-+echo "$as_me:6725: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:6724: result: maybe" >&5
-+	echo "$as_me:6728: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:6731: checking for $ac_word" >&5
-+echo "$as_me:6735: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6743,7 +6747,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:6746: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6750: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6751,10 +6755,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6754: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6758: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6757: result: no" >&5
-+  echo "$as_me:6761: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6768,7 +6772,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6771 "configure"
-+#line 6775 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6780,16 +6784,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6783: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6787: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6786: \$? = $ac_status" >&5
-+  echo "$as_me:6790: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6789: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6793: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6792: \$? = $ac_status" >&5
-+  echo "$as_me:6796: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -6817,7 +6821,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6820: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6824: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6829,11 +6833,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6832: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6836: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6836: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6840: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6870,7 +6874,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6873: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6877: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6883,11 +6887,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6886: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6890: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6890: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6894: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6924,7 +6928,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6927: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6931: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6937,14 +6941,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6940: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6944: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6944: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6948: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6947: result: no" >&5
-+	echo "$as_me:6951: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6955,7 +6959,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6958: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6962: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6974,11 +6978,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6977: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6981: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6981: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6985: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6988,10 +6992,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6991: result: $with_overwrite" >&5
-+echo "$as_me:6995: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6994: checking if external terminfo-database is used" >&5
-+echo "$as_me:6998: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -7001,7 +7005,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:7004: result: $use_database" >&5
-+echo "$as_me:7008: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7017,7 +7021,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7020: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7024: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7025,10 +7029,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7028: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7032: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7031: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7035: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7038,13 +7042,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7041: result: $with_hashed_db" >&5
-+	echo "$as_me:7045: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7047: checking for list of fallback descriptions" >&5
-+echo "$as_me:7051: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7054,11 +7058,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7057: result: $with_fallback" >&5
-+echo "$as_me:7061: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7061: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7065: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7072,11 +7076,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7075: result: $with_xterm_new" >&5
-+echo "$as_me:7079: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7079: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7083: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7097,7 +7101,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7100: result: $with_xterm_kbs" >&5
-+echo "$as_me:7104: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7107,7 +7111,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7110: checking for list of terminfo directories" >&5
-+echo "$as_me:7114: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7147,7 +7151,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7150: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7154: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7170,14 +7174,14 @@
- 	;;
- esac
- 
--echo "$as_me:7173: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7177: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <<EOF
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:7180: checking for default terminfo directory" >&5
-+echo "$as_me:7184: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7213,7 +7217,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7216: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7220: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7222,7 +7226,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7225: result: $TERMINFO" >&5
-+echo "$as_me:7229: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -7233,7 +7237,7 @@
- 
- ###	use option --disable-big-core to make tic run on small machines
- ###	We need 4Mb, check if we can allocate 50% more than that.
--echo "$as_me:7236: checking if big-core option selected" >&5
-+echo "$as_me:7240: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7245,7 +7249,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7248 "configure"
-+#line 7252 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7259,15 +7263,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7266: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7265: \$? = $ac_status" >&5
-+  echo "$as_me:7269: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7267: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7271: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7270: \$? = $ac_status" >&5
-+  echo "$as_me:7274: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7279,7 +7283,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:7282: result: $with_big_core" >&5
-+echo "$as_me:7286: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7289,7 +7293,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7292: checking if big-strings option selected" >&5
-+echo "$as_me:7296: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7313,14 +7317,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7316: result: $with_big_strings" >&5
-+echo "$as_me:7320: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7323: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7327: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7330,14 +7334,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7333: result: $with_termcap" >&5
-+echo "$as_me:7337: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7340: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7344: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7350,13 +7354,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7353: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7357: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7359: checking for list of termcap files" >&5
-+	echo "$as_me:7363: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7396,7 +7400,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7399: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7403: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7419,7 +7423,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7422: result: $TERMPATH" >&5
-+	echo "$as_me:7426: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <<EOF
-@@ -7427,7 +7431,7 @@
- EOF
- 
- 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
--	echo "$as_me:7430: checking if fast termcap-loader is needed" >&5
-+	echo "$as_me:7434: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7437,14 +7441,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7440: result: $with_getcap" >&5
-+	echo "$as_me:7444: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7447: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7451: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7454,7 +7458,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7457: result: $with_getcap_cache" >&5
-+	echo "$as_me:7461: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7464,7 +7468,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7467: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7471: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7474,14 +7478,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7477: result: $with_home_terminfo" >&5
-+echo "$as_me:7481: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7484: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7488: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7491,7 +7495,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7494: result: $with_root_environ" >&5
-+echo "$as_me:7498: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7506,13 +7510,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7509: checking for $ac_func" >&5
-+echo "$as_me:7513: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7515 "configure"
-+#line 7519 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7543,16 +7547,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7546: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7549: \$? = $ac_status" >&5
-+  echo "$as_me:7553: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7552: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7555: \$? = $ac_status" >&5
-+  echo "$as_me:7559: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7562,7 +7566,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7565: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7569: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7579,13 +7583,13 @@
- 		symlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7582: checking for $ac_func" >&5
-+echo "$as_me:7586: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7588 "configure"
-+#line 7592 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7616,16 +7620,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7619: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7623: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7622: \$? = $ac_status" >&5
-+  echo "$as_me:7626: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7625: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7629: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7628: \$? = $ac_status" >&5
-+  echo "$as_me:7632: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7635,7 +7639,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7638: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7642: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7646,7 +7650,7 @@
- done
- 
- else
--	echo "$as_me:7649: checking if link/symlink functions work" >&5
-+	echo "$as_me:7653: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7659,7 +7663,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7662 "configure"
-+#line 7666 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -7689,15 +7693,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7692: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7696: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7695: \$? = $ac_status" >&5
-+  echo "$as_me:7699: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7697: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7700: \$? = $ac_status" >&5
-+  echo "$as_me:7704: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7715,7 +7719,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:7718: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7722: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7735,7 +7739,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7738: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7742: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7745,21 +7749,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:7748: result: $with_symlinks" >&5
-+	echo "$as_me:7752: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--	echo "$as_me:7755: checking if tic should use hard links" >&5
-+	echo "$as_me:7759: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:7762: result: $with_links" >&5
-+	echo "$as_me:7766: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7774,7 +7778,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7777: checking if you want broken-linker support code" >&5
-+echo "$as_me:7781: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7784,7 +7788,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7787: result: $with_broken_linker" >&5
-+echo "$as_me:7791: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -7806,14 +7810,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:7809: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7813: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7816: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7820: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7823,7 +7827,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:7826: result: $with_bsdpad" >&5
-+echo "$as_me:7830: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7880,14 +7884,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:7883: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7887: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7890 "configure"
-+#line 7894 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7902,16 +7906,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7905: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7909: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7908: \$? = $ac_status" >&5
-+  echo "$as_me:7912: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7911: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7914: \$? = $ac_status" >&5
-+  echo "$as_me:7918: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7920,7 +7924,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7923 "configure"
-+#line 7927 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7935,16 +7939,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7938: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7942: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7941: \$? = $ac_status" >&5
-+  echo "$as_me:7945: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7944: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7948: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7947: \$? = $ac_status" >&5
-+  echo "$as_me:7951: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7959,7 +7963,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7962: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7966: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -7984,16 +7988,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:7987: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7991: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:7993: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7997: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7996 "configure"
-+#line 8000 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8008,16 +8012,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8014: \$? = $ac_status" >&5
-+  echo "$as_me:8018: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8020: \$? = $ac_status" >&5
-+  echo "$as_me:8024: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8038,7 +8042,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8041 "configure"
-+#line 8045 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8053,16 +8057,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8056: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8060: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8059: \$? = $ac_status" >&5
-+  echo "$as_me:8063: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8066: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8065: \$? = $ac_status" >&5
-+  echo "$as_me:8069: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8073,15 +8077,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8076: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8080: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8081: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8085: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8084 "configure"
-+#line 8088 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8096,16 +8100,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8099: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8102: \$? = $ac_status" >&5
-+  echo "$as_me:8106: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8105: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8109: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8108: \$? = $ac_status" >&5
-+  echo "$as_me:8112: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8121,7 +8125,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8124: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8128: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8220,6 +8224,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[45]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-@@ -8239,14 +8246,14 @@
- 	;;
- (*)
- 
--echo "$as_me:8242: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8249: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8249 "configure"
-+#line 8256 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8265,16 +8272,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8271: \$? = $ac_status" >&5
-+  echo "$as_me:8278: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8277: \$? = $ac_status" >&5
-+  echo "$as_me:8284: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8283,7 +8290,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8286 "configure"
-+#line 8293 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8302,16 +8309,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8305: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8308: \$? = $ac_status" >&5
-+  echo "$as_me:8315: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8311: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8314: \$? = $ac_status" >&5
-+  echo "$as_me:8321: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8326,7 +8333,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8329: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8336: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -8434,16 +8441,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:8437: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8444: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:8443: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8450: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8446 "configure"
-+#line 8453 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8458,16 +8465,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8461: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8468: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8464: \$? = $ac_status" >&5
-+  echo "$as_me:8471: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8467: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8474: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8470: \$? = $ac_status" >&5
-+  echo "$as_me:8477: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8488,7 +8495,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8491 "configure"
-+#line 8498 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8503,16 +8510,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8513: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8509: \$? = $ac_status" >&5
-+  echo "$as_me:8516: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8512: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8519: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8515: \$? = $ac_status" >&5
-+  echo "$as_me:8522: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8523,15 +8530,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8526: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8533: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8531: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8538: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8534 "configure"
-+#line 8541 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8546,16 +8553,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8556: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8552: \$? = $ac_status" >&5
-+  echo "$as_me:8559: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8555: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8562: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8558: \$? = $ac_status" >&5
-+  echo "$as_me:8565: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8571,7 +8578,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8574: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8581: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8729,7 +8736,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:8732: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8739: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -8737,7 +8744,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8740: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8747: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -8745,7 +8752,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8748: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8755: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -8753,10 +8760,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8756: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8763: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8759 "configure"
-+#line 8766 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8771,16 +8778,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8774: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8781: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8777: \$? = $ac_status" >&5
-+  echo "$as_me:8784: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8787: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8783: \$? = $ac_status" >&5
-+  echo "$as_me:8790: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8789,12 +8796,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8792: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8799: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8797 "configure"
-+#line 8804 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8809,16 +8816,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8812: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8819: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8815: \$? = $ac_status" >&5
-+  echo "$as_me:8822: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8818: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8825: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8821: \$? = $ac_status" >&5
-+  echo "$as_me:8828: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -8829,19 +8836,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:8832: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8839: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:8837: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8844: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8844 "configure"
-+#line 8851 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8860,16 +8867,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8863: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8870: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8866: \$? = $ac_status" >&5
-+  echo "$as_me:8873: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8869: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8876: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8872: \$? = $ac_status" >&5
-+  echo "$as_me:8879: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8878,7 +8885,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8881 "configure"
-+#line 8888 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8897,16 +8904,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8900: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8907: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8903: \$? = $ac_status" >&5
-+  echo "$as_me:8910: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8913: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8909: \$? = $ac_status" >&5
-+  echo "$as_me:8916: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8921,7 +8928,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8924: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8931: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9023,14 +9030,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:9026: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9033: checking if SIGWINCH is defined" >&5
- echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
- if test "${cf_cv_define_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9033 "configure"
-+#line 9040 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9045,23 +9052,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9048: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9051: \$? = $ac_status" >&5
-+  echo "$as_me:9058: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9054: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9061: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9057: \$? = $ac_status" >&5
-+  echo "$as_me:9064: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 9064 "configure"
-+#line 9071 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9079,16 +9086,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9082: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9089: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9085: \$? = $ac_status" >&5
-+  echo "$as_me:9092: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9088: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9095: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9091: \$? = $ac_status" >&5
-+  echo "$as_me:9098: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9102,11 +9109,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9105: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9112: result: $cf_cv_define_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
- 
- if test "$cf_cv_define_sigwinch" = maybe ; then
--echo "$as_me:9109: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9116: checking for actual SIGWINCH definition" >&5
- echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
- if test "${cf_cv_fixup_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9117,7 +9124,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9120 "configure"
-+#line 9127 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9139,16 +9146,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9142: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9145: \$? = $ac_status" >&5
-+  echo "$as_me:9152: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9148: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9155: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9151: \$? = $ac_status" >&5
-+  echo "$as_me:9158: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -9162,7 +9169,7 @@
- done
- 
- fi
--echo "$as_me:9165: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9172: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9172,13 +9179,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:9175: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9182: checking for nl_langinfo and CODESET" >&5
- echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
- if test "${am_cv_langinfo_codeset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9181 "configure"
-+#line 9188 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -9190,16 +9197,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9193: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9200: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9196: \$? = $ac_status" >&5
-+  echo "$as_me:9203: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9206: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9202: \$? = $ac_status" >&5
-+  echo "$as_me:9209: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9210,7 +9217,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9213: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9220: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -9224,7 +9231,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:9227: checking if you want wide-character code" >&5
-+echo "$as_me:9234: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -9234,7 +9241,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9237: result: $with_widec" >&5
-+echo "$as_me:9244: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9249,14 +9256,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9252: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9259: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9259 "configure"
-+#line 9266 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9273,16 +9280,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9283: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9279: \$? = $ac_status" >&5
-+  echo "$as_me:9286: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9282: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9285: \$? = $ac_status" >&5
-+  echo "$as_me:9292: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9292,16 +9299,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9295: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9302: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9301: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9308: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9304 "configure"
-+#line 9311 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9317,16 +9324,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9320: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9327: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9323: \$? = $ac_status" >&5
-+  echo "$as_me:9330: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9326: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9333: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9329: \$? = $ac_status" >&5
-+  echo "$as_me:9336: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9335,16 +9342,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9338: result: $cf_result" >&5
-+echo "$as_me:9345: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9344: checking checking for compatible value versus " >&5
-+	echo "$as_me:9351: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9347 "configure"
-+#line 9354 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9360,16 +9367,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9370: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9366: \$? = $ac_status" >&5
-+  echo "$as_me:9373: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9369: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9376: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9372: \$? = $ac_status" >&5
-+  echo "$as_me:9379: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9378,7 +9385,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9381: result: $cf_result" >&5
-+	echo "$as_me:9388: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9394,13 +9401,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9397: checking for $ac_func" >&5
-+echo "$as_me:9404: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9403 "configure"
-+#line 9410 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9431,16 +9438,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9434: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9437: \$? = $ac_status" >&5
-+  echo "$as_me:9444: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9440: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9443: \$? = $ac_status" >&5
-+  echo "$as_me:9450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9450,7 +9457,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9453: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9460: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9462,7 +9469,7 @@
- 
- 	if test "x$ac_cv_func_putwc" != xyes ; then
- 
--echo "$as_me:9465: checking for multibyte character support" >&5
-+echo "$as_me:9472: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9470,7 +9477,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9473 "configure"
-+#line 9480 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9483,16 +9490,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9493: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9489: \$? = $ac_status" >&5
-+  echo "$as_me:9496: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9499: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9495: \$? = $ac_status" >&5
-+  echo "$as_me:9502: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9504,12 +9511,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9507: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9514: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9512 "configure"
-+#line 9519 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9522,16 +9529,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9525: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9532: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9528: \$? = $ac_status" >&5
-+  echo "$as_me:9535: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9534: \$? = $ac_status" >&5
-+  echo "$as_me:9541: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9545,7 +9552,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9548 "configure"
-+#line 9555 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9558,16 +9565,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9561: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9568: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9564: \$? = $ac_status" >&5
-+  echo "$as_me:9571: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9574: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9570: \$? = $ac_status" >&5
-+  echo "$as_me:9577: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9584,9 +9591,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9587: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9594: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9589: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9596: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9677,11 +9684,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9680: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9687: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9684 "configure"
-+#line 9691 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9694,21 +9701,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9704: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9700: \$? = $ac_status" >&5
-+  echo "$as_me:9707: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9710: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9706: \$? = $ac_status" >&5
-+  echo "$as_me:9713: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9711: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9718: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9726,7 +9733,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9729: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9736: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9801,13 +9808,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9804: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9811: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 9810 "configure"
-+#line 9817 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9820,21 +9827,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9823: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9826: \$? = $ac_status" >&5
-+  echo "$as_me:9833: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9829: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9832: \$? = $ac_status" >&5
-+  echo "$as_me:9839: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9837: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9844: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9876,7 +9883,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9879: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9886: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -9911,7 +9918,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9914 "configure"
-+#line 9921 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9923,16 +9930,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9933: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9929: \$? = $ac_status" >&5
-+  echo "$as_me:9936: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9932: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9939: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9935: \$? = $ac_status" >&5
-+  echo "$as_me:9942: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9949,7 +9956,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9952: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9959: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9985,7 +9992,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9988: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9995: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10017,14 +10024,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10020: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10027: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10027 "configure"
-+#line 10034 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10042,23 +10049,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10045: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10052: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10048: \$? = $ac_status" >&5
-+  echo "$as_me:10055: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10051: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10054: \$? = $ac_status" >&5
-+  echo "$as_me:10061: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10061 "configure"
-+#line 10068 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10077,16 +10084,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10080: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10083: \$? = $ac_status" >&5
-+  echo "$as_me:10090: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10086: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10089: \$? = $ac_status" >&5
-+  echo "$as_me:10096: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10098,7 +10105,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10101: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10108: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10116,14 +10123,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10119: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10126: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10126 "configure"
-+#line 10133 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10141,23 +10148,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10144: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10151: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10147: \$? = $ac_status" >&5
-+  echo "$as_me:10154: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10150: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10157: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10153: \$? = $ac_status" >&5
-+  echo "$as_me:10160: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10160 "configure"
-+#line 10167 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10176,16 +10183,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10182: \$? = $ac_status" >&5
-+  echo "$as_me:10189: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10185: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10192: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10188: \$? = $ac_status" >&5
-+  echo "$as_me:10195: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10197,7 +10204,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10200: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10207: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10220,14 +10227,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10223: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10230: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10230 "configure"
-+#line 10237 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10245,23 +10252,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10255: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10251: \$? = $ac_status" >&5
-+  echo "$as_me:10258: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10254: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10261: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10257: \$? = $ac_status" >&5
-+  echo "$as_me:10264: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10264 "configure"
-+#line 10271 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10280,16 +10287,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10283: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10290: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10286: \$? = $ac_status" >&5
-+  echo "$as_me:10293: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10292: \$? = $ac_status" >&5
-+  echo "$as_me:10299: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10301,7 +10308,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10304: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10311: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10333,7 +10340,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10336: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10343: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10343,7 +10350,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10346: result: $with_lp64" >&5
-+echo "$as_me:10353: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10359,7 +10366,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10362: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10369: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10371,7 +10378,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10374 "configure"
-+#line 10381 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10391,16 +10398,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10394: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10397: \$? = $ac_status" >&5
-+  echo "$as_me:10404: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10400: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10403: \$? = $ac_status" >&5
-+  echo "$as_me:10410: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10410,16 +10417,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10420: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10416: \$? = $ac_status" >&5
-+  echo "$as_me:10423: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10422: \$? = $ac_status" >&5
-+  echo "$as_me:10429: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10433,13 +10440,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10436: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10443: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10442: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10449: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10447,7 +10454,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10450 "configure"
-+#line 10457 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10467,16 +10474,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10470: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10473: \$? = $ac_status" >&5
-+  echo "$as_me:10480: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10483: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10479: \$? = $ac_status" >&5
-+  echo "$as_me:10486: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10485,7 +10492,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10488 "configure"
-+#line 10495 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -10506,16 +10513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10509: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10516: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10512: \$? = $ac_status" >&5
-+  echo "$as_me:10519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10518: \$? = $ac_status" >&5
-+  echo "$as_me:10525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10526,7 +10533,7 @@
-   break
- done
- fi
--echo "$as_me:10529: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10536: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -10536,7 +10543,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10539: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10546: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10544,7 +10551,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10547 "configure"
-+#line 10554 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10564,16 +10571,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10567: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10574: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10570: \$? = $ac_status" >&5
-+  echo "$as_me:10577: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10580: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10576: \$? = $ac_status" >&5
-+  echo "$as_me:10583: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10582,7 +10589,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10585 "configure"
-+#line 10592 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -10603,16 +10610,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10606: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10609: \$? = $ac_status" >&5
-+  echo "$as_me:10616: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10612: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10619: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10615: \$? = $ac_status" >&5
-+  echo "$as_me:10622: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10623,7 +10630,7 @@
-   break
- done
- fi
--echo "$as_me:10626: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10633: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -10636,7 +10643,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10639: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10646: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10644,7 +10651,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10647 "configure"
-+#line 10654 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10656,16 +10663,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10666: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10662: \$? = $ac_status" >&5
-+  echo "$as_me:10669: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10672: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10668: \$? = $ac_status" >&5
-+  echo "$as_me:10675: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10674,7 +10681,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10677 "configure"
-+#line 10684 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -10687,16 +10694,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10690: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10697: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10693: \$? = $ac_status" >&5
-+  echo "$as_me:10700: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10699: \$? = $ac_status" >&5
-+  echo "$as_me:10706: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10707,7 +10714,7 @@
-   break
- done
- fi
--echo "$as_me:10710: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10717: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -10721,13 +10728,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:10724: checking for fseeko" >&5
-+echo "$as_me:10731: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10730 "configure"
-+#line 10737 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10739,16 +10746,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10742: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10745: \$? = $ac_status" >&5
-+  echo "$as_me:10752: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10748: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10751: \$? = $ac_status" >&5
-+  echo "$as_me:10758: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10758,7 +10765,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10761: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10768: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10779,14 +10786,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:10782: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10789: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10789 "configure"
-+#line 10796 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10807,16 +10814,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10810: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10817: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10813: \$? = $ac_status" >&5
-+  echo "$as_me:10820: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10816: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10819: \$? = $ac_status" >&5
-+  echo "$as_me:10826: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10827,7 +10834,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10830: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10837: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10837,7 +10844,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10840: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10847: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10847,14 +10854,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10850: result: $with_tparm_varargs" >&5
-+echo "$as_me:10857: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10857: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10864: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10864,14 +10871,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10867: result: $with_tic_depends" >&5
-+echo "$as_me:10874: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10874: checking for type of bool" >&5
-+echo "$as_me:10881: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10881,10 +10888,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10884: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10891: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10887: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10894: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10895,11 +10902,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10898: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10905: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10902: checking for type of chtype" >&5
-+echo "$as_me:10909: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10909,11 +10916,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10912: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10919: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10916: checking for type of ospeed" >&5
-+echo "$as_me:10923: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10923,11 +10930,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10926: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10933: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10930: checking for type of mmask_t" >&5
-+echo "$as_me:10937: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10937,11 +10944,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10940: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10947: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10944: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10951: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10951,11 +10958,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10954: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10961: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10958: checking for type of tparm args" >&5
-+echo "$as_me:10965: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10965,11 +10972,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10968: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10975: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10972: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10979: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10979,7 +10986,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10982: result: $with_rcs_ids" >&5
-+echo "$as_me:10989: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10988,7 +10995,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10991: checking format of man-pages" >&5
-+echo "$as_me:10998: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11077,14 +11084,14 @@
- 	;;
- esac
- 
--echo "$as_me:11080: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11087: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11083: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11090: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11087: checking for manpage renaming" >&5
-+echo "$as_me:11094: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11112,7 +11119,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11115: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11122: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11126,10 +11133,10 @@
- 	fi
- fi
- 
--echo "$as_me:11129: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11136: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11132: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11139: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11140,7 +11147,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11143: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11150: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11154,7 +11161,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11157: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11164: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11167,17 +11174,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11170: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11177: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11176: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11183: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11180: checking for manpage tbl" >&5
-+echo "$as_me:11187: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11188,7 +11195,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11191: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11198: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11521,7 +11528,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11524: checking if you want to build with function extensions" >&5
-+echo "$as_me:11531: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11531,7 +11538,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11534: result: $with_ext_funcs" >&5
-+echo "$as_me:11541: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11586,7 +11593,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11589: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11596: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11596,7 +11603,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11599: result: $with_sp_funcs" >&5
-+echo "$as_me:11606: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11611,7 +11618,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11614: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11621: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11621,7 +11628,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11624: result: $with_term_driver" >&5
-+echo "$as_me:11631: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11630,19 +11637,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11633: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11640: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11638: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11645: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11645: checking for extended use of const keyword" >&5
-+echo "$as_me:11652: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11652,7 +11659,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11655: result: $with_ext_const" >&5
-+echo "$as_me:11662: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11660,7 +11667,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11663: checking if you want to use extended colors" >&5
-+echo "$as_me:11670: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11670,12 +11677,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11673: result: $with_ext_colors" >&5
-+echo "$as_me:11680: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11678: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11685: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11685,7 +11692,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11688: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11695: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11701,7 +11708,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11704: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11711: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11711,7 +11718,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11714: result: $with_ext_mouse" >&5
-+echo "$as_me:11721: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11722,7 +11729,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11725: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11732: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11731,7 +11738,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11734: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11741: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11741,7 +11748,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11744: result: $with_ext_putwin" >&5
-+echo "$as_me:11751: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11751,7 +11758,7 @@
- 
- fi
- 
--echo "$as_me:11754: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11761: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11761,20 +11768,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11764: result: $with_no_padding" >&5
-+echo "$as_me:11771: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11771: checking for ANSI C header files" >&5
-+echo "$as_me:11778: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11777 "configure"
-+#line 11784 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -11782,13 +11789,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:11785: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11792: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11791: \$? = $ac_status" >&5
-+  echo "$as_me:11798: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11810,7 +11817,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11813 "configure"
-+#line 11820 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -11828,7 +11835,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11831 "configure"
-+#line 11838 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -11849,7 +11856,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11852 "configure"
-+#line 11859 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11875,15 +11882,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11878: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11881: \$? = $ac_status" >&5
-+  echo "$as_me:11888: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11883: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11886: \$? = $ac_status" >&5
-+  echo "$as_me:11893: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11896,7 +11903,7 @@
- fi
- fi
- fi
--echo "$as_me:11899: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11906: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11912,28 +11919,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11915: checking for $ac_header" >&5
-+echo "$as_me:11922: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11921 "configure"
-+#line 11928 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11930: \$? = $ac_status" >&5
-+  echo "$as_me:11937: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11936: \$? = $ac_status" >&5
-+  echo "$as_me:11943: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11943,7 +11950,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11946: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11953: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11953,13 +11960,13 @@
- fi
- done
- 
--echo "$as_me:11956: checking for signed char" >&5
-+echo "$as_me:11963: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11962 "configure"
-+#line 11969 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11974,16 +11981,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11977: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11980: \$? = $ac_status" >&5
-+  echo "$as_me:11987: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11983: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11990: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11986: \$? = $ac_status" >&5
-+  echo "$as_me:11993: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -11993,10 +12000,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11996: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:12003: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:11999: checking size of signed char" >&5
-+echo "$as_me:12006: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12005,7 +12012,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12008 "configure"
-+#line 12015 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12017,21 +12024,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12020: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12023: \$? = $ac_status" >&5
-+  echo "$as_me:12030: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12026: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12029: \$? = $ac_status" >&5
-+  echo "$as_me:12036: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12034 "configure"
-+#line 12041 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12043,16 +12050,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12046: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12053: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12049: \$? = $ac_status" >&5
-+  echo "$as_me:12056: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12059: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12055: \$? = $ac_status" >&5
-+  echo "$as_me:12062: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12068,7 +12075,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12071 "configure"
-+#line 12078 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12080,16 +12087,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12083: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12086: \$? = $ac_status" >&5
-+  echo "$as_me:12093: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12096: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12092: \$? = $ac_status" >&5
-+  echo "$as_me:12099: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12105,7 +12112,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12108 "configure"
-+#line 12115 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12117,16 +12124,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12120: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12123: \$? = $ac_status" >&5
-+  echo "$as_me:12130: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12126: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12129: \$? = $ac_status" >&5
-+  echo "$as_me:12136: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12139,12 +12146,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12142: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12149: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12147 "configure"
-+#line 12154 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12160,15 +12167,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12163: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12170: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12166: \$? = $ac_status" >&5
-+  echo "$as_me:12173: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12168: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12175: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12171: \$? = $ac_status" >&5
-+  echo "$as_me:12178: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12184,7 +12191,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12187: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12194: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -12195,7 +12202,7 @@
- else
- 	NCURSES_SBOOL="char"
- fi
--echo "$as_me:12198: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:12205: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12205,12 +12212,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12208: result: $with_signed_char" >&5
-+echo "$as_me:12215: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12213: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12220: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12220,7 +12227,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12223: result: $with_sigwinch" >&5
-+echo "$as_me:12230: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12228,7 +12235,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12231: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12238: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12238,7 +12245,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12241: result: $with_tcap_names" >&5
-+echo "$as_me:12248: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12246,7 +12253,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12249: checking if you want all development code" >&5
-+echo "$as_me:12256: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12256,11 +12263,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12259: result: $with_develop" >&5
-+echo "$as_me:12266: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12263: checking if you want hard-tabs code" >&5
-+echo "$as_me:12270: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12270,7 +12277,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12273: result: $enable_hard_tabs" >&5
-+echo "$as_me:12280: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12278,7 +12285,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12281: checking if you want limited support for xmc" >&5
-+echo "$as_me:12288: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12288,7 +12295,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12291: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12298: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12298,7 +12305,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12301: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12308: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12308,7 +12315,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12311: result: $with_assumed_color" >&5
-+echo "$as_me:12318: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12316,7 +12323,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12319: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12326: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12326,7 +12333,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12329: result: $with_hashmap" >&5
-+echo "$as_me:12336: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12334,7 +12341,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12337: checking if you want colorfgbg code" >&5
-+echo "$as_me:12344: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12344,7 +12351,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12347: result: $with_colorfgbg" >&5
-+echo "$as_me:12354: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12352,7 +12359,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12355: checking if you want interop bindings" >&5
-+echo "$as_me:12362: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12362,7 +12369,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12365: result: $with_exp_interop" >&5
-+echo "$as_me:12372: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12371,7 +12378,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12374: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12381: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12381,27 +12388,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12384: result: $with_pthread" >&5
-+echo "$as_me:12391: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12388: checking for pthread.h" >&5
-+	echo "$as_me:12395: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12394 "configure"
-+#line 12401 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:12398: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12405: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12404: \$? = $ac_status" >&5
-+  echo "$as_me:12411: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12420,7 +12427,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12423: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12430: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12430,7 +12437,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12433: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12440: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12451,7 +12458,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12454 "configure"
-+#line 12461 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -12468,16 +12475,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12471: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12478: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12474: \$? = $ac_status" >&5
-+  echo "$as_me:12481: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12484: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12480: \$? = $ac_status" >&5
-+  echo "$as_me:12487: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12487,7 +12494,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12490: result: $with_pthread" >&5
-+	    echo "$as_me:12497: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12515,7 +12522,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12518: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12525: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12525,13 +12532,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12528: checking for pthread_kill" >&5
-+	echo "$as_me:12535: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12534 "configure"
-+#line 12541 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12562,16 +12569,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12565: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12568: \$? = $ac_status" >&5
-+  echo "$as_me:12575: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12571: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12574: \$? = $ac_status" >&5
-+  echo "$as_me:12581: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12581,11 +12588,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12584: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12591: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12588: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12595: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12595,7 +12602,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12598: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12605: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12606,7 +12613,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12609: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12616: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12616,18 +12623,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12619: result: $use_weak_symbols" >&5
-+	echo "$as_me:12626: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12623: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12630: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12630 "configure"
-+#line 12637 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -12653,16 +12660,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12656: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12659: \$? = $ac_status" >&5
-+  echo "$as_me:12666: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12662: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12665: \$? = $ac_status" >&5
-+  echo "$as_me:12672: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12673,7 +12680,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12676: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12683: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12706,7 +12713,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12709: checking if you want reentrant code" >&5
-+echo "$as_me:12716: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12716,7 +12723,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12719: result: $with_reentrant" >&5
-+echo "$as_me:12726: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12789,7 +12796,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12792: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12799: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12804,7 +12811,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12807: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12814: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12814,7 +12821,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12817: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12824: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12824,7 +12831,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12827: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12834: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12834,7 +12841,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12837: result: $with_safe_sprintf" >&5
-+echo "$as_me:12844: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12844,7 +12851,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12847: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12854: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12854,7 +12861,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12857: result: $with_scroll_hints" >&5
-+echo "$as_me:12864: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12863,7 +12870,7 @@
- 
- fi
- 
--echo "$as_me:12866: checking if you want wgetch-events code" >&5
-+echo "$as_me:12873: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12873,7 +12880,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12876: result: $with_wgetch_events" >&5
-+echo "$as_me:12883: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12884,7 +12891,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12887: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12894: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -12918,7 +12925,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12921: result: $enableval" >&5
-+echo "$as_me:12928: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12930,7 +12937,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12933: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12940: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12938,7 +12945,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12941: result: $with_warnings" >&5
-+echo "$as_me:12948: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12950,12 +12957,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12953: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12960: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 12958 "configure"
-+#line 12965 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12972,16 +12979,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12975: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12982: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12978: \$? = $ac_status" >&5
-+  echo "$as_me:12985: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12981: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12984: \$? = $ac_status" >&5
-+  echo "$as_me:12991: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12992,7 +12999,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:12995: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:13002: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -13001,12 +13008,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13004: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13011: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13009 "configure"
-+#line 13016 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13023,16 +13030,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13026: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13033: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13029: \$? = $ac_status" >&5
-+  echo "$as_me:13036: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13032: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13039: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13035: \$? = $ac_status" >&5
-+  echo "$as_me:13042: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13043,12 +13050,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13046: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13053: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 13051 "${as_me:-configure}"
-+#line 13058 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13065,7 +13072,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:13068: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13075: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13081,12 +13088,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13084: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13091: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13087: \$? = $ac_status" >&5
-+  echo "$as_me:13094: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13089: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13096: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13095,7 +13102,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13098: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13105: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13119,12 +13126,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13122: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13129: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13125: \$? = $ac_status" >&5
-+  echo "$as_me:13132: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13127: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13134: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13135,7 +13142,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13138: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13145: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13145,7 +13152,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13148: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13155: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13165,12 +13172,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13168: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13175: checking if this is really Intel C++ compiler" >&5
- echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13173 "configure"
-+#line 13180 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13187,16 +13194,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13193: \$? = $ac_status" >&5
-+  echo "$as_me:13200: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13199: \$? = $ac_status" >&5
-+  echo "$as_me:13206: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13207,7 +13214,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13210: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13217: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13216,12 +13223,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13219: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13226: checking if this is really Clang C++ compiler" >&5
- echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13224 "configure"
-+#line 13231 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13238,16 +13245,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13241: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13248: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13244: \$? = $ac_status" >&5
-+  echo "$as_me:13251: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13247: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13254: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13250: \$? = $ac_status" >&5
-+  echo "$as_me:13257: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13258,7 +13265,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13261: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13268: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13270,7 +13277,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <<EOF
--#line 13273 "configure"
-+#line 13280 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13288,7 +13295,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:13291: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13298: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13305,12 +13312,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13308: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13315: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13311: \$? = $ac_status" >&5
-+  echo "$as_me:13318: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13313: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13320: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13319,7 +13326,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13322: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13329: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13349,16 +13356,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13352: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13355: \$? = $ac_status" >&5
-+  echo "$as_me:13362: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13357: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13364: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13361: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13368: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13394,10 +13401,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13397: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13404: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 13400 "${as_me:-configure}"
-+#line 13407 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -13446,12 +13453,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13456: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13452: \$? = $ac_status" >&5
-+  echo "$as_me:13459: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13454: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13461: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13510,7 +13517,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13513: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13520: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13520,7 +13527,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13523: result: $with_string_hacks" >&5
-+echo "$as_me:13530: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13529,19 +13536,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13532: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13539: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13538: checking for $ac_func" >&5
-+echo "$as_me:13545: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13544 "configure"
-+#line 13551 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13572,16 +13579,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13575: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13582: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13578: \$? = $ac_status" >&5
-+  echo "$as_me:13585: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13581: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13588: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13584: \$? = $ac_status" >&5
-+  echo "$as_me:13591: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13591,7 +13598,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13594: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13601: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13604,7 +13611,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:13607: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:13614: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13614,7 +13621,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13617: result: $with_assertions" >&5
-+echo "$as_me:13624: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13630,7 +13637,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13633: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13640: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -13647,7 +13654,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13650: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13657: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13741,23 +13748,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13744: checking for dmalloc.h" >&5
-+	echo "$as_me:13751: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13750 "configure"
-+#line 13757 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13754: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13761: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13760: \$? = $ac_status" >&5
-+  echo "$as_me:13767: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13776,11 +13783,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13779: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13786: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:13783: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13790: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13788,7 +13795,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13791 "configure"
-+#line 13798 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13807,16 +13814,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13810: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13817: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13813: \$? = $ac_status" >&5
-+  echo "$as_me:13820: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13816: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13823: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13819: \$? = $ac_status" >&5
-+  echo "$as_me:13826: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13827,7 +13834,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13830: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13837: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13842,7 +13849,7 @@
- 
- fi
- 
--echo "$as_me:13845: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:13852: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -13859,7 +13866,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13862: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13869: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13953,23 +13960,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13956: checking for dbmalloc.h" >&5
-+	echo "$as_me:13963: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13962 "configure"
-+#line 13969 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13966: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13973: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13972: \$? = $ac_status" >&5
-+  echo "$as_me:13979: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13988,11 +13995,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13991: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13998: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:13995: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:14002: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14000,7 +14007,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14003 "configure"
-+#line 14010 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14019,16 +14026,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14022: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14029: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14025: \$? = $ac_status" >&5
-+  echo "$as_me:14032: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14028: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14031: \$? = $ac_status" >&5
-+  echo "$as_me:14038: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14039,7 +14046,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14042: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14049: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14054,7 +14061,7 @@
- 
- fi
- 
--echo "$as_me:14057: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:14064: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14071,7 +14078,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14074: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14081: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14164,7 +14171,7 @@
- 	;;
- esac
- 
--echo "$as_me:14167: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14174: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14174,7 +14181,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14177: result: $with_no_leaks" >&5
-+echo "$as_me:14184: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14226,7 +14233,7 @@
- 	;;
- esac
- 
--echo "$as_me:14229: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14236: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14236,7 +14243,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14239: result: $cf_with_trace" >&5
-+echo "$as_me:14246: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14326,7 +14333,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14329: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14336: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14343,7 +14350,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14346: result: $enable_gnat_projects" >&5
-+echo "$as_me:14353: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14353,13 +14360,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14356: checking for gettimeofday" >&5
-+echo "$as_me:14363: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14362 "configure"
-+#line 14369 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14390,16 +14397,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14393: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14396: \$? = $ac_status" >&5
-+  echo "$as_me:14403: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14399: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14402: \$? = $ac_status" >&5
-+  echo "$as_me:14409: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14409,7 +14416,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14412: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14419: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14419,7 +14426,7 @@
- 
- else
- 
--echo "$as_me:14422: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14429: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14427,7 +14434,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14430 "configure"
-+#line 14437 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14446,16 +14453,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14449: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14456: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14452: \$? = $ac_status" >&5
-+  echo "$as_me:14459: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14455: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14458: \$? = $ac_status" >&5
-+  echo "$as_me:14465: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14466,7 +14473,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14469: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14476: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14496,14 +14503,14 @@
- 	;;
- esac
- 
--echo "$as_me:14499: checking if -lm needed for math functions" >&5
-+echo "$as_me:14506: checking if -lm needed for math functions" >&5
- echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
- if test "${cf_cv_need_libm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14506 "configure"
-+#line 14513 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -14518,16 +14525,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14521: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14528: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14524: \$? = $ac_status" >&5
-+  echo "$as_me:14531: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14527: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14530: \$? = $ac_status" >&5
-+  echo "$as_me:14537: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14537,7 +14544,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14540: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14547: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14545,13 +14552,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14548: checking for ANSI C header files" >&5
-+echo "$as_me:14555: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14554 "configure"
-+#line 14561 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -14559,13 +14566,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:14562: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14569: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14568: \$? = $ac_status" >&5
-+  echo "$as_me:14575: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14587,7 +14594,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14590 "configure"
-+#line 14597 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -14605,7 +14612,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14608 "configure"
-+#line 14615 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -14626,7 +14633,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14629 "configure"
-+#line 14636 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14652,15 +14659,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14655: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14662: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14658: \$? = $ac_status" >&5
-+  echo "$as_me:14665: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14667: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14663: \$? = $ac_status" >&5
-+  echo "$as_me:14670: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14673,7 +14680,7 @@
- fi
- fi
- fi
--echo "$as_me:14676: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14683: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14686,13 +14693,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:14689: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14696: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14695 "configure"
-+#line 14702 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -14707,16 +14714,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14713: \$? = $ac_status" >&5
-+  echo "$as_me:14720: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14716: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14719: \$? = $ac_status" >&5
-+  echo "$as_me:14726: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14726,7 +14733,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14729: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14736: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14739,7 +14746,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:14742: checking for opendir in -ldir" >&5
-+  echo "$as_me:14749: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14747,7 +14754,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14750 "configure"
-+#line 14757 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14766,16 +14773,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14769: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14776: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14772: \$? = $ac_status" >&5
-+  echo "$as_me:14779: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14775: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14782: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14778: \$? = $ac_status" >&5
-+  echo "$as_me:14785: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14786,14 +14793,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14789: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14796: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:14796: checking for opendir in -lx" >&5
-+  echo "$as_me:14803: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14801,7 +14808,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14804 "configure"
-+#line 14811 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14820,16 +14827,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14823: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14830: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14826: \$? = $ac_status" >&5
-+  echo "$as_me:14833: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14829: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14836: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14832: \$? = $ac_status" >&5
-+  echo "$as_me:14839: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14840,7 +14847,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14843: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14850: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -14848,13 +14855,13 @@
- 
- fi
- 
--echo "$as_me:14851: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14858: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14857 "configure"
-+#line 14864 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -14870,16 +14877,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14873: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14880: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14876: \$? = $ac_status" >&5
-+  echo "$as_me:14883: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14879: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14886: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14882: \$? = $ac_status" >&5
-+  echo "$as_me:14889: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14889,7 +14896,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14892: result: $ac_cv_header_time" >&5
-+echo "$as_me:14899: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14908,13 +14915,13 @@
- 	;;
- esac
- 
--echo "$as_me:14911: checking for regcomp" >&5
-+echo "$as_me:14918: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14917 "configure"
-+#line 14924 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14945,16 +14952,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14948: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14955: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14951: \$? = $ac_status" >&5
-+  echo "$as_me:14958: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14954: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14961: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14957: \$? = $ac_status" >&5
-+  echo "$as_me:14964: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14964,7 +14971,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14967: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14974: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14973,7 +14980,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14976: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14983: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14981,7 +14988,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14984 "configure"
-+#line 14991 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15000,16 +15007,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15003: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15010: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15006: \$? = $ac_status" >&5
-+  echo "$as_me:15013: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15009: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15012: \$? = $ac_status" >&5
-+  echo "$as_me:15019: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15020,7 +15027,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15023: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15030: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -15049,13 +15056,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15052: checking for compile" >&5
-+	echo "$as_me:15059: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15058 "configure"
-+#line 15065 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15086,16 +15093,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15089: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15092: \$? = $ac_status" >&5
-+  echo "$as_me:15099: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15095: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15098: \$? = $ac_status" >&5
-+  echo "$as_me:15105: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15105,13 +15112,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15108: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15115: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15114: checking for compile in -lgen" >&5
-+		echo "$as_me:15121: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15119,7 +15126,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15122 "configure"
-+#line 15129 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15138,16 +15145,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15141: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15148: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15144: \$? = $ac_status" >&5
-+  echo "$as_me:15151: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15154: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15150: \$? = $ac_status" >&5
-+  echo "$as_me:15157: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15158,7 +15165,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15161: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15168: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15186,11 +15193,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15189: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15196: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15193: checking for regular-expression headers" >&5
-+echo "$as_me:15200: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15202,7 +15209,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15205 "configure"
-+#line 15212 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15217,16 +15224,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15220: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15227: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15223: \$? = $ac_status" >&5
-+  echo "$as_me:15230: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15233: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15229: \$? = $ac_status" >&5
-+  echo "$as_me:15236: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15243,7 +15250,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15246 "configure"
-+#line 15253 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$cf_regex_hdr>
-@@ -15261,16 +15268,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15267: \$? = $ac_status" >&5
-+  echo "$as_me:15274: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15273: \$? = $ac_status" >&5
-+  echo "$as_me:15280: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15286,11 +15293,11 @@
- esac
- 
- fi
--echo "$as_me:15289: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15296: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15293: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15300: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15329,23 +15336,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15332: checking for $ac_header" >&5
-+echo "$as_me:15339: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15338 "configure"
-+#line 15345 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15349: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15348: \$? = $ac_status" >&5
-+  echo "$as_me:15355: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15364,7 +15371,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15367: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15374: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15377,23 +15384,23 @@
- for ac_header in unistd.h getopt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15380: checking for $ac_header" >&5
-+echo "$as_me:15387: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15386 "configure"
-+#line 15393 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15390: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15397: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15396: \$? = $ac_status" >&5
-+  echo "$as_me:15403: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15412,7 +15419,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15415: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15422: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15422,7 +15429,7 @@
- fi
- done
- 
--echo "$as_me:15425: checking for header declaring getopt variables" >&5
-+echo "$as_me:15432: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15432,7 +15439,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15435 "configure"
-+#line 15442 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15445,16 +15452,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15448: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15455: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15451: \$? = $ac_status" >&5
-+  echo "$as_me:15458: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15454: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15457: \$? = $ac_status" >&5
-+  echo "$as_me:15464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15466,7 +15473,7 @@
- done
- 
- fi
--echo "$as_me:15469: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15476: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15487,7 +15494,7 @@
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15490: checking for main in -lcposix" >&5
-+echo "$as_me:15497: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15495,7 +15502,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15498 "configure"
-+#line 15505 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15507,16 +15514,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15510: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15517: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15513: \$? = $ac_status" >&5
-+  echo "$as_me:15520: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15523: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15519: \$? = $ac_status" >&5
-+  echo "$as_me:15526: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15527,7 +15534,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15530: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15537: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15538,7 +15545,7 @@
- 
- fi
- 
--	echo "$as_me:15541: checking for bzero in -linet" >&5
-+	echo "$as_me:15548: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15546,7 +15553,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15549 "configure"
-+#line 15556 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15565,16 +15572,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15568: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15571: \$? = $ac_status" >&5
-+  echo "$as_me:15578: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15581: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15577: \$? = $ac_status" >&5
-+  echo "$as_me:15584: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15585,7 +15592,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15588: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15595: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15608,14 +15615,14 @@
- fi
- fi
- 
--echo "$as_me:15611: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15618: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15618 "configure"
-+#line 15625 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15635,16 +15642,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15638: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15641: \$? = $ac_status" >&5
-+  echo "$as_me:15648: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15644: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15651: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15647: \$? = $ac_status" >&5
-+  echo "$as_me:15654: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15656,7 +15663,7 @@
- 
- fi
- 
--echo "$as_me:15659: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15666: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15671,13 +15678,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15674: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15681: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15680 "configure"
-+#line 15687 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15735,16 +15742,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15738: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15745: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15741: \$? = $ac_status" >&5
-+  echo "$as_me:15748: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15744: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15751: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15747: \$? = $ac_status" >&5
-+  echo "$as_me:15754: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15754,7 +15761,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15757: result: $ac_cv_c_const" >&5
-+echo "$as_me:15764: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15764,7 +15771,7 @@
- 
- fi
- 
--echo "$as_me:15767: checking for inline" >&5
-+echo "$as_me:15774: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15772,7 +15779,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15775 "configure"
-+#line 15782 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15781,16 +15788,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15784: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15791: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15787: \$? = $ac_status" >&5
-+  echo "$as_me:15794: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15790: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15797: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15793: \$? = $ac_status" >&5
-+  echo "$as_me:15800: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15801,7 +15808,7 @@
- done
- 
- fi
--echo "$as_me:15804: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15811: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15827,7 +15834,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15830: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15837: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15836,7 +15843,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15839 "configure"
-+#line 15846 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15848,16 +15855,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15858: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15854: \$? = $ac_status" >&5
-+  echo "$as_me:15861: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15864: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15860: \$? = $ac_status" >&5
-+  echo "$as_me:15867: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15869,7 +15876,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15872: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15879: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15955,7 +15962,7 @@
- 	fi
- fi
- 
--echo "$as_me:15958: checking for signal global datatype" >&5
-+echo "$as_me:15965: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15967,7 +15974,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15970 "configure"
-+#line 15977 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15990,16 +15997,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15993: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15996: \$? = $ac_status" >&5
-+  echo "$as_me:16003: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15999: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16006: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16002: \$? = $ac_status" >&5
-+  echo "$as_me:16009: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16013,7 +16020,7 @@
- 
- fi
- 
--echo "$as_me:16016: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16023: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <<EOF
-@@ -16022,7 +16029,7 @@
- 
- if test $NCURSES_CHTYPE = auto ; then
- 
--echo "$as_me:16025: checking for type of chtype" >&5
-+echo "$as_me:16032: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16032,7 +16039,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16035 "configure"
-+#line 16042 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16067,15 +16074,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16077: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16073: \$? = $ac_status" >&5
-+  echo "$as_me:16080: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16078: \$? = $ac_status" >&5
-+  echo "$as_me:16085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16090,7 +16097,7 @@
- 
- fi
- 
--echo "$as_me:16093: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16100: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -16102,14 +16109,14 @@
- fi
- test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- 
--echo "$as_me:16105: checking if unsigned literals are legal" >&5
-+echo "$as_me:16112: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16112 "configure"
-+#line 16119 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16121,16 +16128,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16124: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16131: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16127: \$? = $ac_status" >&5
-+  echo "$as_me:16134: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16130: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16133: \$? = $ac_status" >&5
-+  echo "$as_me:16140: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16142,7 +16149,7 @@
- 
- fi
- 
--echo "$as_me:16145: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16152: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16158,14 +16165,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16161: checking if external errno is declared" >&5
-+echo "$as_me:16168: checking if external errno is declared" >&5
- echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16168 "configure"
-+#line 16175 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16183,16 +16190,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16186: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16193: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16189: \$? = $ac_status" >&5
-+  echo "$as_me:16196: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16192: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16199: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16195: \$? = $ac_status" >&5
-+  echo "$as_me:16202: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16203,7 +16210,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16206: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16213: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16218,14 +16225,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16221: checking if external errno exists" >&5
-+echo "$as_me:16228: checking if external errno exists" >&5
- echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
- if test "${cf_cv_have_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16228 "configure"
-+#line 16235 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16240,16 +16247,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16243: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16250: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16246: \$? = $ac_status" >&5
-+  echo "$as_me:16253: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16256: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16252: \$? = $ac_status" >&5
-+  echo "$as_me:16259: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16260,7 +16267,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16263: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16270: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16273,7 +16280,7 @@
- 
- fi
- 
--echo "$as_me:16276: checking if data-only library module links" >&5
-+echo "$as_me:16283: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16281,20 +16288,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 16284 "configure"
-+#line 16291 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:16287: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16294: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16290: \$? = $ac_status" >&5
-+  echo "$as_me:16297: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 16297 "configure"
-+#line 16304 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -16307,10 +16314,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:16310: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16317: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16313: \$? = $ac_status" >&5
-+  echo "$as_me:16320: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16323,7 +16330,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16326 "configure"
-+#line 16333 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16334,15 +16341,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16337: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16344: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16340: \$? = $ac_status" >&5
-+  echo "$as_me:16347: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16342: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16349: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16345: \$? = $ac_status" >&5
-+  echo "$as_me:16352: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16357,7 +16364,7 @@
- 
- fi
- 
--echo "$as_me:16360: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16367: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16396,13 +16403,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16399: checking for $ac_func" >&5
-+echo "$as_me:16406: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16405 "configure"
-+#line 16412 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16433,16 +16440,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16436: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16443: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16439: \$? = $ac_status" >&5
-+  echo "$as_me:16446: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16449: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16445: \$? = $ac_status" >&5
-+  echo "$as_me:16452: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16452,7 +16459,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16455: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16462: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16464,21 +16471,21 @@
- 
- if test "x$ac_cv_func_getopt" = xno &&
-    test "x$cf_with_progs$cf_with_tests" != xnono; then
--	{ { echo "$as_me:16467: error: getopt is required for building programs" >&5
-+	{ { echo "$as_me:16474: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16474: checking for terminal-capability database functions" >&5
-+echo "$as_me:16481: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16481 "configure"
-+#line 16488 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16498,16 +16505,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16508: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16504: \$? = $ac_status" >&5
-+  echo "$as_me:16511: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16514: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16510: \$? = $ac_status" >&5
-+  echo "$as_me:16517: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16518,7 +16525,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16521: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16528: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16528,14 +16535,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16531: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16538: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16538 "configure"
-+#line 16545 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16557,16 +16564,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16560: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16567: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16563: \$? = $ac_status" >&5
-+  echo "$as_me:16570: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16566: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16573: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16569: \$? = $ac_status" >&5
-+  echo "$as_me:16576: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16577,7 +16584,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16580: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16587: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16591,14 +16598,14 @@
- 
- fi
- 
--echo "$as_me:16594: checking for isascii" >&5
-+echo "$as_me:16601: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16601 "configure"
-+#line 16608 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -16610,16 +16617,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16613: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16616: \$? = $ac_status" >&5
-+  echo "$as_me:16623: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16626: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16622: \$? = $ac_status" >&5
-+  echo "$as_me:16629: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16630,7 +16637,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16633: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16640: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16638,10 +16645,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16641: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16648: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16644 "configure"
-+#line 16651 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16655,16 +16662,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16658: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16665: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16661: \$? = $ac_status" >&5
-+  echo "$as_me:16668: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16671: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16667: \$? = $ac_status" >&5
-+  echo "$as_me:16674: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16672,7 +16679,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16675 "configure"
-+#line 16682 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16687,16 +16694,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16690: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16697: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16693: \$? = $ac_status" >&5
-+  echo "$as_me:16700: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16699: \$? = $ac_status" >&5
-+  echo "$as_me:16706: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16712,11 +16719,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16715: result: $sigact_bad" >&5
-+echo "$as_me:16722: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16719: checking if nanosleep really works" >&5
-+echo "$as_me:16726: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16726,7 +16733,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16729 "configure"
-+#line 16736 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -16751,15 +16758,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16761: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16757: \$? = $ac_status" >&5
-+  echo "$as_me:16764: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16762: \$? = $ac_status" >&5
-+  echo "$as_me:16769: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16771,7 +16778,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16774: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16781: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16786,23 +16793,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16789: checking for $ac_header" >&5
-+echo "$as_me:16796: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16795 "configure"
-+#line 16802 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16799: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16806: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16805: \$? = $ac_status" >&5
-+  echo "$as_me:16812: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16821,7 +16828,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16824: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16831: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16836,23 +16843,23 @@
- for ac_header in sys/termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16839: checking for $ac_header" >&5
-+echo "$as_me:16846: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16845 "configure"
-+#line 16852 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16849: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16856: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16855: \$? = $ac_status" >&5
-+  echo "$as_me:16862: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16871,7 +16878,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16874: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16881: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16889,10 +16896,10 @@
- 	(*)	termios_bad=maybe ;;
- 	esac
- 	if test "$termios_bad" = maybe ; then
--	echo "$as_me:16892: checking whether termios.h needs _POSIX_SOURCE" >&5
-+	echo "$as_me:16899: checking whether termios.h needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16895 "configure"
-+#line 16902 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -16904,16 +16911,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16907: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16910: \$? = $ac_status" >&5
-+  echo "$as_me:16917: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16916: \$? = $ac_status" >&5
-+  echo "$as_me:16923: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16921,7 +16928,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16924 "configure"
-+#line 16931 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16935,16 +16942,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16938: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16945: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16941: \$? = $ac_status" >&5
-+  echo "$as_me:16948: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16944: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16951: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16947: \$? = $ac_status" >&5
-+  echo "$as_me:16954: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16960,19 +16967,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16963: result: $termios_bad" >&5
-+	echo "$as_me:16970: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16968: checking for tcgetattr" >&5
-+echo "$as_me:16975: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16975 "configure"
-+#line 16982 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -17000,16 +17007,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17003: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17006: \$? = $ac_status" >&5
-+  echo "$as_me:17013: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17009: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17012: \$? = $ac_status" >&5
-+  echo "$as_me:17019: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17019,21 +17026,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17022: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17029: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17029: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17036: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17036 "configure"
-+#line 17043 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17049,16 +17056,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17052: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17055: \$? = $ac_status" >&5
-+  echo "$as_me:17062: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17058: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17061: \$? = $ac_status" >&5
-+  echo "$as_me:17068: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17066,7 +17073,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17069 "configure"
-+#line 17076 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17088,16 +17095,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17091: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17098: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17094: \$? = $ac_status" >&5
-+  echo "$as_me:17101: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17097: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17104: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17100: \$? = $ac_status" >&5
-+  echo "$as_me:17107: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17105,7 +17112,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17108 "configure"
-+#line 17115 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17127,16 +17134,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17137: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17133: \$? = $ac_status" >&5
-+  echo "$as_me:17140: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17143: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17139: \$? = $ac_status" >&5
-+  echo "$as_me:17146: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17151,7 +17158,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17154: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17161: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17172,7 +17179,7 @@
- ;;
- esac
- 
--echo "$as_me:17175: checking for working mkstemp" >&5
-+echo "$as_me:17182: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17183,7 +17190,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17186 "configure"
-+#line 17193 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -17221,15 +17228,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17231: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17227: \$? = $ac_status" >&5
-+  echo "$as_me:17234: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17229: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17236: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17232: \$? = $ac_status" >&5
-+  echo "$as_me:17239: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17244,16 +17251,16 @@
- fi
- 
- fi
--echo "$as_me:17247: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17254: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17250: checking for mkstemp" >&5
-+	echo "$as_me:17257: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17256 "configure"
-+#line 17263 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17284,16 +17291,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17287: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17294: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17290: \$? = $ac_status" >&5
-+  echo "$as_me:17297: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17293: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17300: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17296: \$? = $ac_status" >&5
-+  echo "$as_me:17303: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17303,7 +17310,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17306: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17313: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17324,21 +17331,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17327: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17334: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17330: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17337: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17336: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17343: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17341 "configure"
-+#line 17348 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17355,15 +17362,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17358: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17365: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17361: \$? = $ac_status" >&5
-+  echo "$as_me:17368: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17363: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17370: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17366: \$? = $ac_status" >&5
-+  echo "$as_me:17373: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17376,7 +17383,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17379: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17386: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17387,13 +17394,13 @@
- fi
- 
- fi
--echo "$as_me:17390: checking for intptr_t" >&5
-+echo "$as_me:17397: checking for intptr_t" >&5
- echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
- if test "${ac_cv_type_intptr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17396 "configure"
-+#line 17403 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17408,16 +17415,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17411: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17418: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17414: \$? = $ac_status" >&5
-+  echo "$as_me:17421: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17417: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17424: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17420: \$? = $ac_status" >&5
-+  echo "$as_me:17427: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17427,7 +17434,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17430: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17437: result: $ac_cv_type_intptr_t" >&5
- echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
- if test $ac_cv_type_intptr_t = yes; then
-   :
-@@ -17439,13 +17446,13 @@
- 
- fi
- 
--echo "$as_me:17442: checking for ssize_t" >&5
-+echo "$as_me:17449: checking for ssize_t" >&5
- echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17448 "configure"
-+#line 17455 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17460,16 +17467,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17463: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17470: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17466: \$? = $ac_status" >&5
-+  echo "$as_me:17473: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17469: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17476: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17472: \$? = $ac_status" >&5
-+  echo "$as_me:17479: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17479,7 +17486,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17482: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17489: result: $ac_cv_type_ssize_t" >&5
- echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
- if test $ac_cv_type_ssize_t = yes; then
-   :
-@@ -17491,14 +17498,14 @@
- 
- fi
- 
--echo "$as_me:17494: checking for type sigaction_t" >&5
-+echo "$as_me:17501: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17501 "configure"
-+#line 17508 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -17511,16 +17518,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17514: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17517: \$? = $ac_status" >&5
-+  echo "$as_me:17524: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17520: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17523: \$? = $ac_status" >&5
-+  echo "$as_me:17530: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17531,14 +17538,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17534: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17541: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17541: checking declaration of size-change" >&5
-+echo "$as_me:17548: checking declaration of size-change" >&5
- echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
- if test "${cf_cv_sizechange+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17553,7 +17560,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17556 "configure"
-+#line 17563 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -17597,16 +17604,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17600: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17607: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17603: \$? = $ac_status" >&5
-+  echo "$as_me:17610: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17606: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17613: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17609: \$? = $ac_status" >&5
-+  echo "$as_me:17616: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17625,7 +17632,7 @@
- done
- 
- fi
--echo "$as_me:17628: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17635: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17643,13 +17650,13 @@
- 	esac
- fi
- 
--echo "$as_me:17646: checking for memmove" >&5
-+echo "$as_me:17653: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17652 "configure"
-+#line 17659 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17680,16 +17687,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17683: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17690: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17686: \$? = $ac_status" >&5
-+  echo "$as_me:17693: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17696: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17692: \$? = $ac_status" >&5
-+  echo "$as_me:17699: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17699,19 +17706,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17702: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17709: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17708: checking for bcopy" >&5
-+echo "$as_me:17715: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17714 "configure"
-+#line 17721 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17742,16 +17749,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17752: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17748: \$? = $ac_status" >&5
-+  echo "$as_me:17755: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17758: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17754: \$? = $ac_status" >&5
-+  echo "$as_me:17761: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17761,11 +17768,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17764: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17771: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17768: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17775: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17775,7 +17782,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17778 "configure"
-+#line 17785 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17789,15 +17796,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17792: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17799: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17795: \$? = $ac_status" >&5
-+  echo "$as_me:17802: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17800: \$? = $ac_status" >&5
-+  echo "$as_me:17807: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17810,7 +17817,7 @@
- fi
- 
- fi
--echo "$as_me:17813: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17820: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17837,13 +17844,13 @@
- for ac_func in posix_openpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:17840: checking for $ac_func" >&5
-+echo "$as_me:17847: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17846 "configure"
-+#line 17853 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -17874,16 +17881,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17877: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17884: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17880: \$? = $ac_status" >&5
-+  echo "$as_me:17887: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17883: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17886: \$? = $ac_status" >&5
-+  echo "$as_me:17893: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -17893,7 +17900,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17896: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17903: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -17903,7 +17910,7 @@
- fi
- done
-  }
--echo "$as_me:17906: checking if poll really works" >&5
-+echo "$as_me:17913: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17913,7 +17920,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17916 "configure"
-+#line 17923 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17965,15 +17972,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17968: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17975: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17971: \$? = $ac_status" >&5
-+  echo "$as_me:17978: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17973: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17980: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17976: \$? = $ac_status" >&5
-+  echo "$as_me:17983: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17985,21 +17992,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17988: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17995: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:17995: checking for va_copy" >&5
-+echo "$as_me:18002: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18002 "configure"
-+#line 18009 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -18016,16 +18023,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18019: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18026: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18022: \$? = $ac_status" >&5
-+  echo "$as_me:18029: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18025: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18028: \$? = $ac_status" >&5
-+  echo "$as_me:18035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -18035,7 +18042,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18038: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:18045: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -18043,14 +18050,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:18046: checking for __va_copy" >&5
-+echo "$as_me:18053: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18053 "configure"
-+#line 18060 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -18067,16 +18074,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18070: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18077: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18073: \$? = $ac_status" >&5
-+  echo "$as_me:18080: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18076: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18083: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18079: \$? = $ac_status" >&5
-+  echo "$as_me:18086: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18086,7 +18093,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18089: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18096: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18094,13 +18101,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18097: checking for pid_t" >&5
-+echo "$as_me:18104: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18103 "configure"
-+#line 18110 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18115,16 +18122,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18118: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18125: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18121: \$? = $ac_status" >&5
-+  echo "$as_me:18128: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18124: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18131: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18127: \$? = $ac_status" >&5
-+  echo "$as_me:18134: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18134,7 +18141,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18137: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18144: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -18149,23 +18156,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18152: checking for $ac_header" >&5
-+echo "$as_me:18159: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18158 "configure"
-+#line 18165 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18162: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18169: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18168: \$? = $ac_status" >&5
-+  echo "$as_me:18175: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18184,7 +18191,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18187: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18194: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18197,13 +18204,13 @@
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18200: checking for $ac_func" >&5
-+echo "$as_me:18207: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18206 "configure"
-+#line 18213 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18234,16 +18241,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18237: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18240: \$? = $ac_status" >&5
-+  echo "$as_me:18247: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18246: \$? = $ac_status" >&5
-+  echo "$as_me:18253: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18253,7 +18260,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18256: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18263: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18265,7 +18272,7 @@
- 
- ac_cv_func_fork_works=$ac_cv_func_fork
- if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:18268: checking for working fork" >&5
-+  echo "$as_me:18275: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18288,15 +18295,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18291: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18294: \$? = $ac_status" >&5
-+  echo "$as_me:18301: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18296: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18299: \$? = $ac_status" >&5
-+  echo "$as_me:18306: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18308,7 +18315,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18311: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18318: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18322,12 +18329,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18325: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18332: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:18330: checking for working vfork" >&5
-+  echo "$as_me:18337: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18336,7 +18343,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18339 "configure"
-+#line 18346 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -18433,15 +18440,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18436: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18443: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18439: \$? = $ac_status" >&5
-+  echo "$as_me:18446: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18448: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18444: \$? = $ac_status" >&5
-+  echo "$as_me:18451: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18453,13 +18460,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18456: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18463: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:18462: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18469: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -18486,7 +18493,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18489: checking for openpty in -lutil" >&5
-+echo "$as_me:18496: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18494,7 +18501,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18497 "configure"
-+#line 18504 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18513,16 +18520,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18516: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18523: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18519: \$? = $ac_status" >&5
-+  echo "$as_me:18526: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18522: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18525: \$? = $ac_status" >&5
-+  echo "$as_me:18532: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18533,7 +18540,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18536: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18543: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18541,7 +18548,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18544: checking for openpty header" >&5
-+echo "$as_me:18551: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18568,7 +18575,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18571 "configure"
-+#line 18578 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18585,16 +18592,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18588: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18595: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18591: \$? = $ac_status" >&5
-+  echo "$as_me:18598: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18594: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18601: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18597: \$? = $ac_status" >&5
-+  echo "$as_me:18604: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18612,7 +18619,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18615: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18622: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18682,7 +18689,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18685 "configure"
-+#line 18692 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18694,16 +18701,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18704: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18700: \$? = $ac_status" >&5
-+  echo "$as_me:18707: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18710: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18706: \$? = $ac_status" >&5
-+  echo "$as_me:18713: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18720,7 +18727,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18723: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18730: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18756,7 +18763,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18759: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18766: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18767,7 +18774,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18770: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18777: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18836,7 +18843,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18839 "configure"
-+#line 18846 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18848,16 +18855,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18858: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18854: \$? = $ac_status" >&5
-+  echo "$as_me:18861: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18864: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18860: \$? = $ac_status" >&5
-+  echo "$as_me:18867: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18874,7 +18881,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18877: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18884: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18954,7 +18961,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18957: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18964: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18971,23 +18978,23 @@
- 	fi
- esac
- 
--echo "$as_me:18974: checking for db.h" >&5
-+echo "$as_me:18981: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18980 "configure"
-+#line 18987 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:18984: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18991: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18990: \$? = $ac_status" >&5
-+  echo "$as_me:18997: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19006,11 +19013,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19009: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:19016: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:19013: checking for version of db" >&5
-+echo "$as_me:19020: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19021,10 +19028,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:19024: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:19031: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19027 "configure"
-+#line 19034 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19054,16 +19061,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19057: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19060: \$? = $ac_status" >&5
-+  echo "$as_me:19067: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19063: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19066: \$? = $ac_status" >&5
-+  echo "$as_me:19073: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19077,16 +19084,16 @@
- done
- 
- fi
--echo "$as_me:19080: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19087: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19084: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19091: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19089: checking for db libraries" >&5
-+echo "$as_me:19096: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19116,10 +19123,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19119: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19126: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19122 "configure"
-+#line 19129 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19174,16 +19181,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19177: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19180: \$? = $ac_status" >&5
-+  echo "$as_me:19187: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19183: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19186: \$? = $ac_status" >&5
-+  echo "$as_me:19193: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19203,11 +19210,11 @@
- done
- 
- fi
--echo "$as_me:19206: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19213: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19210: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19217: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19233,7 +19240,7 @@
- 
- else
- 
--	{ { echo "$as_me:19236: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19243: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19248,7 +19255,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19251: checking if we should include stdbool.h" >&5
-+echo "$as_me:19258: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19256,7 +19263,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19259 "configure"
-+#line 19266 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19268,23 +19275,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19271: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19278: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19274: \$? = $ac_status" >&5
-+  echo "$as_me:19281: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19277: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19284: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19280: \$? = $ac_status" >&5
-+  echo "$as_me:19287: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19287 "configure"
-+#line 19294 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19300,16 +19307,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19303: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19310: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19306: \$? = $ac_status" >&5
-+  echo "$as_me:19313: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19309: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19316: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19312: \$? = $ac_status" >&5
-+  echo "$as_me:19319: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19323,13 +19330,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19326: result: yes" >&5
-+then	echo "$as_me:19333: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19328: result: no" >&5
-+else	echo "$as_me:19335: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19332: checking for builtin bool type" >&5
-+echo "$as_me:19339: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19337,7 +19344,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19340 "configure"
-+#line 19347 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -19352,16 +19359,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19362: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19358: \$? = $ac_status" >&5
-+  echo "$as_me:19365: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19368: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19364: \$? = $ac_status" >&5
-+  echo "$as_me:19371: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19374,9 +19381,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19377: result: yes" >&5
-+then	echo "$as_me:19384: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19379: result: no" >&5
-+else	echo "$as_me:19386: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19393,10 +19400,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:19396: checking if we already have C++ library" >&5
-+	echo "$as_me:19403: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19399 "configure"
-+#line 19406 "configure"
- #include "confdefs.h"
- 
- 			#include <iostream>
-@@ -19410,16 +19417,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19413: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19416: \$? = $ac_status" >&5
-+  echo "$as_me:19423: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19419: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19422: \$? = $ac_status" >&5
-+  echo "$as_me:19429: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19428,7 +19435,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:19431: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:19438: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -19436,14 +19443,18 @@
- 	then
- 		case $cf_cv_system_name in
- 		(os2*)
--			cf_stdcpp_libname=stdcpp
-+			if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
-+				cf_stdcpp_libname=stdcpp
-+			else
-+				cf_stdcpp_libname=stdc++
-+			fi
- 			;;
- 		(*)
- 			cf_stdcpp_libname=stdc++
- 			;;
- 		esac
- 
--		echo "$as_me:19446: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:19457: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19469,7 +19480,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19472 "configure"
-+#line 19483 "configure"
- #include "confdefs.h"
- 
- 				#include <iostream>
-@@ -19483,16 +19494,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19486: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19489: \$? = $ac_status" >&5
-+  echo "$as_me:19500: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19492: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19495: \$? = $ac_status" >&5
-+  echo "$as_me:19506: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19504,7 +19515,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19507: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19518: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19526,7 +19537,7 @@
- 	fi
- fi
- 
--	echo "$as_me:19529: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19540: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19542,15 +19553,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19545: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19556: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19548: \$? = $ac_status" >&5
-+  echo "$as_me:19559: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19550: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19553: \$? = $ac_status" >&5
-+  echo "$as_me:19564: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19561,10 +19572,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19564: result: yes" >&5
-+  echo "$as_me:19575: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19567: result: no" >&5
-+  echo "$as_me:19578: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19584,7 +19595,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19587: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19598: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19605,7 +19616,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19608 "configure"
-+#line 19619 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19619,16 +19630,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19633: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19625: \$? = $ac_status" >&5
-+  echo "$as_me:19636: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19639: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19631: \$? = $ac_status" >&5
-+  echo "$as_me:19642: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19665,7 +19676,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19668 "configure"
-+#line 19679 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -19679,16 +19690,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19682: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19693: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19685: \$? = $ac_status" >&5
-+  echo "$as_me:19696: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19688: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19699: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19691: \$? = $ac_status" >&5
-+  echo "$as_me:19702: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19721,7 +19732,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19724: result: $cf_cxx_library" >&5
-+	echo "$as_me:19735: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19737,7 +19748,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19740: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19751: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19754,18 +19765,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19757 "configure"
-+#line 19768 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19762: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19773: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19768: \$? = $ac_status" >&5
-+  echo "$as_me:19779: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19788,17 +19799,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19791 "configure"
-+#line 19802 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19795: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19806: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19801: \$? = $ac_status" >&5
-+  echo "$as_me:19812: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19835,7 +19846,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19838: result: $CXXCPP" >&5
-+echo "$as_me:19849: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19845,18 +19856,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19848 "configure"
-+#line 19859 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19853: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19864: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19859: \$? = $ac_status" >&5
-+  echo "$as_me:19870: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19879,17 +19890,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19882 "configure"
-+#line 19893 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19886: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19897: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19892: \$? = $ac_status" >&5
-+  echo "$as_me:19903: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19917,7 +19928,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19920: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19931: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19932,23 +19943,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19935: checking for $ac_header" >&5
-+echo "$as_me:19946: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19941 "configure"
-+#line 19952 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19945: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19956: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19951: \$? = $ac_status" >&5
-+  echo "$as_me:19962: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19967,7 +19978,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19970: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19981: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19980,23 +19991,23 @@
- for ac_header in iostream
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19983: checking for $ac_header" >&5
-+echo "$as_me:19994: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19989 "configure"
-+#line 20000 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19993: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20004: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19999: \$? = $ac_status" >&5
-+  echo "$as_me:20010: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -20015,7 +20026,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20018: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20029: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -20026,10 +20037,10 @@
- done
- 
- if test x"$ac_cv_header_iostream" = xyes ; then
--	echo "$as_me:20029: checking if iostream uses std-namespace" >&5
-+	echo "$as_me:20040: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20032 "configure"
-+#line 20043 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -20046,16 +20057,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20049: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20060: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20052: \$? = $ac_status" >&5
-+  echo "$as_me:20063: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20055: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20066: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20058: \$? = $ac_status" >&5
-+  echo "$as_me:20069: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -20064,7 +20075,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:20067: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:20078: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -20075,7 +20086,7 @@
- 	fi
- fi
- 
--echo "$as_me:20078: checking if we should include stdbool.h" >&5
-+echo "$as_me:20089: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -20083,7 +20094,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20086 "configure"
-+#line 20097 "configure"
- #include "confdefs.h"
- 
- int
-@@ -20095,23 +20106,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20109: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20101: \$? = $ac_status" >&5
-+  echo "$as_me:20112: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20115: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20107: \$? = $ac_status" >&5
-+  echo "$as_me:20118: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 20114 "configure"
-+#line 20125 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20127,16 +20138,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20130: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20141: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20133: \$? = $ac_status" >&5
-+  echo "$as_me:20144: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20139: \$? = $ac_status" >&5
-+  echo "$as_me:20150: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20150,13 +20161,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20153: result: yes" >&5
-+then	echo "$as_me:20164: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20155: result: no" >&5
-+else	echo "$as_me:20166: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20159: checking for builtin bool type" >&5
-+echo "$as_me:20170: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20164,7 +20175,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20167 "configure"
-+#line 20178 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -20179,16 +20190,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20182: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20193: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20185: \$? = $ac_status" >&5
-+  echo "$as_me:20196: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20188: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20199: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20191: \$? = $ac_status" >&5
-+  echo "$as_me:20202: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20201,13 +20212,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20204: result: yes" >&5
-+then	echo "$as_me:20215: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20206: result: no" >&5
-+else	echo "$as_me:20217: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20210: checking for size of bool" >&5
-+echo "$as_me:20221: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20218,7 +20229,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20221 "configure"
-+#line 20232 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20260,15 +20271,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20263: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20266: \$? = $ac_status" >&5
-+  echo "$as_me:20277: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20268: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20271: \$? = $ac_status" >&5
-+  echo "$as_me:20282: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20286,18 +20297,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20289: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20300: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20295: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20306: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20300: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20311: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20315,7 +20326,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20318 "configure"
-+#line 20329 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -20329,16 +20340,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20332: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20343: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20335: \$? = $ac_status" >&5
-+  echo "$as_me:20346: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20338: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20341: \$? = $ac_status" >&5
-+  echo "$as_me:20352: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -20359,12 +20370,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:20362: result: $cf_result" >&5
-+echo "$as_me:20373: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20367: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20378: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20381,7 +20392,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20384 "configure"
-+#line 20395 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20400,15 +20411,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20403: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20406: \$? = $ac_status" >&5
-+  echo "$as_me:20417: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20408: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20419: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20411: \$? = $ac_status" >&5
-+  echo "$as_me:20422: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20427,7 +20438,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20430: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20441: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20437,7 +20448,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20440: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20451: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20451,7 +20462,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20454 "configure"
-+#line 20465 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20495,16 +20506,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20498: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20509: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20501: \$? = $ac_status" >&5
-+  echo "$as_me:20512: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20504: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20515: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20507: \$? = $ac_status" >&5
-+  echo "$as_me:20518: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20522,7 +20533,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20525: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20536: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20571,7 +20582,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20574: checking for size of bool" >&5
-+echo "$as_me:20585: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20582,7 +20593,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20585 "configure"
-+#line 20596 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20624,15 +20635,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20627: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20630: \$? = $ac_status" >&5
-+  echo "$as_me:20641: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20632: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20635: \$? = $ac_status" >&5
-+  echo "$as_me:20646: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20650,25 +20661,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20653: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20664: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20659: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20670: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20665: checking for fallback type of bool" >&5
-+			echo "$as_me:20676: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20671: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20682: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20697,7 +20708,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20700: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20711: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20708,7 +20719,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20711: checking for $ac_word" >&5
-+echo "$as_me:20722: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20723,7 +20734,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20726: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20737: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20732,10 +20743,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20735: result: $gnat_exists" >&5
-+  echo "$as_me:20746: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20738: result: no" >&5
-+  echo "$as_me:20749: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20744,12 +20755,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20747: checking for gnat version" >&5
-+echo "$as_me:20758: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20752: result: $cf_gnat_version" >&5
-+echo "$as_me:20763: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20757,7 +20768,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20760: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20771: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20765,7 +20776,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20768: checking for $ac_word" >&5
-+echo "$as_me:20779: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20780,7 +20791,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20783: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20794: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20789,10 +20800,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20792: result: $M4_exists" >&5
-+  echo "$as_me:20803: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20795: result: no" >&5
-+  echo "$as_me:20806: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20801,7 +20812,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20804: checking if GNAT works" >&5
-+		echo "$as_me:20815: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20829,7 +20840,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20832: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20843: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20838,7 +20849,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20841: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20852: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20855,10 +20866,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20858: result: $ADAFLAGS" >&5
-+	echo "$as_me:20869: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20861: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20872: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20868,11 +20879,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20871: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20882: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20875: checking if GNAT supports generics" >&5
-+echo "$as_me:20886: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20882,7 +20893,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20885: result: $cf_gnat_generics" >&5
-+echo "$as_me:20896: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20894,7 +20905,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20897: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20908: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20942,7 +20953,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20945: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20956: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20955,7 +20966,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20958: checking if GNAT supports project files" >&5
-+echo "$as_me:20969: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -21015,15 +21026,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:21018: result: $cf_gnat_projects" >&5
-+echo "$as_me:21029: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:21024: checking if GNAT supports libraries" >&5
-+	echo "$as_me:21035: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:21026: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21037: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -21043,7 +21054,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:21046: checking for ada-compiler" >&5
-+echo "$as_me:21057: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -21054,12 +21065,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:21057: result: $cf_ada_compiler" >&5
-+echo "$as_me:21068: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:21062: checking for ada-include" >&5
-+echo "$as_me:21073: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -21095,7 +21106,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21098: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21109: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21104,10 +21115,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:21107: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21118: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:21110: checking for ada-objects" >&5
-+echo "$as_me:21121: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21143,7 +21154,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21146: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21157: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21152,10 +21163,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21155: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21166: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21158: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21169: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21165,7 +21176,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21168: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21179: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21188,13 +21199,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21191: checking for wchar_t" >&5
-+	echo "$as_me:21202: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21197 "configure"
-+#line 21208 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21209,16 +21220,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21212: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21215: \$? = $ac_status" >&5
-+  echo "$as_me:21226: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21218: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21221: \$? = $ac_status" >&5
-+  echo "$as_me:21232: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21228,10 +21239,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21231: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21242: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21234: checking size of wchar_t" >&5
-+echo "$as_me:21245: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21240,7 +21251,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21243 "configure"
-+#line 21254 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21252,21 +21263,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21255: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21266: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21258: \$? = $ac_status" >&5
-+  echo "$as_me:21269: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21261: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21272: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21264: \$? = $ac_status" >&5
-+  echo "$as_me:21275: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21269 "configure"
-+#line 21280 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21278,16 +21289,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21281: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21284: \$? = $ac_status" >&5
-+  echo "$as_me:21295: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21287: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21298: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21290: \$? = $ac_status" >&5
-+  echo "$as_me:21301: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21303,7 +21314,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21306 "configure"
-+#line 21317 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21315,16 +21326,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21318: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21329: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21321: \$? = $ac_status" >&5
-+  echo "$as_me:21332: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21324: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21335: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21327: \$? = $ac_status" >&5
-+  echo "$as_me:21338: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21340,7 +21351,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21343 "configure"
-+#line 21354 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21352,16 +21363,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21355: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21366: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21358: \$? = $ac_status" >&5
-+  echo "$as_me:21369: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21372: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21364: \$? = $ac_status" >&5
-+  echo "$as_me:21375: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21374,12 +21385,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21377: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21388: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21382 "configure"
-+#line 21393 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21395,15 +21406,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21401: \$? = $ac_status" >&5
-+  echo "$as_me:21412: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21403: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21414: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21406: \$? = $ac_status" >&5
-+  echo "$as_me:21417: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21419,7 +21430,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21422: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21433: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-@@ -21437,7 +21448,7 @@
- ### chooses to split module lists into libraries.
- ###
- ### (see CF_LIB_RULES).
--echo "$as_me:21440: checking for library subsets" >&5
-+echo "$as_me:21451: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21479,7 +21490,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21482: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21493: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21510,7 +21521,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21513: checking default library suffix" >&5
-+echo "$as_me:21524: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21521,10 +21532,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21524: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21535: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21527: checking default library-dependency suffix" >&5
-+echo "$as_me:21538: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21582,10 +21593,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21585: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21596: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21588: checking default object directory" >&5
-+echo "$as_me:21599: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21601,11 +21612,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21604: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21615: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21608: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21619: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21673,7 +21684,7 @@
- 	fi
- 
- fi
--echo "$as_me:21676: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21687: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21846,19 +21857,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21849: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21860: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 21854 "configure"
-+#line 21865 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21858: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21869: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21861: \$? = $ac_status" >&5
-+  echo "$as_me:21872: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21869,10 +21880,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21872 "configure"
-+#line 21883 "configure"
- #include "confdefs.h"
- 
--#line 21875 "configure"
-+#line 21886 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21887,16 +21898,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21890: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21901: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21893: \$? = $ac_status" >&5
-+  echo "$as_me:21904: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21896: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21907: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21899: \$? = $ac_status" >&5
-+  echo "$as_me:21910: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21919,7 +21930,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21922: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21933: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21935,7 +21946,7 @@
- 	;;
- esac
- 
--echo "$as_me:21938: checking where we will install curses.h" >&5
-+echo "$as_me:21949: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21945,7 +21956,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21948: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21959: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21953,7 +21964,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21956: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21967: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21971,7 +21982,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21974: checking for src modules" >&5
-+echo "$as_me:21985: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -22036,7 +22047,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:22039: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22050: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22256,7 +22267,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22259: checking for $ac_word" >&5
-+echo "$as_me:22270: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22273,7 +22284,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22276: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22287: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22285,10 +22296,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22288: result: $TIC_PATH" >&5
-+  echo "$as_me:22299: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22291: result: no" >&5
-+  echo "$as_me:22302: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22296,7 +22307,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22299: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22310: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22315,6 +22326,16 @@
- FORM_NAME=form
- CXX_NAME=ncurses++
- 
-+# workaround for OS/2 (20151017)
-+case $cf_cv_system_name in
-+(os2*)
-+	LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
-+	;;
-+(*)
-+	LIBTOOL_OPTS_CXX=
-+	;;
-+esac
-+
- # workaround for g++ versus Solaris (20131116)
- case $cf_cv_system_name in
- (solaris2*)
-@@ -22322,7 +22343,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22325: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22346: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22333,7 +22354,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22336: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22357: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22349,7 +22370,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22352: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22373: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22406,7 +22427,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22409: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22430: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22508,7 +22529,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22511: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22532: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22684,7 +22705,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22687: error: ambiguous option: $1
-+    { { echo "$as_me:22708: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22703,7 +22724,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22706: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22727: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22821,7 +22842,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22824: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23157,6 +23178,7 @@
- s,@MENU_NAME@,$MENU_NAME,;t t
- s,@FORM_NAME@,$FORM_NAME,;t t
- s,@CXX_NAME@,$CXX_NAME,;t t
-+s,@LIBTOOL_OPTS_CXX@,$LIBTOOL_OPTS_CXX,;t t
- s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t
- s,@MISC_INSTALL_DATA@,$MISC_INSTALL_DATA,;t t
- s,@MISC_UNINSTALL_DATA@,$MISC_UNINSTALL_DATA,;t t
-@@ -23294,7 +23316,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23297: creating $ac_file" >&5
-+    { echo "$as_me:23319: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23312,7 +23334,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23315: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23325,7 +23347,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23328: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23350: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23341,7 +23363,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23344: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23366: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -23350,7 +23372,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23353: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23375: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -23387,7 +23409,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:23390: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23412: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -23398,7 +23420,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:23401: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23423: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23447,7 +23469,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23450: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23458,7 +23480,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23461: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23471,7 +23493,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23474: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23496: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23529,7 +23551,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:23532: $ac_file is unchanged" >&5
-+      { echo "$as_me:23554: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23867,7 +23889,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23870: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23892: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.619 
---- ncurses-6.0-20151010+/configure.in	2015-08-05 23:32:27.000000000 +0000
-+++ ncurses-6.0-20151017/configure.in	2015-10-17 23:01:54.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.619 2015/08/05 23:32:27 tom Exp $
-+dnl $Id: configure.in,v 1.620 2015/10/17 23:01:54 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.619 $)
-+AC_REVISION($Revision: 1.620 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -2075,6 +2075,17 @@
- AC_SUBST(FORM_NAME)
- AC_SUBST(CXX_NAME)
- 
-+# workaround for OS/2 (20151017)
-+case $cf_cv_system_name in
-+(os2*)
-+	LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
-+	;;
-+(*)
-+	LIBTOOL_OPTS_CXX=
-+	;;
-+esac
-+AC_SUBST(LIBTOOL_OPTS_CXX)
-+
- # workaround for g++ versus Solaris (20131116)
- case $cf_cv_system_name in
- (solaris2*)
-Index: dist.mk
-Prereq:  1.1073 
---- ncurses-6.0-20151010+/dist.mk	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/dist.mk	2015-10-17 20:29:47.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1073 2015/10/10 17:06:12 tom Exp $
-+# $Id: dist.mk,v 1.1074 2015/10/17 20:29:47 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151010
-+NCURSES_PATCH = 20151017
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: ncurses/Makefile.in
-Prereq:  1.147 
---- ncurses-6.0-20151010+/ncurses/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/Makefile.in	2015-10-17 21:48:15.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.147 2015/08/05 23:15:41 tom Exp $
-+# $Id: Makefile.in,v 1.148 2015/10/17 21:48:15 Esa.Peuha Exp $
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -225,7 +225,7 @@
- 	./make_keys$(BUILD_EXEEXT) keys.list > $@
- 
- keys.list :	$(tinfo)/MKkeys_list.sh
--	AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | sort >$@
-+	AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
- 
- make_keys$(BUILD_EXEEXT) : \
- 		$(tinfo)/make_keys.c \
-Index: ncurses/base/lib_color.c
-Prereq:  1.111 
---- ncurses-6.0-20151010+/ncurses/base/lib_color.c	2015-08-22 22:38:58.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/base/lib_color.c	2015-10-17 20:39:18.000000000 +0000
-@@ -45,7 +45,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_color.c,v 1.111 2015/08/22 22:38:58 tom Exp $")
-+MODULE_ID("$Id: lib_color.c,v 1.112 2015/10/17 20:39:18 Denis.Tikhomirov Exp $")
- 
- #ifdef USE_TERM_DRIVER
- #define CanChange      InfoOf(SP_PARM).canchange
-@@ -858,8 +858,6 @@
- 	}
-     } else {
- 	reset_color_pair(NCURSES_SP_ARG);
--	if (old_pair < 0)
--	    return;
-     }
- 
- #if NCURSES_EXT_FUNCS
-Index: ncurses/base/lib_mouse.c
-Prereq:  1.166 
---- ncurses-6.0-20151010+/ncurses/base/lib_mouse.c	2015-07-05 00:28:27.000000000 +0000
-+++ ncurses-6.0-20151017/ncurses/base/lib_mouse.c	2015-10-17 22:08:05.000000000 +0000
-@@ -84,7 +84,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_mouse.c,v 1.166 2015/07/05 00:28:27 tom Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.167 2015/10/17 22:08:05 KO.Myung-Hun Exp $")
- 
- #include <tic.h>
- 
-@@ -888,7 +888,7 @@
-     do { \
- 	    eventp->bstate = MASK_PRESS(n); \
- 	    sp->_mouse_bstate |= MASK_PRESS(n); \
--	    if (kbuf[0] & 0x40) { \
-+	    if (button & 0x40) { \
- 		    eventp->bstate = MASK_RELEASE(n); \
- 		    sp->_mouse_bstate &= ~MASK_PRESS(n); \
- 	    } \
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151010+/package/debian-mingw/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian-mingw/changelog	2015-10-17 20:29:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151010) unstable; urgency=low
-+ncurses6 (6.0+20151017) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Oct 2015 13:06:12 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Oct 2015 16:29:47 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151010+/package/debian-mingw64/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian-mingw64/changelog	2015-10-17 20:29:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151010) unstable; urgency=low
-+ncurses6 (6.0+20151017) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Oct 2015 13:06:12 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Oct 2015 16:29:47 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151010+/package/debian/changelog	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/debian/changelog	2015-10-17 20:29:47.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151010) unstable; urgency=low
-+ncurses6 (6.0+20151017) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Oct 2015 13:06:12 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Oct 2015 16:29:47 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.126 
---- ncurses-6.0-20151010+/package/mingw-ncurses.nsi	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/mingw-ncurses.nsi	2015-10-17 20:29:47.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.126 2015/10/10 17:06:12 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "1010"

-+!define VERSION_MMDD  "1017"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151010+/package/mingw-ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/mingw-ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151010
-+Release: 20151017
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151010+/package/ncurses.spec	2015-10-10 17:06:12.000000000 +0000
-+++ ncurses-6.0-20151017/package/ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151010
-+Release: 20151017
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/aclocal.m4
-Prereq:  1.121 
---- ncurses-6.0-20151010+/test/aclocal.m4	2015-10-10 20:30:48.000000000 +0000
-+++ ncurses-6.0-20151017/test/aclocal.m4	2015-10-17 23:06:10.000000000 +0000
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.121 2015/10/10 20:30:48 tom Exp $
-+dnl $Id: aclocal.m4,v 1.122 2015/10/17 23:06:10 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -3306,7 +3306,7 @@
- test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
-+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -3376,6 +3376,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[[45]]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-Index: test/configure
---- ncurses-6.0-20151010+/test/configure	2015-10-10 20:30:58.000000000 +0000
-+++ ncurses-6.0-20151017/test/configure	2015-10-17 23:06:33.000000000 +0000
-@@ -3173,6 +3173,9 @@
- (openbsd*)
- 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
- 	;;
-+(os2*)
-+	cf_XOPEN_SOURCE=
-+	;;
- (osf[45]*)
- 	cf_xopen_source="-D_OSF_SOURCE"
- 	;;
-@@ -3192,14 +3195,14 @@
- 	;;
- (*)
- 
--echo "$as_me:3195: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:3198: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3202 "configure"
-+#line 3205 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -3218,16 +3221,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3221: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3224: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3224: \$? = $ac_status" >&5
-+  echo "$as_me:3227: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3227: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3230: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3230: \$? = $ac_status" >&5
-+  echo "$as_me:3233: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -3236,7 +3239,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 3239 "configure"
-+#line 3242 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -3255,16 +3258,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3258: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3261: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3261: \$? = $ac_status" >&5
-+  echo "$as_me:3264: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3264: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3267: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3267: \$? = $ac_status" >&5
-+  echo "$as_me:3270: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -3279,7 +3282,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:3282: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:3285: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -3387,16 +3390,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:3390: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:3393: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:3396: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:3399: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3399 "configure"
-+#line 3402 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -3411,16 +3414,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3414: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3417: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3417: \$? = $ac_status" >&5
-+  echo "$as_me:3420: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3420: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3423: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3423: \$? = $ac_status" >&5
-+  echo "$as_me:3426: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -3441,7 +3444,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3444 "configure"
-+#line 3447 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -3456,16 +3459,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3462: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3462: \$? = $ac_status" >&5
-+  echo "$as_me:3465: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3465: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3468: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3468: \$? = $ac_status" >&5
-+  echo "$as_me:3471: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3476,15 +3479,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:3479: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:3482: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:3484: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:3487: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 3487 "configure"
-+#line 3490 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -3499,16 +3502,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3502: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3505: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3505: \$? = $ac_status" >&5
-+  echo "$as_me:3508: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3508: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3511: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3511: \$? = $ac_status" >&5
-+  echo "$as_me:3514: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -3524,7 +3527,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:3527: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:3530: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -3682,7 +3685,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:3685: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:3688: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -3690,7 +3693,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:3693: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:3696: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -3698,7 +3701,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:3701: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:3704: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -3706,10 +3709,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:3709: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:3712: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3712 "configure"
-+#line 3715 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -3724,16 +3727,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3727: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3730: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3730: \$? = $ac_status" >&5
-+  echo "$as_me:3733: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3733: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3736: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3736: \$? = $ac_status" >&5
-+  echo "$as_me:3739: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -3742,12 +3745,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:3745: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:3748: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 3750 "configure"
-+#line 3753 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -3762,16 +3765,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3765: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3768: \$? = $ac_status" >&5
-+  echo "$as_me:3771: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3771: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3774: \$? = $ac_status" >&5
-+  echo "$as_me:3777: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -3782,19 +3785,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:3785: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:3788: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:3790: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:3793: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3797 "configure"
-+#line 3800 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -3813,16 +3816,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3816: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3819: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3819: \$? = $ac_status" >&5
-+  echo "$as_me:3822: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3822: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3825: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3825: \$? = $ac_status" >&5
-+  echo "$as_me:3828: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -3831,7 +3834,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 3834 "configure"
-+#line 3837 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -3850,16 +3853,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:3853: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:3856: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:3856: \$? = $ac_status" >&5
-+  echo "$as_me:3859: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:3859: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:3862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3862: \$? = $ac_status" >&5
-+  echo "$as_me:3865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -3874,7 +3877,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:3877: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:3880: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -3972,7 +3975,7 @@
- 	fi
- fi
- 
--echo "$as_me:3975: checking for signal global datatype" >&5
-+echo "$as_me:3978: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3984,7 +3987,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 3987 "configure"
-+#line 3990 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -4007,16 +4010,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4013: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4013: \$? = $ac_status" >&5
-+  echo "$as_me:4016: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4019: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4019: \$? = $ac_status" >&5
-+  echo "$as_me:4022: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -4030,14 +4033,14 @@
- 
- fi
- 
--echo "$as_me:4033: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:4036: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <<EOF
- #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
- EOF
- 
--echo "$as_me:4040: checking if you want to use pkg-config" >&5
-+echo "$as_me:4043: checking if you want to use pkg-config" >&5
- echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
- 
- # Check whether --with-pkg-config or --without-pkg-config was given.
-@@ -4047,7 +4050,7 @@
- else
-   cf_pkg_config=yes
- fi;
--echo "$as_me:4050: result: $cf_pkg_config" >&5
-+echo "$as_me:4053: result: $cf_pkg_config" >&5
- echo "${ECHO_T}$cf_pkg_config" >&6
- 
- case $cf_pkg_config in
-@@ -4059,7 +4062,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--echo "$as_me:4062: checking for $ac_word" >&5
-+echo "$as_me:4065: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4076,7 +4079,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:4079: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4082: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -4087,10 +4090,10 @@
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- 
- if test -n "$PKG_CONFIG"; then
--  echo "$as_me:4090: result: $PKG_CONFIG" >&5
-+  echo "$as_me:4093: result: $PKG_CONFIG" >&5
- echo "${ECHO_T}$PKG_CONFIG" >&6
- else
--  echo "$as_me:4093: result: no" >&5
-+  echo "$as_me:4096: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4099,7 +4102,7 @@
-   ac_pt_PKG_CONFIG=$PKG_CONFIG
-   # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:4102: checking for $ac_word" >&5
-+echo "$as_me:4105: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4116,7 +4119,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
--   echo "$as_me:4119: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4122: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -4128,10 +4131,10 @@
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- 
- if test -n "$ac_pt_PKG_CONFIG"; then
--  echo "$as_me:4131: result: $ac_pt_PKG_CONFIG" >&5
-+  echo "$as_me:4134: result: $ac_pt_PKG_CONFIG" >&5
- echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
- else
--  echo "$as_me:4134: result: no" >&5
-+  echo "$as_me:4137: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4174,18 +4177,18 @@
- 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:4177: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
-+	{ { echo "$as_me:4180: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
- echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
- esac
- 
- elif test "x$cf_pkg_config" != xno ; then
--	{ echo "$as_me:4184: WARNING: pkg-config is not installed" >&5
-+	{ echo "$as_me:4187: WARNING: pkg-config is not installed" >&5
- echo "$as_me: WARNING: pkg-config is not installed" >&2;}
- fi
- 
--echo "$as_me:4188: checking if you want to see long compiling messages" >&5
-+echo "$as_me:4191: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -4219,10 +4222,10 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:4222: result: $enableval" >&5
-+echo "$as_me:4225: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
--echo "$as_me:4225: checking for ncurses wrap-prefix" >&5
-+echo "$as_me:4228: checking for ncurses wrap-prefix" >&5
- echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
- 
- # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
-@@ -4232,10 +4235,10 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--echo "$as_me:4235: result: $NCURSES_WRAP_PREFIX" >&5
-+echo "$as_me:4238: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- 
--echo "$as_me:4238: checking if you want to check for wide-character functions" >&5
-+echo "$as_me:4241: checking if you want to check for wide-character functions" >&5
- echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -4252,10 +4255,10 @@
- 	cf_enable_widec=yes
- 
- fi;
--echo "$as_me:4255: result: $cf_enable_widec" >&5
-+echo "$as_me:4258: result: $cf_enable_widec" >&5
- echo "${ECHO_T}$cf_enable_widec" >&6
- 
--echo "$as_me:4258: checking for specific curses-directory" >&5
-+echo "$as_me:4261: checking for specific curses-directory" >&5
- echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
- 
- # Check whether --with-curses-dir or --without-curses-dir was given.
-@@ -4265,7 +4268,7 @@
- else
-   cf_cv_curses_dir=no
- fi;
--echo "$as_me:4268: result: $cf_cv_curses_dir" >&5
-+echo "$as_me:4271: result: $cf_cv_curses_dir" >&5
- echo "${ECHO_T}$cf_cv_curses_dir" >&6
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
-@@ -4296,7 +4299,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:4299: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:4302: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -4329,7 +4332,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 4332 "configure"
-+#line 4335 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4341,16 +4344,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4344: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4347: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4347: \$? = $ac_status" >&5
-+  echo "$as_me:4350: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4350: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4353: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4353: \$? = $ac_status" >&5
-+  echo "$as_me:4356: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -4367,7 +4370,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:4370: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:4373: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -4403,7 +4406,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:4406: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:4409: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -4416,7 +4419,7 @@
- 
- cf_cv_screen=curses
- 
--echo "$as_me:4419: checking for specified curses library type" >&5
-+echo "$as_me:4422: checking for specified curses library type" >&5
- echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
- 
- # Check whether --with-screen or --without-screen was given.
-@@ -4460,13 +4463,13 @@
- fi;
- fi;
- 
--echo "$as_me:4463: result: $cf_cv_screen" >&5
-+echo "$as_me:4466: result: $cf_cv_screen" >&5
- echo "${ECHO_T}$cf_cv_screen" >&6
- 
- case $cf_cv_screen in
- (curses|curses_*)
- 
--echo "$as_me:4469: checking for extra include directories" >&5
-+echo "$as_me:4472: checking for extra include directories" >&5
- echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
- if test "${cf_cv_curses_incdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4492,11 +4495,11 @@
- esac
- 
- fi
--echo "$as_me:4495: result: $cf_cv_curses_incdir" >&5
-+echo "$as_me:4498: result: $cf_cv_curses_incdir" >&5
- echo "${ECHO_T}$cf_cv_curses_incdir" >&6
- test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
- 
--echo "$as_me:4499: checking if we have identified curses headers" >&5
-+echo "$as_me:4502: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4508,7 +4511,7 @@
- 	curses.h  ncurses/ncurses.h ncurses/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 4511 "configure"
-+#line 4514 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -4520,16 +4523,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4523: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4526: \$? = $ac_status" >&5
-+  echo "$as_me:4529: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4529: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4532: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4532: \$? = $ac_status" >&5
-+  echo "$as_me:4535: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -4540,11 +4543,11 @@
- done
- 
- fi
--echo "$as_me:4543: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:4546: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:4547: error: No curses header-files found" >&5
-+	{ { echo "$as_me:4550: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -4554,23 +4557,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:4557: checking for $ac_header" >&5
-+echo "$as_me:4560: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4563 "configure"
-+#line 4566 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:4567: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4570: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4573: \$? = $ac_status" >&5
-+  echo "$as_me:4576: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4589,7 +4592,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:4592: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:4595: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -4599,7 +4602,7 @@
- fi
- done
- 
--echo "$as_me:4602: checking for terminfo header" >&5
-+echo "$as_me:4605: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4617,7 +4620,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 4620 "configure"
-+#line 4623 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4632,16 +4635,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4635: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4638: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4638: \$? = $ac_status" >&5
-+  echo "$as_me:4641: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4641: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4644: \$? = $ac_status" >&5
-+  echo "$as_me:4647: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -4657,7 +4660,7 @@
- done
- 
- fi
--echo "$as_me:4660: result: $cf_cv_term_header" >&5
-+echo "$as_me:4663: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -4689,7 +4692,7 @@
- 	;;
- esac
- 
--echo "$as_me:4692: checking for ncurses version" >&5
-+echo "$as_me:4695: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4715,10 +4718,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:4718: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:4721: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4721: \$? = $ac_status" >&5
-+  echo "$as_me:4724: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -4728,7 +4731,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4731 "configure"
-+#line 4734 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -4753,15 +4756,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:4756: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4759: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4759: \$? = $ac_status" >&5
-+  echo "$as_me:4762: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:4761: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4764: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4764: \$? = $ac_status" >&5
-+  echo "$as_me:4767: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -4775,17 +4778,17 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:4778: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:4781: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
- #define NCURSES 1
- EOF
- 
--echo "$as_me:4785: checking if we have identified curses libraries" >&5
-+echo "$as_me:4788: checking if we have identified curses libraries" >&5
- echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 4788 "configure"
-+#line 4791 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -4797,16 +4800,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4800: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4803: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4803: \$? = $ac_status" >&5
-+  echo "$as_me:4806: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4806: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4809: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4809: \$? = $ac_status" >&5
-+  echo "$as_me:4812: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -4815,13 +4818,13 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--echo "$as_me:4818: result: $cf_result" >&5
-+echo "$as_me:4821: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = no ; then
- case $host_os in
- (freebsd*)
--	echo "$as_me:4824: checking for tgoto in -lmytinfo" >&5
-+	echo "$as_me:4827: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4829,7 +4832,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4832 "configure"
-+#line 4835 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4848,16 +4851,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4851: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4854: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4854: \$? = $ac_status" >&5
-+  echo "$as_me:4857: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4860: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4860: \$? = $ac_status" >&5
-+  echo "$as_me:4863: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -4868,7 +4871,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4871: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:4874: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
- 
-@@ -4898,7 +4901,7 @@
- 	# term.h) for cur_colr
- 	if test "x$cf_cv_screen" = "xcurses_colr"
- 	then
--		echo "$as_me:4901: checking for initscr in -lcur_colr" >&5
-+		echo "$as_me:4904: checking for initscr in -lcur_colr" >&5
- echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
- if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4906,7 +4909,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcur_colr  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4909 "configure"
-+#line 4912 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4925,16 +4928,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4928: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4931: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4931: \$? = $ac_status" >&5
-+  echo "$as_me:4934: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4934: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4937: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4937: \$? = $ac_status" >&5
-+  echo "$as_me:4940: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cur_colr_initscr=yes
- else
-@@ -4945,7 +4948,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4948: result: $ac_cv_lib_cur_colr_initscr" >&5
-+echo "$as_me:4951: result: $ac_cv_lib_cur_colr_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
- if test $ac_cv_lib_cur_colr_initscr = yes; then
- 
-@@ -4969,7 +4972,7 @@
- 
- else
- 
--		echo "$as_me:4972: checking for initscr in -lHcurses" >&5
-+		echo "$as_me:4975: checking for initscr in -lHcurses" >&5
- echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
- if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4977,7 +4980,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lHcurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4980 "configure"
-+#line 4983 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4996,16 +4999,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4999: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5002: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5002: \$? = $ac_status" >&5
-+  echo "$as_me:5005: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5005: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5008: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5008: \$? = $ac_status" >&5
-+  echo "$as_me:5011: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_Hcurses_initscr=yes
- else
-@@ -5016,7 +5019,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5019: result: $ac_cv_lib_Hcurses_initscr" >&5
-+echo "$as_me:5022: result: $ac_cv_lib_Hcurses_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
- if test $ac_cv_lib_Hcurses_initscr = yes; then
- 
-@@ -5072,7 +5075,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:5075: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5078: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -5101,7 +5104,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:5104: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5107: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -5132,7 +5135,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:5135: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5138: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -5167,7 +5170,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:5170: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:5173: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -5211,13 +5214,13 @@
- 	# because it may be needed to link the test-case for initscr.
- 	if test "x$cf_term_lib" = x
- 	then
--		echo "$as_me:5214: checking for tgoto" >&5
-+		echo "$as_me:5217: checking for tgoto" >&5
- echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
- if test "${ac_cv_func_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5220 "configure"
-+#line 5223 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char tgoto (); below.  */
-@@ -5248,16 +5251,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5251: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5254: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5254: \$? = $ac_status" >&5
-+  echo "$as_me:5257: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5257: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5260: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5260: \$? = $ac_status" >&5
-+  echo "$as_me:5263: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_tgoto=yes
- else
-@@ -5267,7 +5270,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5270: result: $ac_cv_func_tgoto" >&5
-+echo "$as_me:5273: result: $ac_cv_func_tgoto" >&5
- echo "${ECHO_T}$ac_cv_func_tgoto" >&6
- if test $ac_cv_func_tgoto = yes; then
-   cf_term_lib=predefined
-@@ -5276,7 +5279,7 @@
- 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
- 			do
- 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
--echo "$as_me:5279: checking for tgoto in -l$cf_term_lib" >&5
-+echo "$as_me:5282: checking for tgoto in -l$cf_term_lib" >&5
- echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5284,7 +5287,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_term_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5287 "configure"
-+#line 5290 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5303,16 +5306,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5306: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5309: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5309: \$? = $ac_status" >&5
-+  echo "$as_me:5312: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5312: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5315: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5315: \$? = $ac_status" >&5
-+  echo "$as_me:5318: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -5323,7 +5326,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5326: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:5329: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-   break
-@@ -5342,7 +5345,7 @@
- 		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
- 		do
- 			as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
--echo "$as_me:5345: checking for initscr in -l$cf_curs_lib" >&5
-+echo "$as_me:5348: checking for initscr in -l$cf_curs_lib" >&5
- echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5350,7 +5353,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_curs_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5353 "configure"
-+#line 5356 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5369,16 +5372,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5372: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5375: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5375: \$? = $ac_status" >&5
-+  echo "$as_me:5378: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5378: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5381: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5381: \$? = $ac_status" >&5
-+  echo "$as_me:5384: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -5389,7 +5392,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5392: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:5395: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-   break
-@@ -5397,16 +5400,16 @@
- 
- 		done
- 	fi
--	test $cf_curs_lib = unknown && { { echo "$as_me:5400: error: no curses library found" >&5
-+	test $cf_curs_lib = unknown && { { echo "$as_me:5403: error: no curses library found" >&5
- echo "$as_me: error: no curses library found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
- 	if test "$cf_term_lib" = unknown ; then
--		echo "$as_me:5406: checking if we can link with $cf_curs_lib library" >&5
-+		echo "$as_me:5409: checking if we can link with $cf_curs_lib library" >&5
- echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5409 "configure"
-+#line 5412 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5418,16 +5421,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5421: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5424: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5424: \$? = $ac_status" >&5
-+  echo "$as_me:5427: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5427: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5430: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5430: \$? = $ac_status" >&5
-+  echo "$as_me:5433: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -5436,18 +5439,18 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:5439: result: $cf_result" >&5
-+		echo "$as_me:5442: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
--		test $cf_result = no && { { echo "$as_me:5441: error: Cannot link curses library" >&5
-+		test $cf_result = no && { { echo "$as_me:5444: error: Cannot link curses library" >&5
- echo "$as_me: error: Cannot link curses library" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
- 		:
- 	elif test "$cf_term_lib" != predefined ; then
--		echo "$as_me:5447: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
-+		echo "$as_me:5450: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
- echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5450 "configure"
-+#line 5453 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5459,16 +5462,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5462: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5465: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5465: \$? = $ac_status" >&5
-+  echo "$as_me:5468: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5468: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5471: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5471: \$? = $ac_status" >&5
-+  echo "$as_me:5474: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -5477,7 +5480,7 @@
- 
- 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5480 "configure"
-+#line 5483 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -5489,16 +5492,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5492: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5495: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5495: \$? = $ac_status" >&5
-+  echo "$as_me:5498: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5498: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5501: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5501: \$? = $ac_status" >&5
-+  echo "$as_me:5504: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -5510,7 +5513,7 @@
- 
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:5513: result: $cf_result" >&5
-+		echo "$as_me:5516: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	fi
- fi
-@@ -5519,7 +5522,7 @@
- 	;;
- (ncursesw*)
- 
--echo "$as_me:5522: checking for multibyte character support" >&5
-+echo "$as_me:5525: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5527,7 +5530,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5530 "configure"
-+#line 5533 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5540,16 +5543,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5543: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5546: \$? = $ac_status" >&5
-+  echo "$as_me:5549: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5549: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5552: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5552: \$? = $ac_status" >&5
-+  echo "$as_me:5555: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -5561,12 +5564,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:5564: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5567: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5569 "configure"
-+#line 5572 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5579,16 +5582,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5585: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5585: \$? = $ac_status" >&5
-+  echo "$as_me:5588: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5591: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5591: \$? = $ac_status" >&5
-+  echo "$as_me:5594: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5602,7 +5605,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 5605 "configure"
-+#line 5608 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5615,16 +5618,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5618: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5621: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5621: \$? = $ac_status" >&5
-+  echo "$as_me:5624: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5624: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5627: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5627: \$? = $ac_status" >&5
-+  echo "$as_me:5630: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -5641,9 +5644,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:5644: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:5647: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:5646: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5649: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5734,11 +5737,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5737: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5740: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 5741 "configure"
-+#line 5744 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5751,21 +5754,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5754: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5757: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5757: \$? = $ac_status" >&5
-+  echo "$as_me:5760: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5760: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5763: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5763: \$? = $ac_status" >&5
-+  echo "$as_me:5766: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5768: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5771: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -5783,7 +5786,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:5786: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:5789: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -5858,13 +5861,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5861: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5864: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 5867 "configure"
-+#line 5870 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -5877,21 +5880,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5880: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5883: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5883: \$? = $ac_status" >&5
-+  echo "$as_me:5886: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5886: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5889: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5889: \$? = $ac_status" >&5
-+  echo "$as_me:5892: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:5894: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:5897: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -5933,7 +5936,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5936: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:5939: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -5968,7 +5971,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 5971 "configure"
-+#line 5974 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -5980,16 +5983,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5983: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5986: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5986: \$? = $ac_status" >&5
-+  echo "$as_me:5989: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5989: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5992: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5992: \$? = $ac_status" >&5
-+  echo "$as_me:5995: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6006,7 +6009,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6009: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6012: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6042,7 +6045,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:6045: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:6048: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -6072,13 +6075,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:6075: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:6078: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:6078: result: yes" >&5
-+		echo "$as_me:6081: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:6081: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:6084: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -6104,7 +6107,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 6107 "configure"
-+#line 6110 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -6116,37 +6119,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6119: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6122: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6122: \$? = $ac_status" >&5
-+  echo "$as_me:6125: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6125: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6128: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6128: \$? = $ac_status" >&5
-+  echo "$as_me:6131: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6134 "configure"
-+#line 6137 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6141: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6144: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6144: \$? = $ac_status" >&5
-+  echo "$as_me:6147: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6146: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6149: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6149: \$? = $ac_status" >&5
-+  echo "$as_me:6152: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -6163,7 +6166,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:6166: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:6169: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -6181,7 +6184,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:6184: result: no" >&5
-+		echo "$as_me:6187: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -6197,7 +6200,7 @@
-   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
--echo "$as_me:6200: checking for $ac_word" >&5
-+echo "$as_me:6203: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6212,7 +6215,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:6215: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6218: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6220,10 +6223,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:6223: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:6226: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:6226: result: no" >&5
-+  echo "$as_me:6229: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6236,7 +6239,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:6239: checking for $ac_word" >&5
-+echo "$as_me:6242: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6251,7 +6254,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:6254: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6257: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6259,10 +6262,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:6262: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:6265: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:6265: result: no" >&5
-+  echo "$as_me:6268: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6295,7 +6298,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:6298: checking if we have identified curses headers" >&5
-+echo "$as_me:6301: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6307,7 +6310,7 @@
- 	curses.h $cf_cv_screen/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6310 "configure"
-+#line 6313 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -6319,16 +6322,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6322: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6325: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6325: \$? = $ac_status" >&5
-+  echo "$as_me:6328: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6328: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6331: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6331: \$? = $ac_status" >&5
-+  echo "$as_me:6334: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -6339,11 +6342,11 @@
- done
- 
- fi
--echo "$as_me:6342: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:6345: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:6346: error: No curses header-files found" >&5
-+	{ { echo "$as_me:6349: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -6353,23 +6356,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:6356: checking for $ac_header" >&5
-+echo "$as_me:6359: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6362 "configure"
-+#line 6365 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:6366: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:6369: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:6372: \$? = $ac_status" >&5
-+  echo "$as_me:6375: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -6388,7 +6391,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:6391: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:6394: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -6441,7 +6444,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6444 "configure"
-+#line 6447 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6453,16 +6456,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6456: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6459: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6459: \$? = $ac_status" >&5
-+  echo "$as_me:6462: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6462: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6465: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6465: \$? = $ac_status" >&5
-+  echo "$as_me:6468: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6479,7 +6482,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6482: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6485: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6498,7 +6501,7 @@
- 
- }
- 
--echo "$as_me:6501: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:6504: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6510,7 +6513,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6513 "configure"
-+#line 6516 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6534,16 +6537,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6537: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6540: \$? = $ac_status" >&5
-+  echo "$as_me:6543: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6543: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6546: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6546: \$? = $ac_status" >&5
-+  echo "$as_me:6549: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -6558,14 +6561,14 @@
- 	done
- 
- fi
--echo "$as_me:6561: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:6564: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:6568: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:6571: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6683,7 +6686,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6686 "configure"
-+#line 6689 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6695,16 +6698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6698: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6701: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6701: \$? = $ac_status" >&5
-+  echo "$as_me:6704: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6704: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6707: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6707: \$? = $ac_status" >&5
-+  echo "$as_me:6710: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6721,7 +6724,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6724: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6727: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6744,7 +6747,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6747 "configure"
-+#line 6750 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -6768,16 +6771,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6771: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6774: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6774: \$? = $ac_status" >&5
-+  echo "$as_me:6777: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6780: \$? = $ac_status" >&5
-+  echo "$as_me:6783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -6798,12 +6801,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6801: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6804: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:6806: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:6809: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -6836,7 +6839,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 6839 "configure"
-+#line 6842 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6848,16 +6851,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6854: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6854: \$? = $ac_status" >&5
-+  echo "$as_me:6857: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6857: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6860: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6860: \$? = $ac_status" >&5
-+  echo "$as_me:6863: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6874,7 +6877,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:6877: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:6880: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -6922,7 +6925,7 @@
- 	;;
- esac
- 
--echo "$as_me:6925: checking for terminfo header" >&5
-+echo "$as_me:6928: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6940,7 +6943,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 6943 "configure"
-+#line 6946 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -6955,16 +6958,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6958: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6961: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6961: \$? = $ac_status" >&5
-+  echo "$as_me:6964: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6964: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6967: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6967: \$? = $ac_status" >&5
-+  echo "$as_me:6970: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -6980,7 +6983,7 @@
- done
- 
- fi
--echo "$as_me:6983: result: $cf_cv_term_header" >&5
-+echo "$as_me:6986: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -7018,7 +7021,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:7021: checking for ncurses version" >&5
-+echo "$as_me:7024: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7044,10 +7047,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:7047: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:7050: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7050: \$? = $ac_status" >&5
-+  echo "$as_me:7053: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -7057,7 +7060,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7060 "configure"
-+#line 7063 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -7082,15 +7085,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7085: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7088: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7088: \$? = $ac_status" >&5
-+  echo "$as_me:7091: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7090: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7093: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7093: \$? = $ac_status" >&5
-+  echo "$as_me:7096: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -7104,7 +7107,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:7107: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:7110: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -7117,7 +7120,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:7120: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:7123: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7125,7 +7128,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7128 "configure"
-+#line 7131 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7144,16 +7147,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7147: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7150: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7150: \$? = $ac_status" >&5
-+  echo "$as_me:7153: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7156: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7156: \$? = $ac_status" >&5
-+  echo "$as_me:7159: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -7164,10 +7167,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7167: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:7170: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:7170: checking for initscr in -lgpm" >&5
-+  echo "$as_me:7173: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7175,7 +7178,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7178 "configure"
-+#line 7181 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7194,16 +7197,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7197: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7200: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7200: \$? = $ac_status" >&5
-+  echo "$as_me:7203: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7206: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7206: \$? = $ac_status" >&5
-+  echo "$as_me:7209: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -7214,7 +7217,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7217: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:7220: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -7229,7 +7232,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:7232: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:7235: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7237,7 +7240,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 7240 "configure"
-+#line 7243 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -7256,16 +7259,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7259: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7262: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7262: \$? = $ac_status" >&5
-+  echo "$as_me:7265: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7265: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7268: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7268: \$? = $ac_status" >&5
-+  echo "$as_me:7271: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -7276,7 +7279,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:7279: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:7282: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -7325,13 +7328,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:7328: checking for initscr" >&5
-+	echo "$as_me:7331: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7334 "configure"
-+#line 7337 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -7362,16 +7365,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7365: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7368: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7368: \$? = $ac_status" >&5
-+  echo "$as_me:7371: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7371: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7374: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7374: \$? = $ac_status" >&5
-+  echo "$as_me:7377: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -7381,18 +7384,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7384: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:7387: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:7391: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:7394: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7395 "configure"
-+#line 7398 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7404,25 +7407,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7407: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7410: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7410: \$? = $ac_status" >&5
-+  echo "$as_me:7413: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7413: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7416: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7416: \$? = $ac_status" >&5
-+  echo "$as_me:7419: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7418: result: yes" >&5
-+  echo "$as_me:7421: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7425: result: no" >&5
-+echo "$as_me:7428: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -7490,11 +7493,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:7493: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:7496: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 7497 "configure"
-+#line 7500 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7506,25 +7509,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7512: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7512: \$? = $ac_status" >&5
-+  echo "$as_me:7515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7518: \$? = $ac_status" >&5
-+  echo "$as_me:7521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7520: result: yes" >&5
-+  echo "$as_me:7523: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7527: result: no" >&5
-+echo "$as_me:7530: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -7539,7 +7542,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:7542: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:7545: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7547,7 +7550,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:7550: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:7553: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -7557,7 +7560,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 7560 "configure"
-+#line 7563 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7569,23 +7572,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7572: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7575: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7575: \$? = $ac_status" >&5
-+  echo "$as_me:7578: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7578: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7581: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7581: \$? = $ac_status" >&5
-+  echo "$as_me:7584: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:7583: result: yes" >&5
-+  echo "$as_me:7586: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:7588: result: no" >&5
-+echo "$as_me:7591: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -7610,13 +7613,13 @@
- cf_have_ncuconfig=no
- 
- if test "x${PKG_CONFIG:=none}" != xnone; then
--	echo "$as_me:7613: checking pkg-config for $cf_ncuconfig_root" >&5
-+	echo "$as_me:7616: checking pkg-config for $cf_ncuconfig_root" >&5
- echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
- 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
--		echo "$as_me:7616: result: yes" >&5
-+		echo "$as_me:7619: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
--		echo "$as_me:7619: checking if the $cf_ncuconfig_root package files work" >&5
-+		echo "$as_me:7622: checking if the $cf_ncuconfig_root package files work" >&5
- echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
- 		cf_have_ncuconfig=unknown
- 
-@@ -7642,7 +7645,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7645 "configure"
-+#line 7648 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -7654,37 +7657,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7657: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7660: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7660: \$? = $ac_status" >&5
-+  echo "$as_me:7663: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7663: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7666: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7666: \$? = $ac_status" >&5
-+  echo "$as_me:7669: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   if test "$cross_compiling" = yes; then
-   cf_have_ncuconfig=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7672 "configure"
-+#line 7675 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- 				int main(void)
- 				{ char *xx = curses_version(); return (xx == 0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7679: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7682: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7682: \$? = $ac_status" >&5
-+  echo "$as_me:7685: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7684: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7687: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7687: \$? = $ac_status" >&5
-+  echo "$as_me:7690: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_ncuconfig=yes
- else
-@@ -7701,7 +7704,7 @@
- cf_have_ncuconfig=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--		echo "$as_me:7704: result: $cf_have_ncuconfig" >&5
-+		echo "$as_me:7707: result: $cf_have_ncuconfig" >&5
- echo "${ECHO_T}$cf_have_ncuconfig" >&6
- 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
- 		if test "$cf_have_ncuconfig" != "yes"
-@@ -7719,7 +7722,7 @@
- 		fi
- 
- 	else
--		echo "$as_me:7722: result: no" >&5
-+		echo "$as_me:7725: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		NCURSES_CONFIG_PKG=none
- 	fi
-@@ -7735,7 +7738,7 @@
-   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
--echo "$as_me:7738: checking for $ac_word" >&5
-+echo "$as_me:7741: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7750,7 +7753,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:7753: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7756: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7758,10 +7761,10 @@
- fi
- NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
- if test -n "$NCURSES_CONFIG"; then
--  echo "$as_me:7761: result: $NCURSES_CONFIG" >&5
-+  echo "$as_me:7764: result: $NCURSES_CONFIG" >&5
- echo "${ECHO_T}$NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7764: result: no" >&5
-+  echo "$as_me:7767: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7774,7 +7777,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:7777: checking for $ac_word" >&5
-+echo "$as_me:7780: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7789,7 +7792,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
--echo "$as_me:7792: found $ac_dir/$ac_word" >&5
-+echo "$as_me:7795: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -7797,10 +7800,10 @@
- fi
- ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
- if test -n "$ac_ct_NCURSES_CONFIG"; then
--  echo "$as_me:7800: result: $ac_ct_NCURSES_CONFIG" >&5
-+  echo "$as_me:7803: result: $ac_ct_NCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
- else
--  echo "$as_me:7803: result: no" >&5
-+  echo "$as_me:7806: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -7833,7 +7836,7 @@
- 
- 		# even with config script, some packages use no-override for curses.h
- 
--echo "$as_me:7836: checking if we have identified curses headers" >&5
-+echo "$as_me:7839: checking if we have identified curses headers" >&5
- echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
- if test "${cf_cv_ncurses_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7845,7 +7848,7 @@
- 	curses.h $cf_cv_screen/curses.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 7848 "configure"
-+#line 7851 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int
-@@ -7857,16 +7860,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7863: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7863: \$? = $ac_status" >&5
-+  echo "$as_me:7866: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7866: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7869: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7869: \$? = $ac_status" >&5
-+  echo "$as_me:7872: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -7877,11 +7880,11 @@
- done
- 
- fi
--echo "$as_me:7880: result: $cf_cv_ncurses_header" >&5
-+echo "$as_me:7883: result: $cf_cv_ncurses_header" >&5
- echo "${ECHO_T}$cf_cv_ncurses_header" >&6
- 
- if test "$cf_cv_ncurses_header" = none ; then
--	{ { echo "$as_me:7884: error: No curses header-files found" >&5
-+	{ { echo "$as_me:7887: error: No curses header-files found" >&5
- echo "$as_me: error: No curses header-files found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -7891,23 +7894,23 @@
- for ac_header in $cf_cv_ncurses_header
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:7894: checking for $ac_header" >&5
-+echo "$as_me:7897: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7900 "configure"
-+#line 7903 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:7904: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:7907: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:7910: \$? = $ac_status" >&5
-+  echo "$as_me:7913: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -7926,7 +7929,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:7929: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:7932: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7979,7 +7982,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 7982 "configure"
-+#line 7985 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7991,16 +7994,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7997: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7997: \$? = $ac_status" >&5
-+  echo "$as_me:8000: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8003: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8003: \$? = $ac_status" >&5
-+  echo "$as_me:8006: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8017,7 +8020,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:8020: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8023: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8036,7 +8039,7 @@
- 
- }
- 
--echo "$as_me:8039: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "$as_me:8042: checking for $cf_ncuhdr_root header in include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8048,7 +8051,7 @@
- 	do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8051 "configure"
-+#line 8054 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -8072,16 +8075,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8078: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8078: \$? = $ac_status" >&5
-+  echo "$as_me:8081: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8084: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8084: \$? = $ac_status" >&5
-+  echo "$as_me:8087: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h=$cf_header
- 
-@@ -8096,14 +8099,14 @@
- 	done
- 
- fi
--echo "$as_me:8099: result: $cf_cv_ncurses_h" >&5
-+echo "$as_me:8102: result: $cf_cv_ncurses_h" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h" >&6
- 
- if test "$cf_cv_ncurses_h" != no ; then
- 	cf_cv_ncurses_header=$cf_cv_ncurses_h
- else
- 
--echo "$as_me:8106: checking for $cf_ncuhdr_root include-path" >&5
-+echo "$as_me:8109: checking for $cf_ncuhdr_root include-path" >&5
- echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
- if test "${cf_cv_ncurses_h2+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8221,7 +8224,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8224 "configure"
-+#line 8227 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8233,16 +8236,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8236: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8239: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8239: \$? = $ac_status" >&5
-+  echo "$as_me:8242: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8242: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8245: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8245: \$? = $ac_status" >&5
-+  echo "$as_me:8248: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8259,7 +8262,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:8262: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8265: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8282,7 +8285,7 @@
- 		do
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8285 "configure"
-+#line 8288 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -8306,16 +8309,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8309: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8312: \$? = $ac_status" >&5
-+  echo "$as_me:8315: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8315: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8318: \$? = $ac_status" >&5
-+  echo "$as_me:8321: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_h2=$cf_header
- 
-@@ -8336,12 +8339,12 @@
- 		CPPFLAGS="$cf_save2_CPPFLAGS"
- 		test "$cf_cv_ncurses_h2" != no && break
- 	done
--	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8339: error: not found" >&5
-+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8342: error: not found" >&5
- echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:8344: result: $cf_cv_ncurses_h2" >&5
-+echo "$as_me:8347: result: $cf_cv_ncurses_h2" >&5
- echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
- 
- 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-@@ -8374,7 +8377,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 8377 "configure"
-+#line 8380 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -8386,16 +8389,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8389: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8392: \$? = $ac_status" >&5
-+  echo "$as_me:8395: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8398: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8398: \$? = $ac_status" >&5
-+  echo "$as_me:8401: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8412,7 +8415,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:8415: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:8418: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -8460,7 +8463,7 @@
- 	;;
- esac
- 
--echo "$as_me:8463: checking for terminfo header" >&5
-+echo "$as_me:8466: checking for terminfo header" >&5
- echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8478,7 +8481,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 8481 "configure"
-+#line 8484 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8493,16 +8496,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8496: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8499: \$? = $ac_status" >&5
-+  echo "$as_me:8502: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8502: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8505: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8505: \$? = $ac_status" >&5
-+  echo "$as_me:8508: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_term_header="$cf_test"
-@@ -8518,7 +8521,7 @@
- done
- 
- fi
--echo "$as_me:8521: result: $cf_cv_term_header" >&5
-+echo "$as_me:8524: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- # Set definitions to allow ifdef'ing to accommodate subdirectories
-@@ -8556,7 +8559,7 @@
- #define NCURSES 1
- EOF
- 
--echo "$as_me:8559: checking for ncurses version" >&5
-+echo "$as_me:8562: checking for ncurses version" >&5
- echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
- if test "${cf_cv_ncurses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8582,10 +8585,10 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo "$as_me:8585: \"$cf_try\"") >&5
-+	{ (eval echo "$as_me:8588: \"$cf_try\"") >&5
-   (eval $cf_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8588: \$? = $ac_status" >&5
-+  echo "$as_me:8591: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-@@ -8595,7 +8598,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8598 "configure"
-+#line 8601 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -8620,15 +8623,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8623: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8626: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8626: \$? = $ac_status" >&5
-+  echo "$as_me:8629: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8628: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8631: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8631: \$? = $ac_status" >&5
-+  echo "$as_me:8634: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -8642,7 +8645,7 @@
- 	rm -f $cf_tempfile
- 
- fi
--echo "$as_me:8645: result: $cf_cv_ncurses_version" >&5
-+echo "$as_me:8648: result: $cf_cv_ncurses_version" >&5
- echo "${ECHO_T}$cf_cv_ncurses_version" >&6
- test "$cf_cv_ncurses_version" = no ||
- cat >>confdefs.h <<\EOF
-@@ -8655,7 +8658,7 @@
- 	# to link gpm.
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
--echo "$as_me:8658: checking for Gpm_Open in -lgpm" >&5
-+echo "$as_me:8661: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8663,7 +8666,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8666 "configure"
-+#line 8669 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8682,16 +8685,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8685: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8688: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8688: \$? = $ac_status" >&5
-+  echo "$as_me:8691: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8691: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8694: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8694: \$? = $ac_status" >&5
-+  echo "$as_me:8697: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -8702,10 +8705,10 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8705: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:8708: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
--  echo "$as_me:8708: checking for initscr in -lgpm" >&5
-+  echo "$as_me:8711: checking for initscr in -lgpm" >&5
- echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8713,7 +8716,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8716 "configure"
-+#line 8719 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8732,16 +8735,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8735: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8738: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8738: \$? = $ac_status" >&5
-+  echo "$as_me:8741: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8741: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8744: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8744: \$? = $ac_status" >&5
-+  echo "$as_me:8747: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_initscr=yes
- else
-@@ -8752,7 +8755,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8755: result: $ac_cv_lib_gpm_initscr" >&5
-+echo "$as_me:8758: result: $ac_cv_lib_gpm_initscr" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
- if test $ac_cv_lib_gpm_initscr = yes; then
-   LIBS="$cf_ncurses_SAVE"
-@@ -8767,7 +8770,7 @@
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
--		echo "$as_me:8770: checking for tgoto in -lmytinfo" >&5
-+		echo "$as_me:8773: checking for tgoto in -lmytinfo" >&5
- echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
- if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8775,7 +8778,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmytinfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8778 "configure"
-+#line 8781 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8794,16 +8797,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8797: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8800: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8800: \$? = $ac_status" >&5
-+  echo "$as_me:8803: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8806: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8806: \$? = $ac_status" >&5
-+  echo "$as_me:8809: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_mytinfo_tgoto=yes
- else
-@@ -8814,7 +8817,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8817: result: $ac_cv_lib_mytinfo_tgoto" >&5
-+echo "$as_me:8820: result: $ac_cv_lib_mytinfo_tgoto" >&5
- echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
- if test $ac_cv_lib_mytinfo_tgoto = yes; then
-   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
-@@ -8863,13 +8866,13 @@
- 
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
--	echo "$as_me:8866: checking for initscr" >&5
-+	echo "$as_me:8869: checking for initscr" >&5
- echo $ECHO_N "checking for initscr... $ECHO_C" >&6
- if test "${ac_cv_func_initscr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8872 "configure"
-+#line 8875 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr (); below.  */
-@@ -8900,16 +8903,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8903: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8906: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8906: \$? = $ac_status" >&5
-+  echo "$as_me:8909: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8909: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8912: \$? = $ac_status" >&5
-+  echo "$as_me:8915: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_initscr=yes
- else
-@@ -8919,18 +8922,18 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8922: result: $ac_cv_func_initscr" >&5
-+echo "$as_me:8925: result: $ac_cv_func_initscr" >&5
- echo "${ECHO_T}$ac_cv_func_initscr" >&6
- if test $ac_cv_func_initscr = yes; then
-   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- else
- 
- 		cf_save_LIBS="$LIBS"
--		echo "$as_me:8929: checking for initscr in -l$cf_nculib_root" >&5
-+		echo "$as_me:8932: checking for initscr in -l$cf_nculib_root" >&5
- echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8933 "configure"
-+#line 8936 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -8942,25 +8945,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8945: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8948: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8948: \$? = $ac_status" >&5
-+  echo "$as_me:8951: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8954: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8954: \$? = $ac_status" >&5
-+  echo "$as_me:8957: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:8956: result: yes" >&5
-+  echo "$as_me:8959: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:8963: result: no" >&5
-+echo "$as_me:8966: result: no" >&5
- echo "${ECHO_T}no" >&6
- 
- cf_search=
-@@ -9028,11 +9031,11 @@
- 
- 			for cf_libdir in $cf_search
- 			do
--				echo "$as_me:9031: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+				echo "$as_me:9034: checking for -l$cf_nculib_root in $cf_libdir" >&5
- echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 9035 "configure"
-+#line 9038 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -9044,25 +9047,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9047: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9050: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9050: \$? = $ac_status" >&5
-+  echo "$as_me:9053: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9053: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9056: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9056: \$? = $ac_status" >&5
-+  echo "$as_me:9059: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:9058: result: yes" >&5
-+  echo "$as_me:9061: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
- 					 break
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:9065: result: no" >&5
-+echo "$as_me:9068: result: no" >&5
- echo "${ECHO_T}no" >&6
- 					 LIBS="$cf_save_LIBS"
- fi
-@@ -9077,7 +9080,7 @@
- eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
- 
- if test $cf_found_library = no ; then
--	{ { echo "$as_me:9080: error: Cannot link $cf_nculib_root library" >&5
-+	{ { echo "$as_me:9083: error: Cannot link $cf_nculib_root library" >&5
- echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -9085,7 +9088,7 @@
- fi
- 
- if test -n "$cf_ncurses_LIBS" ; then
--	echo "$as_me:9088: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+	echo "$as_me:9091: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
-@@ -9095,7 +9098,7 @@
- 		fi
- 	done
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9098 "configure"
-+#line 9101 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header:-curses.h}>
- int
-@@ -9107,23 +9110,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9110: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9113: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9113: \$? = $ac_status" >&5
-+  echo "$as_me:9116: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9116: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9119: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9119: \$? = $ac_status" >&5
-+  echo "$as_me:9122: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:9121: result: yes" >&5
-+  echo "$as_me:9124: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:9126: result: no" >&5
-+echo "$as_me:9129: result: no" >&5
- echo "${ECHO_T}no" >&6
- 		 LIBS="$cf_ncurses_SAVE"
- fi
-@@ -9143,7 +9146,7 @@
- 
- 	;;
- (pdcurses)
--	echo "$as_me:9146: checking for X" >&5
-+	echo "$as_me:9149: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6
- 
- # Check whether --with-x or --without-x was given.
-@@ -9240,17 +9243,17 @@
-   # Guess where to find include files, by looking for Intrinsic.h.
-   # First, try using that file with no special directory specified.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9243 "configure"
-+#line 9246 "configure"
- #include "confdefs.h"
- #include <X11/Intrinsic.h>
- _ACEOF
--if { (eval echo "$as_me:9247: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:9250: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9253: \$? = $ac_status" >&5
-+  echo "$as_me:9256: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9283,7 +9286,7 @@
-   ac_save_LIBS=$LIBS
-   LIBS="-lXt $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9286 "configure"
-+#line 9289 "configure"
- #include "confdefs.h"
- #include <X11/Intrinsic.h>
- int
-@@ -9295,16 +9298,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9298: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9301: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9301: \$? = $ac_status" >&5
-+  echo "$as_me:9304: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9304: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9307: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9307: \$? = $ac_status" >&5
-+  echo "$as_me:9310: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
-@@ -9342,7 +9345,7 @@
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  echo "$as_me:9345: result: $have_x" >&5
-+  echo "$as_me:9348: result: $have_x" >&5
- echo "${ECHO_T}$have_x" >&6
-   no_x=yes
- else
-@@ -9352,7 +9355,7 @@
-   # Update the cache value to reflect the command line values.
-   ac_cv_have_x="have_x=yes \
- 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
--  echo "$as_me:9355: result: libraries $x_libraries, headers $x_includes" >&5
-+  echo "$as_me:9358: result: libraries $x_libraries, headers $x_includes" >&5
- echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
- 
-@@ -9376,11 +9379,11 @@
-     # others require no space.  Words are not sufficient . . . .
-     case `(uname -sr) 2>/dev/null` in
-     "SunOS 5"*)
--      echo "$as_me:9379: checking whether -R must be followed by a space" >&5
-+      echo "$as_me:9382: checking whether -R must be followed by a space" >&5
- echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-       cat >conftest.$ac_ext <<_ACEOF
--#line 9383 "configure"
-+#line 9386 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9392,16 +9395,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9395: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9398: \$? = $ac_status" >&5
-+  echo "$as_me:9401: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9401: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9404: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9404: \$? = $ac_status" >&5
-+  echo "$as_me:9407: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_R_nospace=yes
- else
-@@ -9411,13 +9414,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-       if test $ac_R_nospace = yes; then
--	echo "$as_me:9414: result: no" >&5
-+	echo "$as_me:9417: result: no" >&5
- echo "${ECHO_T}no" >&6
- 	X_LIBS="$X_LIBS -R$x_libraries"
-       else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9420 "configure"
-+#line 9423 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9429,16 +9432,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9432: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9435: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9435: \$? = $ac_status" >&5
-+  echo "$as_me:9438: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9438: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9441: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9441: \$? = $ac_status" >&5
-+  echo "$as_me:9444: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_R_space=yes
- else
-@@ -9448,11 +9451,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	if test $ac_R_space = yes; then
--	  echo "$as_me:9451: result: yes" >&5
-+	  echo "$as_me:9454: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	  X_LIBS="$X_LIBS -R $x_libraries"
- 	else
--	  echo "$as_me:9455: result: neither works" >&5
-+	  echo "$as_me:9458: result: neither works" >&5
- echo "${ECHO_T}neither works" >&6
- 	fi
-       fi
-@@ -9472,7 +9475,7 @@
-     # the Alpha needs dnet_stub (dnet does not exist).
-     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-     cat >conftest.$ac_ext <<_ACEOF
--#line 9475 "configure"
-+#line 9478 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9491,22 +9494,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9494: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9497: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9497: \$? = $ac_status" >&5
-+  echo "$as_me:9500: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9500: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9503: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9503: \$? = $ac_status" >&5
-+  echo "$as_me:9506: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--echo "$as_me:9509: checking for dnet_ntoa in -ldnet" >&5
-+echo "$as_me:9512: checking for dnet_ntoa in -ldnet" >&5
- echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9514,7 +9517,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9517 "configure"
-+#line 9520 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9533,16 +9536,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9536: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9539: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9539: \$? = $ac_status" >&5
-+  echo "$as_me:9542: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9542: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9545: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9545: \$? = $ac_status" >&5
-+  echo "$as_me:9548: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dnet_dnet_ntoa=yes
- else
-@@ -9553,14 +9556,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9556: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "$as_me:9559: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
- echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
- 
-     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
--      echo "$as_me:9563: checking for dnet_ntoa in -ldnet_stub" >&5
-+      echo "$as_me:9566: checking for dnet_ntoa in -ldnet_stub" >&5
- echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9568,7 +9571,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldnet_stub  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9571 "configure"
-+#line 9574 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9587,16 +9590,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9590: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9593: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9593: \$? = $ac_status" >&5
-+  echo "$as_me:9596: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9596: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9599: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9599: \$? = $ac_status" >&5
-+  echo "$as_me:9602: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
-@@ -9607,7 +9610,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9610: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "$as_me:9613: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
- echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-@@ -9626,13 +9629,13 @@
-     # on Irix 5.2, according to T.E. Dickey.
-     # The functions gethostbyname, getservbyname, and inet_addr are
-     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
--    echo "$as_me:9629: checking for gethostbyname" >&5
-+    echo "$as_me:9632: checking for gethostbyname" >&5
- echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
- if test "${ac_cv_func_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9635 "configure"
-+#line 9638 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname (); below.  */
-@@ -9663,16 +9666,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9666: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9669: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9669: \$? = $ac_status" >&5
-+  echo "$as_me:9672: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9672: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9675: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9675: \$? = $ac_status" >&5
-+  echo "$as_me:9678: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gethostbyname=yes
- else
-@@ -9682,11 +9685,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9685: result: $ac_cv_func_gethostbyname" >&5
-+echo "$as_me:9688: result: $ac_cv_func_gethostbyname" >&5
- echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
- 
-     if test $ac_cv_func_gethostbyname = no; then
--      echo "$as_me:9689: checking for gethostbyname in -lnsl" >&5
-+      echo "$as_me:9692: checking for gethostbyname in -lnsl" >&5
- echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9694,7 +9697,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9697 "configure"
-+#line 9700 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9713,16 +9716,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9716: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9719: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9719: \$? = $ac_status" >&5
-+  echo "$as_me:9722: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9722: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9725: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9725: \$? = $ac_status" >&5
-+  echo "$as_me:9728: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_nsl_gethostbyname=yes
- else
-@@ -9733,14 +9736,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9736: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "$as_me:9739: result: $ac_cv_lib_nsl_gethostbyname" >&5
- echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
- 
-       if test $ac_cv_lib_nsl_gethostbyname = no; then
--        echo "$as_me:9743: checking for gethostbyname in -lbsd" >&5
-+        echo "$as_me:9746: checking for gethostbyname in -lbsd" >&5
- echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9748,7 +9751,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9751 "configure"
-+#line 9754 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9767,16 +9770,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9770: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9773: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9773: \$? = $ac_status" >&5
-+  echo "$as_me:9776: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9776: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9779: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9779: \$? = $ac_status" >&5
-+  echo "$as_me:9782: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gethostbyname=yes
- else
-@@ -9787,7 +9790,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9790: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "$as_me:9793: result: $ac_cv_lib_bsd_gethostbyname" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-@@ -9803,13 +9806,13 @@
-     # variants that don't use the nameserver (or something).  -lsocket
-     # must be given before -lnsl if both are needed.  We assume that
-     # if connect needs -lnsl, so does gethostbyname.
--    echo "$as_me:9806: checking for connect" >&5
-+    echo "$as_me:9809: checking for connect" >&5
- echo $ECHO_N "checking for connect... $ECHO_C" >&6
- if test "${ac_cv_func_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9812 "configure"
-+#line 9815 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect (); below.  */
-@@ -9840,16 +9843,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9843: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9846: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9846: \$? = $ac_status" >&5
-+  echo "$as_me:9849: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9849: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9852: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9852: \$? = $ac_status" >&5
-+  echo "$as_me:9855: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_connect=yes
- else
-@@ -9859,11 +9862,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9862: result: $ac_cv_func_connect" >&5
-+echo "$as_me:9865: result: $ac_cv_func_connect" >&5
- echo "${ECHO_T}$ac_cv_func_connect" >&6
- 
-     if test $ac_cv_func_connect = no; then
--      echo "$as_me:9866: checking for connect in -lsocket" >&5
-+      echo "$as_me:9869: checking for connect in -lsocket" >&5
- echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
- if test "${ac_cv_lib_socket_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9871,7 +9874,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9874 "configure"
-+#line 9877 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9890,16 +9893,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9893: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9896: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9896: \$? = $ac_status" >&5
-+  echo "$as_me:9899: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9899: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9902: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9902: \$? = $ac_status" >&5
-+  echo "$as_me:9905: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_socket_connect=yes
- else
-@@ -9910,7 +9913,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9913: result: $ac_cv_lib_socket_connect" >&5
-+echo "$as_me:9916: result: $ac_cv_lib_socket_connect" >&5
- echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
- if test $ac_cv_lib_socket_connect = yes; then
-   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-@@ -9919,13 +9922,13 @@
-     fi
- 
-     # Guillermo Gomez says -lposix is necessary on A/UX.
--    echo "$as_me:9922: checking for remove" >&5
-+    echo "$as_me:9925: checking for remove" >&5
- echo $ECHO_N "checking for remove... $ECHO_C" >&6
- if test "${ac_cv_func_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9928 "configure"
-+#line 9931 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove (); below.  */
-@@ -9956,16 +9959,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9959: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9962: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9962: \$? = $ac_status" >&5
-+  echo "$as_me:9965: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9965: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9968: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9968: \$? = $ac_status" >&5
-+  echo "$as_me:9971: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_remove=yes
- else
-@@ -9975,11 +9978,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9978: result: $ac_cv_func_remove" >&5
-+echo "$as_me:9981: result: $ac_cv_func_remove" >&5
- echo "${ECHO_T}$ac_cv_func_remove" >&6
- 
-     if test $ac_cv_func_remove = no; then
--      echo "$as_me:9982: checking for remove in -lposix" >&5
-+      echo "$as_me:9985: checking for remove in -lposix" >&5
- echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
- if test "${ac_cv_lib_posix_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9987,7 +9990,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9990 "configure"
-+#line 9993 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10006,16 +10009,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10009: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10012: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10012: \$? = $ac_status" >&5
-+  echo "$as_me:10015: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10015: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10018: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10018: \$? = $ac_status" >&5
-+  echo "$as_me:10021: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_posix_remove=yes
- else
-@@ -10026,7 +10029,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10029: result: $ac_cv_lib_posix_remove" >&5
-+echo "$as_me:10032: result: $ac_cv_lib_posix_remove" >&5
- echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
- if test $ac_cv_lib_posix_remove = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-@@ -10035,13 +10038,13 @@
-     fi
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--    echo "$as_me:10038: checking for shmat" >&5
-+    echo "$as_me:10041: checking for shmat" >&5
- echo $ECHO_N "checking for shmat... $ECHO_C" >&6
- if test "${ac_cv_func_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10044 "configure"
-+#line 10047 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat (); below.  */
-@@ -10072,16 +10075,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10075: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10078: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10078: \$? = $ac_status" >&5
-+  echo "$as_me:10081: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10081: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10084: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10084: \$? = $ac_status" >&5
-+  echo "$as_me:10087: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_shmat=yes
- else
-@@ -10091,11 +10094,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10094: result: $ac_cv_func_shmat" >&5
-+echo "$as_me:10097: result: $ac_cv_func_shmat" >&5
- echo "${ECHO_T}$ac_cv_func_shmat" >&6
- 
-     if test $ac_cv_func_shmat = no; then
--      echo "$as_me:10098: checking for shmat in -lipc" >&5
-+      echo "$as_me:10101: checking for shmat in -lipc" >&5
- echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10103,7 +10106,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lipc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10106 "configure"
-+#line 10109 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10122,16 +10125,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10125: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10128: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10128: \$? = $ac_status" >&5
-+  echo "$as_me:10131: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10131: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10134: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10134: \$? = $ac_status" >&5
-+  echo "$as_me:10137: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_ipc_shmat=yes
- else
-@@ -10142,7 +10145,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10145: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "$as_me:10148: result: $ac_cv_lib_ipc_shmat" >&5
- echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
- if test $ac_cv_lib_ipc_shmat = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-@@ -10160,7 +10163,7 @@
-   # These have to be linked with before -lX11, unlike the other
-   # libraries we check for below, so use a different variable.
-   # John Interrante, Karl Berry
--  echo "$as_me:10163: checking for IceConnectionNumber in -lICE" >&5
-+  echo "$as_me:10166: checking for IceConnectionNumber in -lICE" >&5
- echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10168,7 +10171,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10171 "configure"
-+#line 10174 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10187,16 +10190,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10190: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10193: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10193: \$? = $ac_status" >&5
-+  echo "$as_me:10196: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10196: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10199: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10199: \$? = $ac_status" >&5
-+  echo "$as_me:10202: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_ICE_IceConnectionNumber=yes
- else
-@@ -10207,7 +10210,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10210: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "$as_me:10213: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
- echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-@@ -10219,7 +10222,7 @@
- 
- cf_x_athena=${cf_x_athena:-Xaw}
- 
--echo "$as_me:10222: checking if you want to link with Xaw 3d library" >&5
-+echo "$as_me:10225: checking if you want to link with Xaw 3d library" >&5
- echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
- withval=
- 
-@@ -10230,14 +10233,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=Xaw3d
--	echo "$as_me:10233: result: yes" >&5
-+	echo "$as_me:10236: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10236: result: no" >&5
-+	echo "$as_me:10239: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:10240: checking if you want to link with Xaw 3d xft library" >&5
-+echo "$as_me:10243: checking if you want to link with Xaw 3d xft library" >&5
- echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
- withval=
- 
-@@ -10248,14 +10251,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=Xaw3dxft
--	echo "$as_me:10251: result: yes" >&5
-+	echo "$as_me:10254: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10254: result: no" >&5
-+	echo "$as_me:10257: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:10258: checking if you want to link with neXT Athena library" >&5
-+echo "$as_me:10261: checking if you want to link with neXT Athena library" >&5
- echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
- withval=
- 
-@@ -10266,14 +10269,14 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=neXtaw
--	echo "$as_me:10269: result: yes" >&5
-+	echo "$as_me:10272: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10272: result: no" >&5
-+	echo "$as_me:10275: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:10276: checking if you want to link with Athena-Plus library" >&5
-+echo "$as_me:10279: checking if you want to link with Athena-Plus library" >&5
- echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
- withval=
- 
-@@ -10284,10 +10287,10 @@
- fi;
- if test "$withval" = yes ; then
- 	cf_x_athena=XawPlus
--	echo "$as_me:10287: result: yes" >&5
-+	echo "$as_me:10290: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--	echo "$as_me:10290: result: no" >&5
-+	echo "$as_me:10293: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -10307,17 +10310,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
- 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
- 
--echo "${as_me:-configure}:10310: testing found package $cf_athena_pkg ..." 1>&5
-+echo "${as_me:-configure}:10313: testing found package $cf_athena_pkg ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
- 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10316: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10319: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:10320: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10323: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -10428,20 +10431,20 @@
- 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
- 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
- 
--echo "${as_me:-configure}:10431: testing ..trimmed $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10434: testing ..trimmed $LIBS ..." 1>&5
- 
- 			;;
- 		esac
- 	done
- 
--echo "$as_me:10437: checking for usable $cf_x_athena/Xmu package" >&5
-+echo "$as_me:10440: checking for usable $cf_x_athena/Xmu package" >&5
- echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
- if test "${cf_cv_xaw_compat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10444 "configure"
-+#line 10447 "configure"
- #include "confdefs.h"
- 
- #include <X11/Xmu/CharSet.h>
-@@ -10457,16 +10460,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10460: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10463: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10463: \$? = $ac_status" >&5
-+  echo "$as_me:10466: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10466: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10469: \$? = $ac_status" >&5
-+  echo "$as_me:10472: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xaw_compat=yes
- else
-@@ -10476,7 +10479,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10479: result: $cf_cv_xaw_compat" >&5
-+echo "$as_me:10482: result: $cf_cv_xaw_compat" >&5
- echo "${ECHO_T}$cf_cv_xaw_compat" >&6
- 
- 			if test "$cf_cv_xaw_compat" = no
-@@ -10488,7 +10491,7 @@
- 				(*)
- 					test -n "$verbose" && echo "	work around broken package" 1>&6
- 
--echo "${as_me:-configure}:10491: testing work around broken package ..." 1>&5
-+echo "${as_me:-configure}:10494: testing work around broken package ..." 1>&5
- 
- 					cf_save_xmu="$LIBS"
- 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
-@@ -10496,17 +10499,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
- 	test -n "$verbose" && echo "	found package xmu" 1>&6
- 
--echo "${as_me:-configure}:10499: testing found package xmu ..." 1>&5
-+echo "${as_me:-configure}:10502: testing found package xmu ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
- 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10505: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10508: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:10509: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10512: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -10606,12 +10609,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--echo "${as_me:-configure}:10609: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10612: testing ...before $LIBS ..." 1>&5
- 
- LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
--echo "${as_me:-configure}:10614: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10617: testing ...after  $LIBS ..." 1>&5
- 
- else
- 	cf_pkgconfig_incs=
-@@ -10619,12 +10622,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--echo "${as_me:-configure}:10622: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10625: testing ...before $LIBS ..." 1>&5
- 
- LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
--echo "${as_me:-configure}:10627: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10630: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -10635,7 +10638,7 @@
- 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
- 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
- 
--echo "${as_me:-configure}:10638: testing ..trimmed $LIBS ..." 1>&5
-+echo "${as_me:-configure}:10641: testing ..trimmed $LIBS ..." 1>&5
- 
- 			;;
- 		esac
-@@ -10660,17 +10663,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
- 	test -n "$verbose" && echo "	found package Xext" 1>&6
- 
--echo "${as_me:-configure}:10663: testing found package Xext ..." 1>&5
-+echo "${as_me:-configure}:10666: testing found package Xext ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
- 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10669: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10672: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:10673: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10676: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -10771,7 +10774,7 @@
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
- 
--	echo "$as_me:10774: checking for XextCreateExtension in -lXext" >&5
-+	echo "$as_me:10777: checking for XextCreateExtension in -lXext" >&5
- echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
- if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10779,7 +10782,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXext  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10782 "configure"
-+#line 10785 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10798,16 +10801,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10801: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10804: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10804: \$? = $ac_status" >&5
-+  echo "$as_me:10807: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10807: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10810: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10810: \$? = $ac_status" >&5
-+  echo "$as_me:10813: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_Xext_XextCreateExtension=yes
- else
-@@ -10818,7 +10821,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10821: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
-+echo "$as_me:10824: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
- echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
- if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
- 
-@@ -10854,17 +10857,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
- 	test -n "$verbose" && echo "	found package x11" 1>&6
- 
--echo "${as_me:-configure}:10857: testing found package x11 ..." 1>&5
-+echo "${as_me:-configure}:10860: testing found package x11 ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
- 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10863: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10866: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:10867: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10870: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -10964,24 +10967,24 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ echo "$as_me:10967: WARNING: unable to find X11 library" >&5
-+	{ echo "$as_me:10970: WARNING: unable to find X11 library" >&5
- echo "$as_me: WARNING: unable to find X11 library" >&2;}
- fi
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
- 	test -n "$verbose" && echo "	found package ice" 1>&6
- 
--echo "${as_me:-configure}:10974: testing found package ice ..." 1>&5
-+echo "${as_me:-configure}:10977: testing found package ice ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
- 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:10980: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:10983: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:10984: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:10987: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -11081,24 +11084,24 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ echo "$as_me:11084: WARNING: unable to find ICE library" >&5
-+	{ echo "$as_me:11087: WARNING: unable to find ICE library" >&5
- echo "$as_me: WARNING: unable to find ICE library" >&2;}
- fi
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
- 	test -n "$verbose" && echo "	found package sm" 1>&6
- 
--echo "${as_me:-configure}:11091: testing found package sm ..." 1>&5
-+echo "${as_me:-configure}:11094: testing found package sm ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
- 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11097: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11100: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:11101: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11104: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -11198,24 +11201,24 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ echo "$as_me:11201: WARNING: unable to find SM library" >&5
-+	{ echo "$as_me:11204: WARNING: unable to find SM library" >&5
- echo "$as_me: WARNING: unable to find SM library" >&2;}
- fi
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
- 	test -n "$verbose" && echo "	found package xt" 1>&6
- 
--echo "${as_me:-configure}:11208: testing found package xt ..." 1>&5
-+echo "${as_me:-configure}:11211: testing found package xt ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
- 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11214: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11217: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:11218: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11221: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -11315,7 +11318,7 @@
- else
- 	cf_pkgconfig_incs=
- 	cf_pkgconfig_libs=
--	{ echo "$as_me:11318: WARNING: unable to find Xt library" >&5
-+	{ echo "$as_me:11321: WARNING: unable to find Xt library" >&5
- echo "$as_me: WARNING: unable to find Xt library" >&2;}
- fi
- 
-@@ -11326,17 +11329,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
- 	test -n "$verbose" && echo "	found package xt" 1>&6
- 
--echo "${as_me:-configure}:11329: testing found package xt ..." 1>&5
-+echo "${as_me:-configure}:11332: testing found package xt ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
- 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11335: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11338: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:11339: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11342: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -11437,14 +11440,14 @@
- 		;;
- 	(*)
- # we have an "xt" package, but it may omit Xt's dependency on X11
--echo "$as_me:11440: checking for usable X dependency" >&5
-+echo "$as_me:11443: checking for usable X dependency" >&5
- echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
- if test "${cf_cv_xt_x11_compat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11447 "configure"
-+#line 11450 "configure"
- #include "confdefs.h"
- 
- #include <X11/Xlib.h>
-@@ -11463,16 +11466,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11466: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11469: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11469: \$? = $ac_status" >&5
-+  echo "$as_me:11472: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11472: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11475: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11475: \$? = $ac_status" >&5
-+  echo "$as_me:11478: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xt_x11_compat=yes
- else
-@@ -11482,30 +11485,30 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11485: result: $cf_cv_xt_x11_compat" >&5
-+echo "$as_me:11488: result: $cf_cv_xt_x11_compat" >&5
- echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
- 		if test "$cf_cv_xt_x11_compat" = no
- 		then
- 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
- 
--echo "${as_me:-configure}:11491: testing work around broken X11 dependency ..." 1>&5
-+echo "${as_me:-configure}:11494: testing work around broken X11 dependency ..." 1>&5
- 
- 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
- 	test -n "$verbose" && echo "	found package x11" 1>&6
- 
--echo "${as_me:-configure}:11498: testing found package x11 ..." 1>&5
-+echo "${as_me:-configure}:11501: testing found package x11 ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
- 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11504: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11507: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:11508: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11511: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -11608,12 +11611,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--echo "${as_me:-configure}:11611: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11614: testing ...before $LIBS ..." 1>&5
- 
- LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
--echo "${as_me:-configure}:11616: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11619: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -11621,14 +11624,14 @@
- 		;;
- 	esac
- 
--echo "$as_me:11624: checking for usable X Toolkit package" >&5
-+echo "$as_me:11627: checking for usable X Toolkit package" >&5
- echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
- if test "${cf_cv_xt_ice_compat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11631 "configure"
-+#line 11634 "configure"
- #include "confdefs.h"
- 
- #include <X11/Shell.h>
-@@ -11643,16 +11646,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11646: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11649: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11649: \$? = $ac_status" >&5
-+  echo "$as_me:11652: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11652: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11655: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11655: \$? = $ac_status" >&5
-+  echo "$as_me:11658: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xt_ice_compat=yes
- else
-@@ -11662,7 +11665,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11665: result: $cf_cv_xt_ice_compat" >&5
-+echo "$as_me:11668: result: $cf_cv_xt_ice_compat" >&5
- echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
- 
- 	if test "$cf_cv_xt_ice_compat" = no
-@@ -11676,22 +11679,22 @@
- 			(*)
- 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
- 
--echo "${as_me:-configure}:11679: testing work around broken ICE dependency ..." 1>&5
-+echo "${as_me:-configure}:11682: testing work around broken ICE dependency ..." 1>&5
- 
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
- 	test -n "$verbose" && echo "	found package ice" 1>&6
- 
--echo "${as_me:-configure}:11684: testing found package ice ..." 1>&5
-+echo "${as_me:-configure}:11687: testing found package ice ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
- 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11690: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11693: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:11694: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11697: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -11790,17 +11793,17 @@
- if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
- 	test -n "$verbose" && echo "	found package sm" 1>&6
- 
--echo "${as_me:-configure}:11793: testing found package sm ..." 1>&5
-+echo "${as_me:-configure}:11796: testing found package sm ..." 1>&5
- 
- 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
- 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
- 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
- 
--echo "${as_me:-configure}:11799: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
-+echo "${as_me:-configure}:11802: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
- 
- 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
- 
--echo "${as_me:-configure}:11803: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
-+echo "${as_me:-configure}:11806: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
- 
- cf_fix_cppflags=no
- cf_new_cflags=
-@@ -11909,12 +11912,12 @@
- 
- test -n "$verbose" && echo "	...before $LIBS" 1>&6
- 
--echo "${as_me:-configure}:11912: testing ...before $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11915: testing ...before $LIBS ..." 1>&5
- 
- LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
- test -n "$verbose" && echo "	...after  $LIBS" 1>&6
- 
--echo "${as_me:-configure}:11917: testing ...after  $LIBS ..." 1>&5
-+echo "${as_me:-configure}:11920: testing ...after  $LIBS ..." 1>&5
- 
- fi
- 
-@@ -11934,7 +11937,7 @@
- 
- test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
- 
--echo "${as_me:-configure}:11937: testing checking additions to CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:11940: testing checking additions to CFLAGS ..." 1>&5
- 
- cf_check_cflags="$CFLAGS"
- cf_check_cppflags="$CPPFLAGS"
-@@ -12005,7 +12008,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:12008: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:12011: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -12013,7 +12016,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:12016: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12019: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -12021,14 +12024,14 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:12024: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12027: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
- if test "x$cf_check_cflags" != "x$CFLAGS" ; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 12031 "configure"
-+#line 12034 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -12040,16 +12043,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12043: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12046: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12046: \$? = $ac_status" >&5
-+  echo "$as_me:12049: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12049: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12052: \$? = $ac_status" >&5
-+  echo "$as_me:12055: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12057,12 +12060,12 @@
- cat conftest.$ac_ext >&5
- test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
- 
--echo "${as_me:-configure}:12060: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12063: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
- 
- 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
- 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
- 
--echo "${as_me:-configure}:12065: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12068: testing but keeping change to \$CPPFLAGS ..." 1>&5
- 
- 	 fi
- 	 CFLAGS="$cf_check_flags"
-@@ -12070,13 +12073,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- 
--	echo "$as_me:12073: checking for XOpenDisplay" >&5
-+	echo "$as_me:12076: checking for XOpenDisplay" >&5
- echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
- if test "${ac_cv_func_XOpenDisplay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12079 "configure"
-+#line 12082 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char XOpenDisplay (); below.  */
-@@ -12107,16 +12110,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12110: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12113: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12113: \$? = $ac_status" >&5
-+  echo "$as_me:12116: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12116: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12119: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12119: \$? = $ac_status" >&5
-+  echo "$as_me:12122: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_XOpenDisplay=yes
- else
-@@ -12126,13 +12129,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12129: result: $ac_cv_func_XOpenDisplay" >&5
-+echo "$as_me:12132: result: $ac_cv_func_XOpenDisplay" >&5
- echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
- if test $ac_cv_func_XOpenDisplay = yes; then
-   :
- else
- 
--	echo "$as_me:12135: checking for XOpenDisplay in -lX11" >&5
-+	echo "$as_me:12138: checking for XOpenDisplay in -lX11" >&5
- echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
- if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12140,7 +12143,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12143 "configure"
-+#line 12146 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12159,16 +12162,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12162: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12165: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12165: \$? = $ac_status" >&5
-+  echo "$as_me:12168: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12168: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12171: \$? = $ac_status" >&5
-+  echo "$as_me:12174: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_X11_XOpenDisplay=yes
- else
-@@ -12179,7 +12182,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12182: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "$as_me:12185: result: $ac_cv_lib_X11_XOpenDisplay" >&5
- echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
- if test $ac_cv_lib_X11_XOpenDisplay = yes; then
- 
-@@ -12203,13 +12206,13 @@
- 
- fi
- 
--	echo "$as_me:12206: checking for XtAppInitialize" >&5
-+	echo "$as_me:12209: checking for XtAppInitialize" >&5
- echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
- if test "${ac_cv_func_XtAppInitialize+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12212 "configure"
-+#line 12215 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char XtAppInitialize (); below.  */
-@@ -12240,16 +12243,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12243: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12246: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12246: \$? = $ac_status" >&5
-+  echo "$as_me:12249: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12249: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12252: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12252: \$? = $ac_status" >&5
-+  echo "$as_me:12255: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_XtAppInitialize=yes
- else
-@@ -12259,13 +12262,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12262: result: $ac_cv_func_XtAppInitialize" >&5
-+echo "$as_me:12265: result: $ac_cv_func_XtAppInitialize" >&5
- echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
- if test $ac_cv_func_XtAppInitialize = yes; then
-   :
- else
- 
--	echo "$as_me:12268: checking for XtAppInitialize in -lXt" >&5
-+	echo "$as_me:12271: checking for XtAppInitialize in -lXt" >&5
- echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
- if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12273,7 +12276,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12276 "configure"
-+#line 12279 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12292,16 +12295,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12295: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12298: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12298: \$? = $ac_status" >&5
-+  echo "$as_me:12301: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12301: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12304: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12304: \$? = $ac_status" >&5
-+  echo "$as_me:12307: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_Xt_XtAppInitialize=yes
- else
-@@ -12312,7 +12315,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12315: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
-+echo "$as_me:12318: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
- echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
- if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
- 
-@@ -12329,7 +12332,7 @@
- fi
- 
- if test $cf_have_X_LIBS = no ; then
--	{ echo "$as_me:12332: WARNING: Unable to successfully link X Toolkit library (-lXt) with
-+	{ echo "$as_me:12335: WARNING: Unable to successfully link X Toolkit library (-lXt) with
- test program.  You will have to check and add the proper libraries by hand
- to makefile." >&5
- echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
-@@ -12351,14 +12354,14 @@
- 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
- 		if test $cf_path != default ; then
- 			CPPFLAGS="$cf_save -I$cf_path/include"
--			echo "$as_me:12354: checking for $cf_test in $cf_path" >&5
-+			echo "$as_me:12357: checking for $cf_test in $cf_path" >&5
- echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
- 		else
--			echo "$as_me:12357: checking for $cf_test" >&5
-+			echo "$as_me:12360: checking for $cf_test" >&5
- echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
- 		fi
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 12361 "configure"
-+#line 12364 "configure"
- #include "confdefs.h"
- 
- #include <X11/Intrinsic.h>
-@@ -12372,16 +12375,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12375: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12378: \$? = $ac_status" >&5
-+  echo "$as_me:12381: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12381: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12384: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12384: \$? = $ac_status" >&5
-+  echo "$as_me:12387: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -12390,7 +12393,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--		echo "$as_me:12393: result: $cf_result" >&5
-+		echo "$as_me:12396: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 		if test "$cf_result" = yes ; then
- 			cf_x_athena_inc=$cf_path
-@@ -12402,7 +12405,7 @@
- done
- 
- if test -z "$cf_x_athena_inc" ; then
--	{ echo "$as_me:12405: WARNING: Unable to successfully find Athena header files with test program" >&5
-+	{ echo "$as_me:12408: WARNING: Unable to successfully find Athena header files with test program" >&5
- echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
- elif test "$cf_x_athena_inc" != default ; then
- 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
-@@ -12448,7 +12451,7 @@
- done
- LIBS="$cf_add_libs"
- 
--				echo "$as_me:12451: checking for $cf_libs in $cf_path" >&5
-+				echo "$as_me:12454: checking for $cf_libs in $cf_path" >&5
- echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
- 			else
- 
-@@ -12468,11 +12471,11 @@
- done
- LIBS="$cf_add_libs"
- 
--				echo "$as_me:12471: checking for $cf_test in $cf_libs" >&5
-+				echo "$as_me:12474: checking for $cf_test in $cf_libs" >&5
- echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
- 			fi
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 12475 "configure"
-+#line 12478 "configure"
- #include "confdefs.h"
- 
- #include <X11/Intrinsic.h>
-@@ -12488,16 +12491,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12491: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12494: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12494: \$? = $ac_status" >&5
-+  echo "$as_me:12497: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12500: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12500: \$? = $ac_status" >&5
-+  echo "$as_me:12503: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -12506,7 +12509,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--			echo "$as_me:12509: result: $cf_result" >&5
-+			echo "$as_me:12512: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 			if test "$cf_result" = yes ; then
- 				cf_x_athena_lib="$cf_libs"
-@@ -12520,7 +12523,7 @@
- done
- 
- if test -z "$cf_x_athena_lib" ; then
--	{ { echo "$as_me:12523: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
-+	{ { echo "$as_me:12526: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
- echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -12538,7 +12541,7 @@
-   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
--echo "$as_me:12541: checking for $ac_word" >&5
-+echo "$as_me:12544: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12553,7 +12556,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
--echo "$as_me:12556: found $ac_dir/$ac_word" >&5
-+echo "$as_me:12559: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -12561,10 +12564,10 @@
- fi
- XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
- if test -n "$XCURSES_CONFIG"; then
--  echo "$as_me:12564: result: $XCURSES_CONFIG" >&5
-+  echo "$as_me:12567: result: $XCURSES_CONFIG" >&5
- echo "${ECHO_T}$XCURSES_CONFIG" >&6
- else
--  echo "$as_me:12567: result: no" >&5
-+  echo "$as_me:12570: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -12577,7 +12580,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:12580: checking for $ac_word" >&5
-+echo "$as_me:12583: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12592,7 +12595,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
--echo "$as_me:12595: found $ac_dir/$ac_word" >&5
-+echo "$as_me:12598: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -12600,10 +12603,10 @@
- fi
- ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
- if test -n "$ac_ct_XCURSES_CONFIG"; then
--  echo "$as_me:12603: result: $ac_ct_XCURSES_CONFIG" >&5
-+  echo "$as_me:12606: result: $ac_ct_XCURSES_CONFIG" >&5
- echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
- else
--  echo "$as_me:12606: result: no" >&5
-+  echo "$as_me:12609: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -12642,7 +12645,7 @@
- 
- test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
- 
--echo "${as_me:-configure}:12645: testing checking additions to CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12648: testing checking additions to CFLAGS ..." 1>&5
- 
- cf_check_cflags="$CFLAGS"
- cf_check_cppflags="$CPPFLAGS"
-@@ -12713,7 +12716,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:12716: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:12719: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -12721,7 +12724,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:12724: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12727: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -12729,14 +12732,14 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:12732: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:12735: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
- if test "x$cf_check_cflags" != "x$CFLAGS" ; then
- cat >conftest.$ac_ext <<_ACEOF
--#line 12739 "configure"
-+#line 12742 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -12748,16 +12751,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12751: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12754: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12754: \$? = $ac_status" >&5
-+  echo "$as_me:12757: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12757: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12760: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12760: \$? = $ac_status" >&5
-+  echo "$as_me:12763: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -12765,12 +12768,12 @@
- cat conftest.$ac_ext >&5
- test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
- 
--echo "${as_me:-configure}:12768: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12771: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
- 
- 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
- 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
- 
--echo "${as_me:-configure}:12773: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+echo "${as_me:-configure}:12776: testing but keeping change to \$CPPFLAGS ..." 1>&5
- 
- 	 fi
- 	 CFLAGS="$cf_check_flags"
-@@ -12778,7 +12781,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- 
--echo "$as_me:12781: checking for XOpenDisplay in -lX11" >&5
-+echo "$as_me:12784: checking for XOpenDisplay in -lX11" >&5
- echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
- if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12786,7 +12789,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 12789 "configure"
-+#line 12792 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -12805,16 +12808,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12808: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12811: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12811: \$? = $ac_status" >&5
-+  echo "$as_me:12814: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12814: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12817: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12817: \$? = $ac_status" >&5
-+  echo "$as_me:12820: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_X11_XOpenDisplay=yes
- else
-@@ -12825,7 +12828,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:12828: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "$as_me:12831: result: $ac_cv_lib_X11_XOpenDisplay" >&5
- echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
- if test $ac_cv_lib_X11_XOpenDisplay = yes; then
- 
-@@ -12847,7 +12850,7 @@
- 
- fi
- 
--echo "$as_me:12850: checking for XCurses library" >&5
-+echo "$as_me:12853: checking for XCurses library" >&5
- echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
- if test "${cf_cv_lib_XCurses+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12870,7 +12873,7 @@
- LIBS="$cf_add_libs"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12873 "configure"
-+#line 12876 "configure"
- #include "confdefs.h"
- 
- #include <xcurses.h>
-@@ -12885,16 +12888,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12888: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12891: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12891: \$? = $ac_status" >&5
-+  echo "$as_me:12894: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12894: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12897: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12897: \$? = $ac_status" >&5
-+  echo "$as_me:12900: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_lib_XCurses=yes
- else
-@@ -12905,7 +12908,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:12908: result: $cf_cv_lib_XCurses" >&5
-+echo "$as_me:12911: result: $cf_cv_lib_XCurses" >&5
- echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
- 
- fi
-@@ -12920,23 +12923,23 @@
- #define XCURSES 1
- EOF
- 
--	echo "$as_me:12923: checking for xcurses.h" >&5
-+	echo "$as_me:12926: checking for xcurses.h" >&5
- echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
- if test "${ac_cv_header_xcurses_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12929 "configure"
-+#line 12932 "configure"
- #include "confdefs.h"
- #include <xcurses.h>
- _ACEOF
--if { (eval echo "$as_me:12933: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12936: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12939: \$? = $ac_status" >&5
-+  echo "$as_me:12942: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12955,7 +12958,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12958: result: $ac_cv_header_xcurses_h" >&5
-+echo "$as_me:12961: result: $ac_cv_header_xcurses_h" >&5
- echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
- if test $ac_cv_header_xcurses_h = yes; then
- 
-@@ -12966,14 +12969,14 @@
- fi
- 
- else
--	{ { echo "$as_me:12969: error: Cannot link with XCurses" >&5
-+	{ { echo "$as_me:12972: error: Cannot link with XCurses" >&5
- echo "$as_me: error: Cannot link with XCurses" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- 	;;
- (*)
--	{ { echo "$as_me:12976: error: unexpected screen-value: $cf_cv_screen" >&5
-+	{ { echo "$as_me:12979: error: unexpected screen-value: $cf_cv_screen" >&5
- echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -12985,14 +12988,14 @@
- 	;;
- (curses|curses_*)
- 
--echo "$as_me:12988: checking for NetBSD form.h" >&5
-+echo "$as_me:12991: checking for NetBSD form.h" >&5
- echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
- if test "${cf_cv_netbsd_form_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12995 "configure"
-+#line 12998 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13011,16 +13014,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13014: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13017: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13017: \$? = $ac_status" >&5
-+  echo "$as_me:13020: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13020: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13023: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13023: \$? = $ac_status" >&5
-+  echo "$as_me:13026: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_netbsd_form_h=yes
- 
-@@ -13032,7 +13035,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:13035: result: $cf_cv_netbsd_form_h" >&5
-+echo "$as_me:13038: result: $cf_cv_netbsd_form_h" >&5
- echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
- 
- test "$cf_cv_netbsd_form_h" = yes &&
-@@ -13040,14 +13043,14 @@
- #define HAVE_NETBSD_FORM_H 1
- EOF
- 
--echo "$as_me:13043: checking for NetBSD menu.h" >&5
-+echo "$as_me:13046: checking for NetBSD menu.h" >&5
- echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
- if test "${cf_cv_netbsd_menu_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13050 "configure"
-+#line 13053 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -13065,16 +13068,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13068: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13071: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13071: \$? = $ac_status" >&5
-+  echo "$as_me:13074: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13077: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13077: \$? = $ac_status" >&5
-+  echo "$as_me:13080: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_netbsd_menu_h=yes
- 
-@@ -13086,7 +13089,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:13089: result: $cf_cv_netbsd_menu_h" >&5
-+echo "$as_me:13092: result: $cf_cv_netbsd_menu_h" >&5
- echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
- 
- test "$cf_cv_netbsd_menu_h" = yes &&
-@@ -13104,7 +13107,7 @@
- 	# look for curses-related libraries
- 
- as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
--echo "$as_me:13107: checking for new_panel in -lpanel$cf_cv_libtype" >&5
-+echo "$as_me:13110: checking for new_panel in -lpanel$cf_cv_libtype" >&5
- echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13112,7 +13115,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpanel$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13115 "configure"
-+#line 13118 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13131,16 +13134,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13137: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13137: \$? = $ac_status" >&5
-+  echo "$as_me:13140: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13143: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13143: \$? = $ac_status" >&5
-+  echo "$as_me:13146: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -13151,7 +13154,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13154: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13157: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -13180,7 +13183,7 @@
- fi
- 
- as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
--echo "$as_me:13183: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
-+echo "$as_me:13186: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
- echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13188,7 +13191,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmenu$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13191 "configure"
-+#line 13194 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13207,16 +13210,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13210: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13213: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13213: \$? = $ac_status" >&5
-+  echo "$as_me:13216: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13216: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13219: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13219: \$? = $ac_status" >&5
-+  echo "$as_me:13222: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -13227,7 +13230,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13230: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13233: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -13256,7 +13259,7 @@
- fi
- 
- as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
--echo "$as_me:13259: checking for form_driver in -lform$cf_cv_libtype" >&5
-+echo "$as_me:13262: checking for form_driver in -lform$cf_cv_libtype" >&5
- echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13264,7 +13267,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lform$cf_cv_libtype  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13267 "configure"
-+#line 13270 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13283,16 +13286,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13286: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13289: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13289: \$? = $ac_status" >&5
-+  echo "$as_me:13292: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13292: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13295: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13295: \$? = $ac_status" >&5
-+  echo "$as_me:13298: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -13303,7 +13306,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13306: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:13309: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -13343,23 +13346,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13346: checking for $ac_header" >&5
-+echo "$as_me:13349: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13352 "configure"
-+#line 13355 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:13356: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13359: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13362: \$? = $ac_status" >&5
-+  echo "$as_me:13365: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13378,7 +13381,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13381: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13384: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13391,13 +13394,13 @@
- 	;;
- esac
- 
--echo "$as_me:13394: checking for ANSI C header files" >&5
-+echo "$as_me:13397: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13400 "configure"
-+#line 13403 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -13405,13 +13408,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:13408: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13411: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13414: \$? = $ac_status" >&5
-+  echo "$as_me:13417: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13433,7 +13436,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13436 "configure"
-+#line 13439 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -13451,7 +13454,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13454 "configure"
-+#line 13457 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -13472,7 +13475,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13475 "configure"
-+#line 13478 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -13498,15 +13501,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13501: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13504: \$? = $ac_status" >&5
-+  echo "$as_me:13507: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13506: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13509: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13509: \$? = $ac_status" >&5
-+  echo "$as_me:13512: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -13519,7 +13522,7 @@
- fi
- fi
- fi
--echo "$as_me:13522: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:13525: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -13529,13 +13532,13 @@
- 
- fi
- 
--echo "$as_me:13532: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:13535: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13538 "configure"
-+#line 13541 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -13551,16 +13554,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13554: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13557: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13557: \$? = $ac_status" >&5
-+  echo "$as_me:13560: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13560: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13563: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13563: \$? = $ac_status" >&5
-+  echo "$as_me:13566: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -13570,7 +13573,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:13573: result: $ac_cv_header_time" >&5
-+echo "$as_me:13576: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -13593,23 +13596,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13596: checking for $ac_header" >&5
-+echo "$as_me:13599: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13602 "configure"
-+#line 13605 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:13606: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13609: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13612: \$? = $ac_status" >&5
-+  echo "$as_me:13615: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13628,7 +13631,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13631: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13634: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13641,23 +13644,23 @@
- for ac_header in unistd.h getopt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13644: checking for $ac_header" >&5
-+echo "$as_me:13647: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13650 "configure"
-+#line 13653 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:13654: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13657: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13660: \$? = $ac_status" >&5
-+  echo "$as_me:13663: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13676,7 +13679,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13679: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:13682: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13686,7 +13689,7 @@
- fi
- done
- 
--echo "$as_me:13689: checking for header declaring getopt variables" >&5
-+echo "$as_me:13692: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13696,7 +13699,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 13699 "configure"
-+#line 13702 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -13709,16 +13712,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13712: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13715: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13715: \$? = $ac_status" >&5
-+  echo "$as_me:13718: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13718: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13721: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13721: \$? = $ac_status" >&5
-+  echo "$as_me:13724: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -13730,7 +13733,7 @@
- done
- 
- fi
--echo "$as_me:13733: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:13736: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -13753,13 +13756,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13756: checking for $ac_func" >&5
-+echo "$as_me:13759: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13762 "configure"
-+#line 13765 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13790,16 +13793,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13793: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13796: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13796: \$? = $ac_status" >&5
-+  echo "$as_me:13799: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13802: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13802: \$? = $ac_status" >&5
-+  echo "$as_me:13805: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13809,7 +13812,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13812: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13815: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13820,7 +13823,7 @@
- done
- 
- if test "x$ac_cv_func_getopt" = xno; then
--	{ { echo "$as_me:13823: error: getopt is required for building programs" >&5
-+	{ { echo "$as_me:13826: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -13839,13 +13842,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13842: checking for $ac_func" >&5
-+echo "$as_me:13845: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13848 "configure"
-+#line 13851 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13876,16 +13879,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13879: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13882: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13882: \$? = $ac_status" >&5
-+  echo "$as_me:13885: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13885: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13888: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13888: \$? = $ac_status" >&5
-+  echo "$as_me:13891: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13895,7 +13898,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13898: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13901: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13907,14 +13910,14 @@
- 
- fi
- 
--echo "$as_me:13910: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:13913: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- if test "${cf_cv_need_xopen_extension+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 13917 "configure"
-+#line 13920 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -13936,23 +13939,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13939: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13942: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13942: \$? = $ac_status" >&5
-+  echo "$as_me:13945: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13945: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13948: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13948: \$? = $ac_status" >&5
-+  echo "$as_me:13951: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 13955 "configure"
-+#line 13958 "configure"
- #include "confdefs.h"
- 
- #define _XOPEN_SOURCE_EXTENDED
-@@ -13974,16 +13977,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13977: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13980: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13980: \$? = $ac_status" >&5
-+  echo "$as_me:13983: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13983: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13986: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13986: \$? = $ac_status" >&5
-+  echo "$as_me:13989: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_xopen_extension=yes
- else
-@@ -13995,11 +13998,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13998: result: $cf_cv_need_xopen_extension" >&5
-+echo "$as_me:14001: result: $cf_cv_need_xopen_extension" >&5
- echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
- test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 
--echo "$as_me:14002: checking for term.h" >&5
-+echo "$as_me:14005: checking for term.h" >&5
- echo $ECHO_N "checking for term.h... $ECHO_C" >&6
- if test "${cf_cv_term_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14020,7 +14023,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14023 "configure"
-+#line 14026 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14034,16 +14037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14037: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14040: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14040: \$? = $ac_status" >&5
-+  echo "$as_me:14043: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14043: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14046: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14046: \$? = $ac_status" >&5
-+  echo "$as_me:14049: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 	 break
-@@ -14062,7 +14065,7 @@
- 	for cf_header in ncurses/term.h ncursesw/term.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 14065 "configure"
-+#line 14068 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14080,16 +14083,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14083: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14086: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14086: \$? = $ac_status" >&5
-+  echo "$as_me:14089: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14092: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14092: \$? = $ac_status" >&5
-+  echo "$as_me:14095: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_term_header=$cf_header
- 			 break
-@@ -14104,7 +14107,7 @@
- esac
- 
- fi
--echo "$as_me:14107: result: $cf_cv_term_header" >&5
-+echo "$as_me:14110: result: $cf_cv_term_header" >&5
- echo "${ECHO_T}$cf_cv_term_header" >&6
- 
- case $cf_cv_term_header in
-@@ -14131,7 +14134,7 @@
- 	;;
- esac
- 
--echo "$as_me:14134: checking for unctrl.h" >&5
-+echo "$as_me:14137: checking for unctrl.h" >&5
- echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
- if test "${cf_cv_unctrl_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14152,7 +14155,7 @@
- for cf_header in $cf_header_list
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14155 "configure"
-+#line 14158 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14166,16 +14169,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14169: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14172: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14172: \$? = $ac_status" >&5
-+  echo "$as_me:14175: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14175: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14178: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14178: \$? = $ac_status" >&5
-+  echo "$as_me:14181: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unctrl_header=$cf_header
- 	 break
-@@ -14188,12 +14191,12 @@
- done
- 
- fi
--echo "$as_me:14191: result: $cf_cv_unctrl_header" >&5
-+echo "$as_me:14194: result: $cf_cv_unctrl_header" >&5
- echo "${ECHO_T}$cf_cv_unctrl_header" >&6
- 
- case $cf_cv_unctrl_header in
- (no)
--	{ echo "$as_me:14196: WARNING: unctrl.h header not found" >&5
-+	{ echo "$as_me:14199: WARNING: unctrl.h header not found" >&5
- echo "$as_me: WARNING: unctrl.h header not found" >&2;}
- 	;;
- esac
-@@ -14267,10 +14270,10 @@
- 
- cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--	echo "$as_me:14270: checking for ${cf_func}" >&5
-+	echo "$as_me:14273: checking for ${cf_func}" >&5
- echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
- 
--echo "${as_me:-configure}:14273: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:14276: testing ${cf_func} ..." 1>&5
- 
- 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14279,7 +14282,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 14282 "configure"
-+#line 14285 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14312,16 +14315,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14315: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14318: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14318: \$? = $ac_status" >&5
-+  echo "$as_me:14321: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14321: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14324: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14324: \$? = $ac_status" >&5
-+  echo "$as_me:14327: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -14337,7 +14340,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:14340: result: $cf_result" >&5
-+	echo "$as_me:14343: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result != no; then
- 		cat >>confdefs.h <<EOF
-@@ -14352,10 +14355,10 @@
- 
- cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
--	echo "$as_me:14355: checking for ${cf_func}" >&5
-+	echo "$as_me:14358: checking for ${cf_func}" >&5
- echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
- 
--echo "${as_me:-configure}:14358: testing ${cf_func} ..." 1>&5
-+echo "${as_me:-configure}:14361: testing ${cf_func} ..." 1>&5
- 
- 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14364,7 +14367,7 @@
- 		eval cf_result='$ac_cv_func_'$cf_func
- 		if test ".$cf_result" != ".no"; then
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 14367 "configure"
-+#line 14370 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -14397,16 +14400,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14403: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14403: \$? = $ac_status" >&5
-+  echo "$as_me:14406: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14409: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14409: \$? = $ac_status" >&5
-+  echo "$as_me:14412: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -14422,7 +14425,7 @@
- 
- 	# use the computed/retrieved cache-value:
- 	eval 'cf_result=$cf_cv_func_'$cf_func
--	echo "$as_me:14425: result: $cf_result" >&5
-+	echo "$as_me:14428: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result != no; then
- 		cat >>confdefs.h <<EOF
-@@ -14446,7 +14449,7 @@
- 				cf_return="return value"
- 			fi
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 14449 "configure"
-+#line 14452 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14466,21 +14469,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14469: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14472: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14472: \$? = $ac_status" >&5
-+  echo "$as_me:14475: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14475: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14478: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14478: \$? = $ac_status" >&5
-+  echo "$as_me:14481: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
- 
--echo "${as_me:-configure}:14483: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
-+echo "${as_me:-configure}:14486: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
- 
- 		cat >>confdefs.h <<EOF
- #define TPUTS_ARG               $cf_arg
-@@ -14500,14 +14503,14 @@
- 	done
- fi
- 
--echo "$as_me:14503: checking for ncurses extended functions" >&5
-+echo "$as_me:14506: checking for ncurses extended functions" >&5
- echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
- if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14510 "configure"
-+#line 14513 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14522,16 +14525,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14525: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14528: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14528: \$? = $ac_status" >&5
-+  echo "$as_me:14531: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14534: \$? = $ac_status" >&5
-+  echo "$as_me:14537: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=defined
- else
-@@ -14539,7 +14542,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14542 "configure"
-+#line 14545 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14564,16 +14567,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14570: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14570: \$? = $ac_status" >&5
-+  echo "$as_me:14573: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14576: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14576: \$? = $ac_status" >&5
-+  echo "$as_me:14579: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ncurses_ext_funcs=yes
- else
-@@ -14587,7 +14590,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:14590: result: $cf_cv_ncurses_ext_funcs" >&5
-+echo "$as_me:14593: result: $cf_cv_ncurses_ext_funcs" >&5
- echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
- test "$cf_cv_ncurses_ext_funcs" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -14601,11 +14604,11 @@
- 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
- 	then
- 		cf_define_xpg5=no
--		echo "$as_me:14604: checking if _XPG5 should be defined to enable wide-characters" >&5
-+		echo "$as_me:14607: checking if _XPG5 should be defined to enable wide-characters" >&5
- echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 14608 "configure"
-+#line 14611 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14618,16 +14621,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14621: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14624: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14624: \$? = $ac_status" >&5
-+  echo "$as_me:14627: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14627: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14630: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14630: \$? = $ac_status" >&5
-+  echo "$as_me:14633: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14636,7 +14639,7 @@
- cf_save_cppflags="$CPPFLAGS"
- 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
- 			 cat >conftest.$ac_ext <<_ACEOF
--#line 14639 "configure"
-+#line 14642 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14649,16 +14652,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14655: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14655: \$? = $ac_status" >&5
-+  echo "$as_me:14658: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14658: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14661: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14661: \$? = $ac_status" >&5
-+  echo "$as_me:14664: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_define_xpg5=yes
- else
-@@ -14669,7 +14672,7 @@
- 			 CPPFLAGS="$cf_save_cppflags"
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--		echo "$as_me:14672: result: $cf_define_xpg5" >&5
-+		echo "$as_me:14675: result: $cf_define_xpg5" >&5
- echo "${ECHO_T}$cf_define_xpg5" >&6
- 
- 		if test "$cf_define_xpg5" = yes
-@@ -14678,14 +14681,14 @@
- 		fi
- 	fi
- 
--	echo "$as_me:14681: checking for wide-character functions" >&5
-+	echo "$as_me:14684: checking for wide-character functions" >&5
- echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
- if test "${cf_cv_widechar_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14688 "configure"
-+#line 14691 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14702,16 +14705,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14705: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14708: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14708: \$? = $ac_status" >&5
-+  echo "$as_me:14711: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14711: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14714: \$? = $ac_status" >&5
-+  echo "$as_me:14717: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_widechar_funcs=yes
- else
-@@ -14722,7 +14725,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:14725: result: $cf_cv_widechar_funcs" >&5
-+echo "$as_me:14728: result: $cf_cv_widechar_funcs" >&5
- echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
- 	if test "$cf_cv_widechar_funcs" != no ; then
- 
-@@ -14743,14 +14746,14 @@
- 
- fi
- 
--echo "$as_me:14746: checking if $cf_cv_screen library uses pthreads" >&5
-+echo "$as_me:14749: checking if $cf_cv_screen library uses pthreads" >&5
- echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
- if test "${cf_cv_use_pthreads+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14753 "configure"
-+#line 14756 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -14768,16 +14771,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14771: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14774: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14774: \$? = $ac_status" >&5
-+  echo "$as_me:14777: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14777: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14780: \$? = $ac_status" >&5
-+  echo "$as_me:14783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_use_pthreads=yes
- else
-@@ -14788,20 +14791,20 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:14791: result: $cf_cv_use_pthreads" >&5
-+echo "$as_me:14794: result: $cf_cv_use_pthreads" >&5
- echo "${ECHO_T}$cf_cv_use_pthreads" >&6
- test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
- #define USE_PTHREADS 1
- EOF
- 
--echo "$as_me:14797: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:14800: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 14804 "configure"
-+#line 14807 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -14821,16 +14824,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14824: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14827: \$? = $ac_status" >&5
-+  echo "$as_me:14830: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14830: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14833: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14833: \$? = $ac_status" >&5
-+  echo "$as_me:14836: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -14842,7 +14845,7 @@
- 
- fi
- 
--echo "$as_me:14845: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:14848: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -14851,7 +14854,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:14854: checking for openpty in -lutil" >&5
-+echo "$as_me:14857: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14859,7 +14862,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14862 "configure"
-+#line 14865 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14878,16 +14881,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14881: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14884: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14884: \$? = $ac_status" >&5
-+  echo "$as_me:14887: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14887: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14890: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14890: \$? = $ac_status" >&5
-+  echo "$as_me:14893: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -14898,7 +14901,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14901: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:14904: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -14906,7 +14909,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:14909: checking for openpty header" >&5
-+echo "$as_me:14912: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14933,7 +14936,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14936 "configure"
-+#line 14939 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -14950,16 +14953,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14953: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14956: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14956: \$? = $ac_status" >&5
-+  echo "$as_me:14959: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14959: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14962: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14962: \$? = $ac_status" >&5
-+  echo "$as_me:14965: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -14977,7 +14980,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:14980: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:14983: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -15011,7 +15014,7 @@
- 	fi
- fi
- 
--echo "$as_me:15014: checking for function curses_version" >&5
-+echo "$as_me:15017: checking for function curses_version" >&5
- echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
- if test "${cf_cv_func_curses_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15021,7 +15024,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15024 "configure"
-+#line 15027 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15034,15 +15037,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15037: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15040: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15040: \$? = $ac_status" >&5
-+  echo "$as_me:15043: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15042: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15045: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15045: \$? = $ac_status" >&5
-+  echo "$as_me:15048: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_curses_version=yes
- 
-@@ -15057,14 +15060,14 @@
- fi
- rm -f core
- fi
--echo "$as_me:15060: result: $cf_cv_func_curses_version" >&5
-+echo "$as_me:15063: result: $cf_cv_func_curses_version" >&5
- echo "${ECHO_T}$cf_cv_func_curses_version" >&6
- test "$cf_cv_func_curses_version" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_CURSES_VERSION 1
- EOF
- 
--echo "$as_me:15067: checking for alternate character set array" >&5
-+echo "$as_me:15070: checking for alternate character set array" >&5
- echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_acs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15074,7 +15077,7 @@
- for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15077 "configure"
-+#line 15080 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header:-curses.h}>
-@@ -15090,16 +15093,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15096: \$? = $ac_status" >&5
-+  echo "$as_me:15099: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15102: \$? = $ac_status" >&5
-+  echo "$as_me:15105: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_acs_map=$name; break
- else
-@@ -15110,7 +15113,7 @@
- done
- 
- fi
--echo "$as_me:15113: result: $cf_cv_curses_acs_map" >&5
-+echo "$as_me:15116: result: $cf_cv_curses_acs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
- 
- test "$cf_cv_curses_acs_map" != unknown &&
-@@ -15120,7 +15123,7 @@
- 
- if test "$cf_enable_widec" = yes; then
- 
--echo "$as_me:15123: checking for wide alternate character set array" >&5
-+echo "$as_me:15126: checking for wide alternate character set array" >&5
- echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_map+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15130,7 +15133,7 @@
- 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15133 "configure"
-+#line 15136 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15146,16 +15149,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15149: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15152: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15152: \$? = $ac_status" >&5
-+  echo "$as_me:15155: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15155: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15158: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15158: \$? = $ac_status" >&5
-+  echo "$as_me:15161: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_map=$name
- 	 break
-@@ -15166,7 +15169,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	done
- fi
--echo "$as_me:15169: result: $cf_cv_curses_wacs_map" >&5
-+echo "$as_me:15172: result: $cf_cv_curses_wacs_map" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
- 
- test "$cf_cv_curses_wacs_map" != unknown &&
-@@ -15174,7 +15177,7 @@
- #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
- EOF
- 
--echo "$as_me:15177: checking for wide alternate character constants" >&5
-+echo "$as_me:15180: checking for wide alternate character constants" >&5
- echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
- if test "${cf_cv_curses_wacs_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15184,7 +15187,7 @@
- if test "$cf_cv_curses_wacs_map" != unknown
- then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15187 "configure"
-+#line 15190 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15201,16 +15204,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15204: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15207: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15207: \$? = $ac_status" >&5
-+  echo "$as_me:15210: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15210: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15213: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15213: \$? = $ac_status" >&5
-+  echo "$as_me:15216: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15220,7 +15223,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- else
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15223 "configure"
-+#line 15226 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15236,16 +15239,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15239: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15242: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15242: \$? = $ac_status" >&5
-+  echo "$as_me:15245: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15245: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15248: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15248: \$? = $ac_status" >&5
-+  echo "$as_me:15251: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_curses_wacs_symbols=yes
- else
-@@ -15256,7 +15259,7 @@
- fi
- 
- fi
--echo "$as_me:15259: result: $cf_cv_curses_wacs_symbols" >&5
-+echo "$as_me:15262: result: $cf_cv_curses_wacs_symbols" >&5
- echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
- 
- test "$cf_cv_curses_wacs_symbols" != no &&
-@@ -15266,10 +15269,10 @@
- 
- fi
- 
--echo "$as_me:15269: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15272: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15272 "configure"
-+#line 15275 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15287,16 +15290,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15293: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15293: \$? = $ac_status" >&5
-+  echo "$as_me:15296: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15296: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15299: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15299: \$? = $ac_status" >&5
-+  echo "$as_me:15302: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15305,7 +15308,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15308: result: $cf_result" >&5
-+echo "$as_me:15311: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15326,14 +15329,14 @@
- if test "$cf_enable_widec" = yes; then
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:15329: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:15332: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15336 "configure"
-+#line 15339 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15351,23 +15354,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15357: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15357: \$? = $ac_status" >&5
-+  echo "$as_me:15360: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15360: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15363: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15363: \$? = $ac_status" >&5
-+  echo "$as_me:15366: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15370 "configure"
-+#line 15373 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15386,16 +15389,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15389: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15392: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15392: \$? = $ac_status" >&5
-+  echo "$as_me:15395: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15395: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15398: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15398: \$? = $ac_status" >&5
-+  echo "$as_me:15401: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -15407,7 +15410,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15410: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:15413: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -15430,14 +15433,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:15433: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:15436: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15440 "configure"
-+#line 15443 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15455,23 +15458,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15458: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15461: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15461: \$? = $ac_status" >&5
-+  echo "$as_me:15464: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15464: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15467: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15467: \$? = $ac_status" >&5
-+  echo "$as_me:15470: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15474 "configure"
-+#line 15477 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15490,16 +15493,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15493: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15496: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15496: \$? = $ac_status" >&5
-+  echo "$as_me:15499: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15502: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15502: \$? = $ac_status" >&5
-+  echo "$as_me:15505: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -15511,7 +15514,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15514: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:15517: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -15534,14 +15537,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:15537: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:15540: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15544 "configure"
-+#line 15547 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15559,23 +15562,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15562: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15565: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15565: \$? = $ac_status" >&5
-+  echo "$as_me:15568: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15568: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15571: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15571: \$? = $ac_status" >&5
-+  echo "$as_me:15574: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 15578 "configure"
-+#line 15581 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -15594,16 +15597,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15597: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15600: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15600: \$? = $ac_status" >&5
-+  echo "$as_me:15603: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15603: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15606: \$? = $ac_status" >&5
-+  echo "$as_me:15609: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -15615,7 +15618,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15618: result: $cf_cv_wint_t" >&5
-+echo "$as_me:15621: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -15639,10 +15642,10 @@
- 
- 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
- 
--echo "$as_me:15642: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15645: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15645 "configure"
-+#line 15648 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15660,16 +15663,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15666: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15666: \$? = $ac_status" >&5
-+  echo "$as_me:15669: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15669: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15672: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15672: \$? = $ac_status" >&5
-+  echo "$as_me:15675: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15678,7 +15681,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15681: result: $cf_result" >&5
-+echo "$as_me:15684: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15700,10 +15703,10 @@
- 
- 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
- 
--echo "$as_me:15703: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15706: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15706 "configure"
-+#line 15709 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15721,16 +15724,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15724: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15727: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15727: \$? = $ac_status" >&5
-+  echo "$as_me:15730: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15730: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15733: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15733: \$? = $ac_status" >&5
-+  echo "$as_me:15736: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15739,7 +15742,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15742: result: $cf_result" >&5
-+echo "$as_me:15745: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15761,10 +15764,10 @@
- 
- 	if test "$NCURSES_OK_WINT_T" = 0 ; then
- 
--echo "$as_me:15764: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15767: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 15767 "configure"
-+#line 15770 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -15782,16 +15785,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15785: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15788: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15788: \$? = $ac_status" >&5
-+  echo "$as_me:15791: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15791: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15794: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15794: \$? = $ac_status" >&5
-+  echo "$as_me:15797: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15800,7 +15803,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15803: result: $cf_result" >&5
-+echo "$as_me:15806: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- if test $cf_result = yes ; then
- 
-@@ -15821,11 +15824,11 @@
- 	fi
- fi
- 
--echo "$as_me:15824: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:15827: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15828 "configure"
-+#line 15831 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15853,16 +15856,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15856: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15859: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15859: \$? = $ac_status" >&5
-+  echo "$as_me:15862: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15865: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15865: \$? = $ac_status" >&5
-+  echo "$as_me:15868: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15871,7 +15874,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:15874: result: $cf_result" >&5
-+echo "$as_me:15877: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -15883,14 +15886,14 @@
- EOF
- 
- else
--	echo "$as_me:15886: checking for data ospeed in library" >&5
-+	echo "$as_me:15889: checking for data ospeed in library" >&5
- echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15893 "configure"
-+#line 15896 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15923,16 +15926,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15926: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15929: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15929: \$? = $ac_status" >&5
-+  echo "$as_me:15932: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15932: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15935: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15935: \$? = $ac_status" >&5
-+  echo "$as_me:15938: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15944,7 +15947,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15947 "configure"
-+#line 15950 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -15970,15 +15973,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:15973: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15976: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15976: \$? = $ac_status" >&5
-+  echo "$as_me:15979: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:15978: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15981: \$? = $ac_status" >&5
-+  echo "$as_me:15984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -15989,7 +15992,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:15992: result: $cf_result" >&5
-+	echo "$as_me:15995: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16002,11 +16005,11 @@
- 	fi
- fi
- 
--echo "$as_me:16005: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16008: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16009 "configure"
-+#line 16012 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16034,16 +16037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16037: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16040: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16040: \$? = $ac_status" >&5
-+  echo "$as_me:16043: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16043: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16046: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16046: \$? = $ac_status" >&5
-+  echo "$as_me:16049: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16052,7 +16055,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16055: result: $cf_result" >&5
-+echo "$as_me:16058: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -16064,14 +16067,14 @@
- EOF
- 
- else
--	echo "$as_me:16067: checking for data boolnames in library" >&5
-+	echo "$as_me:16070: checking for data boolnames in library" >&5
- echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16074 "configure"
-+#line 16077 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16104,16 +16107,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16107: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16110: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16110: \$? = $ac_status" >&5
-+  echo "$as_me:16113: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16113: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16116: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16116: \$? = $ac_status" >&5
-+  echo "$as_me:16119: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16125,7 +16128,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16128 "configure"
-+#line 16131 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16151,15 +16154,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16154: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16157: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16157: \$? = $ac_status" >&5
-+  echo "$as_me:16160: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16159: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16162: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16162: \$? = $ac_status" >&5
-+  echo "$as_me:16165: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16170,7 +16173,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16173: result: $cf_result" >&5
-+	echo "$as_me:16176: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16183,11 +16186,11 @@
- 	fi
- fi
- 
--echo "$as_me:16186: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
-+echo "$as_me:16189: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
- echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16190 "configure"
-+#line 16193 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16215,16 +16218,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16218: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16221: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16221: \$? = $ac_status" >&5
-+  echo "$as_me:16224: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16224: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16227: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16227: \$? = $ac_status" >&5
-+  echo "$as_me:16230: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16233,7 +16236,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16236: result: $cf_result" >&5
-+echo "$as_me:16239: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test $cf_result = yes ; then
-@@ -16245,14 +16248,14 @@
- EOF
- 
- else
--	echo "$as_me:16248: checking for data boolfnames in library" >&5
-+	echo "$as_me:16251: checking for data boolfnames in library" >&5
- echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
- 	# BSD linkers insist on making weak linkage, but resolve at runtime.
- 	if test "$cross_compiling" = yes; then
- 
- 	# cross-compiling
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16255 "configure"
-+#line 16258 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16285,16 +16288,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16288: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16291: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16291: \$? = $ac_status" >&5
-+  echo "$as_me:16294: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16294: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16297: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16297: \$? = $ac_status" >&5
-+  echo "$as_me:16300: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16306,7 +16309,7 @@
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16309 "configure"
-+#line 16312 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_XCURSES
-@@ -16332,15 +16335,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16335: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16338: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16338: \$? = $ac_status" >&5
-+  echo "$as_me:16341: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16340: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16343: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16343: \$? = $ac_status" >&5
-+  echo "$as_me:16346: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -16351,7 +16354,7 @@
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
--	echo "$as_me:16354: result: $cf_result" >&5
-+	echo "$as_me:16357: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test $cf_result = yes ; then
- 
-@@ -16366,7 +16369,7 @@
- 
- if ( test "$GCC" = yes || test "$GXX" = yes )
- then
--echo "$as_me:16369: checking if you want to turn on gcc warnings" >&5
-+echo "$as_me:16372: checking if you want to turn on gcc warnings" >&5
- echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -16383,7 +16386,7 @@
- 	with_warnings=no
- 
- fi;
--echo "$as_me:16386: result: $with_warnings" >&5
-+echo "$as_me:16389: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- if test "$with_warnings" = "yes"
- then
-@@ -16406,10 +16409,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:16409: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:16412: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 16412 "${as_me:-configure}"
-+#line 16415 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -16458,12 +16461,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:16461: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16464: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16464: \$? = $ac_status" >&5
-+  echo "$as_me:16467: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16466: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:16469: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -16527,12 +16530,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:16530: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:16533: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16535 "configure"
-+#line 16538 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16549,16 +16552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16552: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16555: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16555: \$? = $ac_status" >&5
-+  echo "$as_me:16558: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16558: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16561: \$? = $ac_status" >&5
-+  echo "$as_me:16564: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -16569,7 +16572,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:16572: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:16575: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -16578,12 +16581,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:16581: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:16584: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16586 "configure"
-+#line 16589 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16600,16 +16603,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16603: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16606: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16606: \$? = $ac_status" >&5
-+  echo "$as_me:16609: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16609: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16612: \$? = $ac_status" >&5
-+  echo "$as_me:16615: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -16620,12 +16623,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:16623: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:16626: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 16628 "${as_me:-configure}"
-+#line 16631 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -16642,7 +16645,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:16645: checking for $CC warning options..." >&5
-+	{ echo "$as_me:16648: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -16658,12 +16661,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16661: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16664: \$? = $ac_status" >&5
-+  echo "$as_me:16667: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16666: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16669: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -16672,7 +16675,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:16675: checking for $CC warning options..." >&5
-+	{ echo "$as_me:16678: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -16696,12 +16699,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:16699: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:16702: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16702: \$? = $ac_status" >&5
-+  echo "$as_me:16705: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:16704: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:16707: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -16712,7 +16715,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16715: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16718: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16722,7 +16725,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:16725: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:16728: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -16738,7 +16741,7 @@
- fi
- fi
- 
--echo "$as_me:16741: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:16744: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -16755,7 +16758,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:16758: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:16761: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -16849,23 +16852,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:16852: checking for dmalloc.h" >&5
-+	echo "$as_me:16855: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16858 "configure"
-+#line 16861 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:16862: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16865: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16868: \$? = $ac_status" >&5
-+  echo "$as_me:16871: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16884,11 +16887,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16887: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:16890: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:16891: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:16894: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16896,7 +16899,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 16899 "configure"
-+#line 16902 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -16915,16 +16918,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16918: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16921: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16921: \$? = $ac_status" >&5
-+  echo "$as_me:16924: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16927: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16927: \$? = $ac_status" >&5
-+  echo "$as_me:16930: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -16935,7 +16938,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:16938: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:16941: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16950,7 +16953,7 @@
- 
- fi
- 
--echo "$as_me:16953: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:16956: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -16967,7 +16970,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:16970: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:16973: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -17061,23 +17064,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:17064: checking for dbmalloc.h" >&5
-+	echo "$as_me:17067: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17070 "configure"
-+#line 17073 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:17074: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:17077: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:17080: \$? = $ac_status" >&5
-+  echo "$as_me:17083: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -17096,11 +17099,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:17099: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:17102: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:17103: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:17106: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17108,7 +17111,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 17111 "configure"
-+#line 17114 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -17127,16 +17130,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17130: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17133: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17133: \$? = $ac_status" >&5
-+  echo "$as_me:17136: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17136: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17139: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17139: \$? = $ac_status" >&5
-+  echo "$as_me:17142: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -17147,7 +17150,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:17150: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:17153: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -17162,7 +17165,7 @@
- 
- fi
- 
--echo "$as_me:17165: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:17168: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -17179,7 +17182,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:17182: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:17185: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -17272,7 +17275,7 @@
- 	;;
- esac
- 
--echo "$as_me:17275: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:17278: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -17282,7 +17285,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:17285: result: $with_no_leaks" >&5
-+echo "$as_me:17288: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -17298,7 +17301,7 @@
- fi
- 
- LD_RPATH_OPT=
--echo "$as_me:17301: checking for an rpath option" >&5
-+echo "$as_me:17304: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -17329,12 +17332,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:17332: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:17335: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:17337: checking if we need a space after rpath option" >&5
-+	echo "$as_me:17340: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -17355,7 +17358,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17358 "configure"
-+#line 17361 "configure"
- #include "confdefs.h"
- 
- int
-@@ -17367,16 +17370,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17373: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17373: \$? = $ac_status" >&5
-+  echo "$as_me:17376: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17376: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17379: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17379: \$? = $ac_status" >&5
-+  echo "$as_me:17382: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -17386,13 +17389,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:17389: result: $cf_rpath_space" >&5
-+	echo "$as_me:17392: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
- esac
- 
--echo "$as_me:17395: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:17398: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -17409,21 +17412,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:17412: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:17415: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:17416: checking for updated LDFLAGS" >&5
-+echo "$as_me:17419: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:17419: result: maybe" >&5
-+	echo "$as_me:17422: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:17426: checking for $ac_word" >&5
-+echo "$as_me:17429: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17438,7 +17441,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:17441: found $ac_dir/$ac_word" >&5
-+echo "$as_me:17444: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -17446,10 +17449,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:17449: result: $cf_ldd_prog" >&5
-+  echo "$as_me:17452: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:17452: result: no" >&5
-+  echo "$as_me:17455: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17463,7 +17466,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17466 "configure"
-+#line 17469 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -17475,16 +17478,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17478: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17481: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17481: \$? = $ac_status" >&5
-+  echo "$as_me:17484: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17484: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17487: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17487: \$? = $ac_status" >&5
-+  echo "$as_me:17490: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -17512,7 +17515,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:17515: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:17518: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -17524,11 +17527,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17527: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17530: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17531: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17534: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -17565,7 +17568,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17568: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17571: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17578,11 +17581,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17581: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17584: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17585: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17588: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -17619,7 +17622,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:17622: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:17625: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -17632,14 +17635,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:17635: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:17638: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:17639: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:17642: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:17642: result: no" >&5
-+	echo "$as_me:17645: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -17729,7 +17732,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:17732: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:17735: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -17905,7 +17908,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:17908: error: ambiguous option: $1
-+    { { echo "$as_me:17911: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -17924,7 +17927,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:17927: error: unrecognized option: $1
-+  -*) { { echo "$as_me:17930: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -17974,7 +17977,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
--  *) { { echo "$as_me:17977: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:17980: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -18265,7 +18268,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:18268: creating $ac_file" >&5
-+    { echo "$as_me:18271: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -18283,7 +18286,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18286: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18289: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18296,7 +18299,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18299: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18302: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18312,7 +18315,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:18315: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:18318: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -18321,7 +18324,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:18324: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:18327: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -18358,7 +18361,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:18361: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:18364: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -18369,7 +18372,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:18372: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:18375: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -18418,7 +18421,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:18421: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:18424: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -18429,7 +18432,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:18432: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18435: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -18442,7 +18445,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:18445: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18448: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -18500,7 +18503,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:18503: $ac_file is unchanged" >&5
-+      { echo "$as_me:18506: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/patches/ncurses/6.0/190-ncurses-6.0-20151024.patch b/patches/ncurses/6.0/190-ncurses-6.0-20151024.patch
deleted file mode 100644
index 61f922f..0000000
--- a/patches/ncurses/6.0/190-ncurses-6.0-20151024.patch
+++ /dev/null
@@ -1,975 +0,0 @@
-# ncurses 6.0 - patch 20151024 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151024.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Oct 25 00:51:43 UTC 2015
-# ------------------------------------------------------------------------------
-# INSTALL                          |    4 -
-# NEWS                             |   23 ++++++
-# VERSION                          |    2 
-# aclocal.m4                       |    8 +-
-# config.guess                     |   14 ++--
-# config.sub                       |   11 ++-
-# configure                        |    8 +-
-# configure.in                     |    6 -
-# dist.mk                          |    4 -
-# doc/html/man/captoinfo.1m.html   |    2 
-# doc/html/man/clear.1.html        |    2 
-# doc/html/man/curs_attr.3x.html   |    4 -
-# doc/html/man/form.3x.html        |    2 
-# doc/html/man/infocmp.1m.html     |    2 
-# doc/html/man/infotocap.1m.html   |    2 
-# doc/html/man/menu.3x.html        |    2 
-# doc/html/man/ncurses.3x.html     |    2 
-# doc/html/man/panel.3x.html       |    2 
-# doc/html/man/tabs.1.html         |    2 
-# doc/html/man/terminfo.5.html     |    2 
-# doc/html/man/tic.1m.html         |    2 
-# doc/html/man/toe.1m.html         |    2 
-# doc/html/man/tput.1.html         |    2 
-# doc/html/man/tset.1.html         |    2 
-# man/curs_attr.3x                 |    4 -
-# misc/terminfo.src                |  124 ++++++++++++++++++++++++++++---------
-# ncurses/tty/MKexpanded.sh        |    6 -
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/ncurses.c                   |   26 +++----
-# 34 files changed, 195 insertions(+), 97 deletions(-)
-# ------------------------------------------------------------------------------
-Index: INSTALL
-Prereq:  1.193 
---- ncurses-6.0-20151017+/INSTALL	2015-09-26 21:34:14.000000000 +0000
-+++ ncurses-6.0-20151024/INSTALL	2015-10-24 19:03:42.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.193 2015/09/26 21:34:14 tom Exp $
-+-- $Id: INSTALL,v 1.194 2015/10/24 19:03:42 Tomas.Cech Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -978,7 +978,7 @@
- 	copying the man-page for each alias.
- 
-     --with-manpage-tbl
--	Tell the configure script that you with to preprocess the manpages
-+	Tell the configure script that you wish to preprocess the manpages
- 	by running them through tbl to generate tables understandable by
- 	nroff.
- 
-Index: NEWS
-Prereq:  1.2509 
---- ncurses-6.0-20151017+/NEWS	2015-10-17 22:02:46.000000000 +0000
-+++ ncurses-6.0-20151024/NEWS	2015-10-25 00:17:28.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2509 2015/10/17 22:02:46 tom Exp $
-+-- $Id: NEWS,v 1.2516 2015/10/25 00:17:28 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,27 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151024
-+	+ modify MKexpanded.c to update the expansion of a temporary filename
-+	  to "expanded.c", for use in trace statements.
-+	+ modify layout of b/B tests in test/ncurses.c to allow for additional
-+	  annotation on the right margin; some terminals with partial support
-+	  did not display well.
-+	+ fix typo in curs_attr.3x (patch by Sven Joachim).
-+	+ fix typo in INSTALL (patch by Tomas Cech).
-+	+ improve configure check for setting WILDCARD_SYMS variable; on ppc64
-+	  the variable is in the Data section rather than Text (patch by Michel
-+	  Normand).
-+	+ using configure option "--without-fallbacks" incorrectly caused
-+	  FALLBACK_LIST to be set to "no" (patch by Tomas Cech).
-+	+ updated minitel entries to fix kel problem with emacs, and add
-+	  minitel1b-nb (Alexandre Montaron).
-+	+ reviewed/updated nsterm entry Terminal.app in OSX -TD
-+	+ replace some dead URLs in comments with equivalents from the
-+	  Internet Archive -TD
-+	+ update config.guess, config.sub from
-+		http://git.savannah.gnu.org/cgit/config.git
-+
- 20151017
- 	+ modify ncurses/Makefile.in to sort keys.list in POSIX locale
- 	  (Debian #801864, patch by Esa Peuha).
-Index: VERSION
---- ncurses-6.0-20151017+/VERSION	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/VERSION	2015-10-24 13:10:18.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151017
-+5:0:9	6.0	20151024
-Index: aclocal.m4
-Prereq:  1.774 
---- ncurses-6.0-20151017+/aclocal.m4	2015-10-17 23:05:09.000000000 +0000
-+++ ncurses-6.0-20151024/aclocal.m4	2015-10-25 00:51:20.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.774 2015/10/17 23:05:09 tom Exp $
-+dnl $Id: aclocal.m4,v 1.779 2015/10/25 00:51:20 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -7524,7 +7524,7 @@
- 	[USE_VALGRIND])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_VERSIONED_SYMS version: 5 updated: 2015/04/17 21:13:04
-+dnl CF_WITH_VERSIONED_SYMS version: 7 updated: 2015/10/24 20:50:26
- dnl ----------------------
- dnl Use this when building shared library with ELF, to markup symbols with the
- dnl version identifier from the given input file.  Generally that identifier is
-@@ -7638,8 +7638,8 @@
- 		# compile source, make library
- 		if make -f conftest.mk 2>&AC_FD_CC >/dev/null
- 		then
--			# test for missing symbol
--			cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ 	]]T[[ 	]]'`
-+			# test for missing symbol in either Data or Text section
-+			cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[ 	]][[DT]][[ 	]]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
- 		AC_MSG_RESULT($WILDCARD_SYMS)
-Index: config.guess
---- ncurses-6.0-20151017+/config.guess	2015-05-02 11:52:27.000000000 +0000
-+++ ncurses-6.0-20151024/config.guess	2015-10-24 18:37:54.000000000 +0000
-@@ -2,7 +2,7 @@
- # Attempt to guess a canonical system name.
- #   Copyright 1992-2015 Free Software Foundation, Inc.
- 
--timestamp='2015-03-04'
-+timestamp='2015-10-21'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -221,7 +221,7 @@
- 		release='-gnu'
- 		;;
- 	    *)
--		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
- 		;;
- 	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-@@ -249,6 +249,9 @@
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- 	exit ;;
-+    *:Sortix:*:*)
-+	echo ${UNAME_MACHINE}-unknown-sortix
-+	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
- 	*4.0)
-@@ -962,6 +965,9 @@
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-+    k1om:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	exit ;;
-     m32r*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 	exit ;;
-@@ -1038,7 +1044,7 @@
- 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
- 	exit ;;
-     xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-@@ -1117,7 +1123,7 @@
- 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
- 	# the processor, so we play safe by assuming i586.
- 	# Note: whatever this is, it MUST be the same as what config.sub
--	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# prints for the "djgpp" host, or else GDB configure will decide that
- 	# this is a cross-build.
- 	echo i586-pc-msdosdjgpp
- 	exit ;;
-Index: config.sub
---- ncurses-6.0-20151017+/config.sub	2015-05-02 11:52:04.000000000 +0000
-+++ ncurses-6.0-20151024/config.sub	2015-10-24 18:37:37.000000000 +0000
-@@ -2,7 +2,7 @@
- # Configuration validation subroutine script.
- #   Copyright 1992-2015 Free Software Foundation, Inc.
- 
--timestamp='2015-03-08'
-+timestamp='2015-08-20'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -255,6 +255,7 @@
- 	| arc | arceb \
- 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- 	| avr | avr32 \
-+	| ba \
- 	| be32 | be64 \
- 	| bfin \
- 	| c4x | c8051 | clipper \
-@@ -305,7 +306,7 @@
- 	| riscv32 | riscv64 \
- 	| rl78 | rx \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -376,6 +377,7 @@
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* | avr32-* \
-+	| ba-* \
- 	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-@@ -428,12 +430,13 @@
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- 	| pyramid-* \
-+	| riscv32-* | riscv64-* \
- 	| rl78-* | romp-* | rs6000-* | rx-* \
- 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
- 	| tahoe-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- 	| tile*-* \
-@@ -1376,7 +1379,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* | -cloudabi* \
-+	      | -aos* | -aros* | -cloudabi* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-Index: configure
---- ncurses-6.0-20151017+/configure	2015-10-17 23:05:27.000000000 +0000
-+++ ncurses-6.0-20151024/configure	2015-10-24 22:43:05.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.620 .
-+# From configure.in Revision: 1.621 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -6663,8 +6663,8 @@
- 		# compile source, make library
- 		if make -f conftest.mk 2>&5 >/dev/null
- 		then
--			# test for missing symbol
--			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	]T[ 	]'`
-+			# test for missing symbol in either Data or Text section
-+			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
- 		echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
-@@ -7060,7 +7060,7 @@
- fi;
- echo "$as_me:7061: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
--FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
-+FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
- 
- echo "$as_me:7065: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
-Index: configure.in
-Prereq:  1.620 
---- ncurses-6.0-20151017+/configure.in	2015-10-17 23:01:54.000000000 +0000
-+++ ncurses-6.0-20151024/configure.in	2015-10-24 17:57:55.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.620 2015/10/17 23:01:54 tom Exp $
-+dnl $Id: configure.in,v 1.621 2015/10/24 17:57:55 Tomas.Cech Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.620 $)
-+AC_REVISION($Revision: 1.621 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -566,7 +566,7 @@
- 	[with_fallback=$withval],
- 	[with_fallback=])
- AC_MSG_RESULT($with_fallback)
--FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
-+FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
- AC_SUBST(FALLBACK_LIST)
- 
- AC_MSG_CHECKING(if you want modern xterm or antique)
-Index: dist.mk
-Prereq:  1.1074 
---- ncurses-6.0-20151017+/dist.mk	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/dist.mk	2015-10-24 13:10:18.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1074 2015/10/17 20:29:47 tom Exp $
-+# $Id: dist.mk,v 1.1075 2015/10/24 13:10:18 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151017
-+NCURSES_PATCH = 20151024
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: doc/html/man/captoinfo.1m.html
---- ncurses-6.0-20151017+/doc/html/man/captoinfo.1m.html	2015-09-26 22:08:45.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/captoinfo.1m.html	2015-10-25 00:21:09.000000000 +0000
-@@ -205,7 +205,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- </PRE>
-Index: doc/html/man/clear.1.html
---- ncurses-6.0-20151017+/doc/html/man/clear.1.html	2015-09-26 22:08:45.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/clear.1.html	2015-10-25 00:21:09.000000000 +0000
-@@ -71,7 +71,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/curs_attr.3x.html
---- ncurses-6.0-20151017+/doc/html/man/curs_attr.3x.html	2015-09-26 23:25:17.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/curs_attr.3x.html	2015-10-25 00:23:27.000000000 +0000
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp @
-+  * @Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp @
- -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
- <HTML>
-@@ -126,7 +126,7 @@
- <H3><a name="h3-attr_set">attr_set</a></H3><PRE>
-        The <STRONG>attrset</STRONG> routine is actually a legacy feature predating
-        SVr4 curses but kept in X/Open Curses for the same  reason
--       that  SVr4  curses kept it: compatbility.  The routine <STRONG>at-</STRONG>
-+       that  SVr4 curses kept it: compatibility.  The routine <STRONG>at-</STRONG>
-        <STRONG>tr_set</STRONG> provides for passing a color-pair parameter.
- 
-        The remaining <STRONG>attr_</STRONG>* functions operate  exactly  like  the
-Index: doc/html/man/form.3x.html
---- ncurses-6.0-20151017+/doc/html/man/form.3x.html	2015-09-26 22:08:49.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/form.3x.html	2015-10-25 00:21:13.000000000 +0000
-@@ -245,7 +245,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/infocmp.1m.html
---- ncurses-6.0-20151017+/doc/html/man/infocmp.1m.html	2015-09-26 22:08:50.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/infocmp.1m.html	2015-10-25 00:21:14.000000000 +0000
-@@ -487,7 +487,7 @@
- 
-        http://invisible-island.net/ncurses/tctest.html
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- </PRE>
-Index: doc/html/man/infotocap.1m.html
---- ncurses-6.0-20151017+/doc/html/man/infotocap.1m.html	2015-09-26 22:08:50.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/infotocap.1m.html	2015-10-25 00:21:14.000000000 +0000
-@@ -94,7 +94,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- </PRE>
-Index: doc/html/man/menu.3x.html
---- ncurses-6.0-20151017+/doc/html/man/menu.3x.html	2015-09-26 22:08:51.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/menu.3x.html	2015-10-25 00:21:15.000000000 +0000
-@@ -227,7 +227,7 @@
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for
-        detailed descriptions of the entry points.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/ncurses.3x.html
---- ncurses-6.0-20151017+/doc/html/man/ncurses.3x.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/ncurses.3x.html	2015-10-25 00:21:16.000000000 +0000
-@@ -63,7 +63,7 @@
-        sonable optimization.  This implementation is "new curses"
-        (ncurses) and is the approved replacement for 4.4BSD clas-
-        sic  curses,  which has been discontinued.  This describes
--       <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
-        The <STRONG>ncurses</STRONG> library emulates the curses library of  System
-        V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
-Index: doc/html/man/panel.3x.html
---- ncurses-6.0-20151017+/doc/html/man/panel.3x.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/panel.3x.html	2015-10-25 00:21:16.000000000 +0000
-@@ -218,7 +218,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- </PRE>
-Index: doc/html/man/tabs.1.html
---- ncurses-6.0-20151017+/doc/html/man/tabs.1.html	2015-09-26 22:08:52.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tabs.1.html	2015-10-25 00:21:16.000000000 +0000
-@@ -168,7 +168,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/terminfo.5.html
---- ncurses-6.0-20151017+/doc/html/man/terminfo.5.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/terminfo.5.html	2015-10-25 00:21:17.000000000 +0000
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
-        Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-Index: doc/html/man/tic.1m.html
---- ncurses-6.0-20151017+/doc/html/man/tic.1m.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tic.1m.html	2015-10-25 00:21:17.000000000 +0000
-@@ -408,7 +408,7 @@
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- </PRE>
-Index: doc/html/man/toe.1m.html
---- ncurses-6.0-20151017+/doc/html/man/toe.1m.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/toe.1m.html	2015-10-25 00:21:17.000000000 +0000
-@@ -122,7 +122,7 @@
-        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/tput.1.html
---- ncurses-6.0-20151017+/doc/html/man/tput.1.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tput.1.html	2015-10-25 00:21:17.000000000 +0000
-@@ -338,7 +338,7 @@
- <H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
-        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- 
-Index: doc/html/man/tset.1.html
---- ncurses-6.0-20151017+/doc/html/man/tset.1.html	2015-09-26 22:08:53.000000000 +0000
-+++ ncurses-6.0-20151024/doc/html/man/tset.1.html	2015-10-25 00:21:17.000000000 +0000
-@@ -319,7 +319,7 @@
-        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,   <STRONG>tty(4)</STRONG>,
-        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20150926).
-+       This describes <STRONG>ncurses</STRONG> version 6.0 (patch 20151024).
- 
- 
- 
-Index: man/curs_attr.3x
-Prereq:  1.41 
---- ncurses-6.0-20151017+/man/curs_attr.3x	2015-09-05 21:13:25.000000000 +0000
-+++ ncurses-6.0-20151024/man/curs_attr.3x	2015-10-24 19:10:42.000000000 +0000
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.41 2015/09/05 21:13:25 tom Exp $
-+.\" $Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp $
- .TH curs_attr 3X ""
- .na
- .hy 0
-@@ -148,7 +148,7 @@
- .SS attr_set
- The \fBattrset\fP routine is actually a legacy feature predating SVr4 curses
- but kept in X/Open Curses for the same reason that SVr4 curses kept it:
--compatbility.
-+compatibility.
- The routine \fBattr_set\fP provides for passing a color-pair parameter.
- .PP
- The remaining \fBattr_\fR* functions operate exactly like the corresponding
-Index: misc/terminfo.src
---- ncurses-6.0-20151017+/misc/terminfo.src	2015-07-25 19:27:20.000000000 +0000
-+++ ncurses-6.0-20151024/misc/terminfo.src	2015-10-24 17:56:55.000000000 +0000
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.549 $
--#	$Date: 2015/07/25 19:27:20 $
-+#	$Revision: 1.554 $
-+#	$Date: 2015/10/24 16:00:04 $
- #
- # The original header is preserved below for reference.  It is noted that there
- # is a "newer" version which differs in some cosmetic details (but actually
-@@ -1246,9 +1246,50 @@
- nsterm-build343|Terminal.app in OS X 10.10,
- 	kend=\EOF, khome=\EOH, use=nsterm-build326,
- 
-+# reviewed Terminal.app in El Capitan (version 2.6 build 361) -TD
-+# Using vttest:
-+# + no vt52 mode for cursor keys, though vt52 screen works in vttest
-+# + f1-f4 map to pf1-pf4
-+# + no vt220 support aside from DECTCEM and ECH
-+# + there are no protected areas.  Forget about anything above vt220.
-+# + in ECMA-48 cursor movement, VPR and HPR fail.  Others work.
-+# + vttest color 11.6.4 and 11.6.5 (bce for ED/EL and ECH/indexing) are bce
-+# + but bce fails for 11.6.7.2 (test repeat).
-+# + SD (11.6.7.3) also fails, but SL/SR/SU work.
-+# + 11.6.6 (test insert/delete char/line with bce) has several failures.
-+# + normal (not X10 or Highlight tracking) mouse now works.
-+# + mouse any-event works
-+# + mouse button-event works
-+# + in alternate screen:
-+#   mode 47/48 work
-+#   mode 1047 fails to restore cursor position (do not use)
-+#   mode 1049 fails to restore screen contents (do not use)
-+# + dtterm window-modify operations work (some messages are not printed)
-+# + dtterm window-report gives size of window in characters/pixels as
-+#   well as state of window.
-+# Using tack:
-+# + there is no difference between cnorm/cvvis
-+# + has dim/invis/blink (no protect of course)
-+# + most function keys with shift/control modifiers give beep
-+#   (user can configure, but out-of-the-box is what I record)
-+# + shift-F5 is \E[25~ through shift-F12 is \E[34~ (skips \E[30~ between
-+#   F8 and F9).
-+# + kLFT5/kRIT5 work, but not up/down with control-modifier
-+# + kLFT/kRIT work, but not up/down with shift-modifier
-+# + there are a few predefined bindings with Alt, but no clear pattern.
-+# + uses alt-key as UTF-8 "meta" something like xterm altSendsEscape 
-+# Using ncurses test-program with xterm-new:
-+# + no italics
-+# Using xterm's scripts:
-+# + palette for 256-colors is hardcoded.
-+# + no support for "dynamic colors"
-+# + no support for tcap-query.
-+nsterm-build361|Terminal.app in OS X 10.11,
-+	kmous=\E[M, use=nsterm-build343,
-+
- # This is an alias which should always point to the "current" version
- nsterm|Apple_Terminal|AppKit Terminal.app,
--	use=nsterm-build343,
-+	use=nsterm-build361,
- 
- # iTerm.app from http://iterm.sourceforge.net/ is an alternative (and
- # more featureful) terminal emulator for Mac OS X. It is similar
-@@ -6278,7 +6319,7 @@
- #### Pilot Pro Palm-Top
- #
- # Termcap for Top Gun Telnet and SSH on the Palm Pilot.
--# http://www.ai/~iang/TGssh/
-+# https://web.archive.org/web/20051103015726/http://www.ai/~iang/TGssh/
- pilot|tgtelnet|Top Gun Telnet on the Palm Pilot Professional,
- 	OTbs, am, xenl,
- 	cols#39, lines#16,
-@@ -6429,7 +6470,7 @@
- # underline and standout.
- #
- # Since the documentation and terminfo do not agree, see also current code at
--# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/common/io/tem_safe.c
-+# https://web.archive.org/web/20091231042744/http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/common/io/tem_safe.c
- #
- # That (actually a different driver which "supports" sun-color) also supports
- # these features:
-@@ -9708,7 +9749,8 @@
- # Wyse sales can be reached by phone at 1-800-GET-WYSE.  Tech support is at
- # (800)-800-WYSE (option 5 gets you a human).  There's a Web page at the
- # obvious address, <http://www.wyse.com>.  They keep terminfo entries at
--# <http://www.wyse.co.uk/support/appnotes/idxappnt.htm>.
-+# https://web.archive.org/web/19970712022641/http://www.wyse.co.uk/support/appnotes/idxappnt.htm
-+# 
- #
- # Wyse bought out Link Technology, Inc. in 1990 and closed it down in 1995.
- # They now own the Qume and Amdek brands, too.  So these are the people to
-@@ -12980,7 +13022,7 @@
- #
- # Update by TD - 2004:
- # Adapted from
--#	http://www.cs.utk.edu/~shuford/terminal/adds_viewpoint_news.txt
-+#	https://web.archive.org/web/19990922005103/http://www.cs.utk.edu/~shuford/terminal/adds_viewpoint_news.txt
- #
- # COMMANDS                        ASCII CODE
- #
-@@ -18456,7 +18498,7 @@
- #
- 
- # See
--#	http://www.minix3.org/manpages/html4/console.html
-+#	https://web.archive.org/web/20120703021949/http://www.minix3.org/manpages/html4/console.html
- minix|minix console (v3),
- 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
- 	kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
-@@ -18644,16 +18686,19 @@
- minitel1|minitel 1,
- 	am, bw, eslok, hs, hz, msgr,
- 	colors#8, cols#40, lines#24, pairs#8,
--	acsc=+.\,\,./f0g1, bel=^G, blink=\EH, civis=^T, clear=^L,
--	cnorm=^Q, cr=^M, cub1=^H, cud1=^J, cuf1=^I,
--	cup=\037%p1%{65}%+%c%p2%{65}%+%c, cuu1=^K, el=^X,
--	enacs=^Y, fsl=^J, home=^^, ind=^J,
--	is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J, op=\EG,
--	rep=%p1%c\022%p2%{63}%+%c, rev=\E], ri=^K, rmso=\E\\,
--	setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%{64}%+%c%;,
-+	bel=^G, blink=\EH, civis=^T, clear=^L, cnorm=^Q, cr=^M,
-+	cub1=^H, cud1=^J, cuf1=^I,
-+	cup=\037%p1%'A'%+%c%p2%'A'%+%c, cuu1=^K, el=^X,
-+	flash=\037@A\EW \177\022\177\022P\r\030\n, fsl=^J,
-+	home=^^, ind=^J, is2=\E;`ZQ\E\:iC\E\:iE\021, nel=^M^J,
-+	op=\EG, rep=%p1%c\022%p2%'?'%+%c, rev=\E], ri=^K,
-+	rmso=\E\\,
-+	setf=\E%?%p1%{1}%=%tD%e%p1%{3}%=%tF%e%p1%{4}%=%tA%e%p1%{6}%=%tC%e%p1%'@'%+%c%;,
- 	sgr=%?%p1%t\E]%;%?%p3%t\E]%;%?%p4%t\EH%;,
--	sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%{65}%+%c,
--# is2=Fnct TE, Fnct MR, Fnct CM et pour finir: curseur ON.
-+	sgr0=\EI\E\\, smso=\E], tsl=\037@%p1%'A'%+%c,
-+	u6=\037%c%'A'%-%c%'A'%-, u7=\Ea, .acsc=}#f0g1\,\,+../,
-+	.enacs=^Y, .rs2=^L, .u8=\001Br4\004, .u9=\E9{,
-+# is2=Fnct TE, Fnct ER, Fnct CM et pour finir: curseur ON.
- minitel1b|minitel 1-bistandard (in 40cols mode),
- 	mir,
- 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
-@@ -18661,21 +18706,37 @@
- 	dl1=\E[M, ed=\E[J, el1=\E[1K, il=\E[%p1%dL, il1=\E[L,
- 	is1=\E;iYA\E;jYC, kclr=\E[2J, kctab=^I, kcub1=\E[D,
- 	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M,
--	kel=^X, khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l,
--	smir=\E[4h, smkx=\E;iYA\E;jYC, use=minitel1,
--# <rmkx> posait des problemes (logout en sortant de vi).
-+	khome=\E[H, kich1=\E[4h, kil1=\E[L, rmir=\E[4l, smir=\E[4h,
-+	.ich=\E[%p1%d@, .ich1=\E[@, .kel=^X, .rmkx=\E;jYA,
-+	.smkx=\E;iYA\E;jYC, .u8=\001Cu<\004, use=minitel1,
-+# rmkx posait des problemes (logout en sortant de vi).
- minitel1b-80|minitel 1-bistandard (standard teleinformatique),
- 	am@, bw@, hz@,
- 	colors@, cols#80, it#8, pairs@,
- 	blink=\E[5m, bold=\E[1m, civis=\037@A\024\n,
--	clear=\E[H\E[2J, cnorm=\037@A\021\n, cuf1=\E[C,
-+	clear=\E[H\E[J, cnorm=\037@A\021\n, cuf1=\E[C,
- 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, el=\E[K, home=\E[H,
--	ht=^I, ind=\ED, is1@, is2@, kent=\EOM, kf0=\EOp, kf1=\EOq,
--	kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu, kf6=\EOv, kf7=\EOw,
--	kf8=\EOx, kf9=\EOy, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
--	ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, sc=\E7, setf@,
--	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
--	sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m, use=minitel1b,
-+	ht=^I, ind=\ED, is1@, is2@, kbs=\EOl, kcan=\EOQ, kent=\EOM,
-+	kf0=\EOp, kf1=\EOq, kf2=\EOr, kf3=\EOs, kf4=\EOt, kf5=\EOu,
-+	kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy, khlp=\EOm, knp=\EOn,
-+	kpp=\EOR, krfr=\EOS, nel=\EE, op@, rc=\E8, rep@, rev=\E[7m,
-+	ri=\EM, rmkx@, rmso=\E[27m, rmul=\E[24m, rs2=\E[H\E[J\E[m,
-+	sc=\E7, setf@, sgr@, sgr0=\E[m, smkx@, smso=\E[7m, smul=\E[4m,
-+	u6@, u7@, .acsc=}#f[, .enacs=^O, .mc0=\E[i, .rmacs=^O,
-+	.rs2=\Ec,
-+	.sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
-+	.smacs=^N, use=minitel1b,
-+minitel1b-nb|minitel 1b (40cols) noir & blanc sans couleurs avec bold et dim ...,
-+	colors@, pairs@,
-+	acsc=`>a9f!j%k4l<m-n=p#q\,rpt=u5v-w<x5yvzy|l~$,
-+	bold=\EG, clear=^L\EB, cup=\E[%i%p1%d;%p2%dH, dim=\ED,
-+	home=^^\EB, kend=\E)4\r, kf0=^Y0, kf1=\E$4\r, kf11=^Y1,
-+	kf12=^Y/, kf2=\E#4\r, kf3=\E&4\r, kf4=\E!4\r, kf5=\E'4\r,
-+	kf6=\E/4\r, kf7=^Y8, kf8=^Y\,, kf9=^Y., knp=\E(4\r,
-+	kpp=\E"4\r, op@, rmacs=^O, setf@,
-+	sgr=%?%p1%p3%O%t\E]%;%?%p4%t\EH%;%?%p5%t\ED%;%?%p6%t\EG%;,
-+	sgr0=\EI\E\\\EB, smacs=^N, .invis=\E@, .rs2=^L\EB,
-+	.u8=\001Cu|\004, use=minitel1b,
- 
- ######## OBSOLETE VDT TYPES
- #
-@@ -23374,7 +23435,7 @@
- #	  FreeMiNT by Guido Flohr (from patch/report by Alan Hourihane).
- #
- # 2010-06-12
--#	* add mlterm+256color entry -TD
-+#	* add mlterm-256color entry -TD
- #
- # 2010-07-17
- #	* add hard-reset for rs2 to wsvt25 to help ensure that reset ends
-@@ -23702,4 +23763,11 @@
- #	+ add status line to tmux via xterm+sl (patch by Nicholas Marriott).
- #	+ fixes for st 0.5 from testing with tack -TD
- #
-+# 2015-10-24
-+#	+ updated minitel entries to fix kel problem with emacs, and add
-+#	  minitel1b-nb (Alexandre Montaron).
-+#	+ reviewed/updated nsterm entry Terminal.app in OSX -TD
-+#	+ replace some dead URLs in comments with equivalents from the
-+#	  Internet Archive -TD
-+#
- ######## SHANTIH!  SHANTIH!  SHANTIH!
-Index: ncurses/tty/MKexpanded.sh
-Prereq:  1.17 
---- ncurses-6.0-20151017+/ncurses/tty/MKexpanded.sh	2010-01-23 17:57:43.000000000 +0000
-+++ ncurses-6.0-20151024/ncurses/tty/MKexpanded.sh	2015-10-24 23:39:24.000000000 +0000
-@@ -1,6 +1,6 @@
- #! /bin/sh
- ##############################################################################
--# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -29,7 +29,7 @@
- #
- # Author: Thomas E. Dickey, 1997-on
- #
--# $Id: MKexpanded.sh,v 1.17 2010/01/23 17:57:43 tom Exp $
-+# $Id: MKexpanded.sh,v 1.18 2015/10/24 23:39:24 tom Exp $
- #
- # Script to generate 'expanded.c', a dummy source that contains functions
- # corresponding to complex macros used in this library.  By making functions,
-@@ -125,7 +125,7 @@
- EOF
- 
- $preprocessor $TMP 2>/dev/null | \
--	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /'
-+	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /' -e "s,$TMP,expanded.c,"
- 
- cat <<EOF
- #else /* ! NCURSES_EXPANDED */
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151017+/package/debian-mingw/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian-mingw/changelog	2015-10-24 13:10:18.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151017) unstable; urgency=low
-+ncurses6 (6.0+20151024) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Oct 2015 16:29:47 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Oct 2015 09:10:18 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151017+/package/debian-mingw64/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian-mingw64/changelog	2015-10-24 13:10:18.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151017) unstable; urgency=low
-+ncurses6 (6.0+20151024) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Oct 2015 16:29:47 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Oct 2015 09:10:18 -0400
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151017+/package/debian/changelog	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/debian/changelog	2015-10-24 13:10:18.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151017) unstable; urgency=low
-+ncurses6 (6.0+20151024) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Oct 2015 16:29:47 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Oct 2015 09:10:18 -0400
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.127 
---- ncurses-6.0-20151017+/package/mingw-ncurses.nsi	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/mingw-ncurses.nsi	2015-10-24 13:10:18.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.127 2015/10/17 20:29:47 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.128 2015/10/24 13:10:18 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "1017"

-+!define VERSION_MMDD  "1024"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151017+/package/mingw-ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/mingw-ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151017
-+Release: 20151024
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151017+/package/ncurses.spec	2015-10-17 20:29:47.000000000 +0000
-+++ ncurses-6.0-20151024/package/ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151017
-+Release: 20151024
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/ncurses.c
-Prereq:  1.420 
---- ncurses-6.0-20151017+/test/ncurses.c	2015-05-23 23:41:25.000000000 +0000
-+++ ncurses-6.0-20151024/test/ncurses.c	2015-10-24 23:32:57.000000000 +0000
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.420 2015/05/23 23:41:25 tom Exp $
-+$Id: ncurses.c,v 1.421 2015/10/24 23:32:57 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -1255,9 +1255,10 @@
- #define ATTRSTRING_1ST 32	/* ' ' */
- #define ATTRSTRING_END 126	/* '~' */
- 
--#define COL_ATTRSTRING 25
--#define MARGIN_4_ATTRS (COL_ATTRSTRING + 8)
--#define LEN_ATTRSTRING (COLS - MARGIN_4_ATTRS)
-+#define COLS_PRE_ATTRS 5
-+#define COLS_AFT_ATTRS 15
-+#define COL_ATTRSTRING (COLS_PRE_ATTRS + 17)
-+#define LEN_ATTRSTRING (COLS - (COL_ATTRSTRING + COLS_AFT_ATTRS))
- #define MAX_ATTRSTRING (ATTRSTRING_END + 1 - ATTRSTRING_1ST)
- 
- static char attr_test_string[MAX_ATTRSTRING + 1];
-@@ -1415,8 +1416,8 @@
-     chtype test = attr & (chtype) (~A_ALTCHARSET);
- 
-     if (arrow)
--	MvPrintw(row, 5, "-->");
--    MvPrintw(row, 8, "%s mode:", name);
-+	MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
-+    MvPrintw(row, COLS_PRE_ATTRS, "%s mode:", name);
-     MvPrintw(row, COL_ATTRSTRING - 1, "|");
-     if (skip)
- 	printw("%*s", skip, " ");
-@@ -1661,10 +1662,10 @@
- 				my_list[j].name);
- 	    }
- 
--	    MvPrintw(row, 8,
-+	    MvPrintw(row, COLS_PRE_ATTRS,
- 		     "This terminal does %shave the magic-cookie glitch",
- 		     get_xmc() > -1 ? "" : "not ");
--	    MvPrintw(row + 1, 8, "Enter '?' for help.");
-+	    MvPrintw(row + 1, COLS_PRE_ATTRS, "Enter '?' for help.");
- 	    show_color_attr(fg, bg, tx);
- 	    printw("  ACS (%d)", ac != 0);
- 
-@@ -1802,8 +1803,8 @@
-     chtype test = attr & ~WA_ALTCHARSET;
- 
-     if (arrow)
--	MvPrintw(row, 5, "-->");
--    MvPrintw(row, 8, "%s mode:", name);
-+	MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
-+    MvPrintw(row, COLS_PRE_ATTRS, "%s mode:", name);
-     MvPrintw(row, COL_ATTRSTRING - 1, "|");
-     if (skip)
- 	printw("%*s", skip, " ");
-@@ -2012,10 +2013,10 @@
- 				     my_list[j].name);
- 	    }
- 
--	    MvPrintw(row, 8,
-+	    MvPrintw(row, COLS_PRE_ATTRS,
- 		     "This terminal does %shave the magic-cookie glitch",
- 		     get_xmc() > -1 ? "" : "not ");
--	    MvPrintw(row + 1, 8, "Enter '?' for help.");
-+	    MvPrintw(row + 1, COLS_PRE_ATTRS, "Enter '?' for help.");
- 	    show_color_attr(fg, bg, tx);
- 	    printw("  ACS (%d)", ac != 0);
- 
-@@ -5523,7 +5524,6 @@
- 	Cannot("cannot create requested pad");
- 	return;
-     }
--
- #ifdef A_COLOR
-     if (colored && use_colors) {
- 	init_pair(1, COLOR_BLACK, COLOR_GREEN);
diff --git a/patches/ncurses/6.0/200-ncurses-6.0-20151101.patch b/patches/ncurses/6.0/200-ncurses-6.0-20151101.patch
deleted file mode 100644
index 7cae284..0000000
--- a/patches/ncurses/6.0/200-ncurses-6.0-20151101.patch
+++ /dev/null
@@ -1,12290 +0,0 @@
-# ncurses 6.0 - patch 20151101 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151101.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Mon Nov  2 00:38:02 UTC 2015
-# ------------------------------------------------------------------------------
-# Ada95/aclocal.m4                 |   41 
-# NEWS                             |   15 
-# VERSION                          |    2 
-# aclocal.m4                       |   28 
-# configure                        | 3433 ++++++++++++++++++-------------------
-# configure.in                     |   10 
-# dist.mk                          |    4 
-# misc/Makefile.in                 |   32 
-# ncurses/base/lib_mouse.c         |    5 
-# package/debian-mingw/changelog   |    4 
-# package/debian-mingw64/changelog |    4 
-# package/debian/changelog         |    4 
-# package/mingw-ncurses.nsi        |    4 
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# test/ncurses.c                   |   10 
-# 16 files changed, 1800 insertions(+), 1800 deletions(-)
-# ------------------------------------------------------------------------------
-Index: Ada95/aclocal.m4
-Prereq:  1.108 
---- ncurses-6.0-20151024+/Ada95/aclocal.m4	2015-10-17 23:07:06.000000000 +0000
-+++ ncurses-6.0-20151101/Ada95/aclocal.m4	2015-11-01 01:03:41.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey
- dnl
--dnl $Id: aclocal.m4,v 1.108 2015/10/17 23:07:06 tom Exp $
-+dnl $Id: aclocal.m4,v 1.109 2015/11/01 01:03:41 tom Exp $
- dnl Macros used in NCURSES Ada95 auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -742,45 +742,6 @@
- AC_MSG_RESULT($enable_gnat_projects)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ENABLE_PC_FILES version: 12 updated: 2015/04/17 21:13:04
--dnl ------------------
--dnl This is the "--enable-pc-files" option, which is available if there is a
--dnl pkg-config configuration on the local machine.
--AC_DEFUN([CF_ENABLE_PC_FILES],[
--AC_REQUIRE([CF_PKG_CONFIG])
--AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
--
--if test "x$PKG_CONFIG" != xnone
--then
--	AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
--else
--	AC_MSG_CHECKING(if we should install .pc files)
--fi
--
--AC_ARG_ENABLE(pc-files,
--	[  --enable-pc-files       generate and install .pc files for pkg-config],
--	[enable_pc_files=$enableval],
--	[enable_pc_files=no])
--AC_MSG_RESULT($enable_pc_files)
--
--if test "x$enable_pc_files" != xno
--then
--	case "x$PKG_CONFIG_LIBDIR" in
--	(xno|xyes)
--		AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
--		MAKE_PC_FILES="#"
--		;;
--	(*)
--		CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
--		MAKE_PC_FILES=
--		;;
--	esac
--else
--	MAKE_PC_FILES="#"
--fi
--AC_SUBST(MAKE_PC_FILES)
--])dnl
--dnl ---------------------------------------------------------------------------
- dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
- dnl ---------------
- dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
-Index: NEWS
-Prereq:  1.2516 
---- ncurses-6.0-20151024+/NEWS	2015-10-25 00:17:28.000000000 +0000
-+++ ncurses-6.0-20151101/NEWS	2015-11-01 10:27:24.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2516 2015/10/25 00:17:28 tom Exp $
-+-- $Id: NEWS,v 1.2522 2015/11/01 10:27:24 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,17 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151101
-+	+ amend change for pkg-config which allows build of pc-files when no
-+	  valid pkg-config library directory was configured to suppress the
-+	  actual install if it is not overridden to a valid directory at
-+	  install time (cf: 20150822).
-+	+ modify editing script which generates resulting.map to work with the
-+	  clang configuration on recent FreeBSD, which gives an error on an
-+	  empty "local" section.
-+	+ fix a spurious "(Part)" message in test/ncurses.c b/B tests due
-+	  to incorrect attribute-masking.
-+
- 20151024
- 	+ modify MKexpanded.c to update the expansion of a temporary filename
- 	  to "expanded.c", for use in trace statements.
-@@ -55,7 +66,7 @@
- 	+ fix typo in INSTALL (patch by Tomas Cech).
- 	+ improve configure check for setting WILDCARD_SYMS variable; on ppc64
- 	  the variable is in the Data section rather than Text (patch by Michel
--	  Normand).
-+	  Normand, Novell #946048).
- 	+ using configure option "--without-fallbacks" incorrectly caused
- 	  FALLBACK_LIST to be set to "no" (patch by Tomas Cech).
- 	+ updated minitel entries to fix kel problem with emacs, and add
-Index: VERSION
---- ncurses-6.0-20151024+/VERSION	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/VERSION	2015-11-01 10:25:33.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151024
-+5:0:9	6.0	20151101
-Index: aclocal.m4
-Prereq:  1.779 
---- ncurses-6.0-20151024+/aclocal.m4	2015-10-25 00:51:20.000000000 +0000
-+++ ncurses-6.0-20151101/aclocal.m4	2015-11-01 10:29:05.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.779 2015/10/25 00:51:20 tom Exp $
-+dnl $Id: aclocal.m4,v 1.783 2015/11/01 10:29:05 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -1377,7 +1377,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_ENABLE_PC_FILES version: 12 updated: 2015/04/17 21:13:04
-+dnl CF_ENABLE_PC_FILES version: 13 updated: 2015/11/01 05:27:39
- dnl ------------------
- dnl This is the "--enable-pc-files" option, which is available if there is a
- dnl pkg-config configuration on the local machine.
-@@ -1400,14 +1400,13 @@
- 
- if test "x$enable_pc_files" != xno
- then
-+	MAKE_PC_FILES=
- 	case "x$PKG_CONFIG_LIBDIR" in
- 	(xno|xyes)
- 		AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
--		MAKE_PC_FILES="#"
- 		;;
- 	(*)
- 		CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
--		MAKE_PC_FILES=
- 		;;
- 	esac
- else
-@@ -3242,7 +3241,7 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 84 updated: 2015/09/26 17:54:46
-+dnl CF_LIB_RULES version: 85 updated: 2015/10/31 20:06:35
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -3295,25 +3294,32 @@
- 		SHARED_LIB=
- 		Libs_To_Make=
- 
--		cf_sed_options=
-+		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/NCURSES\\([[WT]]\\+\\)\?_/NCURSES\\1${cf_cv_abi_version}_/g\""
--			cf_sed_options="$cf_sed_options -e \"/deprecated in ABI${cf_cv_abi_version}/d\""
-+			cf_awk_program="$cf_awk_program\
-+/deprecated in ABI${cf_cv_abi_version}/ { next; }\
-+{ sub(\"NCURSES([[WT]]+)?\", \"&${cf_cv_abi_version}\"); }\
-+"
- 		fi
- 
- 		if test "x$WILDCARD_SYMS" = xno
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/_\*;//g\""
-+			cf_awk_program="$cf_awk_program\
-+/[[ 	]]_\\*;/ { skip=1; next; }\
-+"
- 		fi
- 
--		if test "x$cf_sed_options" != "x"
-+		if test "x$cf_awk_program" != "x"
- 		then
- 			cat >>$cf_dir/Makefile <<CF_EOF
- 
- # Generated by CF_LIB_RULES
- resulting.map: $UNALTERED_SYMS
--	sed $cf_sed_options < $UNALTERED_SYMS >\[$]@
-+	$AWK '$cf_awk_program \
-+{ if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
-+ skip = 0; last = \[$]\[$]0; } \
-+END { print last; }' < $UNALTERED_SYMS >\[$]@
- 
- distclean::
- 	rm -f resulting.map
-Index: configure
---- ncurses-6.0-20151024+/configure	2015-10-24 22:43:05.000000000 +0000
-+++ ncurses-6.0-20151101/configure	2015-11-01 10:12:02.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.621 .
-+# From configure.in Revision: 1.622 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -3679,11 +3679,11 @@
- 
- if test "x$enable_pc_files" != xno
- then
-+	MAKE_PC_FILES=
- 	case "x$PKG_CONFIG_LIBDIR" in
- 	(xno|xyes)
--		{ echo "$as_me:3684: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
-+		{ echo "$as_me:3685: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
- echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
--		MAKE_PC_FILES="#"
- 		;;
- 	(*)
- 
-@@ -3718,7 +3718,6 @@
- 	;;
- esac
- 
--		MAKE_PC_FILES=
- 		;;
- 	esac
- else
-@@ -3727,7 +3726,7 @@
- 
- if test -z "$MAKE_PC_FILES"
- then
--	echo "$as_me:3730: checking for suffix to add to pc-files" >&5
-+	echo "$as_me:3729: checking for suffix to add to pc-files" >&5
- echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
- 
- # Check whether --with-pc-suffix or --without-pc-suffix was given.
-@@ -3742,13 +3741,13 @@
- 	esac
- fi;
- 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
--	echo "$as_me:3745: result: $PC_MODULE_SUFFIX" >&5
-+	echo "$as_me:3744: result: $PC_MODULE_SUFFIX" >&5
- echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
- 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
- 
- fi
- 
--echo "$as_me:3751: checking if we should assume mixed-case filenames" >&5
-+echo "$as_me:3750: checking if we should assume mixed-case filenames" >&5
- echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
- 
- # Check whether --enable-mixed-case or --disable-mixed-case was given.
-@@ -3758,11 +3757,11 @@
- else
-   enable_mixedcase=auto
- fi;
--echo "$as_me:3761: result: $enable_mixedcase" >&5
-+echo "$as_me:3760: result: $enable_mixedcase" >&5
- echo "${ECHO_T}$enable_mixedcase" >&6
- if test "$enable_mixedcase" = "auto" ; then
- 
--echo "$as_me:3765: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3764: checking if filesystem supports mixed-case filenames" >&5
- echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
- if test "${cf_cv_mixedcase+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3789,7 +3788,7 @@
- fi
- 
- fi
--echo "$as_me:3792: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3791: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -3808,7 +3807,7 @@
- fi
- 
- # do this after mixed-case option (tags/TAGS is not as important as tic).
--echo "$as_me:3811: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:3810: checking whether ${MAKE-make} sets \${MAKE}" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-@@ -3828,11 +3827,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:3831: result: yes" >&5
-+  echo "$as_me:3830: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:3835: result: no" >&5
-+  echo "$as_me:3834: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -3841,7 +3840,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3844: checking for $ac_word" >&5
-+echo "$as_me:3843: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CTAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3856,7 +3855,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CTAGS="$ac_prog"
--echo "$as_me:3859: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3858: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3864,10 +3863,10 @@
- fi
- CTAGS=$ac_cv_prog_CTAGS
- if test -n "$CTAGS"; then
--  echo "$as_me:3867: result: $CTAGS" >&5
-+  echo "$as_me:3866: result: $CTAGS" >&5
- echo "${ECHO_T}$CTAGS" >&6
- else
--  echo "$as_me:3870: result: no" >&5
-+  echo "$as_me:3869: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3878,7 +3877,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3881: checking for $ac_word" >&5
-+echo "$as_me:3880: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ETAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3893,7 +3892,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ETAGS="$ac_prog"
--echo "$as_me:3896: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3895: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3901,10 +3900,10 @@
- fi
- ETAGS=$ac_cv_prog_ETAGS
- if test -n "$ETAGS"; then
--  echo "$as_me:3904: result: $ETAGS" >&5
-+  echo "$as_me:3903: result: $ETAGS" >&5
- echo "${ECHO_T}$ETAGS" >&6
- else
--  echo "$as_me:3907: result: no" >&5
-+  echo "$as_me:3906: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3913,7 +3912,7 @@
- 
- # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
- set dummy ${CTAGS:-ctags}; ac_word=$2
--echo "$as_me:3916: checking for $ac_word" >&5
-+echo "$as_me:3915: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3928,7 +3927,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:3931: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3930: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3937,17 +3936,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:3940: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3939: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:3943: result: no" >&5
-+  echo "$as_me:3942: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
- set dummy ${ETAGS:-etags}; ac_word=$2
--echo "$as_me:3950: checking for $ac_word" >&5
-+echo "$as_me:3949: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3962,7 +3961,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:3965: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3964: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3971,10 +3970,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:3974: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:3973: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:3977: result: no" >&5
-+  echo "$as_me:3976: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3994,7 +3993,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:3997: checking for makeflags variable" >&5
-+echo "$as_me:3996: checking for makeflags variable" >&5
- echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
- if test "${cf_cv_makeflags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4028,13 +4027,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:4031: result: $cf_cv_makeflags" >&5
-+echo "$as_me:4030: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:4037: checking for $ac_word" >&5
-+echo "$as_me:4036: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4049,7 +4048,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:4052: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4051: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4057,10 +4056,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:4060: result: $RANLIB" >&5
-+  echo "$as_me:4059: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:4063: result: no" >&5
-+  echo "$as_me:4062: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4069,7 +4068,7 @@
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:4072: checking for $ac_word" >&5
-+echo "$as_me:4071: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4084,7 +4083,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:4087: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4086: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4093,10 +4092,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:4096: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:4095: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:4099: result: no" >&5
-+  echo "$as_me:4098: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4108,7 +4107,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:4111: checking for $ac_word" >&5
-+echo "$as_me:4110: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4123,7 +4122,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:4126: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4125: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4131,10 +4130,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:4134: result: $LD" >&5
-+  echo "$as_me:4133: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:4137: result: no" >&5
-+  echo "$as_me:4136: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4143,7 +4142,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:4146: checking for $ac_word" >&5
-+echo "$as_me:4145: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4158,7 +4157,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:4161: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4160: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4167,10 +4166,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:4170: result: $ac_ct_LD" >&5
-+  echo "$as_me:4169: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:4173: result: no" >&5
-+  echo "$as_me:4172: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4182,7 +4181,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:4185: checking for $ac_word" >&5
-+echo "$as_me:4184: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4197,7 +4196,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:4200: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4199: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4205,10 +4204,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4208: result: $AR" >&5
-+  echo "$as_me:4207: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4211: result: no" >&5
-+  echo "$as_me:4210: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4217,7 +4216,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:4220: checking for $ac_word" >&5
-+echo "$as_me:4219: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4232,7 +4231,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:4235: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4234: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4241,10 +4240,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4244: result: $ac_ct_AR" >&5
-+  echo "$as_me:4243: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4247: result: no" >&5
-+  echo "$as_me:4246: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4256,7 +4255,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nm; ac_word=$2
--echo "$as_me:4259: checking for $ac_word" >&5
-+echo "$as_me:4258: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4271,7 +4270,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_NM="${ac_tool_prefix}nm"
--echo "$as_me:4274: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4273: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4279,10 +4278,10 @@
- fi
- NM=$ac_cv_prog_NM
- if test -n "$NM"; then
--  echo "$as_me:4282: result: $NM" >&5
-+  echo "$as_me:4281: result: $NM" >&5
- echo "${ECHO_T}$NM" >&6
- else
--  echo "$as_me:4285: result: no" >&5
-+  echo "$as_me:4284: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4291,7 +4290,7 @@
-   ac_ct_NM=$NM
-   # Extract the first word of "nm", so it can be a program name with args.
- set dummy nm; ac_word=$2
--echo "$as_me:4294: checking for $ac_word" >&5
-+echo "$as_me:4293: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4306,7 +4305,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_NM="nm"
--echo "$as_me:4309: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4308: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4315,10 +4314,10 @@
- fi
- ac_ct_NM=$ac_cv_prog_ac_ct_NM
- if test -n "$ac_ct_NM"; then
--  echo "$as_me:4318: result: $ac_ct_NM" >&5
-+  echo "$as_me:4317: result: $ac_ct_NM" >&5
- echo "${ECHO_T}$ac_ct_NM" >&6
- else
--  echo "$as_me:4321: result: no" >&5
-+  echo "$as_me:4320: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4330,7 +4329,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:4333: checking for $ac_word" >&5
-+echo "$as_me:4332: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4345,7 +4344,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:4348: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4347: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4353,10 +4352,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4356: result: $AR" >&5
-+  echo "$as_me:4355: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4359: result: no" >&5
-+  echo "$as_me:4358: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4365,7 +4364,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:4368: checking for $ac_word" >&5
-+echo "$as_me:4367: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4380,7 +4379,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:4383: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4382: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4389,10 +4388,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4392: result: $ac_ct_AR" >&5
-+  echo "$as_me:4391: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4395: result: no" >&5
-+  echo "$as_me:4394: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4401,7 +4400,7 @@
-   AR="$ac_cv_prog_AR"
- fi
- 
--echo "$as_me:4404: checking for options to update archives" >&5
-+echo "$as_me:4403: checking for options to update archives" >&5
- echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
- if test "${cf_cv_ar_flags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4424,13 +4423,13 @@
- 		rm -f conftest.a
- 
- 		cat >conftest.$ac_ext <<EOF
--#line 4427 "configure"
-+#line 4426 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--		if { (eval echo "$as_me:4430: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:4429: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4433: \$? = $ac_status" >&5
-+  echo "$as_me:4432: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
- 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
-@@ -4441,7 +4440,7 @@
- 		else
- 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
- 
--echo "${as_me:-configure}:4444: testing cannot compile test-program ..." 1>&5
-+echo "${as_me:-configure}:4443: testing cannot compile test-program ..." 1>&5
- 
- 			break
- 		fi
-@@ -4449,7 +4448,7 @@
- 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
- 
- fi
--echo "$as_me:4452: result: $cf_cv_ar_flags" >&5
-+echo "$as_me:4451: result: $cf_cv_ar_flags" >&5
- echo "${ECHO_T}$cf_cv_ar_flags" >&6
- 
- if test -n "$ARFLAGS" ; then
-@@ -4460,7 +4459,7 @@
- 	ARFLAGS=$cf_cv_ar_flags
- fi
- 
--echo "$as_me:4463: checking if you have specified an install-prefix" >&5
-+echo "$as_me:4462: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -4473,7 +4472,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:4476: result: $DESTDIR" >&5
-+echo "$as_me:4475: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -4501,7 +4500,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4504: checking for $ac_word" >&5
-+echo "$as_me:4503: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4516,7 +4515,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:4519: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4518: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4524,10 +4523,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:4527: result: $BUILD_CC" >&5
-+  echo "$as_me:4526: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:4530: result: no" >&5
-+  echo "$as_me:4529: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4535,12 +4534,12 @@
- done
- 
- fi;
--	echo "$as_me:4538: checking for native build C compiler" >&5
-+	echo "$as_me:4537: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:4540: result: $BUILD_CC" >&5
-+	echo "$as_me:4539: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:4543: checking for native build C preprocessor" >&5
-+	echo "$as_me:4542: checking for native build C preprocessor" >&5
- echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
- 
- # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -4550,10 +4549,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:4553: result: $BUILD_CPP" >&5
-+	echo "$as_me:4552: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:4556: checking for native build C flags" >&5
-+	echo "$as_me:4555: checking for native build C flags" >&5
- echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -4561,10 +4560,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:4564: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:4563: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:4567: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:4566: checking for native build C preprocessor-flags" >&5
- echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -4572,10 +4571,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:4575: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:4574: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:4578: checking for native build linker-flags" >&5
-+	echo "$as_me:4577: checking for native build linker-flags" >&5
- echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -4583,10 +4582,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:4586: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:4585: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:4589: checking for native build linker-libraries" >&5
-+	echo "$as_me:4588: checking for native build linker-libraries" >&5
- echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
- 
- # Check whether --with-build-libs or --without-build-libs was given.
-@@ -4594,7 +4593,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:4597: result: $BUILD_LIBS" >&5
-+	echo "$as_me:4596: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -4604,7 +4603,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:4607: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:4606: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&5
- echo "$as_me: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&2;}
-@@ -4629,7 +4628,7 @@
- ### shared, for example.
- cf_list_models=""
- 
--echo "$as_me:4632: checking if libtool -version-number should be used" >&5
-+echo "$as_me:4631: checking if libtool -version-number should be used" >&5
- echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
- 
- # Check whether --enable-libtool-version or --disable-libtool-version was given.
-@@ -4646,7 +4645,7 @@
- 	cf_libtool_version=yes
- 
- fi;
--echo "$as_me:4649: result: $cf_libtool_version" >&5
-+echo "$as_me:4648: result: $cf_libtool_version" >&5
- echo "${ECHO_T}$cf_libtool_version" >&6
- 
- if test "$cf_libtool_version" = yes ; then
-@@ -4655,25 +4654,25 @@
- 	LIBTOOL_VERSION="-version-info"
- 	case "x$VERSION" in
- 	(x)
--		{ echo "$as_me:4658: WARNING: VERSION was not set" >&5
-+		{ echo "$as_me:4657: WARNING: VERSION was not set" >&5
- echo "$as_me: WARNING: VERSION was not set" >&2;}
- 		;;
- 	(x*.*.*)
- 		ABI_VERSION="$VERSION"
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4665: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4664: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(x*:*:*)
- 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
- 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
- 
--echo "${as_me:-configure}:4672: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
-+echo "${as_me:-configure}:4671: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:4676: WARNING: unexpected VERSION value: $VERSION" >&5
-+		{ echo "$as_me:4675: WARNING: unexpected VERSION value: $VERSION" >&5
- echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
- 		;;
- 	esac
-@@ -4695,7 +4694,7 @@
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
--echo "$as_me:4698: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4697: checking if you want to build libraries with libtool" >&5
- echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
- 
- # Check whether --with-libtool or --without-libtool was given.
-@@ -4705,7 +4704,7 @@
- else
-   with_libtool=no
- fi;
--echo "$as_me:4708: result: $with_libtool" >&5
-+echo "$as_me:4707: result: $with_libtool" >&5
- echo "${ECHO_T}$with_libtool" >&6
- if test "$with_libtool" != "no"; then
- 
-@@ -4736,7 +4735,7 @@
- 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:4739: error: expected a pathname, not \"$with_libtool\"" >&5
-+	{ { echo "$as_me:4738: error: expected a pathname, not \"$with_libtool\"" >&5
- echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -4749,7 +4748,7 @@
-   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
--echo "$as_me:4752: checking for $ac_word" >&5
-+echo "$as_me:4751: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4764,7 +4763,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:4767: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4766: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4772,10 +4771,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4775: result: $LIBTOOL" >&5
-+  echo "$as_me:4774: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4778: result: no" >&5
-+  echo "$as_me:4777: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4788,7 +4787,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4791: checking for $ac_word" >&5
-+echo "$as_me:4790: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4803,7 +4802,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:4806: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4805: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4811,10 +4810,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:4814: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:4813: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:4817: result: no" >&5
-+  echo "$as_me:4816: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4845,7 +4844,7 @@
-   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
--echo "$as_me:4848: checking for $ac_word" >&5
-+echo "$as_me:4847: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4860,7 +4859,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
--echo "$as_me:4863: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4862: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4868,10 +4867,10 @@
- fi
- LIBTOOL=$ac_cv_prog_LIBTOOL
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4871: result: $LIBTOOL" >&5
-+  echo "$as_me:4870: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4874: result: no" >&5
-+  echo "$as_me:4873: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4884,7 +4883,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4887: checking for $ac_word" >&5
-+echo "$as_me:4886: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4899,7 +4898,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
--echo "$as_me:4902: found $ac_dir/$ac_word" >&5
-+echo "$as_me:4901: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -4907,10 +4906,10 @@
- fi
- ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
- if test -n "$ac_ct_LIBTOOL"; then
--  echo "$as_me:4910: result: $ac_ct_LIBTOOL" >&5
-+  echo "$as_me:4909: result: $ac_ct_LIBTOOL" >&5
- echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
- else
--  echo "$as_me:4913: result: no" >&5
-+  echo "$as_me:4912: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4932,7 +4931,7 @@
- 		fi
- 	fi
- 	if test -z "$LIBTOOL" ; then
--		{ { echo "$as_me:4935: error: Cannot find libtool" >&5
-+		{ { echo "$as_me:4934: error: Cannot find libtool" >&5
- echo "$as_me: error: Cannot find libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -4948,7 +4947,7 @@
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
- then
--	echo "$as_me:4951: checking version of $LIBTOOL" >&5
-+	echo "$as_me:4950: checking version of $LIBTOOL" >&5
- echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
- 
- if test -n "$LIBTOOL" && test "$LIBTOOL" != none
-@@ -4959,15 +4958,15 @@
- fi
- test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
- 
--	echo "$as_me:4962: result: $cf_cv_libtool_version" >&5
-+	echo "$as_me:4961: result: $cf_cv_libtool_version" >&5
- echo "${ECHO_T}$cf_cv_libtool_version" >&6
- 	if test -z "$cf_cv_libtool_version" ; then
--		{ { echo "$as_me:4965: error: This is not GNU libtool" >&5
-+		{ { echo "$as_me:4964: error: This is not GNU libtool" >&5
- echo "$as_me: error: This is not GNU libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- else
--	{ { echo "$as_me:4970: error: GNU libtool has not been found" >&5
-+	{ { echo "$as_me:4969: error: GNU libtool has not been found" >&5
- echo "$as_me: error: GNU libtool has not been found" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5003,7 +5002,7 @@
- 
- else
- 
--echo "$as_me:5006: checking if you want to build shared libraries" >&5
-+echo "$as_me:5005: checking if you want to build shared libraries" >&5
- echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -5013,11 +5012,11 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:5016: result: $with_shared" >&5
-+echo "$as_me:5015: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:5020: checking if you want to build static libraries" >&5
-+echo "$as_me:5019: checking if you want to build static libraries" >&5
- echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
- 
- # Check whether --with-normal or --without-normal was given.
-@@ -5027,11 +5026,11 @@
- else
-   with_normal=yes
- fi;
--echo "$as_me:5030: result: $with_normal" >&5
-+echo "$as_me:5029: result: $with_normal" >&5
- echo "${ECHO_T}$with_normal" >&6
- test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
- 
--echo "$as_me:5034: checking if you want to build debug libraries" >&5
-+echo "$as_me:5033: checking if you want to build debug libraries" >&5
- echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
- 
- # Check whether --with-debug or --without-debug was given.
-@@ -5041,11 +5040,11 @@
- else
-   with_debug=yes
- fi;
--echo "$as_me:5044: result: $with_debug" >&5
-+echo "$as_me:5043: result: $with_debug" >&5
- echo "${ECHO_T}$with_debug" >&6
- test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
- 
--echo "$as_me:5048: checking if you want to build profiling libraries" >&5
-+echo "$as_me:5047: checking if you want to build profiling libraries" >&5
- echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
- 
- # Check whether --with-profile or --without-profile was given.
-@@ -5055,7 +5054,7 @@
- else
-   with_profile=no
- fi;
--echo "$as_me:5058: result: $with_profile" >&5
-+echo "$as_me:5057: result: $with_profile" >&5
- echo "${ECHO_T}$with_profile" >&6
- test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
- 
-@@ -5063,7 +5062,7 @@
- 
- if test "X$cf_with_cxx_binding" != Xno; then
- if test "x$with_shared" = "xyes"; then
--echo "$as_me:5066: checking if you want to build C++ shared libraries" >&5
-+echo "$as_me:5065: checking if you want to build C++ shared libraries" >&5
- echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-cxx-shared or --without-cxx-shared was given.
-@@ -5073,26 +5072,26 @@
- else
-   with_shared_cxx=no
- fi;
--echo "$as_me:5076: result: $with_shared_cxx" >&5
-+echo "$as_me:5075: result: $with_shared_cxx" >&5
- echo "${ECHO_T}$with_shared_cxx" >&6
- fi
- fi
- 
- ###############################################################################
- 
--echo "$as_me:5083: checking for specified models" >&5
-+echo "$as_me:5082: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
- test "$with_libtool" != "no" && cf_list_models=libtool
--echo "$as_me:5087: result: $cf_list_models" >&5
-+echo "$as_me:5086: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:5092: checking for default model" >&5
-+echo "$as_me:5091: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:5095: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:5094: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-@@ -5106,7 +5105,7 @@
- LIB_DIR=../lib
- LIB_2ND=../../lib
- 
--echo "$as_me:5109: checking if you want to have a library-prefix" >&5
-+echo "$as_me:5108: checking if you want to have a library-prefix" >&5
- echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
- 
- # Check whether --with-lib-prefix or --without-lib-prefix was given.
-@@ -5116,7 +5115,7 @@
- else
-   with_lib_prefix=auto
- fi;
--echo "$as_me:5119: result: $with_lib_prefix" >&5
-+echo "$as_me:5118: result: $with_lib_prefix" >&5
- echo "${ECHO_T}$with_lib_prefix" >&6
- 
- if test $with_lib_prefix = auto
-@@ -5144,19 +5143,19 @@
- 
- LIB_SUFFIX=
- 
--	echo "$as_me:5147: checking for PATH separator" >&5
-+	echo "$as_me:5146: checking for PATH separator" >&5
- echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
- 	case $cf_cv_system_name in
- 	(os2*)	PATH_SEPARATOR=';'  ;;
- 	(*)	${PATH_SEPARATOR:=':'}  ;;
- 	esac
- 
--	echo "$as_me:5154: result: $PATH_SEPARATOR" >&5
-+	echo "$as_me:5153: result: $PATH_SEPARATOR" >&5
- echo "${ECHO_T}$PATH_SEPARATOR" >&6
- 
- ###############################################################################
- 
--echo "$as_me:5159: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:5158: checking if you want to build a separate terminfo library" >&5
- echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
- 
- # Check whether --with-termlib or --without-termlib was given.
-@@ -5166,10 +5165,10 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:5169: result: $with_termlib" >&5
-+echo "$as_me:5168: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
--echo "$as_me:5172: checking if you want to build a separate tic library" >&5
-+echo "$as_me:5171: checking if you want to build a separate tic library" >&5
- echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
- 
- # Check whether --with-ticlib or --without-ticlib was given.
-@@ -5179,13 +5178,13 @@
- else
-   with_ticlib=no
- fi;
--echo "$as_me:5182: result: $with_ticlib" >&5
-+echo "$as_me:5181: result: $with_ticlib" >&5
- echo "${ECHO_T}$with_ticlib" >&6
- 
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:5188: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:5187: checking if you want to link with the GPM mouse library" >&5
- echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
- 
- # Check whether --with-gpm or --without-gpm was given.
-@@ -5195,27 +5194,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:5198: result: $with_gpm" >&5
-+echo "$as_me:5197: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5202: checking for gpm.h" >&5
-+	echo "$as_me:5201: checking for gpm.h" >&5
- echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
- if test "${ac_cv_header_gpm_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5208 "configure"
-+#line 5207 "configure"
- #include "confdefs.h"
- #include <gpm.h>
- _ACEOF
--if { (eval echo "$as_me:5212: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:5211: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:5218: \$? = $ac_status" >&5
-+  echo "$as_me:5217: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5234,7 +5233,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:5237: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:5236: result: $ac_cv_header_gpm_h" >&5
- echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
- if test $ac_cv_header_gpm_h = yes; then
- 
-@@ -5245,14 +5244,14 @@
- 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
- 
--echo "${as_me:-configure}:5248: testing assuming we really have GPM library ..." 1>&5
-+echo "${as_me:-configure}:5247: testing assuming we really have GPM library ..." 1>&5
- 
- cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:5255: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:5254: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5260,7 +5259,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5263 "configure"
-+#line 5262 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5279,16 +5278,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5282: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5281: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5285: \$? = $ac_status" >&5
-+  echo "$as_me:5284: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5287: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5291: \$? = $ac_status" >&5
-+  echo "$as_me:5290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -5299,13 +5298,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5302: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:5301: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-   :
- else
- 
--				{ { echo "$as_me:5308: error: Cannot link with GPM library" >&5
-+				{ { echo "$as_me:5307: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5315,7 +5314,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:5318: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:5317: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -5324,7 +5323,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:5327: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:5326: checking if you want to load GPM dynamically" >&5
- echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
- 
- # Check whether --with-dlsym or --without-dlsym was given.
-@@ -5334,18 +5333,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:5337: result: $with_dlsym" >&5
-+	echo "$as_me:5336: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "x$with_dlsym" = xyes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:5342: checking for dlsym" >&5
-+echo "$as_me:5341: checking for dlsym" >&5
- echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
- if test "${ac_cv_func_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5348 "configure"
-+#line 5347 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -5376,16 +5375,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5379: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5378: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5382: \$? = $ac_status" >&5
-+  echo "$as_me:5381: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5385: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5384: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5388: \$? = $ac_status" >&5
-+  echo "$as_me:5387: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -5395,14 +5394,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5398: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:5397: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:5405: checking for dlsym in -ldl" >&5
-+echo "$as_me:5404: checking for dlsym in -ldl" >&5
- echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5410,7 +5409,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5413 "configure"
-+#line 5412 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5429,16 +5428,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5432: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5431: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5435: \$? = $ac_status" >&5
-+  echo "$as_me:5434: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5438: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5437: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5441: \$? = $ac_status" >&5
-+  echo "$as_me:5440: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -5449,7 +5448,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5452: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:5451: result: $ac_cv_lib_dl_dlsym" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
- if test $ac_cv_lib_dl_dlsym = yes; then
- 
-@@ -5478,10 +5477,10 @@
- LIBS="$cf_add_libs"
-  }
- 
--	echo "$as_me:5481: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:5480: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5484 "configure"
-+#line 5483 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- int
-@@ -5499,16 +5498,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5502: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5501: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5505: \$? = $ac_status" >&5
-+  echo "$as_me:5504: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5508: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5507: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5511: \$? = $ac_status" >&5
-+  echo "$as_me:5510: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- cat >>confdefs.h <<\EOF
-@@ -5519,15 +5518,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:5522: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:5521: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:5527: result: ok" >&5
-+	echo "$as_me:5526: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:5530: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:5529: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -5535,12 +5534,12 @@
- 		if test "x$with_gpm" != xyes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
--echo "${as_me:-configure}:5538: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+echo "${as_me:-configure}:5537: testing assuming soname for gpm is $with_gpm ..." 1>&5
- 
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:5543: checking for soname of gpm library" >&5
-+echo "$as_me:5542: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5574,15 +5573,15 @@
- done
- LIBS="$cf_add_libs"
- 
--	if { (eval echo "$as_me:5577: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5576: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5580: \$? = $ac_status" >&5
-+  echo "$as_me:5579: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5582: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5581: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5585: \$? = $ac_status" >&5
-+  echo "$as_me:5584: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -5593,7 +5592,7 @@
- fi
- 
- fi
--echo "$as_me:5596: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:5595: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -5628,7 +5627,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--echo "$as_me:5631: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:5630: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5636,7 +5635,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 5639 "configure"
-+#line 5638 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -5655,16 +5654,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5658: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5657: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5661: \$? = $ac_status" >&5
-+  echo "$as_me:5660: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5664: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5667: \$? = $ac_status" >&5
-+  echo "$as_me:5666: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -5675,11 +5674,11 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:5678: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:5677: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--echo "$as_me:5682: checking if GPM is weakly bound to curses library" >&5
-+echo "$as_me:5681: checking if GPM is weakly bound to curses library" >&5
- echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
- if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5703,15 +5702,15 @@
- 	# to rely on the static library, noting that some packagers may not
- 	# include it.
- 	LIBS="-static -lgpm -dynamic $LIBS"
--	if { (eval echo "$as_me:5706: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:5705: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5709: \$? = $ac_status" >&5
-+  echo "$as_me:5708: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:5711: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:5710: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5714: \$? = $ac_status" >&5
-+  echo "$as_me:5713: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
- 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-@@ -5723,11 +5722,11 @@
- fi
- 
- fi
--echo "$as_me:5726: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "$as_me:5725: result: $cf_cv_check_gpm_wgetch" >&5
- echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
- 
- if test "$cf_cv_check_gpm_wgetch" != yes ; then
--	{ echo "$as_me:5730: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+	{ echo "$as_me:5729: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
- fi
- 
-@@ -5737,7 +5736,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:5740: checking if you want to use sysmouse" >&5
-+echo "$as_me:5739: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -5749,7 +5748,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5752 "configure"
-+#line 5751 "configure"
- #include "confdefs.h"
- 
- #include <osreldate.h>
-@@ -5772,16 +5771,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5775: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:5774: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5778: \$? = $ac_status" >&5
-+  echo "$as_me:5777: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5781: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5780: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5784: \$? = $ac_status" >&5
-+  echo "$as_me:5783: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -5791,7 +5790,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:5794: result: $cf_with_sysmouse" >&5
-+echo "$as_me:5793: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -5810,7 +5809,7 @@
- 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:5813: checking for default loader flags" >&5
-+echo "$as_me:5812: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- (libtool) LD_MODEL=''   ;;
-@@ -5819,13 +5818,13 @@
- (profile) LD_MODEL='-pg';;
- (shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:5822: result: $LD_MODEL" >&5
-+echo "$as_me:5821: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
- case $DFT_LWR_MODEL in
- (shared)
- 
--echo "$as_me:5828: checking if rpath option should be used" >&5
-+echo "$as_me:5827: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -5835,10 +5834,10 @@
- else
-   cf_cv_enable_rpath=no
- fi;
--echo "$as_me:5838: result: $cf_cv_enable_rpath" >&5
-+echo "$as_me:5837: result: $cf_cv_enable_rpath" >&5
- echo "${ECHO_T}$cf_cv_enable_rpath" >&6
- 
--echo "$as_me:5841: checking if shared libraries should be relinked during install" >&5
-+echo "$as_me:5840: checking if shared libraries should be relinked during install" >&5
- echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
- 
- # Check whether --enable-relink or --disable-relink was given.
-@@ -5848,7 +5847,7 @@
- else
-   cf_cv_do_relink=yes
- fi;
--echo "$as_me:5851: result: $cf_cv_do_relink" >&5
-+echo "$as_me:5850: result: $cf_cv_do_relink" >&5
- echo "${ECHO_T}$cf_cv_do_relink" >&6
- 	;;
- esac
-@@ -5857,7 +5856,7 @@
- rel_builddir=..
- 
- LD_RPATH_OPT=
--echo "$as_me:5860: checking for an rpath option" >&5
-+echo "$as_me:5859: checking for an rpath option" >&5
- echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
- case $cf_cv_system_name in
- (irix*)
-@@ -5888,12 +5887,12 @@
- (*)
- 	;;
- esac
--echo "$as_me:5891: result: $LD_RPATH_OPT" >&5
-+echo "$as_me:5890: result: $LD_RPATH_OPT" >&5
- echo "${ECHO_T}$LD_RPATH_OPT" >&6
- 
- case "x$LD_RPATH_OPT" in
- (x-R*)
--	echo "$as_me:5896: checking if we need a space after rpath option" >&5
-+	echo "$as_me:5895: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 	cf_save_LIBS="$LIBS"
- 
-@@ -5914,7 +5913,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 5917 "configure"
-+#line 5916 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5926,16 +5925,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5929: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5928: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5932: \$? = $ac_status" >&5
-+  echo "$as_me:5931: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5935: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5934: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5938: \$? = $ac_status" >&5
-+  echo "$as_me:5937: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5945,7 +5944,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save_LIBS"
--	echo "$as_me:5948: result: $cf_rpath_space" >&5
-+	echo "$as_me:5947: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
- 	;;
-@@ -5966,7 +5965,7 @@
- 	cf_ld_rpath_opt=
- 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- 
--	echo "$as_me:5969: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:5968: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -5981,9 +5980,9 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	(*)
--		echo "$as_me:5984: result: $withval" >&5
-+		echo "$as_me:5983: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
--		{ { echo "$as_me:5986: error: option value must be one of: rel, abi, or auto" >&5
-+		{ { echo "$as_me:5985: error: option value must be one of: rel, abi, or auto" >&5
- echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -5992,7 +5991,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:5995: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:5994: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -6002,14 +6001,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:6005: checking which $CC option to use" >&5
-+		echo "$as_me:6004: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6012 "configure"
-+#line 6011 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6021,16 +6020,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6023: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6027: \$? = $ac_status" >&5
-+  echo "$as_me:6026: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6029: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6033: \$? = $ac_status" >&5
-+  echo "$as_me:6032: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6039,7 +6038,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:6042: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:6041: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -6110,7 +6109,7 @@
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:6113: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:6112: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6119,7 +6118,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6122 "configure"
-+#line 6121 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6131,16 +6130,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6133: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6137: \$? = $ac_status" >&5
-+  echo "$as_me:6136: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6139: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6143: \$? = $ac_status" >&5
-+  echo "$as_me:6142: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -6151,7 +6150,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:6154: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:6153: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -6376,7 +6375,7 @@
- 			do
- 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
- 				cat >conftest.$ac_ext <<_ACEOF
--#line 6379 "configure"
-+#line 6378 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6388,16 +6387,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6390: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6394: \$? = $ac_status" >&5
-+  echo "$as_me:6393: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6397: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6396: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6400: \$? = $ac_status" >&5
-+  echo "$as_me:6399: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -6434,7 +6433,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		(*)
--			{ echo "$as_me:6437: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:6436: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -6444,7 +6443,7 @@
- 	if test -n "$cf_try_cflags"
- 	then
- cat > conftest.$ac_ext <<EOF
--#line 6447 "${as_me:-configure}"
-+#line 6446 "${as_me:-configure}"
- #include <stdio.h>
- int main(int argc, char *argv[])
- {
-@@ -6456,18 +6455,18 @@
- 		for cf_opt in $cf_try_cflags
- 		do
- 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
--			echo "$as_me:6459: checking if CFLAGS option -$cf_opt works" >&5
-+			echo "$as_me:6458: checking if CFLAGS option -$cf_opt works" >&5
- echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
--			if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5
-+			if { (eval echo "$as_me:6460: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6464: \$? = $ac_status" >&5
-+  echo "$as_me:6463: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--				echo "$as_me:6466: result: yes" >&5
-+				echo "$as_me:6465: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 				cf_save_CFLAGS="$CFLAGS"
- 			else
--				echo "$as_me:6470: result: no" >&5
-+				echo "$as_me:6469: result: no" >&5
- echo "${ECHO_T}no" >&6
- 			fi
- 		done
-@@ -6482,17 +6481,17 @@
- 
- 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
- 
--echo "${as_me:-configure}:6485: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
-+echo "${as_me:-configure}:6484: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6489: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6488: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- for model in $cf_list_models; do
- 	case $model in
- 	(libtool)
- 
--echo "$as_me:6495: checking for additional libtool options" >&5
-+echo "$as_me:6494: checking for additional libtool options" >&5
- echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
- 
- # Check whether --with-libtool-opts or --without-libtool-opts was given.
-@@ -6502,7 +6501,7 @@
- else
-   with_libtool_opts=no
- fi;
--echo "$as_me:6505: result: $with_libtool_opts" >&5
-+echo "$as_me:6504: result: $with_libtool_opts" >&5
- echo "${ECHO_T}$with_libtool_opts" >&6
- 
- case .$with_libtool_opts in
-@@ -6513,7 +6512,7 @@
- 	;;
- esac
- 
--echo "$as_me:6516: checking if exported-symbols file should be used" >&5
-+echo "$as_me:6515: checking if exported-symbols file should be used" >&5
- echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-export-syms or --without-export-syms was given.
-@@ -6528,7 +6527,7 @@
- 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
- 
- fi
--echo "$as_me:6531: result: $with_export_syms" >&5
-+echo "$as_me:6530: result: $with_export_syms" >&5
- echo "${ECHO_T}$with_export_syms" >&6
- if test "x$with_export_syms" != xno
- then
-@@ -6539,12 +6538,12 @@
- 		;;
- 	(shared)
- 		if test "$CC_SHARED_OPTS" = "unknown"; then
--			{ { echo "$as_me:6542: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:6541: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
- 
--echo "$as_me:6547: checking if versioned-symbols file should be used" >&5
-+echo "$as_me:6546: checking if versioned-symbols file should be used" >&5
- echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
- 
- # Check whether --with-versioned-syms or --without-versioned-syms was given.
-@@ -6559,7 +6558,7 @@
- 	with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
- 
- fi
--echo "$as_me:6562: result: $with_versioned_syms" >&5
-+echo "$as_me:6561: result: $with_versioned_syms" >&5
- echo "${ECHO_T}$with_versioned_syms" >&6
- 
- RESULTING_SYMS=
-@@ -6575,7 +6574,7 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6578: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6577: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*-dy\ *)
-@@ -6583,11 +6582,11 @@
- 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
- 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
- 
--echo "${as_me:-configure}:6586: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
-+echo "${as_me:-configure}:6585: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
- 
- 		;;
- 	(*)
--		{ echo "$as_me:6590: WARNING: this system does not support versioned-symbols" >&5
-+		{ echo "$as_me:6589: WARNING: this system does not support versioned-symbols" >&5
- echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
- 		;;
- 	esac
-@@ -6599,7 +6598,7 @@
- 	# symbols.
- 	if test "x$VERSIONED_SYMS" != "x"
- 	then
--		echo "$as_me:6602: checking if wildcards can be used to selectively omit symbols" >&5
-+		echo "$as_me:6601: checking if wildcards can be used to selectively omit symbols" >&5
- echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
- 		WILDCARD_SYMS=no
- 
-@@ -6636,7 +6635,7 @@
- } submodule_1.0;
- EOF
- 		cat >conftest.$ac_ext <<EOF
--#line 6639 "configure"
-+#line 6638 "configure"
- int	_ismissing(void) { return 1; }
- int	_localf1(void) { return 1; }
- int	_localf2(void) { return 2; }
-@@ -6667,7 +6666,7 @@
- 			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
- 			test -n "$cf_missing" && WILDCARD_SYMS=yes
- 		fi
--		echo "$as_me:6670: result: $WILDCARD_SYMS" >&5
-+		echo "$as_me:6669: result: $WILDCARD_SYMS" >&5
- echo "${ECHO_T}$WILDCARD_SYMS" >&6
- 		rm -f conftest.*
- 	fi
-@@ -6678,7 +6677,7 @@
- done
- 
- # pretend that ncurses==ncursesw==ncursest
--echo "$as_me:6681: checking if you want to disable library suffixes" >&5
-+echo "$as_me:6680: checking if you want to disable library suffixes" >&5
- echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
- 
- # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
-@@ -6695,13 +6694,13 @@
- 	disable_lib_suffixes=no
- 
- fi;
--echo "$as_me:6698: result: $disable_lib_suffixes" >&5
-+echo "$as_me:6697: result: $disable_lib_suffixes" >&5
- echo "${ECHO_T}$disable_lib_suffixes" >&6
- 
- ### If we're building with rpath, try to link non-standard libs that way too.
- if test "$DFT_LWR_MODEL" = "shared"; then
- 
--echo "$as_me:6704: checking if rpath-hack should be disabled" >&5
-+echo "$as_me:6703: checking if rpath-hack should be disabled" >&5
- echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
- 
- # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
-@@ -6718,21 +6717,21 @@
- 	cf_disable_rpath_hack=no
- 
- fi;
--echo "$as_me:6721: result: $cf_disable_rpath_hack" >&5
-+echo "$as_me:6720: result: $cf_disable_rpath_hack" >&5
- echo "${ECHO_T}$cf_disable_rpath_hack" >&6
- if test "$cf_disable_rpath_hack" = no ; then
- 
--echo "$as_me:6725: checking for updated LDFLAGS" >&5
-+echo "$as_me:6724: checking for updated LDFLAGS" >&5
- echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
- if test -n "$LD_RPATH_OPT" ; then
--	echo "$as_me:6728: result: maybe" >&5
-+	echo "$as_me:6727: result: maybe" >&5
- echo "${ECHO_T}maybe" >&6
- 
- 	for ac_prog in ldd
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:6735: checking for $ac_word" >&5
-+echo "$as_me:6734: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6747,7 +6746,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_cf_ldd_prog="$ac_prog"
--echo "$as_me:6750: found $ac_dir/$ac_word" >&5
-+echo "$as_me:6749: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -6755,10 +6754,10 @@
- fi
- cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
- if test -n "$cf_ldd_prog"; then
--  echo "$as_me:6758: result: $cf_ldd_prog" >&5
-+  echo "$as_me:6757: result: $cf_ldd_prog" >&5
- echo "${ECHO_T}$cf_ldd_prog" >&6
- else
--  echo "$as_me:6761: result: no" >&5
-+  echo "$as_me:6760: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6772,7 +6771,7 @@
- 		cf_rpath_oops=
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6775 "configure"
-+#line 6774 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -6784,16 +6783,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6787: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6786: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6790: \$? = $ac_status" >&5
-+  echo "$as_me:6789: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6793: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6792: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6796: \$? = $ac_status" >&5
-+  echo "$as_me:6795: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
- 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
-@@ -6821,7 +6820,7 @@
- 					then
- 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
- 
--echo "${as_me:-configure}:6824: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
-+echo "${as_me:-configure}:6823: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
- 
- 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
- 						break
-@@ -6833,11 +6832,11 @@
- 
- 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6836: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6835: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6840: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6839: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LDFLAGS
-@@ -6874,7 +6873,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6877: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6876: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6887,11 +6886,11 @@
- 
- test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6890: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6889: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- 
- test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6894: testing ...checking LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6893: testing ...checking LIBS $LIBS ..." 1>&5
- 
- cf_rpath_dst=
- for cf_rpath_src in $LIBS
-@@ -6928,7 +6927,7 @@
- 			then
- 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
- 
--echo "${as_me:-configure}:6931: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
-+echo "${as_me:-configure}:6930: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
- 
- 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
- 			fi
-@@ -6941,14 +6940,14 @@
- 
- test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
- 
--echo "${as_me:-configure}:6944: testing ...checked LIBS $LIBS ..." 1>&5
-+echo "${as_me:-configure}:6943: testing ...checked LIBS $LIBS ..." 1>&5
- 
- 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
- 
--echo "${as_me:-configure}:6948: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+echo "${as_me:-configure}:6947: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
- 
- else
--	echo "$as_me:6951: result: no" >&5
-+	echo "$as_me:6950: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -6959,7 +6958,7 @@
- ###############################################################################
- 
- ###	use option --with-extra-suffix to append suffix to headers and libraries
--echo "$as_me:6962: checking if you wish to append extra suffix to header/library paths" >&5
-+echo "$as_me:6961: checking if you wish to append extra suffix to header/library paths" >&5
- echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
- EXTRA_SUFFIX=
- 
-@@ -6978,11 +6977,11 @@
- 	esac
- 
- fi;
--echo "$as_me:6981: result: $EXTRA_SUFFIX" >&5
-+echo "$as_me:6980: result: $EXTRA_SUFFIX" >&5
- echo "${ECHO_T}$EXTRA_SUFFIX" >&6
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:6985: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:6984: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -6992,10 +6991,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:6995: result: $with_overwrite" >&5
-+echo "$as_me:6994: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:6998: checking if external terminfo-database is used" >&5
-+echo "$as_me:6997: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -7005,7 +7004,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:7008: result: $use_database" >&5
-+echo "$as_me:7007: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in
-@@ -7021,7 +7020,7 @@
- if test "$use_database" != no ; then
- 	NCURSES_USE_DATABASE=1
- 
--	echo "$as_me:7024: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:7023: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --with-database or --without-database was given.
-@@ -7029,10 +7028,10 @@
-   withval="$with_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:7032: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:7031: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:7035: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:7034: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -7042,13 +7041,13 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:7045: result: $with_hashed_db" >&5
-+	echo "$as_me:7044: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- else
- 	with_hashed_db=no
- fi
- 
--echo "$as_me:7051: checking for list of fallback descriptions" >&5
-+echo "$as_me:7050: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -7058,11 +7057,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:7061: result: $with_fallback" >&5
-+echo "$as_me:7060: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:7065: checking if you want modern xterm or antique" >&5
-+echo "$as_me:7064: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -7076,11 +7075,11 @@
- (no) with_xterm_new=xterm-old;;
- (*)	 with_xterm_new=xterm-new;;
- esac
--echo "$as_me:7079: result: $with_xterm_new" >&5
-+echo "$as_me:7078: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
--echo "$as_me:7083: checking if xterm backspace sends BS or DEL" >&5
-+echo "$as_me:7082: checking if xterm backspace sends BS or DEL" >&5
- echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
- 
- # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
-@@ -7101,7 +7100,7 @@
- 	with_xterm_kbs=$withval
- 	;;
- esac
--echo "$as_me:7104: result: $with_xterm_kbs" >&5
-+echo "$as_me:7103: result: $with_xterm_kbs" >&5
- echo "${ECHO_T}$with_xterm_kbs" >&6
- XTERM_KBS=$with_xterm_kbs
- 
-@@ -7111,7 +7110,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:7114: checking for list of terminfo directories" >&5
-+echo "$as_me:7113: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -7151,7 +7150,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7154: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7153: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7174,14 +7173,14 @@
- 	;;
- esac
- 
--echo "$as_me:7177: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:7176: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" &&
- cat >>confdefs.h <<EOF
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:7184: checking for default terminfo directory" >&5
-+echo "$as_me:7183: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -7217,7 +7216,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7220: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:7219: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7226,7 +7225,7 @@
- fi
- eval TERMINFO="$withval"
- 
--echo "$as_me:7229: result: $TERMINFO" >&5
-+echo "$as_me:7228: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -7237,7 +7236,7 @@
- 
- ###	use option --disable-big-core to make tic run on small machines
- ###	We need 4Mb, check if we can allocate 50% more than that.
--echo "$as_me:7240: checking if big-core option selected" >&5
-+echo "$as_me:7239: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -7249,7 +7248,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7252 "configure"
-+#line 7251 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7263,15 +7262,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7266: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7265: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7269: \$? = $ac_status" >&5
-+  echo "$as_me:7268: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7271: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7270: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7274: \$? = $ac_status" >&5
-+  echo "$as_me:7273: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -7283,7 +7282,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:7286: result: $with_big_core" >&5
-+echo "$as_me:7285: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "x$with_big_core" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7293,7 +7292,7 @@
- ### ISO C only guarantees 512-char strings, we have tables which load faster
- ### when constructed using "big" strings.  More than the C compiler, the awk
- ### program is a limit on most vendor UNIX systems.  Check that we can build.
--echo "$as_me:7296: checking if big-strings option selected" >&5
-+echo "$as_me:7295: checking if big-strings option selected" >&5
- echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-strings or --disable-big-strings was given.
-@@ -7317,14 +7316,14 @@
- 	esac
- 
- fi;
--echo "$as_me:7320: result: $with_big_strings" >&5
-+echo "$as_me:7319: result: $with_big_strings" >&5
- echo "${ECHO_T}$with_big_strings" >&6
- 
- USE_BIG_STRINGS=0
- test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
- 
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:7327: checking if you want termcap-fallback support" >&5
-+echo "$as_me:7326: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -7334,14 +7333,14 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:7337: result: $with_termcap" >&5
-+echo "$as_me:7336: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- NCURSES_USE_TERMCAP=0
- if test "x$with_termcap" != "xyes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:7344: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:7343: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -7354,13 +7353,13 @@
- else
- 
- 	if test "$with_ticlib" != no ; then
--		{ { echo "$as_me:7357: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+		{ { echo "$as_me:7356: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
- echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
- 	NCURSES_USE_TERMCAP=1
--	echo "$as_me:7363: checking for list of termcap files" >&5
-+	echo "$as_me:7362: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -7400,7 +7399,7 @@
- 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:7403: error: expected a pathname, not \"$cf_src_path\"" >&5
-+	{ { echo "$as_me:7402: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -7423,7 +7422,7 @@
- 	;;
- esac
- 
--	echo "$as_me:7426: result: $TERMPATH" >&5
-+	echo "$as_me:7425: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- 	test -n "$TERMPATH" &&
- cat >>confdefs.h <<EOF
-@@ -7431,7 +7430,7 @@
- EOF
- 
- 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
--	echo "$as_me:7434: checking if fast termcap-loader is needed" >&5
-+	echo "$as_me:7433: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -7441,14 +7440,14 @@
- else
-   with_getcap=no
- fi;
--	echo "$as_me:7444: result: $with_getcap" >&5
-+	echo "$as_me:7443: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- 	test "x$with_getcap" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--	echo "$as_me:7451: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+	echo "$as_me:7450: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -7458,7 +7457,7 @@
- else
-   with_getcap_cache=no
- fi;
--	echo "$as_me:7461: result: $with_getcap_cache" >&5
-+	echo "$as_me:7460: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- 	test "x$with_getcap_cache" = "xyes" &&
- cat >>confdefs.h <<\EOF
-@@ -7468,7 +7467,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:7471: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:7470: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -7478,14 +7477,14 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:7481: result: $with_home_terminfo" >&5
-+echo "$as_me:7480: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "x$with_home_terminfo" = "xyes" &&
- cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:7488: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:7487: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -7495,7 +7494,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:7498: result: $with_root_environ" >&5
-+echo "$as_me:7497: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "x$with_root_environ" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7510,13 +7509,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7513: checking for $ac_func" >&5
-+echo "$as_me:7512: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7519 "configure"
-+#line 7518 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7547,16 +7546,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7550: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7549: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7553: \$? = $ac_status" >&5
-+  echo "$as_me:7552: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7556: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7559: \$? = $ac_status" >&5
-+  echo "$as_me:7558: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7566,7 +7565,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7569: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7568: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7583,13 +7582,13 @@
- 		symlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:7586: checking for $ac_func" >&5
-+echo "$as_me:7585: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7592 "configure"
-+#line 7591 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -7620,16 +7619,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7623: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7622: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7626: \$? = $ac_status" >&5
-+  echo "$as_me:7625: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7629: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7628: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7632: \$? = $ac_status" >&5
-+  echo "$as_me:7631: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -7639,7 +7638,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7642: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:7641: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -7650,7 +7649,7 @@
- done
- 
- else
--	echo "$as_me:7653: checking if link/symlink functions work" >&5
-+	echo "$as_me:7652: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7663,7 +7662,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7666 "configure"
-+#line 7665 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -7693,15 +7692,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7696: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7699: \$? = $ac_status" >&5
-+  echo "$as_me:7698: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:7701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7700: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7704: \$? = $ac_status" >&5
-+  echo "$as_me:7703: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -7719,7 +7718,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:7722: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:7721: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes &&
- cat >>confdefs.h <<\EOF
-@@ -7739,7 +7738,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "x$ac_cv_func_symlink" = xyes ; then
--	echo "$as_me:7742: checking if tic should use symbolic links" >&5
-+	echo "$as_me:7741: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -7749,21 +7748,21 @@
- else
-   with_symlinks=no
- fi;
--	echo "$as_me:7752: result: $with_symlinks" >&5
-+	echo "$as_me:7751: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--	echo "$as_me:7759: checking if tic should use hard links" >&5
-+	echo "$as_me:7758: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
- 	if test "x$ac_cv_func_link" = xyes ; then
- 		with_links=yes
- 	else
- 		with_links=no
- 	fi
--	echo "$as_me:7766: result: $with_links" >&5
-+	echo "$as_me:7765: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -7778,7 +7777,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:7781: checking if you want broken-linker support code" >&5
-+echo "$as_me:7780: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -7788,7 +7787,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER:-no}
- fi;
--echo "$as_me:7791: result: $with_broken_linker" >&5
-+echo "$as_me:7790: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -7810,14 +7809,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
--echo "${as_me:-configure}:7813: testing cygwin linker is broken anyway ..." 1>&5
-+echo "${as_me:-configure}:7812: testing cygwin linker is broken anyway ..." 1>&5
- 
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:7820: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:7819: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -7827,7 +7826,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:7830: result: $with_bsdpad" >&5
-+echo "$as_me:7829: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "x$with_bsdpad" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -7884,14 +7883,14 @@
- 	;;
- (linux*|gnu*|mint*|k*bsd*-gnu)
- 
--echo "$as_me:7887: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:7886: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7894 "configure"
-+#line 7893 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7906,16 +7905,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7909: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7908: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7912: \$? = $ac_status" >&5
-+  echo "$as_me:7911: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7915: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7914: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7918: \$? = $ac_status" >&5
-+  echo "$as_me:7917: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7924,7 +7923,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 7927 "configure"
-+#line 7926 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -7939,16 +7938,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7942: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7941: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7945: \$? = $ac_status" >&5
-+  echo "$as_me:7944: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7948: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7947: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7951: \$? = $ac_status" >&5
-+  echo "$as_me:7950: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -7963,7 +7962,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7966: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:7965: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -7988,16 +7987,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:7991: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:7990: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:7997: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:7996: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8000 "configure"
-+#line 7999 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8012,16 +8011,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8018: \$? = $ac_status" >&5
-+  echo "$as_me:8017: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8020: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8024: \$? = $ac_status" >&5
-+  echo "$as_me:8023: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8042,7 +8041,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8045 "configure"
-+#line 8044 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8057,16 +8056,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8060: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8059: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8063: \$? = $ac_status" >&5
-+  echo "$as_me:8062: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8066: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8065: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8069: \$? = $ac_status" >&5
-+  echo "$as_me:8068: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8077,15 +8076,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8080: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8079: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8085: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8084: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8088 "configure"
-+#line 8087 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8100,16 +8099,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8102: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8106: \$? = $ac_status" >&5
-+  echo "$as_me:8105: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8109: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8108: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8112: \$? = $ac_status" >&5
-+  echo "$as_me:8111: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8125,7 +8124,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8128: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8127: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8246,14 +8245,14 @@
- 	;;
- (*)
- 
--echo "$as_me:8249: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8248: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8256 "configure"
-+#line 8255 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8272,16 +8271,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8275: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8274: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8278: \$? = $ac_status" >&5
-+  echo "$as_me:8277: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8281: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8280: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8284: \$? = $ac_status" >&5
-+  echo "$as_me:8283: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8290,7 +8289,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8293 "configure"
-+#line 8292 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8309,16 +8308,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8311: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8315: \$? = $ac_status" >&5
-+  echo "$as_me:8314: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8318: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8317: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8321: \$? = $ac_status" >&5
-+  echo "$as_me:8320: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8333,7 +8332,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8336: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8335: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -8441,16 +8440,16 @@
- 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:8444: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:8443: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "${as_me:-configure}:8450: testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me:-configure}:8449: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8453 "configure"
-+#line 8452 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8465,16 +8464,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8468: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8467: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8471: \$? = $ac_status" >&5
-+  echo "$as_me:8470: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8474: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8473: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8477: \$? = $ac_status" >&5
-+  echo "$as_me:8476: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -8495,7 +8494,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8498 "configure"
-+#line 8497 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8510,16 +8509,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8513: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8516: \$? = $ac_status" >&5
-+  echo "$as_me:8515: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8519: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8522: \$? = $ac_status" >&5
-+  echo "$as_me:8521: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8530,15 +8529,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "${as_me:-configure}:8533: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me:-configure}:8532: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "${as_me:-configure}:8538: testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me:-configure}:8537: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8541 "configure"
-+#line 8540 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -8553,16 +8552,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8556: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8555: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8559: \$? = $ac_status" >&5
-+  echo "$as_me:8558: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8562: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8561: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8565: \$? = $ac_status" >&5
-+  echo "$as_me:8564: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8578,7 +8577,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8581: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:8580: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -8736,7 +8735,7 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
--echo "${as_me:-configure}:8739: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+echo "${as_me:-configure}:8738: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
- 
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
-@@ -8744,7 +8743,7 @@
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8747: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8746: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
- 
- 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
- fi
-@@ -8752,7 +8751,7 @@
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
--echo "${as_me:-configure}:8755: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+echo "${as_me:-configure}:8754: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
- 
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
-@@ -8760,10 +8759,10 @@
- fi
- 
- if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
--	echo "$as_me:8763: checking if _XOPEN_SOURCE really is set" >&5
-+	echo "$as_me:8762: checking if _XOPEN_SOURCE really is set" >&5
- echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8766 "configure"
-+#line 8765 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8778,16 +8777,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8781: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8780: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8784: \$? = $ac_status" >&5
-+  echo "$as_me:8783: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8787: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8786: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8790: \$? = $ac_status" >&5
-+  echo "$as_me:8789: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set=yes
- else
-@@ -8796,12 +8795,12 @@
- cf_XOPEN_SOURCE_set=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:8799: result: $cf_XOPEN_SOURCE_set" >&5
-+	echo "$as_me:8798: result: $cf_XOPEN_SOURCE_set" >&5
- echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
- 	if test $cf_XOPEN_SOURCE_set = yes
- 	then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 8804 "configure"
-+#line 8803 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int
-@@ -8816,16 +8815,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8819: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8818: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8822: \$? = $ac_status" >&5
-+  echo "$as_me:8821: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8825: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8824: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8828: \$? = $ac_status" >&5
-+  echo "$as_me:8827: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_XOPEN_SOURCE_set_ok=yes
- else
-@@ -8836,19 +8835,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		if test $cf_XOPEN_SOURCE_set_ok = no
- 		then
--			{ echo "$as_me:8839: WARNING: _XOPEN_SOURCE is lower than requested" >&5
-+			{ echo "$as_me:8838: WARNING: _XOPEN_SOURCE is lower than requested" >&5
- echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
- 		fi
- 	else
- 
--echo "$as_me:8844: checking if we should define _XOPEN_SOURCE" >&5
-+echo "$as_me:8843: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 8851 "configure"
-+#line 8850 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8867,16 +8866,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8870: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8869: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8873: \$? = $ac_status" >&5
-+  echo "$as_me:8872: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8876: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8875: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8879: \$? = $ac_status" >&5
-+  echo "$as_me:8878: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8885,7 +8884,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 8888 "configure"
-+#line 8887 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -8904,16 +8903,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8907: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8910: \$? = $ac_status" >&5
-+  echo "$as_me:8909: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8916: \$? = $ac_status" >&5
-+  echo "$as_me:8915: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -8928,7 +8927,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:8931: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:8930: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 
- if test "$cf_cv_xopen_source" != no ; then
-@@ -9030,14 +9029,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:9033: checking if SIGWINCH is defined" >&5
-+echo "$as_me:9032: checking if SIGWINCH is defined" >&5
- echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
- if test "${cf_cv_define_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9040 "configure"
-+#line 9039 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -9052,23 +9051,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9054: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9058: \$? = $ac_status" >&5
-+  echo "$as_me:9057: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9061: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9060: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9064: \$? = $ac_status" >&5
-+  echo "$as_me:9063: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 9071 "configure"
-+#line 9070 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9086,16 +9085,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9089: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9088: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9092: \$? = $ac_status" >&5
-+  echo "$as_me:9091: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9095: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9094: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9098: \$? = $ac_status" >&5
-+  echo "$as_me:9097: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -9109,11 +9108,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:9112: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:9111: result: $cf_cv_define_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
- 
- if test "$cf_cv_define_sigwinch" = maybe ; then
--echo "$as_me:9116: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:9115: checking for actual SIGWINCH definition" >&5
- echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
- if test "${cf_cv_fixup_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9124,7 +9123,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9127 "configure"
-+#line 9126 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -9146,16 +9145,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9149: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9148: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9152: \$? = $ac_status" >&5
-+  echo "$as_me:9151: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9155: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9154: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9158: \$? = $ac_status" >&5
-+  echo "$as_me:9157: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -9169,7 +9168,7 @@
- done
- 
- fi
--echo "$as_me:9172: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:9171: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -9179,13 +9178,13 @@
- 
- # Checks for CODESET support.
- 
--echo "$as_me:9182: checking for nl_langinfo and CODESET" >&5
-+echo "$as_me:9181: checking for nl_langinfo and CODESET" >&5
- echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
- if test "${am_cv_langinfo_codeset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9188 "configure"
-+#line 9187 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -9197,16 +9196,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9200: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9199: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9203: \$? = $ac_status" >&5
-+  echo "$as_me:9202: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9206: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9205: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9209: \$? = $ac_status" >&5
-+  echo "$as_me:9208: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -9217,7 +9216,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9220: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:9219: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
- 	if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -9231,7 +9230,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:9234: checking if you want wide-character code" >&5
-+echo "$as_me:9233: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -9241,7 +9240,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:9244: result: $with_widec" >&5
-+echo "$as_me:9243: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "x$with_widec" = xyes ; then
- 	if test "x$disable_lib_suffixes" = xno ; then
-@@ -9256,14 +9255,14 @@
- #define NCURSES_WIDECHAR 1
- EOF
- 
--echo "$as_me:9259: checking if wchar.h can be used as is" >&5
-+echo "$as_me:9258: checking if wchar.h can be used as is" >&5
- echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
- if test "${cf_cv_wchar_h_okay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9266 "configure"
-+#line 9265 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9280,16 +9279,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9283: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9282: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9286: \$? = $ac_status" >&5
-+  echo "$as_me:9285: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9288: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9292: \$? = $ac_status" >&5
-+  echo "$as_me:9291: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_h_okay=yes
- else
-@@ -9299,16 +9298,16 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:9302: result: $cf_cv_wchar_h_okay" >&5
-+echo "$as_me:9301: result: $cf_cv_wchar_h_okay" >&5
- echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
- 
- if test $cf_cv_wchar_h_okay = no
- then
- 
--echo "$as_me:9308: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:9307: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 9311 "configure"
-+#line 9310 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9324,16 +9323,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9327: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9326: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9330: \$? = $ac_status" >&5
-+  echo "$as_me:9329: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9333: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9332: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9336: \$? = $ac_status" >&5
-+  echo "$as_me:9335: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -9342,16 +9341,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:9345: result: $cf_result" >&5
-+echo "$as_me:9344: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:9351: checking checking for compatible value versus " >&5
-+	echo "$as_me:9350: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9354 "configure"
-+#line 9353 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -9367,16 +9366,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9370: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9369: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9373: \$? = $ac_status" >&5
-+  echo "$as_me:9372: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9376: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9375: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9379: \$? = $ac_status" >&5
-+  echo "$as_me:9378: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -9385,7 +9384,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:9388: result: $cf_result" >&5
-+	echo "$as_me:9387: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -9401,13 +9400,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:9404: checking for $ac_func" >&5
-+echo "$as_me:9403: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9410 "configure"
-+#line 9409 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -9438,16 +9437,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9440: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9444: \$? = $ac_status" >&5
-+  echo "$as_me:9443: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9447: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9446: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9450: \$? = $ac_status" >&5
-+  echo "$as_me:9449: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -9457,7 +9456,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9460: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:9459: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9469,7 +9468,7 @@
- 
- 	if test "x$ac_cv_func_putwc" != xyes ; then
- 
--echo "$as_me:9472: checking for multibyte character support" >&5
-+echo "$as_me:9471: checking for multibyte character support" >&5
- echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
- if test "${cf_cv_utf8_lib+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9477,7 +9476,7 @@
- 
- 	cf_save_LIBS="$LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 9480 "configure"
-+#line 9479 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -9490,16 +9489,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9493: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9492: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9496: \$? = $ac_status" >&5
-+  echo "$as_me:9495: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9499: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9498: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9502: \$? = $ac_status" >&5
-+  echo "$as_me:9501: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_utf8_lib=yes
- else
-@@ -9511,12 +9510,12 @@
- cf_cv_header_path_utf8=
- cf_cv_library_path_utf8=
- 
--echo "${as_me:-configure}:9514: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9513: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
- 
- cf_save_LIBS="$LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9519 "configure"
-+#line 9518 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9529,16 +9528,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9532: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9531: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9535: \$? = $ac_status" >&5
-+  echo "$as_me:9534: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9537: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9541: \$? = $ac_status" >&5
-+  echo "$as_me:9540: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9552,7 +9551,7 @@
- LIBS="-lutf8  $cf_save_LIBS"
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 9555 "configure"
-+#line 9554 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9565,16 +9564,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9568: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9567: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9571: \$? = $ac_status" >&5
-+  echo "$as_me:9570: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9574: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9573: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9577: \$? = $ac_status" >&5
-+  echo "$as_me:9576: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_find_linkage_utf8=yes
-@@ -9591,9 +9590,9 @@
- 
- 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
- 
--echo "${as_me:-configure}:9594: testing find linkage for utf8 library ..." 1>&5
-+echo "${as_me:-configure}:9593: testing find linkage for utf8 library ..." 1>&5
- 
--echo "${as_me:-configure}:9596: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9595: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9684,11 +9683,11 @@
- 		if test -d $cf_cv_header_path_utf8 ; then
- 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9687: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9686: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
- 
- 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 9691 "configure"
-+#line 9690 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9701,21 +9700,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9704: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9703: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9707: \$? = $ac_status" >&5
-+  echo "$as_me:9706: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9710: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9709: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9713: \$? = $ac_status" >&5
-+  echo "$as_me:9712: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9718: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9717: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
- 
- 				cf_cv_find_linkage_utf8=maybe
- 				cf_test_CPPFLAGS="$CPPFLAGS"
-@@ -9733,7 +9732,7 @@
- 
- 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
- 
--echo "${as_me:-configure}:9736: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
-+echo "${as_me:-configure}:9735: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
- 
- 		cf_save_LIBS="$LIBS"
- 		cf_save_LDFLAGS="$LDFLAGS"
-@@ -9808,13 +9807,13 @@
- 				if test -d $cf_cv_library_path_utf8 ; then
- 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9811: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9810: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					CPPFLAGS="$cf_test_CPPFLAGS"
- 					LIBS="-lutf8  $cf_save_LIBS"
- 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
- 					cat >conftest.$ac_ext <<_ACEOF
--#line 9817 "configure"
-+#line 9816 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -9827,21 +9826,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:9829: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9833: \$? = $ac_status" >&5
-+  echo "$as_me:9832: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9836: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9835: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9839: \$? = $ac_status" >&5
-+  echo "$as_me:9838: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
- 
--echo "${as_me:-configure}:9844: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
-+echo "${as_me:-configure}:9843: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
- 
- 					cf_cv_find_linkage_utf8=yes
- 					cf_cv_library_file_utf8="-lutf8"
-@@ -9883,7 +9882,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:9886: result: $cf_cv_utf8_lib" >&5
-+echo "$as_me:9885: result: $cf_cv_utf8_lib" >&5
- echo "${ECHO_T}$cf_cv_utf8_lib" >&6
- 
- # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
-@@ -9918,7 +9917,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 9921 "configure"
-+#line 9920 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -9930,16 +9929,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9933: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9932: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9936: \$? = $ac_status" >&5
-+  echo "$as_me:9935: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9939: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9938: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9942: \$? = $ac_status" >&5
-+  echo "$as_me:9941: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9956,7 +9955,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:9959: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:9958: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -9992,7 +9991,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:9995: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:9994: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -10024,14 +10023,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:10027: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:10026: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10034 "configure"
-+#line 10033 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10049,23 +10048,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10052: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10051: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10055: \$? = $ac_status" >&5
-+  echo "$as_me:10054: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10058: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10057: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10061: \$? = $ac_status" >&5
-+  echo "$as_me:10060: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10068 "configure"
-+#line 10067 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10084,16 +10083,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10086: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10090: \$? = $ac_status" >&5
-+  echo "$as_me:10089: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10093: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10092: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10096: \$? = $ac_status" >&5
-+  echo "$as_me:10095: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -10105,7 +10104,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10108: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:10107: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -10123,14 +10122,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:10126: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:10125: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10133 "configure"
-+#line 10132 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10148,23 +10147,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10151: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10150: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10154: \$? = $ac_status" >&5
-+  echo "$as_me:10153: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10157: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10156: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10160: \$? = $ac_status" >&5
-+  echo "$as_me:10159: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10167 "configure"
-+#line 10166 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10183,16 +10182,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10185: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10189: \$? = $ac_status" >&5
-+  echo "$as_me:10188: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10192: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10191: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10195: \$? = $ac_status" >&5
-+  echo "$as_me:10194: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -10204,7 +10203,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10207: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:10206: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -10227,14 +10226,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:10230: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:10229: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10237 "configure"
-+#line 10236 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10252,23 +10251,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10255: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10254: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10258: \$? = $ac_status" >&5
-+  echo "$as_me:10257: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10261: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10260: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10264: \$? = $ac_status" >&5
-+  echo "$as_me:10263: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 10271 "configure"
-+#line 10270 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -10287,16 +10286,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10290: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10289: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10293: \$? = $ac_status" >&5
-+  echo "$as_me:10292: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10296: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10295: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10299: \$? = $ac_status" >&5
-+  echo "$as_me:10298: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -10308,7 +10307,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10311: result: $cf_cv_wint_t" >&5
-+echo "$as_me:10310: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -10340,7 +10339,7 @@
- fi
- 
- ###   use option --disable-lp64 to allow long chtype
--echo "$as_me:10343: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:10342: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -10350,7 +10349,7 @@
- else
-   with_lp64=$cf_dft_with_lp64
- fi;
--echo "$as_me:10353: result: $with_lp64" >&5
-+echo "$as_me:10352: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "x$with_lp64" = xyes ; then
-@@ -10366,7 +10365,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:10369: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:10368: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10378,7 +10377,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 10381 "configure"
-+#line 10380 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10398,16 +10397,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10401: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10400: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10404: \$? = $ac_status" >&5
-+  echo "$as_me:10403: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10407: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10406: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10410: \$? = $ac_status" >&5
-+  echo "$as_me:10409: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10417,16 +10416,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10420: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10419: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10423: \$? = $ac_status" >&5
-+  echo "$as_me:10422: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10426: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10425: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10429: \$? = $ac_status" >&5
-+  echo "$as_me:10428: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -10440,13 +10439,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:10443: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:10442: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:10449: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:10448: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10454,7 +10453,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10457 "configure"
-+#line 10456 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10474,16 +10473,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10476: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10480: \$? = $ac_status" >&5
-+  echo "$as_me:10479: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10483: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10486: \$? = $ac_status" >&5
-+  echo "$as_me:10485: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10492,7 +10491,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10495 "configure"
-+#line 10494 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -10513,16 +10512,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10516: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10515: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10519: \$? = $ac_status" >&5
-+  echo "$as_me:10518: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10522: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10521: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10525: \$? = $ac_status" >&5
-+  echo "$as_me:10524: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -10533,7 +10532,7 @@
-   break
- done
- fi
--echo "$as_me:10536: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:10535: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -10543,7 +10542,7 @@
- 
- fi
- rm -rf conftest*
--  echo "$as_me:10546: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:10545: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10551,7 +10550,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10554 "configure"
-+#line 10553 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -10571,16 +10570,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10574: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10573: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10577: \$? = $ac_status" >&5
-+  echo "$as_me:10576: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10580: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10579: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10583: \$? = $ac_status" >&5
-+  echo "$as_me:10582: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10589,7 +10588,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10592 "configure"
-+#line 10591 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -10610,16 +10609,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10613: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10616: \$? = $ac_status" >&5
-+  echo "$as_me:10615: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10622: \$? = $ac_status" >&5
-+  echo "$as_me:10621: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -10630,7 +10629,7 @@
-   break
- done
- fi
--echo "$as_me:10633: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:10632: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -10643,7 +10642,7 @@
- fi
- 
- 	if test "$enable_largefile" != no ; then
--	echo "$as_me:10646: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:10645: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10651,7 +10650,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10654 "configure"
-+#line 10653 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10663,16 +10662,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10666: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10665: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10669: \$? = $ac_status" >&5
-+  echo "$as_me:10668: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10672: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10671: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10675: \$? = $ac_status" >&5
-+  echo "$as_me:10674: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -10681,7 +10680,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10684 "configure"
-+#line 10683 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -10694,16 +10693,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10700: \$? = $ac_status" >&5
-+  echo "$as_me:10699: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10702: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10706: \$? = $ac_status" >&5
-+  echo "$as_me:10705: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -10714,7 +10713,7 @@
-   break
- done
- fi
--echo "$as_me:10717: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:10716: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -10728,13 +10727,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:10731: checking for fseeko" >&5
-+echo "$as_me:10730: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10737 "configure"
-+#line 10736 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -10746,16 +10745,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10748: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10752: \$? = $ac_status" >&5
-+  echo "$as_me:10751: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10754: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10758: \$? = $ac_status" >&5
-+  echo "$as_me:10757: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -10765,7 +10764,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10768: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:10767: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -10786,14 +10785,14 @@
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:10789: checking whether to use struct dirent64" >&5
-+	echo "$as_me:10788: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10796 "configure"
-+#line 10795 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -10814,16 +10813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10817: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10820: \$? = $ac_status" >&5
-+  echo "$as_me:10819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10826: \$? = $ac_status" >&5
-+  echo "$as_me:10825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -10834,7 +10833,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:10837: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:10836: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -10844,7 +10843,7 @@
- 	fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:10847: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:10846: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -10854,14 +10853,14 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:10857: result: $with_tparm_varargs" >&5
-+echo "$as_me:10856: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
- if test "$with_ticlib" != no ; then
--echo "$as_me:10864: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
-+echo "$as_me:10863: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
- echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
- 
- # Check whether --enable-tic-depends or --disable-tic-depends was given.
-@@ -10871,14 +10870,14 @@
- else
-   with_tic_depends=yes
- fi;
--echo "$as_me:10874: result: $with_tic_depends" >&5
-+echo "$as_me:10873: result: $with_tic_depends" >&5
- echo "${ECHO_T}$with_tic_depends" >&6
- else
- 	with_tic_depends=no
- fi
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:10881: checking for type of bool" >&5
-+echo "$as_me:10880: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -10888,10 +10887,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:10891: result: $NCURSES_BOOL" >&5
-+echo "$as_me:10890: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:10894: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:10893: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -10902,11 +10901,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:10905: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:10904: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:10909: checking for type of chtype" >&5
-+echo "$as_me:10908: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -10916,11 +10915,11 @@
- else
-   NCURSES_CHTYPE=$cf_dft_chtype
- fi;
--echo "$as_me:10919: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:10918: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:10923: checking for type of ospeed" >&5
-+echo "$as_me:10922: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -10930,11 +10929,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:10933: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:10932: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:10937: checking for type of mmask_t" >&5
-+echo "$as_me:10936: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -10944,11 +10943,11 @@
- else
-   NCURSES_MMASK_T=$cf_dft_mmask_t
- fi;
--echo "$as_me:10947: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:10946: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ###   use option --with-ccharw-max to override CCHARW_MAX size
--echo "$as_me:10951: checking for size CCHARW_MAX" >&5
-+echo "$as_me:10950: checking for size CCHARW_MAX" >&5
- echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
- 
- # Check whether --with-ccharw-max or --without-ccharw-max was given.
-@@ -10958,11 +10957,11 @@
- else
-   NCURSES_CCHARW_MAX=5
- fi;
--echo "$as_me:10961: result: $NCURSES_CCHARW_MAX" >&5
-+echo "$as_me:10960: result: $NCURSES_CCHARW_MAX" >&5
- echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
- 
- ###   use option --with-tparm-arg to override tparm's argument type
--echo "$as_me:10965: checking for type of tparm args" >&5
-+echo "$as_me:10964: checking for type of tparm args" >&5
- echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
- 
- # Check whether --with-tparm-arg or --without-tparm-arg was given.
-@@ -10972,11 +10971,11 @@
- else
-   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
- fi;
--echo "$as_me:10975: result: $NCURSES_TPARM_ARG" >&5
-+echo "$as_me:10974: result: $NCURSES_TPARM_ARG" >&5
- echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:10979: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:10978: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -10986,7 +10985,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:10989: result: $with_rcs_ids" >&5
-+echo "$as_me:10988: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "x$with_rcs_ids" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -10995,7 +10994,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:10998: checking format of man-pages" >&5
-+echo "$as_me:10997: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -11084,14 +11083,14 @@
- 	;;
- esac
- 
--echo "$as_me:11087: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:11086: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--	{ echo "$as_me:11090: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+	{ echo "$as_me:11089: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:11094: checking for manpage renaming" >&5
-+echo "$as_me:11093: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -11119,7 +11118,7 @@
- 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
- 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
- 	elif test ! -f $MANPAGE_RENAMES ; then
--		{ { echo "$as_me:11122: error: not a filename: $MANPAGE_RENAMES" >&5
-+		{ { echo "$as_me:11121: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -11133,10 +11132,10 @@
- 	fi
- fi
- 
--echo "$as_me:11136: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:11135: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:11139: checking if manpage aliases will be installed" >&5
-+echo "$as_me:11138: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -11147,7 +11146,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:11150: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:11149: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- case "x$LN_S" in
-@@ -11161,7 +11160,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:11164: checking if manpage symlinks should be used" >&5
-+echo "$as_me:11163: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -11174,17 +11173,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:11177: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:11176: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:11183: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:11182: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:11187: checking for manpage tbl" >&5
-+echo "$as_me:11186: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -11195,7 +11194,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:11198: result: $MANPAGE_TBL" >&5
-+echo "$as_me:11197: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
- if test "$prefix" = "NONE" ; then
-@@ -11528,7 +11527,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:11531: checking if you want to build with function extensions" >&5
-+echo "$as_me:11530: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -11538,7 +11537,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:11541: result: $with_ext_funcs" >&5
-+echo "$as_me:11540: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "x$with_ext_funcs" = xyes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -11593,7 +11592,7 @@
- 	GENERATED_EXT_FUNCS=
- fi
- 
--echo "$as_me:11596: checking if you want to build with SCREEN extensions" >&5
-+echo "$as_me:11595: checking if you want to build with SCREEN extensions" >&5
- echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
- 
- # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
-@@ -11603,7 +11602,7 @@
- else
-   with_sp_funcs=$cf_dft_ext_spfuncs
- fi;
--echo "$as_me:11606: result: $with_sp_funcs" >&5
-+echo "$as_me:11605: result: $with_sp_funcs" >&5
- echo "${ECHO_T}$with_sp_funcs" >&6
- if test "x$with_sp_funcs" = xyes ; then
- 	NCURSES_SP_FUNCS=1
-@@ -11618,7 +11617,7 @@
- 	GENERATED_SP_FUNCS=
- fi
- 
--echo "$as_me:11621: checking if you want to build with terminal-driver" >&5
-+echo "$as_me:11620: checking if you want to build with terminal-driver" >&5
- echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
- 
- # Check whether --enable-term-driver or --disable-term-driver was given.
-@@ -11628,7 +11627,7 @@
- else
-   with_term_driver=no
- fi;
--echo "$as_me:11631: result: $with_term_driver" >&5
-+echo "$as_me:11630: result: $with_term_driver" >&5
- echo "${ECHO_T}$with_term_driver" >&6
- if test "x$with_term_driver" = xyes ; then
- 
-@@ -11637,19 +11636,19 @@
- EOF
- 
- 	if test "x$with_termlib" != xno ; then
--		{ { echo "$as_me:11640: error: The term-driver option conflicts with the termlib option" >&5
-+		{ { echo "$as_me:11639: error: The term-driver option conflicts with the termlib option" >&5
- echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 	if test "x$with_sp_funcs" != xyes ; then
--		{ { echo "$as_me:11645: error: The term-driver option relies upon sp-funcs" >&5
-+		{ { echo "$as_me:11644: error: The term-driver option relies upon sp-funcs" >&5
- echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:11652: checking for extended use of const keyword" >&5
-+echo "$as_me:11651: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -11659,7 +11658,7 @@
- else
-   with_ext_const=$cf_dft_ext_const
- fi;
--echo "$as_me:11662: result: $with_ext_const" >&5
-+echo "$as_me:11661: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "x$with_ext_const" = xyes ; then
-@@ -11667,7 +11666,7 @@
- fi
- 
- ###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:11670: checking if you want to use extended colors" >&5
-+echo "$as_me:11669: checking if you want to use extended colors" >&5
- echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
- 
- # Check whether --enable-ext-colors or --disable-ext-colors was given.
-@@ -11677,12 +11676,12 @@
- else
-   with_ext_colors=$cf_dft_ext_colors
- fi;
--echo "$as_me:11680: result: $with_ext_colors" >&5
-+echo "$as_me:11679: result: $with_ext_colors" >&5
- echo "${ECHO_T}$with_ext_colors" >&6
- NCURSES_EXT_COLORS=0
- if test "x$with_ext_colors" = xyes ; then
- 	if test "x$with_widec" != xyes ; then
--		{ echo "$as_me:11685: WARNING: This option applies only to wide-character library" >&5
-+		{ echo "$as_me:11684: WARNING: This option applies only to wide-character library" >&5
- echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
- 	else
- 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-@@ -11692,7 +11691,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11695: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11694: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11708,7 +11707,7 @@
- fi
- 
- ###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:11711: checking if you want to use extended mouse encoding" >&5
-+echo "$as_me:11710: checking if you want to use extended mouse encoding" >&5
- echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
- 
- # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-@@ -11718,7 +11717,7 @@
- else
-   with_ext_mouse=$cf_dft_ext_mouse
- fi;
--echo "$as_me:11721: result: $with_ext_mouse" >&5
-+echo "$as_me:11720: result: $with_ext_mouse" >&5
- echo "${ECHO_T}$with_ext_mouse" >&6
- NCURSES_MOUSE_VERSION=1
- if test "x$with_ext_mouse" = xyes ; then
-@@ -11729,7 +11728,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:11732: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:11731: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -11738,7 +11737,7 @@
- fi
- 
- ###   use option --enable-ext-putwin to turn on extended screendumps
--echo "$as_me:11741: checking if you want to use extended putwin/screendump" >&5
-+echo "$as_me:11740: checking if you want to use extended putwin/screendump" >&5
- echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
- 
- # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
-@@ -11748,7 +11747,7 @@
- else
-   with_ext_putwin=$cf_dft_ext_putwin
- fi;
--echo "$as_me:11751: result: $with_ext_putwin" >&5
-+echo "$as_me:11750: result: $with_ext_putwin" >&5
- echo "${ECHO_T}$with_ext_putwin" >&6
- if test "x$with_ext_putwin" = xyes ; then
- 
-@@ -11758,7 +11757,7 @@
- 
- fi
- 
--echo "$as_me:11761: checking if you want \$NCURSES_NO_PADDING code" >&5
-+echo "$as_me:11760: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -11768,20 +11767,20 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:11771: result: $with_no_padding" >&5
-+echo "$as_me:11770: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "x$with_no_padding" = xyes &&
- cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:11778: checking for ANSI C header files" >&5
-+echo "$as_me:11777: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11784 "configure"
-+#line 11783 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -11789,13 +11788,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:11792: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11791: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11798: \$? = $ac_status" >&5
-+  echo "$as_me:11797: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11817,7 +11816,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11820 "configure"
-+#line 11819 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -11835,7 +11834,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11838 "configure"
-+#line 11837 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -11856,7 +11855,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11859 "configure"
-+#line 11858 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -11882,15 +11881,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11885: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11884: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11888: \$? = $ac_status" >&5
-+  echo "$as_me:11887: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11890: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11889: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11893: \$? = $ac_status" >&5
-+  echo "$as_me:11892: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -11903,7 +11902,7 @@
- fi
- fi
- fi
--echo "$as_me:11906: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:11905: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -11919,28 +11918,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:11922: checking for $ac_header" >&5
-+echo "$as_me:11921: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11928 "configure"
-+#line 11927 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11934: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11933: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11937: \$? = $ac_status" >&5
-+  echo "$as_me:11936: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11939: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11943: \$? = $ac_status" >&5
-+  echo "$as_me:11942: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -11950,7 +11949,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11953: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11952: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11960,13 +11959,13 @@
- fi
- done
- 
--echo "$as_me:11963: checking for signed char" >&5
-+echo "$as_me:11962: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11969 "configure"
-+#line 11968 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -11981,16 +11980,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11983: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11987: \$? = $ac_status" >&5
-+  echo "$as_me:11986: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11990: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11989: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11993: \$? = $ac_status" >&5
-+  echo "$as_me:11992: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -12000,10 +11999,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12003: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:12002: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:12006: checking size of signed char" >&5
-+echo "$as_me:12005: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12012,7 +12011,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 12015 "configure"
-+#line 12014 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12024,21 +12023,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12027: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12026: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12030: \$? = $ac_status" >&5
-+  echo "$as_me:12029: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12033: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12032: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12036: \$? = $ac_status" >&5
-+  echo "$as_me:12035: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12041 "configure"
-+#line 12040 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12050,16 +12049,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12053: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12052: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12056: \$? = $ac_status" >&5
-+  echo "$as_me:12055: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12059: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12062: \$? = $ac_status" >&5
-+  echo "$as_me:12061: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -12075,7 +12074,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12078 "configure"
-+#line 12077 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12087,16 +12086,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12089: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12093: \$? = $ac_status" >&5
-+  echo "$as_me:12092: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12096: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12095: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12099: \$? = $ac_status" >&5
-+  echo "$as_me:12098: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -12112,7 +12111,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12115 "configure"
-+#line 12114 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12124,16 +12123,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12127: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12126: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12130: \$? = $ac_status" >&5
-+  echo "$as_me:12129: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12132: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12136: \$? = $ac_status" >&5
-+  echo "$as_me:12135: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -12146,12 +12145,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12149: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:12148: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12154 "configure"
-+#line 12153 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -12167,15 +12166,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12170: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12169: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12173: \$? = $ac_status" >&5
-+  echo "$as_me:12172: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12175: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12174: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12178: \$? = $ac_status" >&5
-+  echo "$as_me:12177: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -12191,7 +12190,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:12194: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:12193: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -12202,7 +12201,7 @@
- else
- 	NCURSES_SBOOL="char"
- fi
--echo "$as_me:12205: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:12204: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -12212,12 +12211,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:12215: result: $with_signed_char" >&5
-+echo "$as_me:12214: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:12220: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:12219: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -12227,7 +12226,7 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:12230: result: $with_sigwinch" >&5
-+echo "$as_me:12229: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "x$with_sigwinch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12235,7 +12234,7 @@
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:12238: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:12237: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -12245,7 +12244,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:12248: result: $with_tcap_names" >&5
-+echo "$as_me:12247: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
-@@ -12253,7 +12252,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:12256: checking if you want all development code" >&5
-+echo "$as_me:12255: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -12263,11 +12262,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:12266: result: $with_develop" >&5
-+echo "$as_me:12265: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:12270: checking if you want hard-tabs code" >&5
-+echo "$as_me:12269: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -12277,7 +12276,7 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:12280: result: $enable_hard_tabs" >&5
-+echo "$as_me:12279: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "x$enable_hard_tabs" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12285,7 +12284,7 @@
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:12288: checking if you want limited support for xmc" >&5
-+echo "$as_me:12287: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -12295,7 +12294,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:12298: result: $enable_xmc_glitch" >&5
-+echo "$as_me:12297: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "x$enable_xmc_glitch" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12305,7 +12304,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:12308: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:12307: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -12315,7 +12314,7 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:12318: result: $with_assumed_color" >&5
-+echo "$as_me:12317: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "x$with_assumed_color" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12323,7 +12322,7 @@
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:12326: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:12325: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -12333,7 +12332,7 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:12336: result: $with_hashmap" >&5
-+echo "$as_me:12335: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "x$with_hashmap" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12341,7 +12340,7 @@
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:12344: checking if you want colorfgbg code" >&5
-+echo "$as_me:12343: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -12351,7 +12350,7 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:12354: result: $with_colorfgbg" >&5
-+echo "$as_me:12353: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "x$with_colorfgbg" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12359,7 +12358,7 @@
- EOF
- 
- ###   use option --enable-interop to turn on use of bindings used for interop
--echo "$as_me:12362: checking if you want interop bindings" >&5
-+echo "$as_me:12361: checking if you want interop bindings" >&5
- echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
- 
- # Check whether --enable-interop or --disable-interop was given.
-@@ -12369,7 +12368,7 @@
- else
-   with_exp_interop=$cf_dft_interop
- fi;
--echo "$as_me:12372: result: $with_exp_interop" >&5
-+echo "$as_me:12371: result: $with_exp_interop" >&5
- echo "${ECHO_T}$with_exp_interop" >&6
- 
- NCURSES_INTEROP_FUNCS=0
-@@ -12378,7 +12377,7 @@
- # This is still experimental (20080329), but should ultimately be moved to
- # the script-block --with-normal, etc.
- 
--echo "$as_me:12381: checking if you want to link with the pthread library" >&5
-+echo "$as_me:12380: checking if you want to link with the pthread library" >&5
- echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
- # Check whether --with-pthread or --without-pthread was given.
-@@ -12388,27 +12387,27 @@
- else
-   with_pthread=no
- fi;
--echo "$as_me:12391: result: $with_pthread" >&5
-+echo "$as_me:12390: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 
- if test "$with_pthread" != no ; then
--	echo "$as_me:12395: checking for pthread.h" >&5
-+	echo "$as_me:12394: checking for pthread.h" >&5
- echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
- if test "${ac_cv_header_pthread_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12401 "configure"
-+#line 12400 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- _ACEOF
--if { (eval echo "$as_me:12405: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12404: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12411: \$? = $ac_status" >&5
-+  echo "$as_me:12410: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12427,7 +12426,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12430: result: $ac_cv_header_pthread_h" >&5
-+echo "$as_me:12429: result: $ac_cv_header_pthread_h" >&5
- echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
- if test $ac_cv_header_pthread_h = yes; then
- 
-@@ -12437,7 +12436,7 @@
- 
- 	for cf_lib_pthread in pthread c_r
- 	do
--	    echo "$as_me:12440: checking if we can link with the $cf_lib_pthread library" >&5
-+	    echo "$as_me:12439: checking if we can link with the $cf_lib_pthread library" >&5
- echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
- 	    cf_save_LIBS="$LIBS"
- 
-@@ -12458,7 +12457,7 @@
- LIBS="$cf_add_libs"
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 12461 "configure"
-+#line 12460 "configure"
- #include "confdefs.h"
- 
- #include <pthread.h>
-@@ -12475,16 +12474,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12478: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12477: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12481: \$? = $ac_status" >&5
-+  echo "$as_me:12480: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12484: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12483: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12487: \$? = $ac_status" >&5
-+  echo "$as_me:12486: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_pthread=yes
- else
-@@ -12494,7 +12493,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	    LIBS="$cf_save_LIBS"
--	    echo "$as_me:12497: result: $with_pthread" >&5
-+	    echo "$as_me:12496: result: $with_pthread" >&5
- echo "${ECHO_T}$with_pthread" >&6
- 	    test "$with_pthread" = yes && break
- 	done
-@@ -12522,7 +12521,7 @@
- EOF
- 
- 	else
--	    { { echo "$as_me:12525: error: Cannot link with pthread library" >&5
-+	    { { echo "$as_me:12524: error: Cannot link with pthread library" >&5
- echo "$as_me: error: Cannot link with pthread library" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
-@@ -12532,13 +12531,13 @@
- fi
- 
- if test "x$with_pthread" != xno; then
--	echo "$as_me:12535: checking for pthread_kill" >&5
-+	echo "$as_me:12534: checking for pthread_kill" >&5
- echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
- if test "${ac_cv_func_pthread_kill+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12541 "configure"
-+#line 12540 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_kill (); below.  */
-@@ -12569,16 +12568,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12572: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12571: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12575: \$? = $ac_status" >&5
-+  echo "$as_me:12574: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12578: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12581: \$? = $ac_status" >&5
-+  echo "$as_me:12580: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_pthread_kill=yes
- else
-@@ -12588,11 +12587,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12591: result: $ac_cv_func_pthread_kill" >&5
-+echo "$as_me:12590: result: $ac_cv_func_pthread_kill" >&5
- echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
- if test $ac_cv_func_pthread_kill = yes; then
- 
--		echo "$as_me:12595: checking if you want to allow EINTR in wgetch with pthreads" >&5
-+		echo "$as_me:12594: checking if you want to allow EINTR in wgetch with pthreads" >&5
- echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
-@@ -12602,7 +12601,7 @@
- else
-   use_pthreads_eintr=no
- fi;
--		echo "$as_me:12605: result: $use_pthreads_eintr" >&5
-+		echo "$as_me:12604: result: $use_pthreads_eintr" >&5
- echo "${ECHO_T}$use_pthreads_eintr" >&6
- 		if test "x$use_pthreads_eintr" = xyes ; then
- 
-@@ -12613,7 +12612,7 @@
- 		fi
- fi
- 
--	echo "$as_me:12616: checking if you want to use weak-symbols for pthreads" >&5
-+	echo "$as_me:12615: checking if you want to use weak-symbols for pthreads" >&5
- echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
- 
- # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
-@@ -12623,18 +12622,18 @@
- else
-   use_weak_symbols=no
- fi;
--	echo "$as_me:12626: result: $use_weak_symbols" >&5
-+	echo "$as_me:12625: result: $use_weak_symbols" >&5
- echo "${ECHO_T}$use_weak_symbols" >&6
- 	if test "x$use_weak_symbols" = xyes ; then
- 
--echo "$as_me:12630: checking if $CC supports weak symbols" >&5
-+echo "$as_me:12629: checking if $CC supports weak symbols" >&5
- echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
- if test "${cf_cv_weak_symbols+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12637 "configure"
-+#line 12636 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -12660,16 +12659,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12663: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12662: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12666: \$? = $ac_status" >&5
-+  echo "$as_me:12665: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12669: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12672: \$? = $ac_status" >&5
-+  echo "$as_me:12671: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_weak_symbols=yes
- else
-@@ -12680,7 +12679,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:12683: result: $cf_cv_weak_symbols" >&5
-+echo "$as_me:12682: result: $cf_cv_weak_symbols" >&5
- echo "${ECHO_T}$cf_cv_weak_symbols" >&6
- 
- 	else
-@@ -12713,7 +12712,7 @@
- # opaque outside of that, so there is no --enable-opaque option.  We can use
- # this option without --with-pthreads, but this will be always set for
- # pthreads.
--echo "$as_me:12716: checking if you want reentrant code" >&5
-+echo "$as_me:12715: checking if you want reentrant code" >&5
- echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
- 
- # Check whether --enable-reentrant or --disable-reentrant was given.
-@@ -12723,7 +12722,7 @@
- else
-   with_reentrant=no
- fi;
--echo "$as_me:12726: result: $with_reentrant" >&5
-+echo "$as_me:12725: result: $with_reentrant" >&5
- echo "${ECHO_T}$with_reentrant" >&6
- if test "x$with_reentrant" = xyes ; then
- 	cf_cv_enable_reentrant=1
-@@ -12796,7 +12795,7 @@
- 	(5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:12799: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:12798: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
-@@ -12811,7 +12810,7 @@
- 
- ### Allow using a different wrap-prefix
- if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
--	echo "$as_me:12814: checking for prefix used to wrap public variables" >&5
-+	echo "$as_me:12813: checking for prefix used to wrap public variables" >&5
- echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
- 
- # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
-@@ -12821,7 +12820,7 @@
- else
-   NCURSES_WRAP_PREFIX=_nc_
- fi;
--	echo "$as_me:12824: result: $NCURSES_WRAP_PREFIX" >&5
-+	echo "$as_me:12823: result: $NCURSES_WRAP_PREFIX" >&5
- echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
- else
- 	NCURSES_WRAP_PREFIX=_nc_
-@@ -12831,7 +12830,7 @@
- #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX"
- EOF
- 
--echo "$as_me:12834: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:12833: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -12841,7 +12840,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:12844: result: $with_safe_sprintf" >&5
-+echo "$as_me:12843: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "x$with_safe_sprintf" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12851,7 +12850,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:12854: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:12853: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -12861,7 +12860,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:12864: result: $with_scroll_hints" >&5
-+echo "$as_me:12863: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "x$with_scroll_hints" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12870,7 +12869,7 @@
- 
- fi
- 
--echo "$as_me:12873: checking if you want wgetch-events code" >&5
-+echo "$as_me:12872: checking if you want wgetch-events code" >&5
- echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -12880,7 +12879,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:12883: result: $with_wgetch_events" >&5
-+echo "$as_me:12882: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "x$with_wgetch_events" = xyes &&
- cat >>confdefs.h <<\EOF
-@@ -12891,7 +12890,7 @@
- 
- ###	use option --disable-echo to suppress full display compiling commands
- 
--echo "$as_me:12894: checking if you want to see long compiling messages" >&5
-+echo "$as_me:12893: checking if you want to see long compiling messages" >&5
- echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -12925,7 +12924,7 @@
- 	ECHO_CC=''
- 
- fi;
--echo "$as_me:12928: result: $enableval" >&5
-+echo "$as_me:12927: result: $enableval" >&5
- echo "${ECHO_T}$enableval" >&6
- 
- if test "x$enable_echo" = xyes; then
-@@ -12937,7 +12936,7 @@
- fi
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:12940: checking if you want to see compiler warnings" >&5
-+echo "$as_me:12939: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -12945,7 +12944,7 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:12948: result: $with_warnings" >&5
-+echo "$as_me:12947: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
- if test "x$with_warnings" = "xyes"; then
-@@ -12957,12 +12956,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:12960: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:12959: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 12965 "configure"
-+#line 12964 "configure"
- #include "confdefs.h"
- 
- int
-@@ -12979,16 +12978,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12982: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12985: \$? = $ac_status" >&5
-+  echo "$as_me:12984: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12987: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12991: \$? = $ac_status" >&5
-+  echo "$as_me:12990: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -12999,7 +12998,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13002: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:13001: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
-@@ -13008,12 +13007,12 @@
- CLANG_COMPILER=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13011: checking if this is really Clang C compiler" >&5
-+	echo "$as_me:13010: checking if this is really Clang C compiler" >&5
- echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13016 "configure"
-+#line 13015 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13030,16 +13029,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13033: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13032: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13036: \$? = $ac_status" >&5
-+  echo "$as_me:13035: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13039: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13042: \$? = $ac_status" >&5
-+  echo "$as_me:13041: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13050,12 +13049,12 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13053: result: $CLANG_COMPILER" >&5
-+	echo "$as_me:13052: result: $CLANG_COMPILER" >&5
- echo "${ECHO_T}$CLANG_COMPILER" >&6
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 13058 "${as_me:-configure}"
-+#line 13057 "${as_me:-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13072,7 +13071,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #279: controlling expression is constant
- 
--	{ echo "$as_me:13075: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13074: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
-@@ -13088,12 +13087,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13091: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13090: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13094: \$? = $ac_status" >&5
-+  echo "$as_me:13093: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13096: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13095: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -13102,7 +13101,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:13105: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13104: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS=
-@@ -13126,12 +13125,12 @@
- 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13129: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13128: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13132: \$? = $ac_status" >&5
-+  echo "$as_me:13131: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13134: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13133: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in
- 			(Wcast-qual)
-@@ -13142,7 +13141,7 @@
- 				([34].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13145: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13144: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13152,7 +13151,7 @@
- 				([12].*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
--echo "${as_me:-configure}:13155: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+echo "${as_me:-configure}:13154: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
- 
- 					continue;;
- 				esac
-@@ -13172,12 +13171,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	(linux*|gnu*)
--		echo "$as_me:13175: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:13174: checking if this is really Intel C++ compiler" >&5
- echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 13180 "configure"
-+#line 13179 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13194,16 +13193,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13197: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13200: \$? = $ac_status" >&5
-+  echo "$as_me:13199: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13206: \$? = $ac_status" >&5
-+  echo "$as_me:13205: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147"
-@@ -13214,7 +13213,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:13217: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:13216: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -13223,12 +13222,12 @@
- CLANG_CPLUSPLUS=no
- 
- if test "$GCC" = yes ; then
--	echo "$as_me:13226: checking if this is really Clang C++ compiler" >&5
-+	echo "$as_me:13225: checking if this is really Clang C++ compiler" >&5
- echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
- 	cf_save_CFLAGS="$CXXFLAGS"
- 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13231 "configure"
-+#line 13230 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13245,16 +13244,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13248: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13247: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13251: \$? = $ac_status" >&5
-+  echo "$as_me:13250: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13254: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13253: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13257: \$? = $ac_status" >&5
-+  echo "$as_me:13256: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CLANG_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
-@@ -13265,7 +13264,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	CXXFLAGS="$cf_save_CFLAGS"
--	echo "$as_me:13268: result: $CLANG_CPLUSPLUS" >&5
-+	echo "$as_me:13267: result: $CLANG_CPLUSPLUS" >&5
- echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
- fi
- 
-@@ -13277,7 +13276,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <<EOF
--#line 13280 "configure"
-+#line 13279 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -13295,7 +13294,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:13298: checking for $CC warning options..." >&5
-+	{ echo "$as_me:13297: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -13312,12 +13311,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:13315: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13314: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13318: \$? = $ac_status" >&5
-+  echo "$as_me:13317: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13320: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13319: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -13326,7 +13325,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:13329: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:13328: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -13356,16 +13355,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:13359: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13358: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13362: \$? = $ac_status" >&5
-+  echo "$as_me:13361: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13364: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13363: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:13368: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:13367: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -13401,10 +13400,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:13404: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:13403: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 13407 "${as_me:-configure}"
-+#line 13406 "${as_me:-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -13453,12 +13452,12 @@
- 			;;
- 		esac
- 
--		if { (eval echo "$as_me:13456: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:13455: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13459: \$? = $ac_status" >&5
-+  echo "$as_me:13458: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:13461: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:13460: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 			case $cf_attribute in
-@@ -13517,7 +13516,7 @@
- rm -rf conftest*
- fi
- 
--echo "$as_me:13520: checking if you want to work around bogus compiler/loader warnings" >&5
-+echo "$as_me:13519: checking if you want to work around bogus compiler/loader warnings" >&5
- echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
- 
- # Check whether --enable-string-hacks or --disable-string-hacks was given.
-@@ -13527,7 +13526,7 @@
- else
-   with_string_hacks=no
- fi;
--echo "$as_me:13530: result: $with_string_hacks" >&5
-+echo "$as_me:13529: result: $with_string_hacks" >&5
- echo "${ECHO_T}$with_string_hacks" >&6
- 
- if test "x$with_string_hacks" = "xyes"; then
-@@ -13536,19 +13535,19 @@
- #define USE_STRING_HACKS 1
- EOF
- 
--	{ echo "$as_me:13539: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
-+	{ echo "$as_me:13538: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
- echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
- 
- for ac_func in strlcat strlcpy snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:13545: checking for $ac_func" >&5
-+echo "$as_me:13544: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13551 "configure"
-+#line 13550 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -13579,16 +13578,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13582: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13581: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13585: \$? = $ac_status" >&5
-+  echo "$as_me:13584: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13587: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13591: \$? = $ac_status" >&5
-+  echo "$as_me:13590: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -13598,7 +13597,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:13601: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:13600: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13611,7 +13610,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:13614: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:13613: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -13621,7 +13620,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:13624: result: $with_assertions" >&5
-+echo "$as_me:13623: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -13637,7 +13636,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:13640: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:13639: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -13654,7 +13653,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:13657: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:13656: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13748,23 +13747,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:13751: checking for dmalloc.h" >&5
-+	echo "$as_me:13750: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13757 "configure"
-+#line 13756 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13761: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13760: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13767: \$? = $ac_status" >&5
-+  echo "$as_me:13766: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13783,11 +13782,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13786: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:13785: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:13790: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:13789: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13795,7 +13794,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13798 "configure"
-+#line 13797 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -13814,16 +13813,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13817: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13816: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13820: \$? = $ac_status" >&5
-+  echo "$as_me:13819: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13823: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13822: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13826: \$? = $ac_status" >&5
-+  echo "$as_me:13825: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -13834,7 +13833,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:13837: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:13836: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13849,7 +13848,7 @@
- 
- fi
- 
--echo "$as_me:13852: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:13851: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -13866,7 +13865,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:13869: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:13868: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in
-@@ -13960,23 +13959,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:13963: checking for dbmalloc.h" >&5
-+	echo "$as_me:13962: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13969 "configure"
-+#line 13968 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:13973: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13972: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13979: \$? = $ac_status" >&5
-+  echo "$as_me:13978: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13995,11 +13994,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13998: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:13997: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:14002: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:14001: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14007,7 +14006,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14010 "configure"
-+#line 14009 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14026,16 +14025,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14029: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14028: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14032: \$? = $ac_status" >&5
-+  echo "$as_me:14031: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14035: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14034: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14038: \$? = $ac_status" >&5
-+  echo "$as_me:14037: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -14046,7 +14045,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14049: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:14048: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14061,7 +14060,7 @@
- 
- fi
- 
--echo "$as_me:14064: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:14063: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -14078,7 +14077,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:14081: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:14080: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in
-@@ -14171,7 +14170,7 @@
- 	;;
- esac
- 
--echo "$as_me:14174: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:14173: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -14181,7 +14180,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:14184: result: $with_no_leaks" >&5
-+echo "$as_me:14183: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -14233,7 +14232,7 @@
- 	;;
- esac
- 
--echo "$as_me:14236: checking whether to add trace feature to all models" >&5
-+echo "$as_me:14235: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -14243,7 +14242,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:14246: result: $cf_with_trace" >&5
-+echo "$as_me:14245: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "x$cf_with_trace" = xyes ; then
-@@ -14333,7 +14332,7 @@
- 	ADA_TRACE=FALSE
- fi
- 
--echo "$as_me:14336: checking if we want to use GNAT projects" >&5
-+echo "$as_me:14335: checking if we want to use GNAT projects" >&5
- echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
- 
- # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
-@@ -14350,7 +14349,7 @@
- 	enable_gnat_projects=yes
- 
- fi;
--echo "$as_me:14353: result: $enable_gnat_projects" >&5
-+echo "$as_me:14352: result: $enable_gnat_projects" >&5
- echo "${ECHO_T}$enable_gnat_projects" >&6
- 
- ###	Checks for libraries.
-@@ -14360,13 +14359,13 @@
- 	LIBS=" -lpsapi $LIBS"
- 	;;
- (*)
--echo "$as_me:14363: checking for gettimeofday" >&5
-+echo "$as_me:14362: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14369 "configure"
-+#line 14368 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -14397,16 +14396,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14399: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14403: \$? = $ac_status" >&5
-+  echo "$as_me:14402: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14409: \$? = $ac_status" >&5
-+  echo "$as_me:14408: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -14416,7 +14415,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14419: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:14418: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
- 
-@@ -14426,7 +14425,7 @@
- 
- else
- 
--echo "$as_me:14429: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:14428: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14434,7 +14433,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14437 "configure"
-+#line 14436 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14453,16 +14452,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14456: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14455: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14459: \$? = $ac_status" >&5
-+  echo "$as_me:14458: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14462: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14461: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14465: \$? = $ac_status" >&5
-+  echo "$as_me:14464: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -14473,7 +14472,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14476: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:14475: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
- 
-@@ -14503,14 +14502,14 @@
- 	;;
- esac
- 
--echo "$as_me:14506: checking if -lm needed for math functions" >&5
-+echo "$as_me:14505: checking if -lm needed for math functions" >&5
- echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
- if test "${cf_cv_need_libm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14513 "configure"
-+#line 14512 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -14525,16 +14524,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14528: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14527: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14531: \$? = $ac_status" >&5
-+  echo "$as_me:14530: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14534: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14533: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14537: \$? = $ac_status" >&5
-+  echo "$as_me:14536: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -14544,7 +14543,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14547: result: $cf_cv_need_libm" >&5
-+echo "$as_me:14546: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -14552,13 +14551,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:14555: checking for ANSI C header files" >&5
-+echo "$as_me:14554: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14561 "configure"
-+#line 14560 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -14566,13 +14565,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:14569: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14568: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:14575: \$? = $ac_status" >&5
-+  echo "$as_me:14574: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -14594,7 +14593,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14597 "configure"
-+#line 14596 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -14612,7 +14611,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14615 "configure"
-+#line 14614 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -14633,7 +14632,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14636 "configure"
-+#line 14635 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -14659,15 +14658,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14662: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14661: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14665: \$? = $ac_status" >&5
-+  echo "$as_me:14664: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14667: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14666: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14670: \$? = $ac_status" >&5
-+  echo "$as_me:14669: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -14680,7 +14679,7 @@
- fi
- fi
- fi
--echo "$as_me:14683: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:14682: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -14693,13 +14692,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:14696: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:14695: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14702 "configure"
-+#line 14701 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -14714,16 +14713,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14716: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14720: \$? = $ac_status" >&5
-+  echo "$as_me:14719: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14722: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14726: \$? = $ac_status" >&5
-+  echo "$as_me:14725: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -14733,7 +14732,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14736: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14735: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -14746,7 +14745,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:14749: checking for opendir in -ldir" >&5
-+  echo "$as_me:14748: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14754,7 +14753,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14757 "configure"
-+#line 14756 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14773,16 +14772,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14776: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14775: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14779: \$? = $ac_status" >&5
-+  echo "$as_me:14778: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14782: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14781: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14785: \$? = $ac_status" >&5
-+  echo "$as_me:14784: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -14793,14 +14792,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14796: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:14795: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:14803: checking for opendir in -lx" >&5
-+  echo "$as_me:14802: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14808,7 +14807,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14811 "configure"
-+#line 14810 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -14827,16 +14826,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14830: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14829: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14833: \$? = $ac_status" >&5
-+  echo "$as_me:14832: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14836: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14835: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14839: \$? = $ac_status" >&5
-+  echo "$as_me:14838: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -14847,7 +14846,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:14850: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:14849: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -14855,13 +14854,13 @@
- 
- fi
- 
--echo "$as_me:14858: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:14857: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14864 "configure"
-+#line 14863 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -14877,16 +14876,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14880: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14879: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14883: \$? = $ac_status" >&5
-+  echo "$as_me:14882: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14886: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14885: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14889: \$? = $ac_status" >&5
-+  echo "$as_me:14888: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -14896,7 +14895,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:14899: result: $ac_cv_header_time" >&5
-+echo "$as_me:14898: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -14915,13 +14914,13 @@
- 	;;
- esac
- 
--echo "$as_me:14918: checking for regcomp" >&5
-+echo "$as_me:14917: checking for regcomp" >&5
- echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
- if test "${ac_cv_func_regcomp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14924 "configure"
-+#line 14923 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char regcomp (); below.  */
-@@ -14952,16 +14951,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14955: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14954: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14958: \$? = $ac_status" >&5
-+  echo "$as_me:14957: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14961: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14960: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14964: \$? = $ac_status" >&5
-+  echo "$as_me:14963: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_regcomp=yes
- else
-@@ -14971,7 +14970,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:14974: result: $ac_cv_func_regcomp" >&5
-+echo "$as_me:14973: result: $ac_cv_func_regcomp" >&5
- echo "${ECHO_T}$ac_cv_func_regcomp" >&6
- if test $ac_cv_func_regcomp = yes; then
-   cf_regex_func=regcomp
-@@ -14980,7 +14979,7 @@
- 	for cf_regex_lib in $cf_regex_libs
- 	do
- 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
--echo "$as_me:14983: checking for regcomp in -l$cf_regex_lib" >&5
-+echo "$as_me:14982: checking for regcomp in -l$cf_regex_lib" >&5
- echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14988,7 +14987,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-l$cf_regex_lib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14991 "configure"
-+#line 14990 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15007,16 +15006,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15010: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15009: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15013: \$? = $ac_status" >&5
-+  echo "$as_me:15012: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15015: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15019: \$? = $ac_status" >&5
-+  echo "$as_me:15018: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Lib=yes"
- else
-@@ -15027,7 +15026,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15030: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-+echo "$as_me:15029: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
-@@ -15056,13 +15055,13 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	echo "$as_me:15059: checking for compile" >&5
-+	echo "$as_me:15058: checking for compile" >&5
- echo $ECHO_N "checking for compile... $ECHO_C" >&6
- if test "${ac_cv_func_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15065 "configure"
-+#line 15064 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char compile (); below.  */
-@@ -15093,16 +15092,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15096: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15095: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15099: \$? = $ac_status" >&5
-+  echo "$as_me:15098: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15102: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15101: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15105: \$? = $ac_status" >&5
-+  echo "$as_me:15104: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_compile=yes
- else
-@@ -15112,13 +15111,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:15115: result: $ac_cv_func_compile" >&5
-+echo "$as_me:15114: result: $ac_cv_func_compile" >&5
- echo "${ECHO_T}$ac_cv_func_compile" >&6
- if test $ac_cv_func_compile = yes; then
-   cf_regex_func=compile
- else
- 
--		echo "$as_me:15121: checking for compile in -lgen" >&5
-+		echo "$as_me:15120: checking for compile in -lgen" >&5
- echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_compile+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15126,7 +15125,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15129 "configure"
-+#line 15128 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15145,16 +15144,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15148: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15147: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15151: \$? = $ac_status" >&5
-+  echo "$as_me:15150: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15154: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15153: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15157: \$? = $ac_status" >&5
-+  echo "$as_me:15156: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_compile=yes
- else
-@@ -15165,7 +15164,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15168: result: $ac_cv_lib_gen_compile" >&5
-+echo "$as_me:15167: result: $ac_cv_lib_gen_compile" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
- if test $ac_cv_lib_gen_compile = yes; then
- 
-@@ -15193,11 +15192,11 @@
- fi
- 
- if test "$cf_regex_func" = no ; then
--	{ echo "$as_me:15196: WARNING: cannot find regular expression library" >&5
-+	{ echo "$as_me:15195: WARNING: cannot find regular expression library" >&5
- echo "$as_me: WARNING: cannot find regular expression library" >&2;}
- fi
- 
--echo "$as_me:15200: checking for regular-expression headers" >&5
-+echo "$as_me:15199: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex_hdrs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15209,7 +15208,7 @@
- 	for cf_regex_hdr in regexp.h regexpr.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15212 "configure"
-+#line 15211 "configure"
- #include "confdefs.h"
- #include <$cf_regex_hdr>
- int
-@@ -15224,16 +15223,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15227: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15226: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15230: \$? = $ac_status" >&5
-+  echo "$as_me:15229: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15233: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15232: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15236: \$? = $ac_status" >&5
-+  echo "$as_me:15235: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15250,7 +15249,7 @@
- 	for cf_regex_hdr in regex.h
- 	do
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15253 "configure"
-+#line 15252 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$cf_regex_hdr>
-@@ -15268,16 +15267,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15271: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15270: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15274: \$? = $ac_status" >&5
-+  echo "$as_me:15273: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15277: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15276: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15280: \$? = $ac_status" >&5
-+  echo "$as_me:15279: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_regex_hdrs=$cf_regex_hdr
-@@ -15293,11 +15292,11 @@
- esac
- 
- fi
--echo "$as_me:15296: result: $cf_cv_regex_hdrs" >&5
-+echo "$as_me:15295: result: $cf_cv_regex_hdrs" >&5
- echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
- 
- case $cf_cv_regex_hdrs in
--	(no)		{ echo "$as_me:15300: WARNING: no regular expression header found" >&5
-+	(no)		{ echo "$as_me:15299: WARNING: no regular expression header found" >&5
- echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
- 	(regex.h)
- cat >>confdefs.h <<\EOF
-@@ -15336,23 +15335,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15339: checking for $ac_header" >&5
-+echo "$as_me:15338: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15345 "configure"
-+#line 15344 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15349: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15348: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15355: \$? = $ac_status" >&5
-+  echo "$as_me:15354: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15371,7 +15370,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15374: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15373: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15384,23 +15383,23 @@
- for ac_header in unistd.h getopt.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:15387: checking for $ac_header" >&5
-+echo "$as_me:15386: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15393 "configure"
-+#line 15392 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:15397: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:15396: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:15403: \$? = $ac_status" >&5
-+  echo "$as_me:15402: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -15419,7 +15418,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:15422: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:15421: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15429,7 +15428,7 @@
- fi
- done
- 
--echo "$as_me:15432: checking for header declaring getopt variables" >&5
-+echo "$as_me:15431: checking for header declaring getopt variables" >&5
- echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
- if test "${cf_cv_getopt_header+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15439,7 +15438,7 @@
- for cf_header in stdio.h stdlib.h unistd.h getopt.h
- do
- cat >conftest.$ac_ext <<_ACEOF
--#line 15442 "configure"
-+#line 15441 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -15452,16 +15451,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15455: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15454: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15458: \$? = $ac_status" >&5
-+  echo "$as_me:15457: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15461: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15460: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15464: \$? = $ac_status" >&5
-+  echo "$as_me:15463: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_getopt_header=$cf_header
-  break
-@@ -15473,7 +15472,7 @@
- done
- 
- fi
--echo "$as_me:15476: result: $cf_cv_getopt_header" >&5
-+echo "$as_me:15475: result: $cf_cv_getopt_header" >&5
- echo "${ECHO_T}$cf_cv_getopt_header" >&6
- if test $cf_cv_getopt_header != none ; then
- 
-@@ -15494,7 +15493,7 @@
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "x$ISC" = xyes ; then
- 
--echo "$as_me:15497: checking for main in -lcposix" >&5
-+echo "$as_me:15496: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15502,7 +15501,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15505 "configure"
-+#line 15504 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15514,16 +15513,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15517: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15516: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15520: \$? = $ac_status" >&5
-+  echo "$as_me:15519: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15523: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15522: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15526: \$? = $ac_status" >&5
-+  echo "$as_me:15525: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -15534,7 +15533,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15537: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:15536: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <<EOF
-@@ -15545,7 +15544,7 @@
- 
- fi
- 
--	echo "$as_me:15548: checking for bzero in -linet" >&5
-+	echo "$as_me:15547: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15553,7 +15552,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 15556 "configure"
-+#line 15555 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -15572,16 +15571,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15574: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:15578: \$? = $ac_status" >&5
-+  echo "$as_me:15577: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:15581: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15580: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15584: \$? = $ac_status" >&5
-+  echo "$as_me:15583: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -15592,7 +15591,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:15595: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:15594: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
- 
-@@ -15615,14 +15614,14 @@
- fi
- fi
- 
--echo "$as_me:15618: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:15617: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 15625 "configure"
-+#line 15624 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15642,16 +15641,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15645: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15644: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15648: \$? = $ac_status" >&5
-+  echo "$as_me:15647: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15651: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15650: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15654: \$? = $ac_status" >&5
-+  echo "$as_me:15653: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -15663,7 +15662,7 @@
- 
- fi
- 
--echo "$as_me:15666: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:15665: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -15678,13 +15677,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:15681: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:15680: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15687 "configure"
-+#line 15686 "configure"
- #include "confdefs.h"
- 
- int
-@@ -15742,16 +15741,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15745: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15748: \$? = $ac_status" >&5
-+  echo "$as_me:15747: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15751: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15754: \$? = $ac_status" >&5
-+  echo "$as_me:15753: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -15761,7 +15760,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:15764: result: $ac_cv_c_const" >&5
-+echo "$as_me:15763: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -15771,7 +15770,7 @@
- 
- fi
- 
--echo "$as_me:15774: checking for inline" >&5
-+echo "$as_me:15773: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15779,7 +15778,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 15782 "configure"
-+#line 15781 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -15788,16 +15787,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15791: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15790: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15794: \$? = $ac_status" >&5
-+  echo "$as_me:15793: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15797: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15796: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15800: \$? = $ac_status" >&5
-+  echo "$as_me:15799: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -15808,7 +15807,7 @@
- done
- 
- fi
--echo "$as_me:15811: result: $ac_cv_c_inline" >&5
-+echo "$as_me:15810: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -15834,7 +15833,7 @@
- 		:
- 	elif test "$GCC" = yes
- 	then
--		echo "$as_me:15837: checking if $CC supports options to tune inlining" >&5
-+		echo "$as_me:15836: checking if $CC supports options to tune inlining" >&5
- echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
- if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15843,7 +15842,7 @@
- 		cf_save_CFLAGS=$CFLAGS
- 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 15846 "configure"
-+#line 15845 "configure"
- #include "confdefs.h"
- inline int foo(void) { return 1; }
- int
-@@ -15855,16 +15854,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:15858: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15857: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:15861: \$? = $ac_status" >&5
-+  echo "$as_me:15860: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:15864: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:15867: \$? = $ac_status" >&5
-+  echo "$as_me:15866: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gcc_inline=yes
- else
-@@ -15876,7 +15875,7 @@
- 		CFLAGS=$cf_save_CFLAGS
- 
- fi
--echo "$as_me:15879: result: $cf_cv_gcc_inline" >&5
-+echo "$as_me:15878: result: $cf_cv_gcc_inline" >&5
- echo "${ECHO_T}$cf_cv_gcc_inline" >&6
- 		if test "$cf_cv_gcc_inline" = yes ; then
- 
-@@ -15962,7 +15961,7 @@
- 	fi
- fi
- 
--echo "$as_me:15965: checking for signal global datatype" >&5
-+echo "$as_me:15964: checking for signal global datatype" >&5
- echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
- if test "${cf_cv_sig_atomic_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15974,7 +15973,7 @@
- 		"int"
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 15977 "configure"
-+#line 15976 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -15997,16 +15996,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15999: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16003: \$? = $ac_status" >&5
-+  echo "$as_me:16002: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16006: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16005: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16009: \$? = $ac_status" >&5
-+  echo "$as_me:16008: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sig_atomic_t=$cf_type
- else
-@@ -16020,7 +16019,7 @@
- 
- fi
- 
--echo "$as_me:16023: result: $cf_cv_sig_atomic_t" >&5
-+echo "$as_me:16022: result: $cf_cv_sig_atomic_t" >&5
- echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
- test "$cf_cv_sig_atomic_t" != no &&
- cat >>confdefs.h <<EOF
-@@ -16029,7 +16028,7 @@
- 
- if test $NCURSES_CHTYPE = auto ; then
- 
--echo "$as_me:16032: checking for type of chtype" >&5
-+echo "$as_me:16031: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- if test "${cf_cv_typeof_chtype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16039,7 +16038,7 @@
-   cf_cv_typeof_chtype=long
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16042 "configure"
-+#line 16041 "configure"
- #include "confdefs.h"
- 
- #define WANT_BITS 31
-@@ -16074,15 +16073,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16076: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16080: \$? = $ac_status" >&5
-+  echo "$as_me:16079: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16082: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16081: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16085: \$? = $ac_status" >&5
-+  echo "$as_me:16084: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -16097,7 +16096,7 @@
- 
- fi
- 
--echo "$as_me:16100: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:16099: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -16109,14 +16108,14 @@
- fi
- test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- 
--echo "$as_me:16112: checking if unsigned literals are legal" >&5
-+echo "$as_me:16111: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16119 "configure"
-+#line 16118 "configure"
- #include "confdefs.h"
- 
- int
-@@ -16128,16 +16127,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16131: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16130: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16134: \$? = $ac_status" >&5
-+  echo "$as_me:16133: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16136: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16140: \$? = $ac_status" >&5
-+  echo "$as_me:16139: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -16149,7 +16148,7 @@
- 
- fi
- 
--echo "$as_me:16152: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:16151: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
-@@ -16165,14 +16164,14 @@
- 
- ###	Checks for external-data
- 
--echo "$as_me:16168: checking if external errno is declared" >&5
-+echo "$as_me:16167: checking if external errno is declared" >&5
- echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16175 "configure"
-+#line 16174 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -16190,16 +16189,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16193: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16192: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16196: \$? = $ac_status" >&5
-+  echo "$as_me:16195: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16202: \$? = $ac_status" >&5
-+  echo "$as_me:16201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -16210,7 +16209,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:16213: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:16212: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -16225,14 +16224,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:16228: checking if external errno exists" >&5
-+echo "$as_me:16227: checking if external errno exists" >&5
- echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
- if test "${cf_cv_have_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16235 "configure"
-+#line 16234 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -16247,16 +16246,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16250: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16249: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16253: \$? = $ac_status" >&5
-+  echo "$as_me:16252: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16256: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16255: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16259: \$? = $ac_status" >&5
-+  echo "$as_me:16258: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -16267,7 +16266,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16270: result: $cf_cv_have_errno" >&5
-+echo "$as_me:16269: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -16280,7 +16279,7 @@
- 
- fi
- 
--echo "$as_me:16283: checking if data-only library module links" >&5
-+echo "$as_me:16282: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16288,20 +16287,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 16291 "configure"
-+#line 16290 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:16294: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16293: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16297: \$? = $ac_status" >&5
-+  echo "$as_me:16296: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 16304 "configure"
-+#line 16303 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -16314,10 +16313,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:16317: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:16316: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16320: \$? = $ac_status" >&5
-+  echo "$as_me:16319: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -16330,7 +16329,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16333 "configure"
-+#line 16332 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -16341,15 +16340,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16344: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16343: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16347: \$? = $ac_status" >&5
-+  echo "$as_me:16346: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16349: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16348: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16352: \$? = $ac_status" >&5
-+  echo "$as_me:16351: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -16364,7 +16363,7 @@
- 
- fi
- 
--echo "$as_me:16367: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:16366: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -16403,13 +16402,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:16406: checking for $ac_func" >&5
-+echo "$as_me:16405: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16412 "configure"
-+#line 16411 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -16440,16 +16439,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16443: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16442: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16446: \$? = $ac_status" >&5
-+  echo "$as_me:16445: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16449: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16448: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16452: \$? = $ac_status" >&5
-+  echo "$as_me:16451: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -16459,7 +16458,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:16462: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:16461: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16471,21 +16470,21 @@
- 
- if test "x$ac_cv_func_getopt" = xno &&
-    test "x$cf_with_progs$cf_with_tests" != xnono; then
--	{ { echo "$as_me:16474: error: getopt is required for building programs" >&5
-+	{ { echo "$as_me:16473: error: getopt is required for building programs" >&5
- echo "$as_me: error: getopt is required for building programs" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "x$with_getcap" = "xyes" ; then
- 
--echo "$as_me:16481: checking for terminal-capability database functions" >&5
-+echo "$as_me:16480: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16488 "configure"
-+#line 16487 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16505,16 +16504,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16508: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16507: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16511: \$? = $ac_status" >&5
-+  echo "$as_me:16510: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16514: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16513: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16517: \$? = $ac_status" >&5
-+  echo "$as_me:16516: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -16525,7 +16524,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16528: result: $cf_cv_cgetent" >&5
-+echo "$as_me:16527: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- 
- if test "$cf_cv_cgetent" = yes
-@@ -16535,14 +16534,14 @@
- #define HAVE_BSD_CGETENT 1
- EOF
- 
--echo "$as_me:16538: checking if cgetent uses const parameter" >&5
-+echo "$as_me:16537: checking if cgetent uses const parameter" >&5
- echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
- if test "${cf_cv_cgetent_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16545 "configure"
-+#line 16544 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -16564,16 +16563,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16567: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16566: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16570: \$? = $ac_status" >&5
-+  echo "$as_me:16569: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16573: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16572: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16576: \$? = $ac_status" >&5
-+  echo "$as_me:16575: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent_const=yes
- else
-@@ -16584,7 +16583,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16587: result: $cf_cv_cgetent_const" >&5
-+echo "$as_me:16586: result: $cf_cv_cgetent_const" >&5
- echo "${ECHO_T}$cf_cv_cgetent_const" >&6
- 	if test "$cf_cv_cgetent_const" = yes
- 	then
-@@ -16598,14 +16597,14 @@
- 
- fi
- 
--echo "$as_me:16601: checking for isascii" >&5
-+echo "$as_me:16600: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16608 "configure"
-+#line 16607 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -16617,16 +16616,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16619: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16623: \$? = $ac_status" >&5
-+  echo "$as_me:16622: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:16626: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16629: \$? = $ac_status" >&5
-+  echo "$as_me:16628: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -16637,7 +16636,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:16640: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:16639: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes &&
- cat >>confdefs.h <<\EOF
-@@ -16645,10 +16644,10 @@
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:16648: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:16647: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 16651 "configure"
-+#line 16650 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -16662,16 +16661,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16665: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16664: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16668: \$? = $ac_status" >&5
-+  echo "$as_me:16667: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16671: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16670: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16674: \$? = $ac_status" >&5
-+  echo "$as_me:16673: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -16679,7 +16678,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16682 "configure"
-+#line 16681 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16694,16 +16693,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16697: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16696: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16700: \$? = $ac_status" >&5
-+  echo "$as_me:16699: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16703: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16702: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16706: \$? = $ac_status" >&5
-+  echo "$as_me:16705: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 
-@@ -16719,11 +16718,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:16722: result: $sigact_bad" >&5
-+echo "$as_me:16721: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:16726: checking if nanosleep really works" >&5
-+echo "$as_me:16725: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16733,7 +16732,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16736 "configure"
-+#line 16735 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -16758,15 +16757,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:16761: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:16764: \$? = $ac_status" >&5
-+  echo "$as_me:16763: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16765: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16769: \$? = $ac_status" >&5
-+  echo "$as_me:16768: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -16778,7 +16777,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:16781: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:16780: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" &&
-@@ -16793,23 +16792,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16796: checking for $ac_header" >&5
-+echo "$as_me:16795: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16802 "configure"
-+#line 16801 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16806: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16805: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16812: \$? = $ac_status" >&5
-+  echo "$as_me:16811: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16828,7 +16827,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16831: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16830: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16843,23 +16842,23 @@
- for ac_header in sys/termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:16846: checking for $ac_header" >&5
-+echo "$as_me:16845: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 16852 "configure"
-+#line 16851 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:16856: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:16855: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:16862: \$? = $ac_status" >&5
-+  echo "$as_me:16861: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -16878,7 +16877,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:16881: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:16880: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -16896,10 +16895,10 @@
- 	(*)	termios_bad=maybe ;;
- 	esac
- 	if test "$termios_bad" = maybe ; then
--	echo "$as_me:16899: checking whether termios.h needs _POSIX_SOURCE" >&5
-+	echo "$as_me:16898: checking whether termios.h needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 16902 "configure"
-+#line 16901 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -16911,16 +16910,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16913: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16917: \$? = $ac_status" >&5
-+  echo "$as_me:16916: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16919: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16923: \$? = $ac_status" >&5
-+  echo "$as_me:16922: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -16928,7 +16927,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 16931 "configure"
-+#line 16930 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -16942,16 +16941,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:16945: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:16944: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:16948: \$? = $ac_status" >&5
-+  echo "$as_me:16947: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:16951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:16950: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:16954: \$? = $ac_status" >&5
-+  echo "$as_me:16953: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -16967,19 +16966,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:16970: result: $termios_bad" >&5
-+	echo "$as_me:16969: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:16975: checking for tcgetattr" >&5
-+echo "$as_me:16974: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 16982 "configure"
-+#line 16981 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -17007,16 +17006,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17009: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17013: \$? = $ac_status" >&5
-+  echo "$as_me:17012: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17015: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17019: \$? = $ac_status" >&5
-+  echo "$as_me:17018: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -17026,21 +17025,21 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17029: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:17028: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:17036: checking for vsscanf function or workaround" >&5
-+echo "$as_me:17035: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17043 "configure"
-+#line 17042 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17056,16 +17055,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17059: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17058: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17062: \$? = $ac_status" >&5
-+  echo "$as_me:17061: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17065: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17064: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17068: \$? = $ac_status" >&5
-+  echo "$as_me:17067: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -17073,7 +17072,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17076 "configure"
-+#line 17075 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17095,16 +17094,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17098: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17097: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17101: \$? = $ac_status" >&5
-+  echo "$as_me:17100: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17104: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17103: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17107: \$? = $ac_status" >&5
-+  echo "$as_me:17106: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -17112,7 +17111,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 17115 "configure"
-+#line 17114 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -17134,16 +17133,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17137: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17136: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17140: \$? = $ac_status" >&5
-+  echo "$as_me:17139: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17143: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17142: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17146: \$? = $ac_status" >&5
-+  echo "$as_me:17145: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -17158,7 +17157,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17161: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:17160: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in
-@@ -17179,7 +17178,7 @@
- ;;
- esac
- 
--echo "$as_me:17182: checking for working mkstemp" >&5
-+echo "$as_me:17181: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17190,7 +17189,7 @@
-   cf_cv_func_mkstemp=maybe
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17193 "configure"
-+#line 17192 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -17228,15 +17227,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17231: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17230: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17234: \$? = $ac_status" >&5
-+  echo "$as_me:17233: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17236: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17235: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17239: \$? = $ac_status" >&5
-+  echo "$as_me:17238: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -17251,16 +17250,16 @@
- fi
- 
- fi
--echo "$as_me:17254: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:17253: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "x$cf_cv_func_mkstemp" = xmaybe ; then
--	echo "$as_me:17257: checking for mkstemp" >&5
-+	echo "$as_me:17256: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17263 "configure"
-+#line 17262 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -17291,16 +17290,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17294: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17293: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17297: \$? = $ac_status" >&5
-+  echo "$as_me:17296: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17300: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17299: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17303: \$? = $ac_status" >&5
-+  echo "$as_me:17302: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -17310,7 +17309,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17313: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:17312: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- fi
-@@ -17331,21 +17330,21 @@
- fi
- 
- if test "x$cross_compiling" = xyes ; then
--	{ echo "$as_me:17334: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:17333: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:17337: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:17336: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:17343: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:17342: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17348 "configure"
-+#line 17347 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -17362,15 +17361,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17365: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17364: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17368: \$? = $ac_status" >&5
-+  echo "$as_me:17367: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17370: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17369: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17373: \$? = $ac_status" >&5
-+  echo "$as_me:17372: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -17383,7 +17382,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:17386: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:17385: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -17394,13 +17393,13 @@
- fi
- 
- fi
--echo "$as_me:17397: checking for intptr_t" >&5
-+echo "$as_me:17396: checking for intptr_t" >&5
- echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
- if test "${ac_cv_type_intptr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17403 "configure"
-+#line 17402 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17415,16 +17414,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17418: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17417: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17421: \$? = $ac_status" >&5
-+  echo "$as_me:17420: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17424: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17427: \$? = $ac_status" >&5
-+  echo "$as_me:17426: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_intptr_t=yes
- else
-@@ -17434,7 +17433,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17437: result: $ac_cv_type_intptr_t" >&5
-+echo "$as_me:17436: result: $ac_cv_type_intptr_t" >&5
- echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
- if test $ac_cv_type_intptr_t = yes; then
-   :
-@@ -17446,13 +17445,13 @@
- 
- fi
- 
--echo "$as_me:17449: checking for ssize_t" >&5
-+echo "$as_me:17448: checking for ssize_t" >&5
- echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
- if test "${ac_cv_type_ssize_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17455 "configure"
-+#line 17454 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -17467,16 +17466,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17470: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17469: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17473: \$? = $ac_status" >&5
-+  echo "$as_me:17472: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17476: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17475: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17479: \$? = $ac_status" >&5
-+  echo "$as_me:17478: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_ssize_t=yes
- else
-@@ -17486,7 +17485,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:17489: result: $ac_cv_type_ssize_t" >&5
-+echo "$as_me:17488: result: $ac_cv_type_ssize_t" >&5
- echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
- if test $ac_cv_type_ssize_t = yes; then
-   :
-@@ -17498,14 +17497,14 @@
- 
- fi
- 
--echo "$as_me:17501: checking for type sigaction_t" >&5
-+echo "$as_me:17500: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17508 "configure"
-+#line 17507 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -17518,16 +17517,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17521: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17524: \$? = $ac_status" >&5
-+  echo "$as_me:17523: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17527: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17526: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17530: \$? = $ac_status" >&5
-+  echo "$as_me:17529: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -17538,14 +17537,14 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:17541: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:17540: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes &&
- cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:17548: checking declaration of size-change" >&5
-+echo "$as_me:17547: checking declaration of size-change" >&5
- echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
- if test "${cf_cv_sizechange+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17560,7 +17559,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 17563 "configure"
-+#line 17562 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -17604,16 +17603,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:17607: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:17606: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:17610: \$? = $ac_status" >&5
-+  echo "$as_me:17609: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:17613: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17612: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17616: \$? = $ac_status" >&5
-+  echo "$as_me:17615: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -17632,7 +17631,7 @@
- done
- 
- fi
--echo "$as_me:17635: result: $cf_cv_sizechange" >&5
-+echo "$as_me:17634: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 
-@@ -17650,13 +17649,13 @@
- 	esac
- fi
- 
--echo "$as_me:17653: checking for memmove" >&5
-+echo "$as_me:17652: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17659 "configure"
-+#line 17658 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -17687,16 +17686,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17690: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17689: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17693: \$? = $ac_status" >&5
-+  echo "$as_me:17692: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17695: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17699: \$? = $ac_status" >&5
-+  echo "$as_me:17698: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -17706,19 +17705,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17709: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:17708: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:17715: checking for bcopy" >&5
-+echo "$as_me:17714: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17721 "configure"
-+#line 17720 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -17749,16 +17748,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17752: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17751: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17755: \$? = $ac_status" >&5
-+  echo "$as_me:17754: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17758: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17761: \$? = $ac_status" >&5
-+  echo "$as_me:17760: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -17768,11 +17767,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17771: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:17770: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:17775: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:17774: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17782,7 +17781,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17785 "configure"
-+#line 17784 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -17796,15 +17795,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17799: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17798: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17802: \$? = $ac_status" >&5
-+  echo "$as_me:17801: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17803: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17807: \$? = $ac_status" >&5
-+  echo "$as_me:17806: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -17817,7 +17816,7 @@
- fi
- 
- fi
--echo "$as_me:17820: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:17819: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -17844,13 +17843,13 @@
- for ac_func in posix_openpt
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:17847: checking for $ac_func" >&5
-+echo "$as_me:17846: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17853 "configure"
-+#line 17852 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -17881,16 +17880,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:17884: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17883: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17887: \$? = $ac_status" >&5
-+  echo "$as_me:17886: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:17890: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17889: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17893: \$? = $ac_status" >&5
-+  echo "$as_me:17892: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -17900,7 +17899,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:17903: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:17902: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -17910,7 +17909,7 @@
- fi
- done
-  }
--echo "$as_me:17913: checking if poll really works" >&5
-+echo "$as_me:17912: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -17920,7 +17919,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 17923 "configure"
-+#line 17922 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -17972,15 +17971,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:17975: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:17974: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:17978: \$? = $ac_status" >&5
-+  echo "$as_me:17977: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:17980: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:17979: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:17983: \$? = $ac_status" >&5
-+  echo "$as_me:17982: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -17992,21 +17991,21 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:17995: result: $cf_cv_working_poll" >&5
-+echo "$as_me:17994: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" &&
- cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
--echo "$as_me:18002: checking for va_copy" >&5
-+echo "$as_me:18001: checking for va_copy" >&5
- echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
- if test "${cf_cv_have_va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18009 "configure"
-+#line 18008 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -18023,16 +18022,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18026: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18025: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18029: \$? = $ac_status" >&5
-+  echo "$as_me:18028: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18032: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18031: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18035: \$? = $ac_status" >&5
-+  echo "$as_me:18034: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_va_copy=yes
- else
-@@ -18042,7 +18041,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18045: result: $cf_cv_have_va_copy" >&5
-+echo "$as_me:18044: result: $cf_cv_have_va_copy" >&5
- echo "${ECHO_T}$cf_cv_have_va_copy" >&6
- 
- test "$cf_cv_have_va_copy" = yes &&
-@@ -18050,14 +18049,14 @@
- #define HAVE_VA_COPY 1
- EOF
- 
--echo "$as_me:18053: checking for __va_copy" >&5
-+echo "$as_me:18052: checking for __va_copy" >&5
- echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
- if test "${cf_cv_have___va_copy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 18060 "configure"
-+#line 18059 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -18074,16 +18073,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18077: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18076: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18080: \$? = $ac_status" >&5
-+  echo "$as_me:18079: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18083: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18082: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18086: \$? = $ac_status" >&5
-+  echo "$as_me:18085: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have___va_copy=yes
- else
-@@ -18093,7 +18092,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18096: result: $cf_cv_have___va_copy" >&5
-+echo "$as_me:18095: result: $cf_cv_have___va_copy" >&5
- echo "${ECHO_T}$cf_cv_have___va_copy" >&6
- 
- test "$cf_cv_have___va_copy" = yes &&
-@@ -18101,13 +18100,13 @@
- #define HAVE___VA_COPY 1
- EOF
- 
--echo "$as_me:18104: checking for pid_t" >&5
-+echo "$as_me:18103: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18110 "configure"
-+#line 18109 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -18122,16 +18121,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18125: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18124: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18128: \$? = $ac_status" >&5
-+  echo "$as_me:18127: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18131: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18130: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18134: \$? = $ac_status" >&5
-+  echo "$as_me:18133: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -18141,7 +18140,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:18144: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:18143: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
-@@ -18156,23 +18155,23 @@
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:18159: checking for $ac_header" >&5
-+echo "$as_me:18158: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18165 "configure"
-+#line 18164 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:18169: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18168: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18175: \$? = $ac_status" >&5
-+  echo "$as_me:18174: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -18191,7 +18190,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:18194: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:18193: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18204,13 +18203,13 @@
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:18207: checking for $ac_func" >&5
-+echo "$as_me:18206: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18213 "configure"
-+#line 18212 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -18241,16 +18240,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18244: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18243: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18247: \$? = $ac_status" >&5
-+  echo "$as_me:18246: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18249: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18253: \$? = $ac_status" >&5
-+  echo "$as_me:18252: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -18260,7 +18259,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:18263: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:18262: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -18272,7 +18271,7 @@
- 
- ac_cv_func_fork_works=$ac_cv_func_fork
- if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:18275: checking for working fork" >&5
-+  echo "$as_me:18274: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18295,15 +18294,15 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18298: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18297: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18301: \$? = $ac_status" >&5
-+  echo "$as_me:18300: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18303: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18302: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18306: \$? = $ac_status" >&5
-+  echo "$as_me:18305: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-@@ -18315,7 +18314,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18318: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:18317: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -18329,12 +18328,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:18332: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18331: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:18337: checking for working vfork" >&5
-+  echo "$as_me:18336: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18343,7 +18342,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18346 "configure"
-+#line 18345 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -18440,15 +18439,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:18443: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18442: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18446: \$? = $ac_status" >&5
-+  echo "$as_me:18445: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:18448: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18451: \$? = $ac_status" >&5
-+  echo "$as_me:18450: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-@@ -18460,13 +18459,13 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:18463: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:18462: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:18469: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
-+  { echo "$as_me:18468: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
- echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
- fi
- 
-@@ -18493,7 +18492,7 @@
- 
- # special check for test/ditto.c
- 
--echo "$as_me:18496: checking for openpty in -lutil" >&5
-+echo "$as_me:18495: checking for openpty in -lutil" >&5
- echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
- if test "${ac_cv_lib_util_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18501,7 +18500,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lutil  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 18504 "configure"
-+#line 18503 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -18520,16 +18519,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18523: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18522: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18526: \$? = $ac_status" >&5
-+  echo "$as_me:18525: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18529: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18528: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18532: \$? = $ac_status" >&5
-+  echo "$as_me:18531: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_util_openpty=yes
- else
-@@ -18540,7 +18539,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:18543: result: $ac_cv_lib_util_openpty" >&5
-+echo "$as_me:18542: result: $ac_cv_lib_util_openpty" >&5
- echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
- if test $ac_cv_lib_util_openpty = yes; then
-   cf_cv_lib_util=yes
-@@ -18548,7 +18547,7 @@
-   cf_cv_lib_util=no
- fi
- 
--echo "$as_me:18551: checking for openpty header" >&5
-+echo "$as_me:18550: checking for openpty header" >&5
- echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
- if test "${cf_cv_func_openpty+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18575,7 +18574,7 @@
- 	for cf_header in pty.h libutil.h util.h
- 	do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 18578 "configure"
-+#line 18577 "configure"
- #include "confdefs.h"
- 
- #include <$cf_header>
-@@ -18592,16 +18591,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:18595: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:18598: \$? = $ac_status" >&5
-+  echo "$as_me:18597: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:18601: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18604: \$? = $ac_status" >&5
-+  echo "$as_me:18603: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cf_cv_func_openpty=$cf_header
-@@ -18619,7 +18618,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:18622: result: $cf_cv_func_openpty" >&5
-+echo "$as_me:18621: result: $cf_cv_func_openpty" >&5
- echo "${ECHO_T}$cf_cv_func_openpty" >&6
- 
- if test "$cf_cv_func_openpty" != no ; then
-@@ -18689,7 +18688,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18692 "configure"
-+#line 18691 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18701,16 +18700,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18704: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18703: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18707: \$? = $ac_status" >&5
-+  echo "$as_me:18706: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18710: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18709: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18713: \$? = $ac_status" >&5
-+  echo "$as_me:18712: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18727,7 +18726,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18730: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18729: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18763,7 +18762,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18766: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18765: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18774,7 +18773,7 @@
- 	else
- 		case "$with_hashed_db" in
- 		(./*|../*|/*)
--			{ echo "$as_me:18777: WARNING: no such directory $with_hashed_db" >&5
-+			{ echo "$as_me:18776: WARNING: no such directory $with_hashed_db" >&5
- echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
- 			;;
- 		(*)
-@@ -18843,7 +18842,7 @@
- 			  cf_save_CPPFLAGS=$CPPFLAGS
- 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 			  cat >conftest.$ac_ext <<_ACEOF
--#line 18846 "configure"
-+#line 18845 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -18855,16 +18854,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:18858: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:18857: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:18861: \$? = $ac_status" >&5
-+  echo "$as_me:18860: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:18864: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:18863: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:18867: \$? = $ac_status" >&5
-+  echo "$as_me:18866: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -18881,7 +18880,7 @@
- 		if test "$cf_have_incdir" = no ; then
- 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
- 
--echo "${as_me:-configure}:18884: testing adding $cf_add_incdir to include-path ..." 1>&5
-+echo "${as_me:-configure}:18883: testing adding $cf_add_incdir to include-path ..." 1>&5
- 
- 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
- 
-@@ -18961,7 +18960,7 @@
- 			if test "$cf_have_libdir" = no ; then
- 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
- 
--echo "${as_me:-configure}:18964: testing adding $cf_add_libdir to library-path ..." 1>&5
-+echo "${as_me:-configure}:18963: testing adding $cf_add_libdir to library-path ..." 1>&5
- 
- 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
- 			fi
-@@ -18978,23 +18977,23 @@
- 	fi
- esac
- 
--echo "$as_me:18981: checking for db.h" >&5
-+echo "$as_me:18980: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 18987 "configure"
-+#line 18986 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:18991: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:18990: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:18997: \$? = $ac_status" >&5
-+  echo "$as_me:18996: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -19013,11 +19012,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19016: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:19015: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:19020: checking for version of db" >&5
-+echo "$as_me:19019: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19028,10 +19027,10 @@
- for cf_db_version in 1 2 3 4 5 6
- do
- 
--echo "${as_me:-configure}:19031: testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me:-configure}:19030: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19034 "configure"
-+#line 19033 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19061,16 +19060,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19067: \$? = $ac_status" >&5
-+  echo "$as_me:19066: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19069: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19073: \$? = $ac_status" >&5
-+  echo "$as_me:19072: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -19084,16 +19083,16 @@
- done
- 
- fi
--echo "$as_me:19087: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:19086: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:19091: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:19090: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:19096: checking for db libraries" >&5
-+echo "$as_me:19095: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19123,10 +19122,10 @@
- 
- 	fi
- 
--echo "${as_me:-configure}:19126: testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me:-configure}:19125: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19129 "configure"
-+#line 19128 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -19181,16 +19180,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19184: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19183: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19187: \$? = $ac_status" >&5
-+  echo "$as_me:19186: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19190: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19189: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19193: \$? = $ac_status" >&5
-+  echo "$as_me:19192: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -19210,11 +19209,11 @@
- done
- 
- fi
--echo "$as_me:19213: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:19212: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:19217: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:19216: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -19240,7 +19239,7 @@
- 
- else
- 
--	{ { echo "$as_me:19243: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:19242: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -19255,7 +19254,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:19258: checking if we should include stdbool.h" >&5
-+echo "$as_me:19257: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -19263,7 +19262,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19266 "configure"
-+#line 19265 "configure"
- #include "confdefs.h"
- 
- int
-@@ -19275,23 +19274,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19278: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19277: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19281: \$? = $ac_status" >&5
-+  echo "$as_me:19280: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19284: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19283: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19287: \$? = $ac_status" >&5
-+  echo "$as_me:19286: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19294 "configure"
-+#line 19293 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -19307,16 +19306,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19310: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19309: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19313: \$? = $ac_status" >&5
-+  echo "$as_me:19312: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19316: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19315: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19319: \$? = $ac_status" >&5
-+  echo "$as_me:19318: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -19330,13 +19329,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:19333: result: yes" >&5
-+then	echo "$as_me:19332: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19335: result: no" >&5
-+else	echo "$as_me:19334: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:19339: checking for builtin bool type" >&5
-+echo "$as_me:19338: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -19344,7 +19343,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19347 "configure"
-+#line 19346 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -19359,16 +19358,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:19362: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:19361: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:19365: \$? = $ac_status" >&5
-+  echo "$as_me:19364: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:19368: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19367: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19371: \$? = $ac_status" >&5
-+  echo "$as_me:19370: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -19381,9 +19380,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:19384: result: yes" >&5
-+then	echo "$as_me:19383: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:19386: result: no" >&5
-+else	echo "$as_me:19385: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19400,10 +19399,10 @@
- 
- 	cf_save="$LIBS"
- 	LIBS="$LIBS $CXXLIBS"
--	echo "$as_me:19403: checking if we already have C++ library" >&5
-+	echo "$as_me:19402: checking if we already have C++ library" >&5
- echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19406 "configure"
-+#line 19405 "configure"
- #include "confdefs.h"
- 
- 			#include <iostream>
-@@ -19417,16 +19416,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19419: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19423: \$? = $ac_status" >&5
-+  echo "$as_me:19422: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19425: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19429: \$? = $ac_status" >&5
-+  echo "$as_me:19428: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_have_libstdcpp=yes
- else
-@@ -19435,7 +19434,7 @@
- cf_have_libstdcpp=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:19438: result: $cf_have_libstdcpp" >&5
-+	echo "$as_me:19437: result: $cf_have_libstdcpp" >&5
- echo "${ECHO_T}$cf_have_libstdcpp" >&6
- 	LIBS="$cf_save"
- 
-@@ -19454,7 +19453,7 @@
- 			;;
- 		esac
- 
--		echo "$as_me:19457: checking for library $cf_stdcpp_libname" >&5
-+		echo "$as_me:19456: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19480,7 +19479,7 @@
- LIBS="$cf_add_libs"
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 19483 "configure"
-+#line 19482 "configure"
- #include "confdefs.h"
- 
- 				#include <iostream>
-@@ -19494,16 +19493,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19497: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19496: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19500: \$? = $ac_status" >&5
-+  echo "$as_me:19499: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19503: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19502: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19506: \$? = $ac_status" >&5
-+  echo "$as_me:19505: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -19515,7 +19514,7 @@
- 			LIBS="$cf_save"
- 
- fi
--echo "$as_me:19518: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:19517: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- 		test "$cf_cv_libstdcpp" = yes && {
- cf_add_libs="-l$cf_stdcpp_libname"
-@@ -19537,7 +19536,7 @@
- 	fi
- fi
- 
--	echo "$as_me:19540: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:19539: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19553,15 +19552,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:19556: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:19555: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19559: \$? = $ac_status" >&5
-+  echo "$as_me:19558: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:19561: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:19560: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19564: \$? = $ac_status" >&5
-+  echo "$as_me:19563: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -19572,10 +19571,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:19575: result: yes" >&5
-+  echo "$as_me:19574: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:19578: result: no" >&5
-+  echo "$as_me:19577: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -19595,7 +19594,7 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:19598: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:19597: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 
-@@ -19616,7 +19615,7 @@
- LIBS="$cf_add_libs"
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 19619 "configure"
-+#line 19618 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -19630,16 +19629,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19633: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19632: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19636: \$? = $ac_status" >&5
-+  echo "$as_me:19635: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19639: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19642: \$? = $ac_status" >&5
-+  echo "$as_me:19641: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19676,7 +19675,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 19679 "configure"
-+#line 19678 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -19690,16 +19689,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:19693: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:19692: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:19696: \$? = $ac_status" >&5
-+  echo "$as_me:19695: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:19699: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:19698: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:19702: \$? = $ac_status" >&5
-+  echo "$as_me:19701: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 
-@@ -19732,7 +19731,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:19735: result: $cf_cxx_library" >&5
-+	echo "$as_me:19734: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -19748,7 +19747,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:19751: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:19750: checking how to run the C++ preprocessor" >&5
- echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-@@ -19765,18 +19764,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19768 "configure"
-+#line 19767 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19773: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19772: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19779: \$? = $ac_status" >&5
-+  echo "$as_me:19778: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19799,17 +19798,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19802 "configure"
-+#line 19801 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19806: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19805: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19812: \$? = $ac_status" >&5
-+  echo "$as_me:19811: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19846,7 +19845,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:19849: result: $CXXCPP" >&5
-+echo "$as_me:19848: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -19856,18 +19855,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19859 "configure"
-+#line 19858 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:19864: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19863: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19870: \$? = $ac_status" >&5
-+  echo "$as_me:19869: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19890,17 +19889,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19893 "configure"
-+#line 19892 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:19897: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19896: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19903: \$? = $ac_status" >&5
-+  echo "$as_me:19902: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19928,7 +19927,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:19931: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:19930: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -19943,23 +19942,23 @@
- for ac_header in typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19946: checking for $ac_header" >&5
-+echo "$as_me:19945: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 19952 "configure"
-+#line 19951 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:19956: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:19955: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:19962: \$? = $ac_status" >&5
-+  echo "$as_me:19961: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -19978,7 +19977,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:19981: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:19980: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -19991,23 +19990,23 @@
- for ac_header in iostream
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:19994: checking for $ac_header" >&5
-+echo "$as_me:19993: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20000 "configure"
-+#line 19999 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:20004: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:20003: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:20010: \$? = $ac_status" >&5
-+  echo "$as_me:20009: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -20026,7 +20025,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:20029: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:20028: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -20037,10 +20036,10 @@
- done
- 
- if test x"$ac_cv_header_iostream" = xyes ; then
--	echo "$as_me:20040: checking if iostream uses std-namespace" >&5
-+	echo "$as_me:20039: checking if iostream uses std-namespace" >&5
- echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20043 "configure"
-+#line 20042 "configure"
- #include "confdefs.h"
- 
- #include <iostream>
-@@ -20057,16 +20056,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20060: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20059: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20063: \$? = $ac_status" >&5
-+  echo "$as_me:20062: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20066: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20065: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20069: \$? = $ac_status" >&5
-+  echo "$as_me:20068: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_iostream_namespace=yes
- else
-@@ -20075,7 +20074,7 @@
- cf_iostream_namespace=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:20078: result: $cf_iostream_namespace" >&5
-+	echo "$as_me:20077: result: $cf_iostream_namespace" >&5
- echo "${ECHO_T}$cf_iostream_namespace" >&6
- 	if test "$cf_iostream_namespace" = yes ; then
- 
-@@ -20086,7 +20085,7 @@
- 	fi
- fi
- 
--echo "$as_me:20089: checking if we should include stdbool.h" >&5
-+echo "$as_me:20088: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -20094,7 +20093,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20097 "configure"
-+#line 20096 "configure"
- #include "confdefs.h"
- 
- int
-@@ -20106,23 +20105,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20109: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20108: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20112: \$? = $ac_status" >&5
-+  echo "$as_me:20111: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20115: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20118: \$? = $ac_status" >&5
-+  echo "$as_me:20117: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 20125 "configure"
-+#line 20124 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -20138,16 +20137,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20141: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20140: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20144: \$? = $ac_status" >&5
-+  echo "$as_me:20143: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20150: \$? = $ac_status" >&5
-+  echo "$as_me:20149: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -20161,13 +20160,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:20164: result: yes" >&5
-+then	echo "$as_me:20163: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20166: result: no" >&5
-+else	echo "$as_me:20165: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20170: checking for builtin bool type" >&5
-+echo "$as_me:20169: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -20175,7 +20174,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20178 "configure"
-+#line 20177 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -20190,16 +20189,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20193: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20192: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20196: \$? = $ac_status" >&5
-+  echo "$as_me:20195: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20199: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20198: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20202: \$? = $ac_status" >&5
-+  echo "$as_me:20201: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -20212,13 +20211,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:20215: result: yes" >&5
-+then	echo "$as_me:20214: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:20217: result: no" >&5
-+else	echo "$as_me:20216: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:20221: checking for size of bool" >&5
-+echo "$as_me:20220: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20229,7 +20228,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20232 "configure"
-+#line 20231 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20271,15 +20270,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20273: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20277: \$? = $ac_status" >&5
-+  echo "$as_me:20276: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20278: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20282: \$? = $ac_status" >&5
-+  echo "$as_me:20281: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20297,18 +20296,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20300: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20299: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20306: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20305: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:20311: checking for special defines needed for etip.h" >&5
-+echo "$as_me:20310: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -20326,7 +20325,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 20329 "configure"
-+#line 20328 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -20340,16 +20339,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20343: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20342: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20346: \$? = $ac_status" >&5
-+  echo "$as_me:20345: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20349: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20352: \$? = $ac_status" >&5
-+  echo "$as_me:20351: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -20370,12 +20369,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:20373: result: $cf_result" >&5
-+echo "$as_me:20372: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:20378: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:20377: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20392,7 +20391,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20395 "configure"
-+#line 20394 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -20411,15 +20410,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20414: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20413: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20417: \$? = $ac_status" >&5
-+  echo "$as_me:20416: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20419: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20418: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20422: \$? = $ac_status" >&5
-+  echo "$as_me:20421: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -20438,7 +20437,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20441: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:20440: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes &&
-@@ -20448,7 +20447,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:20451: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:20450: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20462,7 +20461,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 20465 "configure"
-+#line 20464 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -20506,16 +20505,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:20509: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:20508: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:20512: \$? = $ac_status" >&5
-+  echo "$as_me:20511: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:20515: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20514: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20518: \$? = $ac_status" >&5
-+  echo "$as_me:20517: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -20533,7 +20532,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:20536: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:20535: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -20582,7 +20581,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:20585: checking for size of bool" >&5
-+echo "$as_me:20584: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20593,7 +20592,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 20596 "configure"
-+#line 20595 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -20635,15 +20634,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:20638: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:20637: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:20641: \$? = $ac_status" >&5
-+  echo "$as_me:20640: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:20643: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:20642: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:20646: \$? = $ac_status" >&5
-+  echo "$as_me:20645: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -20661,25 +20660,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:20664: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:20663: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in
- 	(.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:20670: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:20669: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:20676: checking for fallback type of bool" >&5
-+			echo "$as_me:20675: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in
- 			(i?86)	cf_cv_type_of_bool=char	;;
- 			(*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:20682: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:20681: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -20708,7 +20707,7 @@
- 
- 	if test "$cf_with_ada" != "no" ; then
- 		if test "$with_libtool" != "no"; then
--			{ echo "$as_me:20711: WARNING: libtool does not support Ada - disabling feature" >&5
-+			{ echo "$as_me:20710: WARNING: libtool does not support Ada - disabling feature" >&5
- echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
- 			cf_with_ada=no
- 		fi
-@@ -20719,7 +20718,7 @@
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:20722: checking for $ac_word" >&5
-+echo "$as_me:20721: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20734,7 +20733,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:20737: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20736: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20743,10 +20742,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:20746: result: $gnat_exists" >&5
-+  echo "$as_me:20745: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:20749: result: no" >&5
-+  echo "$as_me:20748: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20755,12 +20754,12 @@
- 	cf_cv_prog_gnat_correct=no
- else
- 
--echo "$as_me:20758: checking for gnat version" >&5
-+echo "$as_me:20757: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
- 	grep '[0-9].[0-9][0-9]*' |\
- 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:20763: result: $cf_gnat_version" >&5
-+echo "$as_me:20762: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -20768,7 +20767,7 @@
- 	cf_cv_prog_gnat_correct=yes
- 	;;
- (*)
--	{ echo "$as_me:20771: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
-+	{ echo "$as_me:20770: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
- echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
- 	cf_cv_prog_gnat_correct=no
- 	;;
-@@ -20776,7 +20775,7 @@
- 
- 	# Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:20779: checking for $ac_word" >&5
-+echo "$as_me:20778: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20791,7 +20790,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:20794: found $ac_dir/$ac_word" >&5
-+echo "$as_me:20793: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -20800,10 +20799,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:20803: result: $M4_exists" >&5
-+  echo "$as_me:20802: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:20806: result: no" >&5
-+  echo "$as_me:20805: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -20812,7 +20811,7 @@
- 		echo Ada95 binding required program m4 not found. Ada95 binding disabled.
- 	fi
- 	if test "$cf_cv_prog_gnat_correct" = yes; then
--		echo "$as_me:20815: checking if GNAT works" >&5
-+		echo "$as_me:20814: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -rf conftest* *~conftest*
-@@ -20840,7 +20839,7 @@
- fi
- rm -rf conftest* *~conftest*
- 
--		echo "$as_me:20843: result: $cf_cv_prog_gnat_correct" >&5
-+		echo "$as_me:20842: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
- 	fi
- fi
-@@ -20849,7 +20848,7 @@
- 
-  	ADAFLAGS="$ADAFLAGS -gnatpn"
- 
--	echo "$as_me:20852: checking optimization options for ADAFLAGS" >&5
-+	echo "$as_me:20851: checking optimization options for ADAFLAGS" >&5
- echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
- 	case "$CFLAGS" in
- 	(*-g*)
-@@ -20866,10 +20865,10 @@
- 
- 		;;
- 	esac
--	echo "$as_me:20869: result: $ADAFLAGS" >&5
-+	echo "$as_me:20868: result: $ADAFLAGS" >&5
- echo "${ECHO_T}$ADAFLAGS" >&6
- 
--echo "$as_me:20872: checking if GNATPREP supports -T option" >&5
-+echo "$as_me:20871: checking if GNATPREP supports -T option" >&5
- echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
- if test "${cf_cv_gnatprep_opt_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20879,11 +20878,11 @@
- gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
- 
- fi
--echo "$as_me:20882: result: $cf_cv_gnatprep_opt_t" >&5
-+echo "$as_me:20881: result: $cf_cv_gnatprep_opt_t" >&5
- echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
- test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
- 
--echo "$as_me:20886: checking if GNAT supports generics" >&5
-+echo "$as_me:20885: checking if GNAT supports generics" >&5
- echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[1-9]*|[4-9].*)
-@@ -20893,7 +20892,7 @@
- 	cf_gnat_generics=no
- 	;;
- esac
--echo "$as_me:20896: result: $cf_gnat_generics" >&5
-+echo "$as_me:20895: result: $cf_gnat_generics" >&5
- echo "${ECHO_T}$cf_gnat_generics" >&6
- 
- if test "$cf_gnat_generics" = yes
-@@ -20905,7 +20904,7 @@
- 	cf_generic_objects=
- fi
- 
--echo "$as_me:20908: checking if GNAT supports SIGINT" >&5
-+echo "$as_me:20907: checking if GNAT supports SIGINT" >&5
- echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
- if test "${cf_cv_gnat_sigint+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -20953,7 +20952,7 @@
- rm -rf conftest* *~conftest*
- 
- fi
--echo "$as_me:20956: result: $cf_cv_gnat_sigint" >&5
-+echo "$as_me:20955: result: $cf_cv_gnat_sigint" >&5
- echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
- 
- if test $cf_cv_gnat_sigint = yes ; then
-@@ -20966,7 +20965,7 @@
- cf_gnat_projects=no
- 
- if test "$enable_gnat_projects" != no ; then
--echo "$as_me:20969: checking if GNAT supports project files" >&5
-+echo "$as_me:20968: checking if GNAT supports project files" >&5
- echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
- case $cf_gnat_version in
- (3.[0-9]*)
-@@ -21026,15 +21025,15 @@
- 	esac
- 	;;
- esac
--echo "$as_me:21029: result: $cf_gnat_projects" >&5
-+echo "$as_me:21028: result: $cf_gnat_projects" >&5
- echo "${ECHO_T}$cf_gnat_projects" >&6
- fi # enable_gnat_projects
- 
- if test $cf_gnat_projects = yes
- then
--	echo "$as_me:21035: checking if GNAT supports libraries" >&5
-+	echo "$as_me:21034: checking if GNAT supports libraries" >&5
- echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
--	echo "$as_me:21037: result: $cf_gnat_libraries" >&5
-+	echo "$as_me:21036: result: $cf_gnat_libraries" >&5
- echo "${ECHO_T}$cf_gnat_libraries" >&6
- fi
- 
-@@ -21054,7 +21053,7 @@
- 	USE_GNAT_LIBRARIES="#"
- fi
- 
--echo "$as_me:21057: checking for ada-compiler" >&5
-+echo "$as_me:21056: checking for ada-compiler" >&5
- echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
- 
- # Check whether --with-ada-compiler or --without-ada-compiler was given.
-@@ -21065,12 +21064,12 @@
-   cf_ada_compiler=gnatmake
- fi;
- 
--echo "$as_me:21068: result: $cf_ada_compiler" >&5
-+echo "$as_me:21067: result: $cf_ada_compiler" >&5
- echo "${ECHO_T}$cf_ada_compiler" >&6
- 
- 			cf_ada_package=terminal_interface
- 
--echo "$as_me:21073: checking for ada-include" >&5
-+echo "$as_me:21072: checking for ada-include" >&5
- echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
- 
- # Check whether --with-ada-include or --without-ada-include was given.
-@@ -21106,7 +21105,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21109: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21108: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21115,10 +21114,10 @@
- fi
- eval ADA_INCLUDE="$withval"
- 
--echo "$as_me:21118: result: $ADA_INCLUDE" >&5
-+echo "$as_me:21117: result: $ADA_INCLUDE" >&5
- echo "${ECHO_T}$ADA_INCLUDE" >&6
- 
--echo "$as_me:21121: checking for ada-objects" >&5
-+echo "$as_me:21120: checking for ada-objects" >&5
- echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -21154,7 +21153,7 @@
- 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
- 	;;
- (*)
--	{ { echo "$as_me:21157: error: expected a pathname, not \"$withval\"" >&5
-+	{ { echo "$as_me:21156: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
- 	;;
-@@ -21163,10 +21162,10 @@
- fi
- eval ADA_OBJECTS="$withval"
- 
--echo "$as_me:21166: result: $ADA_OBJECTS" >&5
-+echo "$as_me:21165: result: $ADA_OBJECTS" >&5
- echo "${ECHO_T}$ADA_OBJECTS" >&6
- 
--echo "$as_me:21169: checking if an Ada95 shared-library should be built" >&5
-+echo "$as_me:21168: checking if an Ada95 shared-library should be built" >&5
- echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
- 
- # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
-@@ -21176,7 +21175,7 @@
- else
-   with_ada_sharedlib=no
- fi;
--echo "$as_me:21179: result: $with_ada_sharedlib" >&5
-+echo "$as_me:21178: result: $with_ada_sharedlib" >&5
- echo "${ECHO_T}$with_ada_sharedlib" >&6
- 
- ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
-@@ -21199,13 +21198,13 @@
- 
- # do this "late" to avoid conflict with header-checks
- if test "x$with_widec" = xyes ; then
--	echo "$as_me:21202: checking for wchar_t" >&5
-+	echo "$as_me:21201: checking for wchar_t" >&5
- echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
- if test "${ac_cv_type_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21208 "configure"
-+#line 21207 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21220,16 +21219,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21223: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21222: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21226: \$? = $ac_status" >&5
-+  echo "$as_me:21225: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21228: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21232: \$? = $ac_status" >&5
-+  echo "$as_me:21231: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_wchar_t=yes
- else
-@@ -21239,10 +21238,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:21242: result: $ac_cv_type_wchar_t" >&5
-+echo "$as_me:21241: result: $ac_cv_type_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
- 
--echo "$as_me:21245: checking size of wchar_t" >&5
-+echo "$as_me:21244: checking size of wchar_t" >&5
- echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
- if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21251,7 +21250,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 21254 "configure"
-+#line 21253 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21263,21 +21262,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21266: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21265: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21269: \$? = $ac_status" >&5
-+  echo "$as_me:21268: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21272: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21271: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21275: \$? = $ac_status" >&5
-+  echo "$as_me:21274: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21280 "configure"
-+#line 21279 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21289,16 +21288,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21292: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21291: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21295: \$? = $ac_status" >&5
-+  echo "$as_me:21294: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21298: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21297: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21301: \$? = $ac_status" >&5
-+  echo "$as_me:21300: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -21314,7 +21313,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 21317 "configure"
-+#line 21316 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21326,16 +21325,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21329: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21332: \$? = $ac_status" >&5
-+  echo "$as_me:21331: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21335: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21334: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21338: \$? = $ac_status" >&5
-+  echo "$as_me:21337: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -21351,7 +21350,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21354 "configure"
-+#line 21353 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21363,16 +21362,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:21366: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:21365: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21369: \$? = $ac_status" >&5
-+  echo "$as_me:21368: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:21372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21371: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21375: \$? = $ac_status" >&5
-+  echo "$as_me:21374: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -21385,12 +21384,12 @@
- ac_cv_sizeof_wchar_t=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:21388: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:21387: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 21393 "configure"
-+#line 21392 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -21406,15 +21405,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:21409: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21408: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21412: \$? = $ac_status" >&5
-+  echo "$as_me:21411: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:21414: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21413: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21417: \$? = $ac_status" >&5
-+  echo "$as_me:21416: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_wchar_t=`cat conftest.val`
- else
-@@ -21430,7 +21429,7 @@
-   ac_cv_sizeof_wchar_t=0
- fi
- fi
--echo "$as_me:21433: result: $ac_cv_sizeof_wchar_t" >&5
-+echo "$as_me:21432: result: $ac_cv_sizeof_wchar_t" >&5
- echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-@@ -21448,7 +21447,7 @@
- ### chooses to split module lists into libraries.
- ###
- ### (see CF_LIB_RULES).
--echo "$as_me:21451: checking for library subsets" >&5
-+echo "$as_me:21450: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
- LIB_SUBSETS=
- 
-@@ -21490,7 +21489,7 @@
- test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
- 
--echo "$as_me:21493: result: $LIB_SUBSETS" >&5
-+echo "$as_me:21492: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -21521,7 +21520,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:21524: checking default library suffix" >&5
-+echo "$as_me:21523: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21532,10 +21531,10 @@
- 	(shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:21535: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:21534: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:21538: checking default library-dependency suffix" >&5
-+echo "$as_me:21537: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case X$DFT_LWR_MODEL in
-@@ -21593,10 +21592,10 @@
- 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
- 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
- 	fi
--echo "$as_me:21596: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:21595: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:21599: checking default object directory" >&5
-+echo "$as_me:21598: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -21612,11 +21611,11 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:21615: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:21614: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- if test "x$cf_with_cxx" = xyes ; then
--echo "$as_me:21619: checking c++ library-dependency suffix" >&5
-+echo "$as_me:21618: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
-@@ -21684,7 +21683,7 @@
- 	fi
- 
- fi
--echo "$as_me:21687: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:21686: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
-@@ -21857,19 +21856,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21860: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21859: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 21865 "configure"
-+#line 21864 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21869: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21868: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21872: \$? = $ac_status" >&5
-+  echo "$as_me:21871: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21880,10 +21879,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21883 "configure"
-+#line 21882 "configure"
- #include "confdefs.h"
- 
--#line 21886 "configure"
-+#line 21885 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21898,16 +21897,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21901: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21904: \$? = $ac_status" >&5
-+  echo "$as_me:21903: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21907: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21910: \$? = $ac_status" >&5
-+  echo "$as_me:21909: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21930,7 +21929,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21933: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21932: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21946,7 +21945,7 @@
- 	;;
- esac
- 
--echo "$as_me:21949: checking where we will install curses.h" >&5
-+echo "$as_me:21948: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21956,7 +21955,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21959: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21958: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21964,7 +21963,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21967: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21966: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21982,7 +21981,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21985: checking for src modules" >&5
-+echo "$as_me:21984: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -22047,7 +22046,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:22050: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22049: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22258,16 +22257,13 @@
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
- SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${USE_CFG_SUFFIX}-config.1:man/MKncu_config.in"
- 
--if test "x$enable_pc_files" = xyes ; then \
-+if test "x$enable_pc_files" = xyes && test -z "$MAKE_PC_FILES" ; then
- SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
--MAKE_PC_FILES=
--else
--MAKE_PC_FILES="#"
- fi
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22270: checking for $ac_word" >&5
-+echo "$as_me:22266: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22284,7 +22280,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22287: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22283: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22296,10 +22292,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22299: result: $TIC_PATH" >&5
-+  echo "$as_me:22295: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22302: result: no" >&5
-+  echo "$as_me:22298: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22307,7 +22303,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22310: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22306: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22343,7 +22339,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22346: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22342: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22354,7 +22350,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22357: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22353: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22370,7 +22366,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22373: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22369: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22427,7 +22423,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22430: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22426: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22529,7 +22525,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22532: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22528: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22705,7 +22701,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22708: error: ambiguous option: $1
-+    { { echo "$as_me:22704: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22724,7 +22720,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22727: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22723: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22842,7 +22838,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22841: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23316,7 +23312,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23319: creating $ac_file" >&5
-+    { echo "$as_me:23315: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23334,7 +23330,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23333: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23347,7 +23343,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23350: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23346: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23363,7 +23359,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23366: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23362: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -23372,7 +23368,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23375: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23371: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -23409,7 +23405,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:23412: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23408: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -23420,7 +23416,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:23423: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23419: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23469,7 +23465,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23468: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23480,7 +23476,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23479: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23493,7 +23489,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23496: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23492: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23551,7 +23547,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:23554: $ac_file is unchanged" >&5
-+      { echo "$as_me:23550: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23650,25 +23646,32 @@
- 		SHARED_LIB=
- 		Libs_To_Make=
- 
--		cf_sed_options=
-+		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/NCURSES\\([WT]\\+\\)\?_/NCURSES\\1${cf_cv_abi_version}_/g\""
--			cf_sed_options="$cf_sed_options -e \"/deprecated in ABI${cf_cv_abi_version}/d\""
-+			cf_awk_program="$cf_awk_program\
-+/deprecated in ABI${cf_cv_abi_version}/ { next; }\
-+{ sub(\"NCURSES([WT]+)?\", \"&${cf_cv_abi_version}\"); }\
-+"
- 		fi
- 
- 		if test "x$WILDCARD_SYMS" = xno
- 		then
--			cf_sed_options="$cf_sed_options -e \"s/_\*;//g\""
-+			cf_awk_program="$cf_awk_program\
-+/[ 	]_\\*;/ { skip=1; next; }\
-+"
- 		fi
- 
--		if test "x$cf_sed_options" != "x"
-+		if test "x$cf_awk_program" != "x"
- 		then
- 			cat >>$cf_dir/Makefile <<CF_EOF
- 
- # Generated by CF_LIB_RULES
- resulting.map: $UNALTERED_SYMS
--	sed $cf_sed_options < $UNALTERED_SYMS >\$@
-+	$AWK '$cf_awk_program \
-+{ if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\
-+ skip = 0; last = \$\$0; } \
-+END { print last; }' < $UNALTERED_SYMS >\$@
- 
- distclean::
- 	rm -f resulting.map
-@@ -23889,7 +23892,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23892: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23895: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.621 
---- ncurses-6.0-20151024+/configure.in	2015-10-24 17:57:55.000000000 +0000
-+++ ncurses-6.0-20151101/configure.in	2015-11-01 01:22:57.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.621 2015/10/24 17:57:55 Tomas.Cech Exp $
-+dnl $Id: configure.in,v 1.622 2015/11/01 01:22:57 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.621 $)
-+AC_REVISION($Revision: 1.622 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -2035,13 +2035,9 @@
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
- SUB_MAKEFILES="$SUB_MAKEFILES man/ncurses${USE_CFG_SUFFIX}-config.1:man/MKncu_config.in"
- 
--if test "x$enable_pc_files" = xyes ; then \
-+if test "x$enable_pc_files" = xyes && test -z "$MAKE_PC_FILES" ; then
- SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
--MAKE_PC_FILES=
--else
--MAKE_PC_FILES="#"
- fi
--AC_SUBST(MAKE_PC_FILES)
- AC_SUBST(cross_compiling)
- 
- AC_PATH_PROG(TIC_PATH,tic,unknown,$PATH:/usr/local/ncurses/bin)
-Index: dist.mk
-Prereq:  1.1075 
---- ncurses-6.0-20151024+/dist.mk	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/dist.mk	2015-11-01 10:25:33.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1075 2015/10/24 13:10:18 tom Exp $
-+# $Id: dist.mk,v 1.1077 2015/11/01 10:25:33 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151024
-+NCURSES_PATCH = 20151101
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: misc/Makefile.in
-Prereq:  1.63 
---- ncurses-6.0-20151024+/misc/Makefile.in	2015-08-05 23:15:41.000000000 +0000
-+++ ncurses-6.0-20151101/misc/Makefile.in	2015-11-01 20:01:20.000000000 +0000
-@@ -1,4 +1,4 @@
--# $Id: Makefile.in,v 1.63 2015/08/05 23:15:41 tom Exp $
-+# $Id: Makefile.in,v 1.65 2015/11/01 20:01:20 tom Exp $
- ##############################################################################
- # Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.                #
- #                                                                            #
-@@ -110,8 +110,22 @@
- install.libs :: $(DESTDIR)$(bindir) ncurses-config
- 	$(INSTALL_SCRIPT) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
- 
--@MAKE_PC_FILES@install.libs :: pc-files $(DESTDIR)$(PKG_CONFIG_LIBDIR)
--@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
-+# some packagers prefer to be able to construct pc-files on servers where
-+# pkg-config is not installed.  Work around that by creating the library
-+# directory during this rule:
-+@MAKE_PC_FILES@install.libs :: pc-files
-+@MAKE_PC_FILES@	@$(SHELL) -c 'case "x$(DESTDIR)$(PKG_CONFIG_LIBDIR)" in \
-+	(x/*) \
-+		mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
-+		for name in *.pc; do \
-+			echo installing $$name; \
-+			$(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
-+		done \
-+		;; \
-+	(*) \
-+		echo "...skip actual install: no destination was given" ; \
-+		;; \
-+	esac'
- 
- @MAKE_PC_FILES@sources :: pc-files
- @MAKE_PC_FILES@pc-files :
-@@ -131,8 +145,7 @@
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) \
- $(DESTDIR)$(datadir) \
--$(DESTDIR)$(tabsetdir) \
--$(DESTDIR)$(PKG_CONFIG_LIBDIR) :
-+$(DESTDIR)$(tabsetdir) :
- 	mkdir -p $@
- 
- uninstall : @MISC_UNINSTALL_DATA@ uninstall.libs
-@@ -144,7 +157,14 @@
- 
- uninstall.libs :
- 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
--@MAKE_PC_FILES@	$(SHELL) -c 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
-+@MAKE_PC_FILES@	@$(SHELL) -c 'case x$(DESTDIR)$(PKG_CONFIG_LIBDIR) in \
-+	(x/*) \
-+		for name in *.pc; do \
-+			echo uninstalling $$name; \
-+			rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
-+		done \
-+		;; \
-+	esac'
- 
- tags :
- 
-Index: ncurses/base/lib_mouse.c
-Prereq:  1.167 
---- ncurses-6.0-20151024+/ncurses/base/lib_mouse.c	2015-10-17 22:08:05.000000000 +0000
-+++ ncurses-6.0-20151101/ncurses/base/lib_mouse.c	2015-10-31 20:47:41.000000000 +0000
-@@ -84,7 +84,7 @@
- #define CUR SP_TERMTYPE
- #endif
- 
--MODULE_ID("$Id: lib_mouse.c,v 1.167 2015/10/17 22:08:05 KO.Myung-Hun Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.168 2015/10/31 20:47:41 tom Exp $")
- 
- #include <tic.h>
- 
-@@ -641,13 +641,14 @@
- 
- #if USE_SYSMOUSE
-     {
-+	static char dev_tty[] = "/dev/tty";
- 	struct mouse_info the_mouse;
- 	char *the_device = 0;
- 
- 	if (NC_ISATTY(sp->_ifd))
- 	    the_device = ttyname(sp->_ifd);
- 	if (the_device == 0)
--	    the_device = "/dev/tty";
-+	    the_device = dev_tty;
- 
- 	sp->_mouse_fd = open(the_device, O_RDWR);
- 
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151024+/package/debian-mingw/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian-mingw/changelog	2015-11-01 10:25:33.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151024) unstable; urgency=low
-+ncurses6 (6.0+20151101) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Oct 2015 09:10:18 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Nov 2015 05:25:33 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151024+/package/debian-mingw64/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian-mingw64/changelog	2015-11-01 10:25:33.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151024) unstable; urgency=low
-+ncurses6 (6.0+20151101) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Oct 2015 09:10:18 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Nov 2015 05:25:33 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151024+/package/debian/changelog	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/debian/changelog	2015-11-01 10:25:33.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151024) unstable; urgency=low
-+ncurses6 (6.0+20151101) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Oct 2015 09:10:18 -0400
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Nov 2015 05:25:33 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.128 
---- ncurses-6.0-20151024+/package/mingw-ncurses.nsi	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/mingw-ncurses.nsi	2015-11-01 10:25:33.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.128 2015/10/24 13:10:18 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.130 2015/11/01 10:25:33 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "1024"

-+!define VERSION_MMDD  "1101"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151024+/package/mingw-ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/mingw-ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151024
-+Release: 20151101
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151024+/package/ncurses.spec	2015-10-24 13:10:18.000000000 +0000
-+++ ncurses-6.0-20151101/package/ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151024
-+Release: 20151101
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: test/ncurses.c
-Prereq:  1.421 
---- ncurses-6.0-20151024+/test/ncurses.c	2015-10-24 23:32:57.000000000 +0000
-+++ ncurses-6.0-20151101/test/ncurses.c	2015-10-31 19:53:06.000000000 +0000
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.421 2015/10/24 23:32:57 tom Exp $
-+$Id: ncurses.c,v 1.423 2015/10/31 19:53:06 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -1413,7 +1413,7 @@
- show_attr(WINDOW *win, int row, int skip, bool arrow, chtype attr, const char *name)
- {
-     int ncv = get_ncv();
--    chtype test = attr & (chtype) (~A_ALTCHARSET);
-+    chtype test = attr & (chtype) (~(A_ALTCHARSET | A_CHARTEXT));
- 
-     if (arrow)
- 	MvPrintw(row, COLS_PRE_ATTRS - 3, "-->");
-@@ -1478,8 +1478,9 @@
- 		if (found)
- 		    printw(" (NCV)");
- 	    }
--	    if ((termattrs() & test) != test)
-+	    if ((termattrs() & test) != test) {
- 		printw(" (Part)");
-+	    }
- 	}
-     }
-     return row + 2;
-@@ -1868,8 +1869,9 @@
- 		if (found)
- 		    printw(" (NCV)");
- 	    }
--	    if ((term_attrs() & test) != test)
-+	    if ((term_attrs() & test) != test) {
- 		printw(" (Part)");
-+	    }
- 	}
-     }
-     return row + 2;
diff --git a/patches/ncurses/6.0/210-ncurses-6.0-20151107.patch b/patches/ncurses/6.0/210-ncurses-6.0-20151107.patch
deleted file mode 100644
index f2567c9..0000000
--- a/patches/ncurses/6.0/210-ncurses-6.0-20151107.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-# ncurses 6.0 - patch 20151107 - Thomas E. Dickey
-#
-# ------------------------------------------------------------------------------
-#
-# Ncurses 6.0 is at
-# 	ftp.gnu.org:/pub/gnu
-#
-# Patches for ncurses 6.0 can be found at
-# 	ftp://invisible-island.net/ncurses/6.0
-#	http://invisible-mirror.net/archives/ncurses/6.0 
-#
-# ------------------------------------------------------------------------------
-# ftp://invisible-island.net/ncurses/6.0/ncurses-6.0-20151107.patch.gz
-# patch by Thomas E. Dickey <dickey@invisible-island.net>
-# created  Sun Nov  8 02:34:05 UTC 2015
-# ------------------------------------------------------------------------------
-# NEWS                             |   15 +++++
-# VERSION                          |    2 
-# aclocal.m4                       |   10 +--
-# configure                        |   96 +++++++++++++++++++------------------
-# configure.in                     |   10 ++-
-# dist.mk                          |    4 -
-# package/debian-mingw/changelog   |    4 -
-# package/debian-mingw64/changelog |    4 -
-# package/debian/changelog         |    4 -
-# package/mingw-ncurses.nsi        |    4 -
-# package/mingw-ncurses.spec       |    2 
-# package/ncurses.spec             |    2 
-# progs/tset.c                     |    7 --
-# 13 files changed, 91 insertions(+), 73 deletions(-)
-# ------------------------------------------------------------------------------
-Index: NEWS
-Prereq:  1.2522 
---- ncurses-6.0-20151101+/NEWS	2015-11-01 10:27:24.000000000 +0000
-+++ ncurses-6.0-20151107/NEWS	2015-11-08 01:57:15.000000000 +0000
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.2522 2015/11/01 10:27:24 tom Exp $
-+-- $Id: NEWS,v 1.2526 2015/11/08 01:57:15 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,19 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20151107
-+	+ modify tset's assignment to TERM in its output to reflect the name by
-+	  which the terminal description is found, rather than the primary
-+	  name.  That was an unnecessary part from the initial conversion of
-+	  tset from termcap to terminfo.  The termcap program in 4.3BSD did
-+	  this to avoid using the short 2-character name (report by Rich
-+	  Burridge).
-+	+ minor fix to configure script to ensure that rules for resulting.map
-+	  are only generated when needed (cf: 20151101).
-+	+ modify configure script to handle the case where tic-library is
-+	  renamed, but the --with-debug option is used by itself without
-+	  normal or shared libraries (prompted by comment in Debian #803482).
-+
- 20151101
- 	+ amend change for pkg-config which allows build of pc-files when no
- 	  valid pkg-config library directory was configured to suppress the
-Index: VERSION
---- ncurses-6.0-20151101+/VERSION	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/VERSION	2015-11-06 00:44:10.000000000 +0000
-@@ -1 +1 @@
--5:0:9	6.0	20151101
-+5:0:9	6.0	20151107
-Index: aclocal.m4
-Prereq:  1.783 
---- ncurses-6.0-20151101+/aclocal.m4	2015-11-01 10:29:05.000000000 +0000
-+++ ncurses-6.0-20151107/aclocal.m4	2015-11-08 01:03:06.000000000 +0000
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.783 2015/11/01 10:29:05 tom Exp $
-+dnl $Id: aclocal.m4,v 1.785 2015/11/08 01:03:06 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -3241,7 +3241,7 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 85 updated: 2015/10/31 20:06:35
-+dnl CF_LIB_RULES version: 86 updated: 2015/11/07 20:01:34
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-@@ -3293,8 +3293,7 @@
- 
- 		SHARED_LIB=
- 		Libs_To_Make=
--
--		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
-+		cf_awk_program=
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
- 			cf_awk_program="$cf_awk_program\
-@@ -3316,7 +3315,8 @@
- 
- # Generated by CF_LIB_RULES
- resulting.map: $UNALTERED_SYMS
--	$AWK '$cf_awk_program \
-+	$AWK 'BEGIN { skip = 1; last=""; } \
-+$cf_awk_program \
- { if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
-  skip = 0; last = \[$]\[$]0; } \
- END { print last; }' < $UNALTERED_SYMS >\[$]@
-Index: configure
---- ncurses-6.0-20151101+/configure	2015-11-01 10:12:02.000000000 +0000
-+++ ncurses-6.0-20151107/configure	2015-11-08 01:06:42.000000000 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 1.622 .
-+# From configure.in Revision: 1.623 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by Autoconf 2.52.20150926.
- #
-@@ -21722,17 +21722,20 @@
- 
- 	if test "x$with_ticlib" != xyes ; then
- 		TICS_NAME=$with_ticlib
-+		TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
- 		TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_LIB_SUFFIX="${with_ticlib}"
- 	else
-+		TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 		TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}"
- 		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
- 		TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}"
- 	fi
- 	TICS_LDFLAGS="-L${LIB_DIR}"
--	TICS_LIBS="-l${TICS_LIB_SUFFIX}"
-+	TICS_LIBS="-l${TICS_ARG_SUFFIX}"
- else
-+	TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 	TICS_LDFLAGS="-L${LIB_DIR}"
- 	TICS_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}"
- fi
-@@ -21856,19 +21859,19 @@
- 
- if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
- then
--	echo "$as_me:21859: checking if linker supports switching between static/dynamic" >&5
-+	echo "$as_me:21862: checking if linker supports switching between static/dynamic" >&5
- echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
- 
- 	rm -f libconftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 21864 "configure"
-+#line 21867 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp) { return fflush(fp); }
- EOF
--	if { (eval echo "$as_me:21868: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:21871: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:21871: \$? = $ac_status" >&5
-+  echo "$as_me:21874: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
- 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
-@@ -21879,10 +21882,10 @@
- 
- 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 21882 "configure"
-+#line 21885 "configure"
- #include "confdefs.h"
- 
--#line 21885 "configure"
-+#line 21888 "configure"
- #include <stdio.h>
- int cf_ldflags_static(FILE *fp);
- 
-@@ -21897,16 +21900,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:21900: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:21903: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:21903: \$? = $ac_status" >&5
-+  echo "$as_me:21906: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:21906: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:21909: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:21909: \$? = $ac_status" >&5
-+  echo "$as_me:21912: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	# some linkers simply ignore the -dynamic
-@@ -21929,7 +21932,7 @@
- 	rm -f libconftest.*
- 	LIBS="$cf_save_LIBS"
- 
--	echo "$as_me:21932: result: $cf_ldflags_static" >&5
-+	echo "$as_me:21935: result: $cf_ldflags_static" >&5
- echo "${ECHO_T}$cf_ldflags_static" >&6
- 
- 	if test $cf_ldflags_static != yes
-@@ -21945,7 +21948,7 @@
- 	;;
- esac
- 
--echo "$as_me:21948: checking where we will install curses.h" >&5
-+echo "$as_me:21951: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- 
- includesubdir=
-@@ -21955,7 +21958,7 @@
- then
- 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
- fi
--echo "$as_me:21958: result: ${includedir}${includesubdir}" >&5
-+echo "$as_me:21961: result: ${includedir}${includesubdir}" >&5
- echo "${ECHO_T}${includedir}${includesubdir}" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -21963,7 +21966,7 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:21966: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:21969: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
-@@ -21981,7 +21984,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:21984: checking for src modules" >&5
-+echo "$as_me:21987: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -22046,7 +22049,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:22049: result: $cf_cv_src_modules" >&5
-+echo "$as_me:22052: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -22263,7 +22266,7 @@
- 
- # Extract the first word of "tic", so it can be a program name with args.
- set dummy tic; ac_word=$2
--echo "$as_me:22266: checking for $ac_word" >&5
-+echo "$as_me:22269: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_TIC_PATH+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -22280,7 +22283,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
--   echo "$as_me:22283: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:22286: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -22292,10 +22295,10 @@
- TIC_PATH=$ac_cv_path_TIC_PATH
- 
- if test -n "$TIC_PATH"; then
--  echo "$as_me:22295: result: $TIC_PATH" >&5
-+  echo "$as_me:22298: result: $TIC_PATH" >&5
- echo "${ECHO_T}$TIC_PATH" >&6
- else
--  echo "$as_me:22298: result: no" >&5
-+  echo "$as_me:22301: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -22303,7 +22306,7 @@
- then
- 	if test "$TIC_PATH" = unknown
- 	then
--		{ echo "$as_me:22306: WARNING: no tic program found for fallbacks" >&5
-+		{ echo "$as_me:22309: WARNING: no tic program found for fallbacks" >&5
- echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
- 	fi
- fi
-@@ -22339,7 +22342,7 @@
- 	(*-D_XOPEN_SOURCE_EXTENDED*)
- 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
- 
--echo "${as_me:-configure}:22342: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
-+echo "${as_me:-configure}:22345: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
- 
- 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
- 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
-@@ -22350,7 +22353,7 @@
- 
- # Help to automatically enable the extended curses features when using either
- # the *-config or the ".pc" files by adding defines.
--echo "$as_me:22353: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
-+echo "$as_me:22356: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
- echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
- PKG_CFLAGS=
- for cf_loop1 in $CPPFLAGS_after_XOPEN
-@@ -22366,7 +22369,7 @@
- 	done
- 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
- done
--echo "$as_me:22369: result: $PKG_CFLAGS" >&5
-+echo "$as_me:22372: result: $PKG_CFLAGS" >&5
- echo "${ECHO_T}$PKG_CFLAGS" >&6
- 
- # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
-@@ -22423,7 +22426,7 @@
- 	cf_filter_syms=$cf_dft_filter_syms
- 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
- 
--echo "${as_me:-configure}:22426: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
-+echo "${as_me:-configure}:22429: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
- 
- fi
- 
-@@ -22525,7 +22528,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:22528: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:22531: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -22701,7 +22704,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:22704: error: ambiguous option: $1
-+    { { echo "$as_me:22707: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22720,7 +22723,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:22723: error: unrecognized option: $1
-+  -*) { { echo "$as_me:22726: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -22782,6 +22785,7 @@
- TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
- TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
- TICS_NAME="$TICS_NAME"
-+TICS_SUFFIX="$TICS_SUFFIX"
- TIC_PATH="$TIC_PATH"
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
-@@ -22838,7 +22842,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:22841: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:22845: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -23312,7 +23316,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:23315: creating $ac_file" >&5
-+    { echo "$as_me:23319: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -23330,7 +23334,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23333: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23337: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23343,7 +23347,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23346: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23350: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23359,7 +23363,7 @@
-       if test -n "$ac_seen"; then
-         ac_used=`grep '@datarootdir@' $ac_item`
-         if test -z "$ac_used"; then
--          { echo "$as_me:23362: WARNING: datarootdir was used implicitly but not set:
-+          { echo "$as_me:23366: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used implicitly but not set:
- $ac_seen" >&2;}
-@@ -23368,7 +23372,7 @@
-       fi
-       ac_seen=`grep '${datarootdir}' $ac_item`
-       if test -n "$ac_seen"; then
--        { echo "$as_me:23371: WARNING: datarootdir was used explicitly but not set:
-+        { echo "$as_me:23375: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: datarootdir was used explicitly but not set:
- $ac_seen" >&2;}
-@@ -23405,7 +23409,7 @@
-             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
-             if test -z "$ac_init"; then
-               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
--              { echo "$as_me:23408: WARNING: Variable $ac_name is used but was not set:
-+              { echo "$as_me:23412: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&5
- echo "$as_me: WARNING: Variable $ac_name is used but was not set:
- $ac_seen" >&2;}
-@@ -23416,7 +23420,7 @@
-     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
-     if test -s $tmp/out; then
-       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
--      { echo "$as_me:23419: WARNING: Some variables may not be substituted:
-+      { echo "$as_me:23423: WARNING: Some variables may not be substituted:
- $ac_seen" >&5
- echo "$as_me: WARNING: Some variables may not be substituted:
- $ac_seen" >&2;}
-@@ -23465,7 +23469,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:23468: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:23472: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -23476,7 +23480,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:23479: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:23483: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -23489,7 +23493,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:23492: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:23496: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -23547,7 +23551,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:23550: $ac_file is unchanged" >&5
-+      { echo "$as_me:23554: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -23645,8 +23649,7 @@
- 
- 		SHARED_LIB=
- 		Libs_To_Make=
--
--		cf_awk_program="BEGIN { skip = 1; last=\"\"; }"
-+		cf_awk_program=
- 		if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
- 		then
- 			cf_awk_program="$cf_awk_program\
-@@ -23668,7 +23671,8 @@
- 
- # Generated by CF_LIB_RULES
- resulting.map: $UNALTERED_SYMS
--	$AWK '$cf_awk_program \
-+	$AWK 'BEGIN { skip = 1; last=""; } \
-+$cf_awk_program \
- { if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\
-  skip = 0; last = \$\$0; } \
- END { print last; }' < $UNALTERED_SYMS >\$@
-@@ -23892,7 +23896,7 @@
- 				(cygdll|msysdll|mingw)
- 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
- 
--echo "${as_me:-configure}:23895: testing overriding CXX_MODEL to SHARED ..." 1>&5
-+echo "${as_me:-configure}:23899: testing overriding CXX_MODEL to SHARED ..." 1>&5
- 
- 					with_shared_cxx=yes
- 					;;
-Index: configure.in
-Prereq:  1.622 
---- ncurses-6.0-20151101+/configure.in	2015-11-01 01:22:57.000000000 +0000
-+++ ncurses-6.0-20151107/configure.in	2015-11-07 22:41:37.000000000 +0000
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.622 2015/11/01 01:22:57 tom Exp $
-+dnl $Id: configure.in,v 1.623 2015/11/07 22:41:37 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.52.20030208)
--AC_REVISION($Revision: 1.622 $)
-+AC_REVISION($Revision: 1.623 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -1859,17 +1859,20 @@
- 
- 	if test "x$with_ticlib" != xyes ; then
- 		TICS_NAME=$with_ticlib
-+		TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
- 		TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TICS_LIB_SUFFIX="${with_ticlib}"
- 	else
-+		TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 		TICS_ARG_SUFFIX="${TICS_NAME}${USE_ARG_SUFFIX}"
- 		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
- 		TICS_LIB_SUFFIX="${TICS_NAME}${USE_LIB_SUFFIX}"
- 	fi
- 	TICS_LDFLAGS="-L${LIB_DIR}"
--	TICS_LIBS="-l${TICS_LIB_SUFFIX}"
-+	TICS_LIBS="-l${TICS_ARG_SUFFIX}"
- else
-+	TICS_SUFFIX=${DFT_LIB_SUFFIX}
- 	TICS_LDFLAGS="-L${LIB_DIR}"
- 	TICS_LIBS="-l${LIB_NAME}${USE_ARG_SUFFIX}"
- fi
-@@ -2236,6 +2239,7 @@
- TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
- TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
- TICS_NAME="$TICS_NAME"
-+TICS_SUFFIX="$TICS_SUFFIX"
- TIC_PATH="$TIC_PATH"
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
-Index: dist.mk
-Prereq:  1.1077 
---- ncurses-6.0-20151101+/dist.mk	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/dist.mk	2015-11-06 00:44:10.000000000 +0000
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.1077 2015/11/01 10:25:33 tom Exp $
-+# $Id: dist.mk,v 1.1078 2015/11/06 00:44:10 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 6
- NCURSES_MINOR = 0
--NCURSES_PATCH = 20151101
-+NCURSES_PATCH = 20151107
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-Index: package/debian-mingw/changelog
---- ncurses-6.0-20151101+/package/debian-mingw/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian-mingw/changelog	2015-11-06 00:44:10.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151101) unstable; urgency=low
-+ncurses6 (6.0+20151107) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Nov 2015 05:25:33 -0500
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 05 Nov 2015 19:44:10 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian-mingw64/changelog
---- ncurses-6.0-20151101+/package/debian-mingw64/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian-mingw64/changelog	2015-11-06 00:44:10.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151101) unstable; urgency=low
-+ncurses6 (6.0+20151107) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Nov 2015 05:25:33 -0500
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 05 Nov 2015 19:44:10 -0500
- 
- ncurses6 (5.9-20131005) unstable; urgency=low
- 
-Index: package/debian/changelog
---- ncurses-6.0-20151101+/package/debian/changelog	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/debian/changelog	2015-11-06 00:44:10.000000000 +0000
-@@ -1,8 +1,8 @@
--ncurses6 (6.0+20151101) unstable; urgency=low
-+ncurses6 (6.0+20151107) unstable; urgency=low
- 
-   * latest weekly patch
- 
-- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Nov 2015 05:25:33 -0500
-+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 05 Nov 2015 19:44:10 -0500
- 
- ncurses6 (5.9-20120608) unstable; urgency=low
- 
-Index: package/mingw-ncurses.nsi
-Prereq:  1.130 
---- ncurses-6.0-20151101+/package/mingw-ncurses.nsi	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/mingw-ncurses.nsi	2015-11-06 00:44:10.000000000 +0000
-@@ -1,4 +1,4 @@
--; $Id: mingw-ncurses.nsi,v 1.130 2015/11/01 10:25:33 tom Exp $

-+; $Id: mingw-ncurses.nsi,v 1.131 2015/11/06 00:44:10 tom Exp $

- 

- ; TODO add examples

- ; TODO bump ABI to 6

-@@ -10,7 +10,7 @@
- !define VERSION_MAJOR "6"

- !define VERSION_MINOR "0"

- !define VERSION_YYYY  "2015"

--!define VERSION_MMDD  "1101"

-+!define VERSION_MMDD  "1107"

- !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

- 

- !define MY_ABI   "5"

-Index: package/mingw-ncurses.spec
---- ncurses-6.0-20151101+/package/mingw-ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/mingw-ncurses.spec	2015-11-06 00:44:10.000000000 +0000
-@@ -3,7 +3,7 @@
- Summary: shared libraries for terminal handling
- Name: mingw32-ncurses6
- Version: 6.0
--Release: 20151101
-+Release: 20151107
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: package/ncurses.spec
---- ncurses-6.0-20151101+/package/ncurses.spec	2015-11-01 10:25:33.000000000 +0000
-+++ ncurses-6.0-20151107/package/ncurses.spec	2015-11-06 00:44:10.000000000 +0000
-@@ -1,7 +1,7 @@
- Summary: shared libraries for terminal handling
- Name: ncurses6
- Version: 6.0
--Release: 20151101
-+Release: 20151107
- License: X11
- Group: Development/Libraries
- Source: ncurses-%{version}-%{release}.tgz
-Index: progs/tset.c
-Prereq:  1.96 
---- ncurses-6.0-20151101+/progs/tset.c	2015-04-12 15:36:06.000000000 +0000
-+++ ncurses-6.0-20151107/progs/tset.c	2015-11-08 01:45:47.000000000 +0000
-@@ -119,7 +119,7 @@
- #include <dump_entry.h>
- #include <transform.h>
- 
--MODULE_ID("$Id: tset.c,v 1.96 2015/04/12 15:36:06 tom Exp $")
-+MODULE_ID("$Id: tset.c,v 1.97 2015/11/08 01:45:47 tom Exp $")
- 
- /*
-  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
-@@ -1293,7 +1293,7 @@
- 	reset_mode();
-     }
- 
--    (void) get_termcap_entry(*argv);
-+    ttype = get_termcap_entry(*argv);
- 
-     if (!noset) {
- #if HAVE_SIZECHANGE
-@@ -1327,9 +1327,6 @@
- 	}
-     }
- 
--    /* Get the terminal name from the entry. */
--    ttype = _nc_first_name(cur_term->type.term_names);
--
-     if (noset)
- 	(void) printf("%s\n", ttype);
-     else {
diff --git a/patches/ncurses/6.0/999-create-run_tic.patch b/patches/ncurses/6.0/999-create-run_tic.patch
deleted file mode 100644
index 7c4fb0d..0000000
--- a/patches/ncurses/6.0/999-create-run_tic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urpN ncurses-6.0.orig/configure ncurses-6.0/configure
---- ncurses-6.0.orig/configure	2017-02-05 11:06:35.342548609 -0800
-+++ ncurses-6.0/configure	2017-02-05 11:07:02.878754676 -0800
-@@ -22254,7 +22254,6 @@ else
- fi
- 
- ################################################################################
--test "x$use_database" = xyes && \
- SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
- 
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
-diff -urpN ncurses-6.0.orig/configure.in ncurses-6.0/configure.in
---- ncurses-6.0.orig/configure.in	2017-02-05 11:06:35.326548489 -0800
-+++ ncurses-6.0/configure.in	2017-02-05 11:07:08.926799658 -0800
-@@ -2032,7 +2032,6 @@ CF_SUBST_IF(["x$ac_cv_header_termio_h" =
- CF_SUBST_IF(["x$ac_cv_header_termios_h" = xyes], HAVE_TERMIOS_H, 1, 0)
- 
- ################################################################################
--test "x$use_database" = xyes && \
- SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
- 
- SUB_MAKEFILES="$SUB_MAKEFILES misc/ncurses-config:misc/ncurses-config.in"
diff --git a/patches/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch b/patches/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 6214ee5..0000000
--- a/patches/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.18.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.18.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.18.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mcpu32__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/patches/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch b/patches/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 191363a..0000000
--- a/patches/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
-[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.19.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.19.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/patches/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch b/patches/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch
deleted file mode 100644
index 1d0b49b..0000000
--- a/patches/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-The m68k mcpu processor does not like unaligned access
-
-Disable at least mcpu32, m68010 and m68020. These processors certainly
-do not like unaligned accesses.
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
-[yann.morin.1998@anciens.enib.fr: update for 1.19.0 from 1.18.0]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-[austinpmorton@gmail.com: update for 1.20.0 from 1.19.0]
-Signed-off-by: Austin Morton <austinpmorton@gmail.com>
----
- newlib/libc/machine/m68k/memcpy.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-===================================================================
---- newlib-1.20.0.orig/newlib/libc/machine/m68k/memcpy.S
-+++ newlib-1.20.0/newlib/libc/machine/m68k/memcpy.S
-@@ -15,7 +15,7 @@
- 
- #include "m68kasm.h"
- 
--#if defined (__mcoldfire__) || defined (__mc68010__) || defined (__mc68020__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
-+#if defined (__mcoldfire__) || defined (__mc68030__) || defined (__mc68040__) || defined (__mc68060__)
- # define MISALIGNED_OK 1
- #else
- # define MISALIGNED_OK 0
diff --git a/patches/newlib/1.20.0/110-fix-eabihf.patch b/patches/newlib/1.20.0/110-fix-eabihf.patch
deleted file mode 100644
index 0f0d5e7..0000000
--- a/patches/newlib/1.20.0/110-fix-eabihf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur newlib-1.20.0.orig/libgloss/arm/configure.in newlib-1.20.0/libgloss/arm/configure.in
---- newlib-1.20.0.orig/libgloss/arm/configure.in    2006-05-10 22:51:40.000000000 +0200
-+++ newlib-1.20.0/libgloss/arm/configure.in 2015-01-04 15:27:41.471549917 +0100
-@@ -49,7 +49,7 @@
- LIB_AM_PROG_AS
-
- case "${target}" in
--  *-*-elf | *-*-eabi)
-+  *-*-elf | *-*-eabi*)
-    objtype=elf-
-    ;;
-   *-*-coff)
diff --git a/patches/newlib/2.0.0/100-fix-optimising-for-space.patch b/patches/newlib/2.0.0/100-fix-optimising-for-space.patch
deleted file mode 100644
index 8480f92..0000000
--- a/patches/newlib/2.0.0/100-fix-optimising-for-space.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- newlib-2.0.0/config/mt-ospace-orig	2014-11-13 12:02:45.463578281 +0000
-+++ newlib-2.0.0/config/mt-ospace	2014-11-13 12:03:01.409592374 +0000
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/patches/newlib/2.1.0/100-fix-optimising-for-space.patch b/patches/newlib/2.1.0/100-fix-optimising-for-space.patch
deleted file mode 100644
index 0e94d50..0000000
--- a/patches/newlib/2.1.0/100-fix-optimising-for-space.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- newlib-2.1.0/config/mt-ospace-orig	2014-11-13 12:02:45.463578281 +0000
-+++ newlib-2.1.0/config/mt-ospace	2014-11-13 12:03:01.409592374 +0000
-@@ -1,3 +1,3 @@
- # Build libraries optimizing for space, not speed.
-- CFLAGS_FOR_TARGET = -g -Os
-- CXXFLAGS_FOR_TARGET = -g -Os
-+ CFLAGS_FOR_TARGET += -g -Os
-+ CXXFLAGS_FOR_TARGET += -g -Os
diff --git a/patches/strace/4.10/001_aarch64_rt_sigreturn.patch b/patches/strace/4.10/001_aarch64_rt_sigreturn.patch
deleted file mode 100644
index 6b7bbe3..0000000
--- a/patches/strace/4.10/001_aarch64_rt_sigreturn.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit d76d3069526c348e6fe5d40bbbceb2ae4a928d16
-Author: Dmitry V. Levin <ldv@altlinux.org>
-Date:   Wed Mar 11 14:32:25 2015 +0000
-
-    aarch64: fix rt_sigreturn decoding
-    
-    * sigreturn.c (sys_sigreturn) [AARCH64]: Fix personality check.
-
-diff --git a/sigreturn.c b/sigreturn.c
-index 648bd0a..c253a0c 100644
---- a/sigreturn.c
-+++ b/sigreturn.c
-@@ -23,7 +23,7 @@ sys_sigreturn(struct tcb *tcp)
- # define OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK (5 * 4 + SIZEOF_STRUCT_SIGCONTEXT)
- 		const long addr =
- # ifdef AARCH64
--			current_personality == 0 ?
-+			current_personality == 1 ?
- 				(*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO +
- 				 offsetof(struct ucontext, uc_sigmask)) :
- # endif
diff --git a/patches/strace/4.10/002_arm_mmap2.patch b/patches/strace/4.10/002_arm_mmap2.patch
deleted file mode 100644
index 41953e2..0000000
--- a/patches/strace/4.10/002_arm_mmap2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit dbadf7bcc8995612d5ef737047b909e868387e37
-Author: Andreas Schwab <schwab@suse.de>
-Date:   Mon Mar 9 16:55:06 2015 +0100
-
-    Fix decoding of mmap2 for arm
-    
-    * syscallent.h (mmap2): Decode with sys_mmap_4koff, not
-    sys_mmap_pgoff.
-
-diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
-index 52aed9e..b66a5a2 100644
---- a/linux/arm/syscallent.h
-+++ b/linux/arm/syscallent.h
-@@ -218,7 +218,7 @@
- [189] = { 5,	0,		sys_putpmsg,			"putpmsg"		},
- [190] = { 0,	TP,		sys_vfork,			"vfork"			},
- [191] = { 2,	0,		sys_getrlimit,			"ugetrlimit"		},
--[192] = { 6,	TD|TM|SI,	sys_mmap_pgoff,			"mmap2"			},
-+[192] = { 6,	TD|TM|SI,	sys_mmap_4koff,			"mmap2"			},
- [193] = { 4,	TF,		sys_truncate64,			"truncate64"		},
- [194] = { 4,	TD,		sys_ftruncate64,		"ftruncate64"		},
- [195] = { 2,	TF,		sys_stat64,			"stat64"		},
diff --git a/patches/strace/4.10/003_aarch64_arch_regs.patch b/patches/strace/4.10/003_aarch64_arch_regs.patch
deleted file mode 100644
index e5153b5..0000000
--- a/patches/strace/4.10/003_aarch64_arch_regs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 64fc9cedc475b2fc0d940509dc4232b02b5f83ec
-Author: Andreas Schwab <schwab@suse.de>
-Date:   Thu Mar 12 11:54:08 2015 +0100
-
-    Distribute linux/aarch64/arch_regs.h
-    
-    * Makefile.am (EXTRA_DIST): Add linux/aarch64/arch_regs.h.
-
-diff --git a/Makefile.am b/Makefile.am
-index 2030f9b..48fe1d7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -164,6 +164,7 @@ EXTRA_DIST =				\
- 	linux/32/syscallent.h		\
- 	linux/64/ioctls_inc.h		\
- 	linux/64/syscallent.h		\
-+	linux/aarch64/arch_regs.h	\
- 	linux/aarch64/errnoent1.h	\
- 	linux/aarch64/ioctls_arch0.h	\
- 	linux/aarch64/ioctls_arch1.h	\
---- a/linux/aarch64/arch_regs.h	2015-06-09 03:27:46.170000000 +0000
-+++ b/linux/aarch64/arch_regs.h	2015-07-01 21:23:17.025202308 +0000
-@@ -0,0 +1,2 @@
-+extern uint64_t *const aarch64_sp_ptr;
-+extern uint32_t *const arm_sp_ptr;
diff --git a/patches/strace/4.10/004_stat64-v.test.patch b/patches/strace/4.10/004_stat64-v.test.patch
deleted file mode 100644
index 53383e3..0000000
--- a/patches/strace/4.10/004_stat64-v.test.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit f79252f072a193bdff435afeaa6b6cd6d5c79947
-Author: Dmitry V. Levin <ldv@altlinux.org>
-Date:   Mon Mar 16 17:18:40 2015 +0000
-
-    stat64-v.test: add newfstatat syscall support
-    
-    Newer architectures have no stat syscall, so stat() is implemented there
-    using newfstatat syscall.
-    
-    * tests/stat.c (STAT_FNAME): Rename to STAT_PREFIX.  Update callers.
-    [_FILE_OFFSET_BITS == 64] (STAT_PREFIX): Add newfstatat support.
-    (main) [!NR_stat]: Add newfstatat support.
-    
-    Reported-by: Andreas Schwab <schwab@suse.de>
-
-diff --git a/tests/stat.c b/tests/stat.c
-index 21e37fb..2b04010 100644
---- a/tests/stat.c
-+++ b/tests/stat.c
-@@ -14,22 +14,22 @@
- # include <sys/types.h>
- #endif
- 
--#undef STAT_FNAME
-+#undef STAT_PREFIX
- #undef NR_stat
- 
- #if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64
- # include <sys/stat.h>
--# define STAT_FNAME "stat(64)?"
-+# define STAT_PREFIX "(stat(64)?\\(|newfstatat\\(AT_FDCWD, )"
- #else
- # include <sys/syscall.h>
- # if defined __NR_stat
- #  define NR_stat __NR_stat
--#  define STAT_FNAME "stat"
-+#  define STAT_PREFIX "stat\\("
- # elif defined __NR_newstat
- #  define NR_stat __NR_newstat
--#  define STAT_FNAME "newstat"
-+#  define STAT_PREFIX "newstat\\("
- # endif
--# ifdef STAT_FNAME
-+# ifdef STAT_PREFIX
- /* for S_IFMT */
- #  define stat libc_stat
- #  define stat64 libc_stat64
-@@ -57,10 +57,10 @@
- #  define off_t __kernel_off_t
- #  define loff_t __kernel_loff_t
- #  include <asm/stat.h>
--#  endif /* STAT_FNAME */
-+#  endif /* STAT_PREFIX */
- #endif /* _FILE_OFFSET_BITS */
- 
--#ifdef STAT_FNAME
-+#ifdef STAT_PREFIX
- 
- static void
- print_ftype(unsigned int mode)
-@@ -115,7 +115,7 @@ main(int ac, const char **av)
- 	assert(stat(av[1], &stb) == 0);
- #endif
- 
--	printf(STAT_FNAME "\\(\"%s\", \\{", av[1]);
-+	printf(STAT_PREFIX "\"%s\", \\{", av[1]);
- 	printf("st_dev=makedev\\(%u, %u\\)",
- 	       (unsigned int) major(stb.st_dev),
- 	       (unsigned int) minor(stb.st_dev));
-@@ -159,11 +159,15 @@ main(int ac, const char **av)
- 	printf("(, st_flags=[0-9]+)?");
- 	printf("(, st_fstype=[^,]*)?");
- 	printf("(, st_gen=[0-9]+)?");
--	printf("\\}\\) += 0\n");
-+	printf("\\}");
-+#ifndef NR_stat
-+	printf("(, 0)?");
-+#endif
-+	printf("\\) += 0\n");
- 	return 0;
- }
- 
--#else /* !STAT_FNAME */
-+#else /* !STAT_PREFIX */
- int main(void)
- {
- 	return 77;
diff --git a/patches/strace/4.10/005_select_test.patch b/patches/strace/4.10/005_select_test.patch
deleted file mode 100644
index cb56ec6..0000000
--- a/patches/strace/4.10/005_select_test.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 95336102eb836ba69a2b51a3bbe733abd63bbe77
-Author: Andreas Schwab <schwab@suse.de>
-Date:   Thu Mar 12 16:47:38 2015 +0100
-
-    tests/select.test: handle architectures using pselect6 syscall
-    
-    * tests/select.awk (BEGIN): Update regexps to match both select
-    and pselect6 syscalls.
-    * tests/select.test: Probe for both select and pselect6 syscall.
-
-diff --git a/tests/select.awk b/tests/select.awk
-index 142504a..688cefe 100644
---- a/tests/select.awk
-+++ b/tests/select.awk
-@@ -1,7 +1,7 @@
- BEGIN {
--	r[1] = "^select\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL\\) += 1 \\(\\)$"
--	r[2] = "^select\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL\\) += -1 "
--	r[3] = "^select\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100\\}\\) += 0 \\(Timeout\\)$"
-+	r[1] = "^p?select6?\\(2, \\[0 1\\], \\[0 1\\], \\[0 1\\], NULL(, 0)?\\) += 1 \\(\\)$"
-+	r[2] = "^p?select6?\\(-1, NULL, 0x[0-9a-f]+, NULL, NULL(, 0)?\\) += -1 "
-+	r[3] = "^p?select6?\\(1025, \\[0\\], \\[\\], NULL, \\{0, 100(000)?\\}(, 0)?\\) += 0 \\(Timeout\\)$"
- 	r[4] = "^\\+\\+\\+ exited with 0 \\+\\+\\+$"
- 	lines = 4
- 	fail = 0
-diff --git a/tests/select.test b/tests/select.test
-index bd3066b..5d5fe54 100755
---- a/tests/select.test
-+++ b/tests/select.test
-@@ -6,13 +6,16 @@
- 
- check_prog awk
- 
--$STRACE -eselect -h > /dev/null ||
-+syscall=
-+$STRACE -epselect6 -h > /dev/null && syscall=$syscall,pselect6
-+$STRACE -eselect -h > /dev/null && syscall=$syscall,select
-+test -n "$syscall" ||
- 	skip_ 'select syscall is not supported on this architecture'
- 
- ./select ||
- 	framework_skip_ 'select syscall does not behave as expected'
- 
--args='-eselect ./select'
-+args="-e$syscall ./select"
- $STRACE -o "$LOG" $args || {
- 	cat "$LOG"
- 	fail_ "$STRACE $args failed"
diff --git a/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch b/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
deleted file mode 100644
index a270349..0000000
--- a/patches/strace/4.10/006_fix_aarch64_ioctl_decoding.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 0e3811d7914f209858cf4e445221fd65644cc94b
-Author: Andreas Schwab <schwab@suse.de>
-Date:   Thu Mar 12 18:07:00 2015 +0100
-
-    aarch64: fix ioctl decoding
-    
-    * linux/aarch64/ioctls_inc0.h: Rename from ioctls_inc1.h.
-    * linux/aarch64/ioctls_inc1.h: Rename from ioctls_inc0.h.
-    * linux/aarch64/ioctls_arch0.h: Rename from ioctls_arch1.h.
-    * linux/aarch64/ioctls_arch1.h: Rename from ioctls_arch0.h.
-
-diff --git a/linux/aarch64/ioctls_arch0.h b/linux/aarch64/ioctls_arch0.h
-index 6a674cc..b722d22 100644
---- a/linux/aarch64/ioctls_arch0.h
-+++ b/linux/aarch64/ioctls_arch0.h
-@@ -1 +1 @@
--/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */
-+#include "arm/ioctls_arch0.h"
-diff --git a/linux/aarch64/ioctls_arch1.h b/linux/aarch64/ioctls_arch1.h
-index b722d22..6a674cc 100644
---- a/linux/aarch64/ioctls_arch1.h
-+++ b/linux/aarch64/ioctls_arch1.h
-@@ -1 +1 @@
--#include "arm/ioctls_arch0.h"
-+/* Generated by ioctls_gen.sh from definitions found in $linux/arch/arm64/include/ tree. */
-diff --git a/linux/aarch64/ioctls_inc0.h b/linux/aarch64/ioctls_inc0.h
-index f9939fa..46c11b1 100644
---- a/linux/aarch64/ioctls_inc0.h
-+++ b/linux/aarch64/ioctls_inc0.h
-@@ -1 +1 @@
--#include "64/ioctls_inc.h"
-+#include "arm/ioctls_inc0.h"
-diff --git a/linux/aarch64/ioctls_inc1.h b/linux/aarch64/ioctls_inc1.h
-index 46c11b1..f9939fa 100644
---- a/linux/aarch64/ioctls_inc1.h
-+++ b/linux/aarch64/ioctls_inc1.h
-@@ -1 +1 @@
--#include "arm/ioctls_inc0.h"
-+#include "64/ioctls_inc.h"
diff --git a/patches/strace/4.10/007_fix_bexecve64_test.patch b/patches/strace/4.10/007_fix_bexecve64_test.patch
deleted file mode 100644
index 6dc9b46..0000000
--- a/patches/strace/4.10/007_fix_bexecve64_test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit b704e8fbb4d9cf90ac56f3c889de5b779c444db4
-(loosely based on)
---- a/tests/bexecve.test
-+++ b/tests/bexecve.test
-@@ -24,13 +24,14 @@
- }
- 
- pattern='Process [1-9][0-9]* detached'
-+pattern_personality='\[ Process PID=[1-9][0-9]* runs in .* mode. \]'
- 
- LC_ALL=C grep -x "$pattern" "$LOG" > /dev/null || {
- 	cat "$LOG"
- 	fail_ "$what: unexpected output"
- }
- 
--if LC_ALL=C grep -v -x "$pattern" "$LOG" > /dev/null; then
-+if LC_ALL=C grep -E -v -x "($pattern|$pattern_personality)" "$LOG" > /dev/null; then
- 	cat "$LOG"
- 	fail_ "$what: unexpected output"
- fi
diff --git a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch b/patches/strace/4.10/008_decode_mips_indirect_syscall.patch
deleted file mode 100644
index d2d7217..0000000
--- a/patches/strace/4.10/008_decode_mips_indirect_syscall.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit f34b97f89dd3893ef3652a6899487771402fc13c
-Index: strace-4.10/linux/mips/syscallent-o32.h
-===================================================================
---- strace-4.10.orig/linux/mips/syscallent-o32.h
-+++ strace-4.10/linux/mips/syscallent-o32.h
-@@ -1,6 +1,6 @@
- #if defined LINUX_MIPSO32
- /* For an O32 strace, decode the o32 syscalls.  */
--[4000] = { MA,	0,		printargs,			"syscall"		}, /* start of Linux o32 */
-+[4000] = { MA,	0,		sys_syscall,			"syscall"		}, /* start of Linux o32 */
- [4001] = { 1,	TP|SE,		sys_exit,			"exit"			},
- [4002] = { 0,	TP,		sys_fork,			"fork"			},
- [4003] = { 3,	TD,		sys_read,			"read"			},
-Index: strace-4.10/syscall.c
-===================================================================
---- strace-4.10.orig/syscall.c
-+++ strace-4.10/syscall.c
-@@ -606,6 +606,25 @@ decode_ipc_subcall(struct tcb *tcp)
- }
- #endif
- 
-+#ifdef LINUX_MIPSO32
-+static void
-+decode_mips_subcall(struct tcb *tcp)
-+{
-+	if (!SCNO_IS_VALID(tcp->u_arg[0]))
-+		return;
-+	tcp->scno = tcp->u_arg[0];
-+	tcp->qual_flg = qual_flags[tcp->scno];
-+	tcp->s_ent = &sysent[tcp->scno];
-+	memmove(&tcp->u_arg[0], &tcp->u_arg[1],
-+		sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
-+}
-+
-+int sys_syscall(struct tcb *tcp)
-+{
-+	return printargs(tcp);
-+}
-+#endif
-+
- int
- printargs(struct tcb *tcp)
- {
-@@ -1774,6 +1793,11 @@ trace_syscall_entering(struct tcb *tcp)
- 		goto ret;
- 	}
- 
-+#ifdef LINUX_MIPSO32
-+	if (sys_syscall == tcp->s_ent->sys_func)
-+		decode_mips_subcall(tcp);
-+#endif
-+
- 	if (   sys_execve == tcp->s_ent->sys_func
- # if defined(SPARC) || defined(SPARC64)
- 	    || sys_execv == tcp->s_ent->sys_func
---- strace-4.10.orig/linux/syscall.h	2015-02-06 01:23:05.000000000 +0000
-+++ strace-4.10/linux/syscall.h	2015-07-09 14:36:49.372494628 +0100
-@@ -277,6 +277,7 @@
- int sys_symlinkat();
- int sys_sync_file_range();
- int sys_sync_file_range2();
-+int sys_syscall();
- int sys_sysctl();
- int sys_sysinfo();
- int sys_syslog();
diff --git a/patches/strace/4.10/009-upstream-musl_includes.patch b/patches/strace/4.10/009-upstream-musl_includes.patch
deleted file mode 100644
index c68f8d8..0000000
--- a/patches/strace/4.10/009-upstream-musl_includes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-commit 3460dc486d333231998de0f19918204aacee9ae3
-commit d34e00b293942b1012ddc49ed3ab379a32337611
---- a/evdev.c
-+++ b/evdev.c
-@@ -28,6 +28,8 @@
- 
- #include "defs.h"
- 
-+#include <linux/ioctl.h>
-+
- #ifdef HAVE_LINUX_INPUT_H
- #include <linux/input.h>
- #include "xlat/evdev_abs.h"
---- a/ioctl.c
-+++ b/ioctl.c
-@@ -29,7 +29,7 @@
-  */
- 
- #include "defs.h"
--#include <asm/ioctl.h>
-+#include <linux/ioctl.h>
- #include "xlat/ioctl_dirs.h"
- 
- #ifdef HAVE_LINUX_INPUT_H
---- a/ioctlsort.c
-+++ b/ioctlsort.c
-@@ -33,7 +33,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <asm/ioctl.h>
-+#include <linux/ioctl.h>
- 
- struct ioctlent {
- 	const char *info;
---- a/mknod.c
-+++ b/mknod.c
-@@ -1,6 +1,7 @@
- #include "defs.h"
- 
- #include <fcntl.h>
-+#include <sys/stat.h>
- 
- #ifdef MAJOR_IN_SYSMACROS
- # include <sys/sysmacros.h>
---- a/printmode.c
-+++ b/printmode.c
-@@ -1,6 +1,7 @@
- #include "defs.h"
- 
- #include <fcntl.h>
-+#include <sys/stat.h>
- 
- #include "xlat/modetypes.h"
- 
diff --git a/patches/strace/4.10/010-use-host-ioctl.patch b/patches/strace/4.10/010-use-host-ioctl.patch
deleted file mode 100644
index e9c34d3..0000000
--- a/patches/strace/4.10/010-use-host-ioctl.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -urpN strace-4.10.orig/ioctl_iocdef.c strace-4.10/ioctl_iocdef.c
---- strace-4.10.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.10/ioctl_iocdef.c	2017-01-14 15:05:49.505335680 -0800
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
-+ * is included into ioctlsort (which is compiled for build). Since some
-+ * of these values are used in structure initializers, they cannot be
-+ * defined as 'const unsigned int' - instead, they have to be macros.
-+ * Hence, the result of preprocessing will be run through sed to change
-+ * 'DEFINE' into '#define'
-+ */
-+#include <linux/ioctl.h>
-+
-+DEFINE HOST_IOC_NONE _IOC_NONE
-+DEFINE HOST_IOC_READ _IOC_READ
-+DEFINE HOST_IOC_WRITE _IOC_WRITE
-+
-+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
-+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.10.orig/ioctlsort.c strace-4.10/ioctlsort.c
---- strace-4.10.orig/ioctlsort.c	2015-02-15 18:35:58.000000000 -0800
-+++ strace-4.10/ioctlsort.c	2017-01-14 15:20:30.597371979 -0800
-@@ -33,7 +33,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <linux/ioctl.h>
-+
-+#include "ioctl_iocdef.h"
- 
- struct ioctlent {
- 	const char *info;
-diff -urpN strace-4.10.orig/Makefile.am strace-4.10/Makefile.am
---- strace-4.10.orig/Makefile.am	2015-03-05 18:19:01.000000000 -0800
-+++ strace-4.10/Makefile.am	2017-01-14 15:07:28.978244260 -0800
-@@ -159,6 +159,7 @@ EXTRA_DIST =				\
- 	debian/strace64.manpages	\
- 	debian/watch			\
- 	errnoent.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/syscallent.h		\
-@@ -416,15 +417,24 @@ ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFL
- ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
- ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
- BUILT_SOURCES += $(ioctlent_h)
--CLEANFILES = $(ioctlent_h)
-+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h
- 
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-diff -urpN strace-4.10.orig/Makefile.in strace-4.10/Makefile.in
---- strace-4.10.orig/Makefile.in	2015-03-06 07:16:46.000000000 -0800
-+++ strace-4.10/Makefile.in	2017-01-14 15:23:06.718794409 -0800
-@@ -687,6 +687,7 @@ EXTRA_DIST = \
- 	debian/strace64.manpages	\
- 	debian/watch			\
- 	errnoent.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/syscallent.h		\
-@@ -921,7 +922,7 @@ ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS
- ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD)
- ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
- ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
--CLEANFILES = $(ioctlent_h)
-+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h
- @MAINTAINER_MODE_TRUE@gen_changelog_start_date = 2009-07-08 20:00
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -3414,13 +3415,22 @@ news-check: NEWS
- 		exit 1;						\
- 	fi
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.11/010-use-host-ioctl.patch b/patches/strace/4.11/010-use-host-ioctl.patch
deleted file mode 100644
index 5155200..0000000
--- a/patches/strace/4.11/010-use-host-ioctl.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -urpN strace-4.11.orig/ioctl_iocdef.c strace-4.11/ioctl_iocdef.c
---- strace-4.11.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.11/ioctl_iocdef.c	2017-01-14 15:31:16.925139193 -0800
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
-+ * is included into ioctlsort (which is compiled for build). Since some
-+ * of these values are used in structure initializers, they cannot be
-+ * defined as 'const unsigned int' - instead, they have to be macros.
-+ * Hence, the result of preprocessing will be run through sed to change
-+ * 'DEFINE' into '#define'
-+ */
-+#include <linux/ioctl.h>
-+
-+DEFINE HOST_IOC_NONE _IOC_NONE
-+DEFINE HOST_IOC_READ _IOC_READ
-+DEFINE HOST_IOC_WRITE _IOC_WRITE
-+
-+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
-+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.11.orig/ioctlsort.c strace-4.11/ioctlsort.c
---- strace-4.11.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.11/ioctlsort.c	2017-01-14 15:32:13.373831957 -0800
-@@ -33,7 +33,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <linux/ioctl.h>
-+
-+#include "ioctl_iocdef.h"
- 
- struct ioctlent {
- 	const char *info;
-diff -urpN strace-4.11.orig/Makefile.am strace-4.11/Makefile.am
---- strace-4.11.orig/Makefile.am	2015-12-17 09:56:48.000000000 -0800
-+++ strace-4.11/Makefile.am	2017-01-14 15:33:39.186837242 -0800
-@@ -239,6 +239,7 @@ EXTRA_DIST =				\
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -666,17 +667,26 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
- 	cat $^ > $@
- 
- BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
--CLEANFILES    = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
-+CLEANFILES    = $(ioctlent_h) ioctl_iocdef.h native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
- 
- # defines mpers_source_files
-diff -urpN strace-4.11.orig/Makefile.in strace-4.11/Makefile.in
---- strace-4.11.orig/Makefile.in	2015-12-21 15:24:05.000000000 -0800
-+++ strace-4.11/Makefile.in	2017-01-14 15:34:34.803440359 -0800
-@@ -848,6 +848,7 @@ EXTRA_DIST = \
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -1243,7 +1244,7 @@ ioctlent_h = $(patsubst $(srcdir)/$(OS)/
- BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h \
- 	native_printer_defs.h printers.h sen.h sys_func.h .version \
- 	$(am__append_7) $(am__append_11)
--CLEANFILES = $(ioctlent_h) native_printer_decls.h \
-+CLEANFILES = $(ioctlent_h) ioctl_iocdef.h native_printer_decls.h \
- 	native_printer_defs.h printers.h sen.h sys_func.h \
- 	$(am__append_8) $(am__append_12)
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -4829,13 +4830,22 @@ news-check: NEWS
- 		exit 1;						\
- 	fi
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.12/010-use-host-ioctl.patch b/patches/strace/4.12/010-use-host-ioctl.patch
deleted file mode 100644
index bd5a40e..0000000
--- a/patches/strace/4.12/010-use-host-ioctl.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -urpN strace-4.12.orig/ioctl_iocdef.c strace-4.12/ioctl_iocdef.c
---- strace-4.12.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.12/ioctl_iocdef.c	2017-01-14 15:35:21.055924401 -0800
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
-+ * is included into ioctlsort (which is compiled for build). Since some
-+ * of these values are used in structure initializers, they cannot be
-+ * defined as 'const unsigned int' - instead, they have to be macros.
-+ * Hence, the result of preprocessing will be run through sed to change
-+ * 'DEFINE' into '#define'
-+ */
-+#include <linux/ioctl.h>
-+
-+DEFINE HOST_IOC_NONE _IOC_NONE
-+DEFINE HOST_IOC_READ _IOC_READ
-+DEFINE HOST_IOC_WRITE _IOC_WRITE
-+
-+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
-+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.12.orig/ioctlsort.c strace-4.12/ioctlsort.c
---- strace-4.12.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.12/ioctlsort.c	2017-01-14 15:35:21.055924401 -0800
-@@ -33,7 +33,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <linux/ioctl.h>
-+
-+#include "ioctl_iocdef.h"
- 
- struct ioctlent {
- 	const char *info;
-diff -urpN strace-4.12.orig/Makefile.am strace-4.12/Makefile.am
---- strace-4.12.orig/Makefile.am	2016-05-28 03:29:30.000000000 -0700
-+++ strace-4.12/Makefile.am	2017-01-14 15:36:46.916796883 -0800
-@@ -274,6 +274,7 @@ EXTRA_DIST =				\
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -712,10 +713,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -723,7 +733,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
- 
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
--CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
- 
-diff -urpN strace-4.12.orig/Makefile.in strace-4.12/Makefile.in
---- strace-4.12.orig/Makefile.in	2016-05-31 04:35:57.000000000 -0700
-+++ strace-4.12/Makefile.in	2017-01-14 15:37:33.353259891 -0800
-@@ -952,6 +952,7 @@ EXTRA_DIST = \
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -1351,7 +1352,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
- 	native_printer_defs.h printers.h sen.h sys_func.h .version \
- 	$(am__append_7) $(am__append_11)
--CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
- 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
- 	sys_func.h $(am__append_8) $(am__append_12)
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -5506,13 +5507,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- 	rm -f $<-t
- 	mv $@-t $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.13/010-use-host-ioctl.patch b/patches/strace/4.13/010-use-host-ioctl.patch
deleted file mode 100644
index 40ebbf3..0000000
--- a/patches/strace/4.13/010-use-host-ioctl.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -urpN strace-4.13.orig/ioctl_iocdef.c strace-4.13/ioctl_iocdef.c
---- strace-4.13.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.13/ioctl_iocdef.c	2017-01-14 15:50:14.368196376 -0800
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
-+ * is included into ioctlsort (which is compiled for build). Since some
-+ * of these values are used in structure initializers, they cannot be
-+ * defined as 'const unsigned int' - instead, they have to be macros.
-+ * Hence, the result of preprocessing will be run through sed to change
-+ * 'DEFINE' into '#define'
-+ */
-+#include <linux/ioctl.h>
-+
-+DEFINE HOST_IOC_NONE _IOC_NONE
-+DEFINE HOST_IOC_READ _IOC_READ
-+DEFINE HOST_IOC_WRITE _IOC_WRITE
-+
-+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
-+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.13.orig/ioctlsort.c strace-4.13/ioctlsort.c
---- strace-4.13.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.13/ioctlsort.c	2017-01-14 15:50:14.368196376 -0800
-@@ -33,7 +33,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <linux/ioctl.h>
-+
-+#include "ioctl_iocdef.h"
- 
- struct ioctlent {
- 	const char *info;
-diff -urpN strace-4.13.orig/Makefile.am strace-4.13/Makefile.am
---- strace-4.13.orig/Makefile.am	2016-07-22 12:28:06.000000000 -0700
-+++ strace-4.13/Makefile.am	2017-01-14 15:50:14.368196376 -0800
-@@ -283,6 +283,7 @@ EXTRA_DIST =				\
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -721,10 +722,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -732,7 +742,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
- 
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
--CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
- 
-diff -urpN strace-4.13.orig/Makefile.in strace-4.13/Makefile.in
---- strace-4.13.orig/Makefile.in	2016-07-26 09:17:18.000000000 -0700
-+++ strace-4.13/Makefile.in	2017-01-14 15:50:14.368196376 -0800
-@@ -978,6 +978,7 @@ EXTRA_DIST = \
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -1377,7 +1378,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
- 	native_printer_defs.h printers.h sen.h sys_func.h .version \
- 	$(am__append_7) $(am__append_11)
--CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
- 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
- 	sys_func.h $(am__append_8) $(am__append_12)
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -5730,13 +5731,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- 	rm -f $<-t
- 	mv $@-t $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.14/010-use-host-ioctl.patch b/patches/strace/4.14/010-use-host-ioctl.patch
deleted file mode 100644
index 2c7671f..0000000
--- a/patches/strace/4.14/010-use-host-ioctl.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -urpN strace-4.14.orig/ioctl_iocdef.c strace-4.14/ioctl_iocdef.c
---- strace-4.14.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.14/ioctl_iocdef.c	2017-01-14 15:50:38.748425119 -0800
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
-+ * is included into ioctlsort (which is compiled for build). Since some
-+ * of these values are used in structure initializers, they cannot be
-+ * defined as 'const unsigned int' - instead, they have to be macros.
-+ * Hence, the result of preprocessing will be run through sed to change
-+ * 'DEFINE' into '#define'
-+ */
-+#include <linux/ioctl.h>
-+
-+DEFINE HOST_IOC_NONE _IOC_NONE
-+DEFINE HOST_IOC_READ _IOC_READ
-+DEFINE HOST_IOC_WRITE _IOC_WRITE
-+
-+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
-+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.14.orig/ioctlsort.c strace-4.14/ioctlsort.c
---- strace-4.14.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.14/ioctlsort.c	2017-01-14 15:50:38.748425119 -0800
-@@ -33,7 +33,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <linux/ioctl.h>
-+
-+#include "ioctl_iocdef.h"
- 
- struct ioctlent {
- 	const char *info;
-diff -urpN strace-4.14.orig/Makefile.am strace-4.14/Makefile.am
---- strace-4.14.orig/Makefile.am	2016-09-05 12:52:57.000000000 -0700
-+++ strace-4.14/Makefile.am	2017-01-14 15:50:38.748425119 -0800
-@@ -289,6 +289,7 @@ EXTRA_DIST =				\
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -739,10 +740,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -750,7 +760,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
- 
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
--CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
- 
-diff -urpN strace-4.14.orig/Makefile.in strace-4.14/Makefile.in
---- strace-4.14.orig/Makefile.in	2016-10-04 12:13:20.000000000 -0700
-+++ strace-4.14/Makefile.in	2017-01-14 15:50:38.752425155 -0800
-@@ -995,6 +995,7 @@ EXTRA_DIST = \
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align32.h	\
-@@ -1406,7 +1407,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
- 	native_printer_defs.h printers.h sen.h sys_func.h .version \
- 	$(am__append_7) $(am__append_11)
--CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
- 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
- 	sys_func.h $(am__append_8) $(am__append_12)
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -5896,13 +5897,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- 	rm -f $<-t
- 	mv $@-t $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.15/010-use-host-ioctl.patch b/patches/strace/4.15/010-use-host-ioctl.patch
deleted file mode 100644
index 71d380a..0000000
--- a/patches/strace/4.15/010-use-host-ioctl.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -urpN strace-4.15.orig/ioctl_iocdef.c strace-4.15/ioctl_iocdef.c
---- strace-4.15.orig/ioctl_iocdef.c	1969-12-31 16:00:00.000000000 -0800
-+++ strace-4.15/ioctl_iocdef.c	2017-01-14 15:50:56.388590804 -0800
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * This file is *PREPROCESSED*, not *COMPILED* for host and the result
-+ * is included into ioctlsort (which is compiled for build). Since some
-+ * of these values are used in structure initializers, they cannot be
-+ * defined as 'const unsigned int' - instead, they have to be macros.
-+ * Hence, the result of preprocessing will be run through sed to change
-+ * 'DEFINE' into '#define'
-+ */
-+#include <linux/ioctl.h>
-+
-+DEFINE HOST_IOC_NONE _IOC_NONE
-+DEFINE HOST_IOC_READ _IOC_READ
-+DEFINE HOST_IOC_WRITE _IOC_WRITE
-+
-+DEFINE HOST_IOC_SIZESHIFT _IOC_SIZESHIFT
-+DEFINE HOST_IOC_DIRSHIFT _IOC_DIRSHIFT
-diff -urpN strace-4.15.orig/ioctlsort.c strace-4.15/ioctlsort.c
---- strace-4.15.orig/ioctlsort.c	2015-03-28 15:37:30.000000000 -0700
-+++ strace-4.15/ioctlsort.c	2017-01-14 15:50:56.388590804 -0800
-@@ -33,7 +33,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <linux/ioctl.h>
-+
-+#include "ioctl_iocdef.h"
- 
- struct ioctlent {
- 	const char *info;
-diff -urpN strace-4.15.orig/Makefile.am strace-4.15/Makefile.am
---- strace-4.15.orig/Makefile.am	2016-12-07 07:53:13.000000000 -0800
-+++ strace-4.15/Makefile.am	2017-01-14 15:50:56.392590842 -0800
-@@ -298,6 +298,7 @@ EXTRA_DIST =				\
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align16.h	\
-@@ -815,10 +816,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
-@@ -826,7 +836,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/i
- 
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
--CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) ioctl_iocdef.h $(mpers_preproc_files) \
- 		native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
- 
-diff -urpN strace-4.15.orig/Makefile.in strace-4.15/Makefile.in
---- strace-4.15.orig/Makefile.in	2016-12-14 01:17:46.000000000 -0800
-+++ strace-4.15/Makefile.in	2017-01-14 15:50:56.392590842 -0800
-@@ -1036,6 +1036,7 @@ EXTRA_DIST = \
- 	debian/watch			\
- 	errnoent.sh			\
- 	generate_sen.sh			\
-+	ioctl_iocdef.c			\
- 	ioctlsort.c			\
- 	linux/32/ioctls_inc.h		\
- 	linux/32/ioctls_inc_align16.h	\
-@@ -1514,7 +1515,7 @@ ioctl_redefs_h = $(filter-out ioctl_rede
- BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) native_printer_decls.h \
- 	native_printer_defs.h printers.h sen.h sys_func.h .version \
- 	$(am__append_7) $(am__append_11)
--CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
-+CLEANFILES = $(ioctl_redefs_h) $(ioctlent_h) octl_iocdef.h $(mpers_preproc_files) \
- 	native_printer_decls.h native_printer_defs.h printers.h sen.h \
- 	sys_func.h $(am__append_8) $(am__append_12)
- DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
-@@ -6177,13 +6178,22 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
- 	rm -f $<-t
- 	mv $@-t $@
- 
-+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
-+# ioctlsort *for build*, hence this magic.
-+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
-+	$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+		$(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
-+
-+ioctl_iocdef.h: ioctl_iocdef.i
-+	sed -n 's/^DEFINE HOST/#define /p' $< > $@
-+
- ioctlent%.h: ioctlsort%
- 	./$< > $@
- 
- ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
- 	$(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
- 
--ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
-+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
- 	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
- 
- ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
diff --git a/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch b/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch
deleted file mode 100644
index ebbf69a..0000000
--- a/patches/strace/4.5.18/110-dont-use-REG_SYSCALL-for-sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -dur strace-4.5.16.orig/process.c strace-4.5.16/process.c
---- strace-4.5.16.orig/process.c	2007-01-11 23:08:38.000000000 +0100
-+++ strace-4.5.16/process.c	2007-07-14 19:19:58.000000000 +0200
-@@ -2685,7 +2685,6 @@
-        { 4*REG_GBR,            "4*REG_GBR"                             },
-        { 4*REG_MACH,           "4*REG_MACH"                            },
-        { 4*REG_MACL,           "4*REG_MACL"                            },
--       { 4*REG_SYSCALL,        "4*REG_SYSCALL"                         },
-        { 4*REG_FPUL,           "4*REG_FPUL"                            },
-        { 4*REG_FPREG0,         "4*REG_FPREG0"                          },
-        { 4*(REG_FPREG0+1),     "4*REG_FPREG1"                          },
diff --git a/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch b/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch
deleted file mode 100644
index 2f47dc9..0000000
--- a/patches/strace/4.5.18/130-fix-disabled-largefile-syscalls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
---- strace-4.5.16.orig/syscall.c	2007-07-14 19:21:44.000000000 +0200
-+++ strace-4.5.16/syscall.c	2007-07-14 19:22:49.000000000 +0200
-@@ -125,6 +125,18 @@
- #define TP TRACE_PROCESS
- #define TS TRACE_SIGNAL
-
-+#ifndef HAVE_STATFS64
-+/*
-+ * Ugly hacks for systems that do not have LFS
-+ */
-+
-+#define sys_truncate64  sys_truncate
-+#define sys_ftruncate64 sys_ftruncate
-+#define sys_getdents64  sys_getdents
-+#define sys_statfs64    sys_statfs
-+#define sys_fstatfs64   sys_fstatfs
-+#endif
-+
- static const struct sysent sysent0[] = {
- #include "syscallent.h"
- };
diff --git a/patches/strace/4.5.18/140-statfs64-check.patch b/patches/strace/4.5.18/140-statfs64-check.patch
deleted file mode 100644
index 758966b..0000000
--- a/patches/strace/4.5.18/140-statfs64-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -dur strace-4.5.16.orig/acinclude.m4 strace-4.5.16/acinclude.m4
---- strace-4.5.16.orig/acinclude.m4	2004-04-14 04:21:01.000000000 +0200
-+++ strace-4.5.16/acinclude.m4	2007-07-14 19:25:25.000000000 +0200
-@@ -210,6 +210,26 @@
- fi
- ])
-
-+dnl ### A macro to determine whether statfs64 is defined.
-+AC_DEFUN([AC_STATFS64],
-+[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h)
-+AC_CACHE_VAL(ac_cv_type_statfs64,
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX
-+#include <linux/types.h>
-+#include <sys/statfs.h>
-+#else
-+#include <sys/vfs.h>
-+#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])])
-+AC_MSG_RESULT($ac_cv_type_statfs64)
-+if test "$ac_cv_type_statfs64" = yes
-+then
-+	AC_DEFINE([HAVE_STATFS64], 1,
-+[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.])
-+fi
-+])
-+
-+
-+
- dnl ### A macro to determine if off_t is a long long
- AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
- [AC_MSG_CHECKING(for long long off_t)
-diff -dur strace-4.5.16.orig/configure.ac strace-4.5.16/configure.ac
---- strace-4.5.16.orig/configure.ac	2007-01-11 12:37:55.000000000 +0100
-+++ strace-4.5.16/configure.ac	2007-07-14 19:25:25.000000000 +0200
-@@ -169,6 +169,7 @@
- 		  struct stat.st_level,
- 		  struct stat.st_rdev])
- AC_STAT64
-+AC_STATFS64
-
- AC_TYPE_SIGNAL
- AC_TYPE_UID_T
-diff -dur strace-4.5.16.orig/file.c strace-4.5.16/file.c
---- strace-4.5.16.orig/file.c	2007-01-15 21:25:52.000000000 +0100
-+++ strace-4.5.16/file.c	2007-07-14 19:25:25.000000000 +0200
-@@ -1636,7 +1636,7 @@
- 	return 0;
- }
-
--#ifdef LINUX
-+#ifdef HAVE_STATFS64
- static void
- printstatfs64(tcp, addr)
- struct tcb *tcp;
diff --git a/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch b/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch
deleted file mode 100644
index e12b4e4..0000000
--- a/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Dmitry V. Levin [Tue, 3 Nov 2009 16:49:49 +0000]
-
-Fix check for linux/netlink.h on Linux 2.6.32-rc5+
-
-* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include 
-  sys/socket.h instead of linux/socket.h beforehand.
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -197,7 +197,7 @@ AC_CHECK_HEADERS([ \
- ], [], [])
- AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
-                  [], [], [#include <stddef.h>
--#include <linux/socket.h>])
-+#include <sys/socket.h>])
- AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
- AC_CHECK_TYPES([struct sigcontext_struct],,, [#include <signal.h>])
- AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
diff --git a/patches/strace/4.5.18/160-undef-syscall.patch b/patches/strace/4.5.18/160-undef-syscall.patch
deleted file mode 100644
index c7dcb07..0000000
--- a/patches/strace/4.5.18/160-undef-syscall.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -dur strace-4.5.16.orig/linux/syscallent.h strace-4.5.16/linux/syscallent.h
---- strace-4.5.16.orig/linux/syscallent.h	2006-10-16 03:17:52.000000000 +0200
-+++ strace-4.5.16/linux/syscallent.h	2007-07-14 19:30:16.000000000 +0200
-@@ -130,7 +130,11 @@
- 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
- 	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
- 	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
--	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
-+	{ 2,	TD,	sys_socketcall,		"socketcall"
-+#ifdef __NR_socketcall
-+	    , SYS_socketcall
-+#endif
-+								}, /* 102 */
- 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
- 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
- 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-@@ -145,7 +149,11 @@
- 	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
- 	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
- 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
--	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
-+	{ 6,	0,	sys_ipc,		"ipc"
-+#ifdef __NR_ipc
-+	    , SYS_ipc
-+#endif
-+								}, /* 117 */
- 	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
- 	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
- 	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
-@@ -282,7 +290,11 @@
- 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
- 	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 250 */
- 	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
--	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
-+	{ 1,	TP,	sys_exit,		"exit_group"
-+#ifdef __NR_exit_group
-+	    , __NR_exit_group
-+#endif
-+								}, /* 252 */
- 	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
- 	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
- 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
diff --git a/patches/strace/4.5.18/170-no_cachectl.patch b/patches/strace/4.5.18/170-no_cachectl.patch
deleted file mode 100644
index a8fab23..0000000
--- a/patches/strace/4.5.18/170-no_cachectl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This patch is needed on newer uclibc becuase the uclibc header generation
-mechanism generates the sysnum.h properly NR_cacheflush is defined for ARM
-but there is no cachectl.h file which is exported to userspace. Strace 
-assumes that if SYS_cacheflush is defined than it icludes asm/cachectl.h
-which breaks the build for ARM now.
-
-This patch adds a check for ARM architecture.
-
--Khem
-
-Here is error
-
-| if ccache arm-angstrom-linux-uclibcgnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I. -Ilinux/arm -I./linux/arm -Ilinux -I./linux  -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -Wall -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -MT term.o -MD -MP -MF ".deps/term.Tpo" -c -o term.o term.c; \
-|   then mv -f ".deps/term.Tpo" ".deps/term.Po"; else rm -f ".deps/term.Tpo"; exit 1; fi
-| system.c:69:26: error: asm/cachectl.h: No such file or directory
-| make[1]: *** [system.o] Error 1
-| make[1]: *** Waiting for unfinished jobs....
-| signal.c: In function 'sys_sigreturn':
-| signal.c:1221: warning: passing argument 4 of 'ptrace' makes integer from pointer without a cast
-| make[1]: Leaving directory `/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/work/armv5te-angstrom-linux-uclibcgnueabi/strace-4.5.14-r5/strace-4.5.14'
-| make: *** [all] Error 2
-| FATAL: oe_runmake failed
-
-Index: strace-4.5.14/system.c
-===================================================================
---- strace-4.5.14.orig/system.c 2008-05-15 20:23:16.000000000 -0700
-+++ strace-4.5.14/system.c  2008-05-15 20:24:03.000000000 -0700
-@@ -65,7 +65,7 @@
- #include <linux/capability.h>
- #endif
- 
--#ifdef SYS_cacheflush
-+#if defined SYS_cacheflush && !defined ARM
- #include <asm/cachectl.h>
- #endif
diff --git a/patches/strace/4.5.18/180-arm-EABI-syscalls.patch b/patches/strace/4.5.18/180-arm-EABI-syscalls.patch
deleted file mode 100644
index 1f28450..0000000
--- a/patches/strace/4.5.18/180-arm-EABI-syscalls.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Patch from upstream:
-http://strace.cvs.sourceforge.net/viewvc/strace/strace/linux/arm/syscallent.h?r1=1.17&r2=1.18&sortby=file
-
-2008-11-13  Kirill A. Shutemov  <kirill@shutemov.name>
-
-    * linux/arm/syscallent.h: Fix build on ARM EABI which does not
-    provide syscalls socketcall and ipc.
-
---- strace-4.5.18.orig/linux/arm/syscallent.h	2008/12/29 20:04:15	1.17
-+++ strace-4.5.18/linux/arm/syscallent.h	2009/01/01 23:20:38	1.18
-@@ -431,6 +431,7 @@
- 	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
- 	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
- 
-+#ifndef __ARM_EABI__
- #if SYS_socket_subcall != 400
-  #error fix me
- #endif
-@@ -481,3 +482,4 @@
- 	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
- 	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
- 	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
-+#endif
diff --git a/patches/strace/4.5.18/900-autoreconf.patch b/patches/strace/4.5.18/900-autoreconf.patch
deleted file mode 100644
index cff775f..0000000
--- a/patches/strace/4.5.18/900-autoreconf.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -ruN strace-4.5.19.orig/config.h.in strace-4.5.19/config.h.in
---- strace-4.5.19.orig/config.h.in      2009-10-21 19:41:12.000000000 +0200
-+++ strace-4.5.19/config.h.in   2010-01-01 10:39:36.000000000 +0100
-@@ -143,6 +143,9 @@
- /* Define if stat64 is available in asm/stat.h. */
- #undef HAVE_STAT64
- 
-+/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */
-+#undef HAVE_STATFS64
-+
- /* Define to 1 if stdbool.h conforms to C99. */
- #undef HAVE_STDBOOL_H
- 
-diff -dur strace-4.5.16.orig/configure strace-4.5.16/configure
---- strace-4.5.16.orig/configure	2007-01-11 23:23:33.000000000 +0100
-+++ strace-4.5.16/configure	2007-07-14 19:18:43.000000000 +0200
-@@ -5994,6 +5994,73 @@
-
- fi
-
-+echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
-+echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
-+if test "${ac_cv_type_statfs64+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef LINUX
-+#include <linux/types.h>
-+#include <sys/statfs.h>
-+#else
-+#include <sys/vfs.h>
-+#endif
-+int
-+main ()
-+{
-+struct statfs64 st;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_statfs64=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_statfs64=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
-+echo "${ECHO_T}$ac_cv_type_statfs64" >&6
-+if test "$ac_cv_type_statfs64" = yes
-+then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STATFS64 1
-+_ACEOF
-+
-+fi
-+
- 
- { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
- echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-@@ -7580,7 +7647,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <stddef.h>
--#include <linux/socket.h>
-+#include <sys/socket.h>
- 
- #include <$ac_header>
- _ACEOF
diff --git a/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch b/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch
deleted file mode 100644
index a555fc2..0000000
--- a/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -durN strace-4.5.19.orig/syscall.c strace-4.5.19/syscall.c
---- strace-4.5.19.orig/syscall.c	2009-10-28 18:47:18.000000000 +0100
-+++ strace-4.5.19/syscall.c	2009-10-28 18:47:18.000000000 +0100
-@@ -110,6 +110,18 @@
- #define TP TRACE_PROCESS
- #define TS TRACE_SIGNAL
- 
-+#ifndef HAVE_STATFS64
-+/*
-+ * Ugly hacks for systems that do not have LFS
-+ */
-+
-+#define sys_truncate64  sys_truncate
-+#define sys_ftruncate64 sys_ftruncate
-+#define sys_getdents64  sys_getdents
-+#define sys_statfs64    sys_statfs
-+#define sys_fstatfs64   sys_fstatfs
-+#endif
-+
- static const struct sysent sysent0[] = {
- #include "syscallent.h"
- };
diff --git a/patches/strace/4.5.19/130-statfs64-check.patch b/patches/strace/4.5.19/130-statfs64-check.patch
deleted file mode 100644
index 0959bdd..0000000
--- a/patches/strace/4.5.19/130-statfs64-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -durN strace-4.5.19.orig/acinclude.m4 strace-4.5.19/acinclude.m4
---- strace-4.5.19.orig/acinclude.m4	2004-04-14 04:45:53.000000000 +0200
-+++ strace-4.5.19/acinclude.m4	2009-10-28 18:47:18.000000000 +0100
-@@ -210,6 +210,26 @@
- fi
- ])
- 
-+dnl ### A macro to determine whether statfs64 is defined.
-+AC_DEFUN([AC_STATFS64],
-+[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h)
-+AC_CACHE_VAL(ac_cv_type_statfs64,
-+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX
-+#include <linux/types.h>
-+#include <sys/statfs.h>
-+#else
-+#include <sys/vfs.h>
-+#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])])
-+AC_MSG_RESULT($ac_cv_type_statfs64)
-+if test "$ac_cv_type_statfs64" = yes
-+then
-+	AC_DEFINE([HAVE_STATFS64], 1,
-+[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.])
-+fi
-+])
-+
-+
-+
- dnl ### A macro to determine if off_t is a long long
- AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
- [AC_MSG_CHECKING(for long long off_t)
-diff -durN strace-4.5.19.orig/configure.ac strace-4.5.19/configure.ac
---- strace-4.5.19.orig/configure.ac	2009-10-12 21:54:43.000000000 +0200
-+++ strace-4.5.19/configure.ac	2009-10-28 18:47:18.000000000 +0100
-@@ -187,6 +187,7 @@
- 		  struct stat.st_level,
- 		  struct stat.st_rdev])
- AC_STAT64
-+AC_STATFS64
- 
- AC_TYPE_SIGNAL
- AC_TYPE_UID_T
-diff -durN strace-4.5.19.orig/file.c strace-4.5.19/file.c
---- strace-4.5.19.orig/file.c	2009-10-21 15:44:04.000000000 +0200
-+++ strace-4.5.19/file.c	2009-10-28 18:47:18.000000000 +0100
-@@ -1688,7 +1688,7 @@
- 	return 0;
- }
- 
--#ifdef LINUX
-+#ifdef HAVE_STATFS64
- static void
- printstatfs64(struct tcb *tcp, long addr)
- {
diff --git a/patches/strace/4.5.19/150-undef-syscall.patch b/patches/strace/4.5.19/150-undef-syscall.patch
deleted file mode 100644
index 7d65e1d..0000000
--- a/patches/strace/4.5.19/150-undef-syscall.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -durN strace-4.5.19.orig/linux/syscallent.h strace-4.5.19/linux/syscallent.h
---- strace-4.5.19.orig/linux/syscallent.h	2009-09-01 21:53:29.000000000 +0200
-+++ strace-4.5.19/linux/syscallent.h	2009-10-28 18:47:18.000000000 +0100
-@@ -130,7 +130,11 @@
- 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
- 	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
- 	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
--	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
-+	{ 2,	TD,	sys_socketcall,		"socketcall"
-+#ifdef __NR_socketcall
-+	    , SYS_socketcall
-+#endif
-+								}, /* 102 */
- 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
- 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
- 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-@@ -145,7 +149,11 @@
- 	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
- 	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
- 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
--	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
-+	{ 6,	0,	sys_ipc,		"ipc"
-+#ifdef __NR_ipc
-+	    , SYS_ipc
-+#endif
-+								}, /* 117 */
- 	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
- 	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
- 	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
-@@ -282,7 +290,11 @@
- 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
- 	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 250 */
- 	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
--	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
-+	{ 1,	TP,	sys_exit,		"exit_group"
-+#ifdef __NR_exit_group
-+	    , __NR_exit_group
-+#endif
-+								}, /* 252 */
- 	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
- 	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
- 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
diff --git a/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch b/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch
deleted file mode 100644
index d8c6b2a..0000000
--- a/patches/strace/4.5.19/160-fix-check-for-linux-netlink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Dmitry V. Levin [Tue, 3 Nov 2009 16:49:49 +0000]
-
-Fix check for linux/netlink.h on Linux 2.6.32-rc5+
-
-* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include 
-  sys/socket.h instead of linux/socket.h beforehand.
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,7 +258,7 @@ AC_CHECK_HEADERS([ \
- ], [], [])
- AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
-                  [], [], [#include <stddef.h>
--#include <linux/socket.h>])
-+#include <sys/socket.h>])
- AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
- AC_CHECK_TYPES([struct sigcontext_struct,
- 		struct sigcontext],,, [#include <signal.h>])
diff --git a/patches/strace/4.5.19/170-update-configure.patch b/patches/strace/4.5.19/170-update-configure.patch
deleted file mode 100644
index 5d12276..0000000
--- a/patches/strace/4.5.19/170-update-configure.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ruN strace-4.5.19.orig/config.h.in strace-4.5.19/config.h.in
---- strace-4.5.19.orig/config.h.in	2009-10-21 19:41:12.000000000 +0200
-+++ strace-4.5.19/config.h.in	2010-01-01 10:39:36.000000000 +0100
-@@ -161,6 +161,9 @@
- /* Define if stat64 is available in asm/stat.h. */
- #undef HAVE_STAT64
- 
-+/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */
-+#undef HAVE_STATFS64
-+
- /* Define to 1 if stdbool.h conforms to C99. */
- #undef HAVE_STDBOOL_H
- 
-diff -ruN strace-4.5.19.orig/configure strace-4.5.19/configure
---- strace-4.5.19.orig/configure	2010-01-01 10:38:49.000000000 +0100
-+++ strace-4.5.19/configure	2010-01-01 10:39:36.000000000 +0100
-@@ -5374,6 +5374,44 @@
- 
- fi
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs64 in sys/(statfs|vfs).h" >&5
-+$as_echo_n "checking for statfs64 in sys/(statfs|vfs).h... " >&6; }
-+if test "${ac_cv_type_statfs64+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef LINUX
-+#include <linux/types.h>
-+#include <sys/statfs.h>
-+#else
-+#include <sys/vfs.h>
-+#endif
-+int
-+main ()
-+{
-+struct statfs64 st;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_type_statfs64=yes
-+else
-+  ac_cv_type_statfs64=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_statfs64" >&5
-+$as_echo "$ac_cv_type_statfs64" >&6; }
-+if test "$ac_cv_type_statfs64" = yes
-+then
-+
-+$as_echo "#define HAVE_STATFS64 1" >>confdefs.h
-+
-+fi
-+
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
- $as_echo_n "checking return type of signal handlers... " >&6; }
-@@ -5880,7 +5851,7 @@
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h>
--#include <linux/socket.h>
-+#include <sys/socket.h>
- "
- eval as_val=\$$as_ac_Header
-    if test "x$as_val" = x""yes; then :
-diff -ruN strace-4.5.19.orig/Makefile.in strace-4.5.19/Makefile.in
---- strace-4.5.19.orig/Makefile.in	2009-10-21 19:41:14.000000000 +0200
-+++ strace-4.5.19/Makefile.in	2010-01-01 10:39:36.000000000 +0100
-@@ -42,8 +42,9 @@
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
--	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS INSTALL \
--	NEWS TODO config.guess config.sub depcomp install-sh missing
-+	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
-+	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
-+	install-sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- 	$(top_srcdir)/configure.ac
diff --git a/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch b/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
deleted file mode 100644
index 49a71e1..0000000
--- a/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2013-08-26
-Initial Package Version: 4.8
-Upstream Status: Unknown
-Origin: Unknown
-Description: Fixes compilation with glibc-2.18.
-From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net.
-http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm
-Their changelog reports:
- * Wed Aug 14 2013 schwab@suse.de
- - strace-linux-ptrace-h.patch: handle conflict with struct
-   ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
-
-
-Index: strace-4.8/process.c
-===================================================================
---- strace-4.8.orig/process.c
-+++ strace-4.8/process.c
-@@ -63,9 +63,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- # include <linux/ptrace.h>
- # undef ia64_fpreg
- # undef pt_all_user_regs
-+# undef ptrace_peeksiginfo_args
- #endif
- 
- #if defined(SPARC64)
-Index: strace-4.8/signal.c
-===================================================================
---- strace-4.8.orig/signal.c
-+++ strace-4.8/signal.c
-@@ -51,9 +51,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- # include <linux/ptrace.h>
- # undef ia64_fpreg
- # undef pt_all_user_regs
-+# undef ptrace_peeksiginfo_args
- #endif
- 
- #ifdef IA64
-Index: strace-4.8/syscall.c
-===================================================================
---- strace-4.8.orig/syscall.c
-+++ strace-4.8/syscall.c
-@@ -48,9 +48,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- # include <linux/ptrace.h>
- # undef ia64_fpreg
- # undef pt_all_user_regs
-+# undef ptrace_peeksiginfo_args
- #endif
- 
- #if defined(SPARC64)
-Index: strace-4.8/util.c
-===================================================================
---- strace-4.8.orig/util.c
-+++ strace-4.8/util.c
-@@ -55,9 +55,11 @@
- # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
- #  define pt_all_user_regs XXX_pt_all_user_regs
- # endif
-+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- # include <linux/ptrace.h>
- # undef ia64_fpreg
- # undef pt_all_user_regs
-+# undef ptrace_peeksiginfo_args
- #endif
- 
- int
diff --git a/patches/uClibc-ng/1.0.20/100-xtensa-static-link.patch b/patches/uClibc-ng/1.0.20/100-xtensa-static-link.patch
deleted file mode 100644
index 3f8a518..0000000
--- a/patches/uClibc-ng/1.0.20/100-xtensa-static-link.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urpN uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/Makefile.commonarch uClibc-ng-1.0.20/libpthread/nptl/sysdeps/Makefile.commonarch
---- uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/Makefile.commonarch	2016-12-06 13:02:51.385861492 -0800
-+++ uClibc-ng-1.0.20/libpthread/nptl/sysdeps/Makefile.commonarch	2016-12-06 19:08:53.150146970 -0800
-@@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(
- libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ)
- 
- libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC))
--libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC))
-+libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC))
- libc_arch_OBJS = $(libc_arch_COBJ) $(libc_arch_SOBJ)
- libc_arch_a_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_CSRC))
--libc_arch_a_OBJS = $(libc_arch_a_COBJ)
-+libc_arch_a_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_SSRC))
-+libc_arch_a_OBJS = $(libc_arch_a_COBJ) $(libc_arch_a_SOBJ)
- 
- librt_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(librt_arch_CSRC))
- librt_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(librt_arch_SSRC))
-diff -urpN uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S
---- uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S	1969-12-31 16:00:00.000000000 -0800
-+++ uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S	2016-12-06 19:08:53.150146970 -0800
-@@ -0,0 +1 @@
-+#include <ldso/ldso/xtensa/dl-tlsdesc.S>
-diff -urpN uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/Makefile.arch uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/Makefile.arch
---- uClibc-ng-1.0.20.orig/libpthread/nptl/sysdeps/xtensa/Makefile.arch	2016-12-06 13:02:51.401861642 -0800
-+++ uClibc-ng-1.0.20/libpthread/nptl/sysdeps/xtensa/Makefile.arch	2016-12-06 19:08:53.150146970 -0800
-@@ -20,7 +20,7 @@
- ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread
- 
- libc_arch_a_CSRC = libc-tls.c
--librt_arch_a_SSRC = dl-tlsdesc.S
-+libc_arch_a_SSRC = libc-dl-tlsdesc.S
- 
- CFLAGS-gen_tlsdesc.c = -S
- $(libpthread_arch_OUT)/gen_tlsdesc.c: $(libpthread_arch_DIR)/tlsdesc.sym | $(libpthread_arch_OUT)
diff --git a/patches/uClibc-ng/1.0.20/110-has-lfs.patch b/patches/uClibc-ng/1.0.20/110-has-lfs.patch
deleted file mode 100644
index c5b90de..0000000
--- a/patches/uClibc-ng/1.0.20/110-has-lfs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2a40d18badc4f0bff8c2e02507cd8d59cfeb3e7c Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Mon, 23 Jan 2017 14:21:54 -0800
-Subject: [PATCH] Restore UCLIBC_HAS_LFS as "always enabled".
-
-Otherwise, buildroot rejects uClibc-ng in an external toolchain.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- extra/Configs/Config.in | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
-index a9d62f5..b2cf977 100644
---- a/extra/Configs/Config.in
-+++ b/extra/Configs/Config.in
-@@ -566,6 +566,11 @@ config UCLIBC_HAS_SYSLOG
- 	  Support sending messages to the system logger.
- 	  This requires socket-support.
- 
-+config UCLIBC_HAS_LFS
-+	def_bool y
-+	help
-+	  Large file support (always enabled; config symbol retained for
-+	  feature test to be compatible with uClibc).
- choice
- 	prompt "Malloc Implementation"
- 	default MALLOC if ! ARCH_USE_MMU
--- 
-2.9.3
-
diff --git a/patches/uClibc-ng/1.0.21/110-has-lfs.patch b/patches/uClibc-ng/1.0.21/110-has-lfs.patch
deleted file mode 100644
index c5b90de..0000000
--- a/patches/uClibc-ng/1.0.21/110-has-lfs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2a40d18badc4f0bff8c2e02507cd8d59cfeb3e7c Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Mon, 23 Jan 2017 14:21:54 -0800
-Subject: [PATCH] Restore UCLIBC_HAS_LFS as "always enabled".
-
-Otherwise, buildroot rejects uClibc-ng in an external toolchain.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- extra/Configs/Config.in | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
-index a9d62f5..b2cf977 100644
---- a/extra/Configs/Config.in
-+++ b/extra/Configs/Config.in
-@@ -566,6 +566,11 @@ config UCLIBC_HAS_SYSLOG
- 	  Support sending messages to the system logger.
- 	  This requires socket-support.
- 
-+config UCLIBC_HAS_LFS
-+	def_bool y
-+	help
-+	  Large file support (always enabled; config symbol retained for
-+	  feature test to be compatible with uClibc).
- choice
- 	prompt "Malloc Implementation"
- 	default MALLOC if ! ARCH_USE_MMU
--- 
-2.9.3
-
diff --git a/patches/uClibc-ng/1.0.21/120-module.patch b/patches/uClibc-ng/1.0.21/120-module.patch
deleted file mode 100644
index 2e8a989..0000000
--- a/patches/uClibc-ng/1.0.21/120-module.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 03884934b32c79da545ef38a42835a6c257b125d
-Author: Waldemar Brodkorb <wbx@uclibc-ng.org>
-Date:   Tue Dec 27 09:24:24 2016 +0100
-
-    add init_module/delete_module syscall wrappers
-    
-    Add the wrappers unconditionally, because kmod package
-    still uses them.
-
-diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
-index 595074c..faed6fd 100644
---- a/libc/sysdeps/linux/common/Makefile.in
-+++ b/libc/sysdeps/linux/common/Makefile.in
-@@ -31,6 +31,7 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += \
- 	ioperm.c \
- 	iopl.c \
- 	modify_ldt.c \
-+	module.c \
- 	personality.c \
- 	pipe2.c \
- 	ppoll.c \
-diff --git a/libc/sysdeps/linux/common/module.c b/libc/sysdeps/linux/common/module.c
-new file mode 100644
-index 0000000..146a43e
---- /dev/null
-+++ b/libc/sysdeps/linux/common/module.c
-@@ -0,0 +1,23 @@
-+/*
-+ * init_module()/delete_module() for uClibc
-+ *
-+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+
-+#ifdef __NR_init_module
-+int init_module(void *first, void *second, void *third, void *fourth, void *fifth);
-+/* This may have 5 arguments (for old 2.0 kernels) or 2 arguments
-+ * (for 2.2 and 2.4 kernels).  Use the greatest common denominator,
-+ * and let the kernel cope with whatever it gets.  It's good at that. */
-+_syscall5(int, init_module, void *, first, void *, second, void *, third,
-+	  void *, fourth, void *, fifth)
-+#endif
-+
-+#ifdef __NR_delete_module
-+int delete_module(const char *name, unsigned int flags);
-+_syscall2(int, delete_module, const char *, name, unsigned int, flags)
-+#endif
diff --git a/patches/uClibc/0.9.33.2/100-m68k-ice.patch b/patches/uClibc/0.9.33.2/100-m68k-ice.patch
deleted file mode 100644
index 410f8d6..0000000
--- a/patches/uClibc/0.9.33.2/100-m68k-ice.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN uClibc-0.9.33.2~orig/Rules.mak uClibc-0.9.33.2/Rules.mak
---- uClibc-0.9.33.2~orig/Rules.mak	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/Rules.mak	2012-09-24 14:09:51.092953729 +0200
-@@ -226,6 +226,7 @@
- 
- OPTIMIZATION:=
- # Use '-Os' optimization if available, else use -O2, allow Config to override
-+ifneq ($(TARGET_ARCH),m68k)
- $(eval $(call check-gcc-var,-Os))
- ifneq ($(CFLAG_-Os),)
- OPTIMIZATION += $(CFLAG_-Os)
-@@ -233,6 +234,7 @@
- $(eval $(call check-gcc-var,-O2))
- OPTIMIZATION += $(CFLAG_-O2)
- endif
-+endif
- # Use the gcc 3.4 -funit-at-a-time optimization when available
- $(eval $(call check-gcc-var,-funit-at-a-time))
- OPTIMIZATION += $(CFLAG_-funit-at-a-time)
diff --git a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch b/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
deleted file mode 100644
index 0381ba8..0000000
--- a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-From 7fef6b983456e4c529a5239ea90715050e6f4452 Mon Sep 17 00:00:00 2001
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Mon, 1 Oct 2012 18:12:54 +1300
-Subject: [PATCH 4/8] libc/sysdeps: add __kernel_long and __kernel_ulong
-
-Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
-exported header files were updated to use these new types. Add the
-definitions for __kernel_long_t and __kernel_ulong_t to the relevant
-kernel_types.h headers.
-
-This change was automated with the following scriptlet
-
-  git grep --name-only 'typedef.*__kernel_old_dev_t' \
-    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
-  typedef long\t\t__kernel_long_t;\
-  typedef unsigned long\t__kernel_ulong_t;'
-
-Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
-
-Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
-Here's a cleaned up patch which should get the whitespace right. I'm a
-bit iffy about the sparc changes they make sense to me but it's not a
-platform I have access to.
-
-I can break this up per arch or per maintainer if requested.
-
- libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
- 22 files changed, 50 insertions(+)
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libc/sysdeps/linux/alpha/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/arm/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/avr32/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/bfin/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/c6x/bits/kernel_types.h        | 2 ++
- libc/sysdeps/linux/cris/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/e1/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/h8300/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/hppa/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/i386/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/ia64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/m68k/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/microblaze/bits/kernel_types.h | 2 ++
- libc/sysdeps/linux/mips/bits/kernel_types.h       | 4 ++++
- libc/sysdeps/linux/nios2/bits/kernel_types.h      | 2 ++
- libc/sysdeps/linux/powerpc/bits/kernel_types.h    | 4 ++++
- libc/sysdeps/linux/sh/bits/kernel_types.h         | 2 ++
- libc/sysdeps/linux/sh64/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/sparc/bits/kernel_types.h      | 4 ++++
- libc/sysdeps/linux/v850/bits/kernel_types.h       | 2 ++
- libc/sysdeps/linux/x86_64/bits/kernel_types.h     | 2 ++
- libc/sysdeps/linux/xtensa/bits/kernel_types.h     | 2 ++
- 22 files changed, 50 insertions(+)
-
-diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-index d5574c9..cd59b9d 100644
---- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
- typedef __kernel_uid_t __kernel_uid32_t;
- typedef __kernel_gid_t __kernel_gid32_t;
- typedef __kernel_dev_t __kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- typedef struct {
- 	int val[2];
-diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
-index 766a306..6b36f32 100644
---- a/libc/sysdeps/linux/arm/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short		__kernel_old_uid_t;
- typedef unsigned short		__kernel_old_gid_t;
- typedef long long		__kernel_loff_t;
- typedef __kernel_dev_t		__kernel_old_dev_t;
-+typedef long			__kernel_long_t;
-+typedef unsigned long		__kernel_ulong_t;
- 
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-index f7d8b52..c551d57 100644
---- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
-@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
- typedef unsigned short		__kernel_old_uid_t;
- typedef unsigned short		__kernel_old_gid_t;
- typedef unsigned short		__kernel_old_dev_t;
-+typedef long			__kernel_long_t;
-+typedef unsigned long		__kernel_ulong_t;
- 
- #ifdef __GNUC__
- typedef long long		__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-index d69a875..9fec595 100644
---- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef long long	__kernel_loff_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-index 7557309..2c363a8 100644
---- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
-@@ -22,6 +22,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef unsigned int	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef unsigned int	__kernel_size_t;
- typedef int		__kernel_ssize_t;
- typedef int		__kernel_ptrdiff_t;
-diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
-index f122c7f..5d31f7b 100644
---- a/libc/sysdeps/linux/cris/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
-@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
- typedef unsigned short  __kernel_old_uid_t;
- typedef unsigned short  __kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- #ifdef __GNUC__
- typedef long long	__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
-index 8017d85..f55a129 100644
---- a/libc/sysdeps/linux/e1/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long	__kernel_loff_t;
- 
- /*
-diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-index 0570675..4cfd1bf 100644
---- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef long long	__kernel_loff_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-index 4441f9b..6b2e794 100644
---- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
-@@ -45,6 +45,8 @@ typedef long long		__kernel_off64_t;
- typedef unsigned long long	__kernel_ino64_t;
- 
- typedef unsigned int		__kernel_old_dev_t;
-+typedef long			__kernel_long_t;
-+typedef unsigned long		__kernel_ulong_t;
- 
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
-index 9c07c72..59044b8 100644
---- a/libc/sysdeps/linux/i386/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long	__kernel_loff_t;
- 
- typedef struct {
-diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-index c8ef86d..e31dc65 100644
---- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
-@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
- 
- typedef unsigned int	__kernel_dev_t;
- typedef unsigned int	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- #endif /* _ASM_IA64_POSIX_TYPES_H */
-diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-index 0a77a8f..176b968 100644
---- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef long long	__kernel_loff_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-index 2a70575..a9f736b 100644
---- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
-@@ -44,6 +44,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef unsigned int	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- #ifdef __GNUC__
- typedef long long	__kernel_loff_t;
-diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
-index 9fc3b96..97faeac 100644
---- a/libc/sysdeps/linux/mips/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef int		__kernel_gid32_t;
- typedef __kernel_uid_t	__kernel_old_uid_t;
- typedef __kernel_gid_t	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long      __kernel_loff_t;
- #else
- typedef unsigned int	__kernel_dev_t;
-@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
- typedef __kernel_uid_t	__kernel_old_uid_t;
- typedef __kernel_gid_t	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long      __kernel_loff_t;
- #endif
- 
-diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-index 8b86d79..3c030e7 100644
---- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
-@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef unsigned short	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long	__kernel_loff_t;
- 
- typedef struct {
-diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-index 3f3b933..1167de2 100644
---- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
-@@ -36,6 +36,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- #else
- typedef unsigned int	__kernel_dev_t;
- typedef unsigned int	__kernel_ino_t;
-@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned int	__kernel_old_uid_t;
- typedef unsigned int	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long	__kernel_loff_t;
- #endif
- 
-diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
-index f96e9fa..ac97261 100644
---- a/libc/sysdeps/linux/sh/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long	__kernel_loff_t;
- 
- typedef struct {
-diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-index 671cc83..8cc6c61 100644
---- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
-@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
- typedef unsigned short  __kernel_old_uid_t;
- typedef unsigned short  __kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long       __kernel_loff_t;
- 
- typedef struct {
-diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-index 0cc4bc2..a10e075 100644
---- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
-@@ -32,6 +32,8 @@ typedef unsigned short	       __kernel_gid16_t;
- typedef __kernel_uid_t 	       __kernel_old_uid_t;
- typedef __kernel_gid_t         __kernel_old_gid_t;
- typedef __kernel_dev_t         __kernel_old_dev_t;
-+typedef long                   __kernel_long_t;
-+typedef unsigned long          __kernel_ulong_t;
- typedef __kernel_uid_t	       __kernel_uid32_t;
- typedef __kernel_gid_t	       __kernel_gid32_t;
- typedef int		       __kernel_suseconds_t;
-@@ -62,6 +64,8 @@ typedef unsigned int	       __kernel_gid32_t;
- typedef unsigned short	       __kernel_old_uid_t;
- typedef unsigned short	       __kernel_old_gid_t;
- typedef __kernel_dev_t         __kernel_old_dev_t;
-+typedef long                   __kernel_long_t;
-+typedef unsigned long          __kernel_ulong_t;
- typedef long long              __kernel_loff_t;
- #endif
- 
-diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
-index 3e851ab..780aa8a 100644
---- a/libc/sysdeps/linux/v850/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
-@@ -41,6 +41,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- 
- typedef struct {
- #ifdef __USE_ALL
-diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-index de800d7..0cae08c 100644
---- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
-@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef __kernel_dev_t	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long	__kernel_loff_t;
- 
- typedef struct {
-diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-index 44f1075..ed38f2e 100644
---- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-+++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
-@@ -33,6 +33,8 @@ typedef unsigned int	__kernel_gid32_t;
- typedef unsigned short	__kernel_old_uid_t;
- typedef unsigned short	__kernel_old_gid_t;
- typedef unsigned short	__kernel_old_dev_t;
-+typedef long		__kernel_long_t;
-+typedef unsigned long	__kernel_ulong_t;
- typedef long long	__kernel_loff_t;
- 
- /* Beginning in 2.6 kernels, which is the first version that includes the
--- 
-1.8.1.2
-
diff --git a/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch b/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch
deleted file mode 100644
index 884307d..0000000
--- a/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrupa uClibc-0.9.33.2.orig/extra/scripts/unifdef.c uClibc-0.9.33.2/extra/scripts/unifdef.c
---- uClibc-0.9.33.2.orig/extra/scripts/unifdef.c	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/extra/scripts/unifdef.c	2014-10-25 17:07:33.000000000 +0200
-@@ -78,8 +78,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/
- #define errx(exit_code, fmt, args...) ({ warnx(fmt, ## args); exit(exit_code); })
- #define err(exit_code, fmt, args...)  errx(exit_code, fmt ": %s", ## args, strerror(errno))
- 
--size_t strlcpy(char *dst, const char *src, size_t siz);
--
- /* types of input lines: */
- typedef enum {
- 	LT_TRUEI,		/* a true #if with ignore flag */
diff --git a/patches/uClibc/0.9.33.2/400-arm-unwind.patch b/patches/uClibc/0.9.33.2/400-arm-unwind.patch
deleted file mode 100644
index d31844c..0000000
--- a/patches/uClibc/0.9.33.2/400-arm-unwind.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 16884562bf54a93e76c6d2ba03edb1fb00e8b3e0
-Author: Alexey Neyman <stilor@att.net>
-Date:   Thu Oct 1 13:22:37 2015 -0700
-
-    Mark libgcc_c_resume as used.
-    
-    Recent GCC releases eliminate the data that is only set and never read,
-    along with the code storing to that data. For assembly blocks like in
-    ARM unwind code, the data structures need to be declared used.
-
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index f9a4ffb..f0c3047 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-@@ -25,7 +25,7 @@
- #define __libc_dlclose          dlclose
- #define __libc_fatal(x)         {/*write(STDERR_FILENO, x, strlen(x));*/ abort();}
- 
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
-   (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- 
diff --git a/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch b/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch
deleted file mode 100644
index 8bc87ec..0000000
--- a/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urpN uClibc-0.9.33.2.orig/extra/config/conf.c uClibc-0.9.33.2/extra/config/conf.c
---- uClibc-0.9.33.2.orig/extra/config/conf.c	2017-02-04 12:57:38.488808014 -0800
-+++ uClibc-0.9.33.2/extra/config/conf.c	2017-02-04 20:26:28.613244457 -0800
-@@ -435,6 +435,7 @@ int main(int ac, char **av)
- 	const char *name;
- 	const char *configname = conf_get_configname();
- 	struct stat tmpstat;
-+	int olddefconfig = 0;
- 
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(PACKAGE, LOCALEDIR);
-@@ -451,6 +452,7 @@ int main(int ac, char **av)
- 			break;
- 		case 'd':
- 			input_mode = set_default;
-+			olddefconfig = 1;
- 			break;
- 		case 'D':
- 			input_mode = set_default;
-@@ -514,7 +516,7 @@ int main(int ac, char **av)
- 	switch (input_mode) {
- 	case set_default:
- 		if (!defconfig_file)
--			defconfig_file = conf_get_default_confname();
-+			defconfig_file = olddefconfig ? NULL : conf_get_default_confname();
- 		if (conf_read(defconfig_file)) {
- 			printf(_("***\n"
- 				"*** Can't find default configuration \"%s\"!\n"
-diff -urpN uClibc-0.9.33.2.orig/Makefile.in uClibc-0.9.33.2/Makefile.in
---- uClibc-0.9.33.2.orig/Makefile.in	2017-02-04 12:57:38.484807980 -0800
-+++ uClibc-0.9.33.2/Makefile.in	2017-02-04 12:59:34.625789324 -0800
-@@ -460,6 +460,9 @@ allyesconfig: $(conf)
- allnoconfig: $(conf)
- 	$(Q)$< -n extra/Configs/Config.in
- 
-+olddefconfig: $(conf)
-+	$(Q)$< -d extra/Configs/Config.in
-+
- defconfig: $(conf)
- 	$(Q)$< -D extra/Configs/defconfigs/$(ARCH)/$@ extra/Configs/Config.in
- 
diff --git a/patches/zlib/1.2.11/100-make-check-fail.patch b/patches/zlib/1.2.11/100-make-check-fail.patch
deleted file mode 100644
index 3852206..0000000
--- a/patches/zlib/1.2.11/100-make-check-fail.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-'make check' should return with non-zero status
-
-... if the test fails.
-
---- zlib-1.2.11/Makefile.in.orig	2017-02-11 12:00:37.768094420 -0800
-+++ zlib-1.2.11/Makefile.in	2017-02-11 12:01:02.088399001 -0800
-@@ -91,7 +91,7 @@
- 	  echo '		*** zlib test OK ***'; \
- 	else \
- 	  echo '		*** zlib test FAILED ***'; false; \
--	fi; \
-+	fi
- 	rm -f $$TMPST
- 
- testshared: shared
-@@ -104,7 +104,7 @@
- 	  echo '		*** zlib shared test OK ***'; \
- 	else \
- 	  echo '		*** zlib shared test FAILED ***'; false; \
--	fi; \
-+	fi
- 	rm -f $$TMPSH
- 
- test64: all64
-@@ -113,7 +113,7 @@
- 	  echo '		*** zlib 64-bit test OK ***'; \
- 	else \
- 	  echo '		*** zlib 64-bit test FAILED ***'; false; \
--	fi; \
-+	fi
- 	rm -f $$TMP64
- 
- infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
diff --git a/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch b/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch
deleted file mode 100644
index 6704e3e..0000000
--- a/patches/zlib/1.2.11/110-no-_wopen-cygwin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a5e814c69315f3b7528418f6a5185c4f8a9dc250 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 15 Feb 2017 22:36:35 -0800
-Subject: [PATCH] Fix unresolved reference to _wopen on Cygwin
-
-The default Cygwin GCC/glibc do not provide _wopen. This seems to be
-part of Win32API, which is provided by x86-w64-mingw32-gcc - but that
-compiler does not define __CYGWIN__, it defines _WIN32.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- gzguts.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gzguts.h b/gzguts.h
-index 990a4d2..6378d46 100644
---- a/gzguts.h
-+++ b/gzguts.h
-@@ -39,7 +39,7 @@
- #  include <io.h>
- #endif
- 
--#if defined(_WIN32) || defined(__CYGWIN__)
-+#if defined(_WIN32)
- #  define WIDECHAR
- #endif
- 
--- 
-2.9.3
-