rebase to 1.21

5 files changed, 82 insertions, 24586 deletions

diff --git a/groff-japanese-charclass.patch b/groff-japanese-charclass.patch
deleted file mode 100644
index b295db6..0000000
--- a/groff-japanese-charclass.patch
+++ /dev/null
@@ -1,859 +0,0 @@
-Resolves: #596900
-
-From 8855b7d5f80f7c7a667abd690da7e65e0a77ab97 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Thu, 5 Aug 2010 16:00:32 +0900
-Subject: [PATCH] Import Colin Watson's charclass branch with minor fixes.
-
-Changes from the branch:
-- libgroff: make sure to return -1 from glyph_to_unicode() on error.
-- tmac: add cflags to non-punct Japanese characters to ja.tmac.
-- troff: skip "-" on parsing character ranges of the class request.
-- troff: make class request parsing robuster.
-- troff: suppress debug messages if DEBUGGING is not set.
-- nroff: supply "-mja" to groff if running under Japanese locales.
----
- src/include/classes.h          |   62 ++++++++++++
- src/include/font.h             |   16 +++
- src/libs/libgroff/Makefile.sub |    2 +
- src/libs/libgroff/classes.cpp  |   48 ++++++++++
- src/libs/libgroff/font.cpp     |  203 ++++++++++++++++++++++++++--------------
- src/roff/nroff/nroff.sh        |    6 +
- src/roff/troff/charinfo.h      |   50 +++++++++--
- src/roff/troff/input.cpp       |  138 +++++++++++++++++++++++++++
- tmac/Makefile.sub              |    3 +-
- tmac/ja.tmac                   |   49 ++++++++++
- 10 files changed, 499 insertions(+), 78 deletions(-)
- create mode 100644 src/include/classes.h
- create mode 100644 src/libs/libgroff/classes.cpp
- create mode 100644 tmac/ja.tmac
-
-diff --git a/src/include/classes.h b/src/include/classes.h
-new file mode 100644
-index 0000000..2f0e2bd
---- /dev/null
-+++ b/src/include/classes.h
-@@ -0,0 +1,62 @@
-+/* This file is in the public domain. */
-+
-+class charinfo;
-+
-+class char_class
-+{
-+  public:
-+    virtual bool is_in_class(int c);
-+    virtual int lookup_char(int c) = 0;
-+    charinfo *get_charinfo();
-+    void set_charinfo(charinfo *);
-+  protected:
-+  private:
-+    charinfo *ci;
-+};
-+
-+class single_char_class : public char_class
-+{
-+  public:
-+    single_char_class(int c);
-+    int lookup_char(int c);
-+  protected:
-+  private:
-+    int ch;
-+};
-+
-+class range_char_class : public char_class
-+{
-+  public:
-+    range_char_class(int low, int high);
-+    int lookup_char(int c);
-+  protected:
-+  private:
-+    int lo, hi;
-+};
-+
-+class ref_char_class : public char_class
-+{
-+  public:
-+    ref_char_class(char_class *klass);
-+    int lookup_char(int c);
-+    char_class *get_class();
-+  protected:
-+  private:
-+    char_class *ref;
-+};
-+
-+inline bool char_class::is_in_class(int c)
-+{
-+  return lookup_char(c) == 0;
-+}
-+
-+inline charinfo *char_class::get_charinfo()
-+{
-+  return ci;
-+}
-+
-+inline void char_class::set_charinfo(charinfo *cis)
-+{
-+  ci = cis;
-+}
-+
-diff --git a/src/include/font.h b/src/include/font.h
-index 944250b..4e9edc4 100644
---- a/src/include/font.h
-+++ b/src/include/font.h
-@@ -18,6 +18,12 @@ for more details.
- 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 <string>
-+#include <map>
-+#include <vector>
-+
-+class char_class;
-+
- // A function of this type can be registered to define the semantics of
- // arbitrary commands in a font DESC file.
- typedef void (*FONT_COMMAND_HANDLER)(const char *,	// command
-@@ -73,6 +79,9 @@ inline int glyph_to_number(glyph *);	// Convert the given glyph back to
- 			// a numbered character.
- inline int glyph_to_index(glyph *);	// Return the unique index that is
- 			// associated with the given glyph. It is >= 0.
-+extern int glyph_to_unicode(glyph *);	// Convert the given glyph to its
-+			// Unicode codepoint.  Return -1 if it does not
-+			// designate a Unicode character.
- 
- inline int glyph_to_number(glyph *g)
- {
-@@ -267,6 +276,8 @@ public:
- 			// upper1, ... lowerN, upperN, 0 }.
- 
- private:
-+  std::map<std::string, std::vector<char_class *> > class_map;
-+			// A map of names to class objects.
-   unsigned ligatures;	// Bit mask of available ligatures.  Used by
- 			// has_ligature().
-   font_kern_list **kern_hash_table;	// Hash table of kerning pairs. 
-@@ -308,6 +319,11 @@ private:
-   void extend_ch();
-   void compact();
- 
-+  // These methods add glyphs to character classes.
-+  void add_class(const char *, glyph *);
-+  void add_class(const char *, glyph *, glyph *);
-+  void add_class(const char *, const char *);
-+
-   void add_kern(glyph *, glyph *, int);	// Add to the kerning table a
- 			// kerning amount (arg3) between two given glyphs
- 			// (arg1 and arg2).
-diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
-index ac83892..cb8c14e 100644
---- a/src/libs/libgroff/Makefile.sub
-+++ b/src/libs/libgroff/Makefile.sub
-@@ -5,6 +5,7 @@ EXTRA_CFLAGS=-D__GETOPT_PREFIX=groff_ \
- OBJS=\
-   assert.$(OBJEXT) \
-   change_lf.$(OBJEXT) \
-+  classes.$(OBJEXT) \
-   cmap.$(OBJEXT) \
-   color.$(OBJEXT) \
-   cset.$(OBJEXT) \
-@@ -55,6 +56,7 @@ OBJS=\
- CCSRCS=\
-   $(srcdir)/assert.cpp \
-   $(srcdir)/change_lf.cpp \
-+  $(srcdir)/classes.cpp \
-   $(srcdir)/cmap.cpp \
-   $(srcdir)/color.cpp \
-   $(srcdir)/cset.cpp \
-diff --git a/src/libs/libgroff/classes.cpp b/src/libs/libgroff/classes.cpp
-new file mode 100644
-index 0000000..eef1742
---- /dev/null
-+++ b/src/libs/libgroff/classes.cpp
-@@ -0,0 +1,48 @@
-+/* This file is in the public domain. */
-+
-+#include "classes.h"
-+
-+single_char_class::single_char_class(int c) :
-+  ch(c)
-+{
-+}
-+
-+int single_char_class::lookup_char(int c)
-+{
-+  if (c < ch)
-+    return -1;
-+  else if (c > ch)
-+    return 1;
-+  else
-+    return 0;
-+}
-+
-+range_char_class::range_char_class(int low, int high) :
-+  lo(low), hi(high)
-+{
-+}
-+
-+int range_char_class::lookup_char(int c)
-+{
-+  if (c < lo)
-+    return -1;
-+  else if (c > hi)
-+    return 1;
-+  else
-+    return 0;
-+}
-+
-+ref_char_class::ref_char_class(char_class *klass) :
-+  ref(klass)
-+{
-+}
-+
-+int ref_char_class::lookup_char(int c)
-+{
-+  return ref->lookup_char(c);
-+}
-+
-+char_class *ref_char_class::get_class()
-+{
-+  return ref;
-+}
-diff --git a/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp
-index d0b4a12..18e0a07 100644
---- a/src/libs/libgroff/font.cpp
-+++ b/src/libs/libgroff/font.cpp
-@@ -31,6 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
- #include "font.h"
- #include "unicode.h"
- #include "paper.h"
-+#include "classes.h"
- 
- const char *const WS = " \t\n\r";
- 
-@@ -148,6 +149,49 @@ void text_file::error(const char *format,
- }
- 
- 
-+int glyph_to_unicode(glyph *g)
-+{
-+  const char *nm = glyph_to_name(g);
-+  if (nm != NULL) {
-+    // ASCII character?
-+    if (nm[0] == 'c' && nm[1] == 'h' && nm[2] == 'a' && nm[3] == 'r'
-+	&& (nm[4] >= '0' && nm[4] <= '9')) {
-+      int n = (nm[4] - '0');
-+      if (nm[5] == '\0')
-+	return n;
-+      if (n > 0 && (nm[5] >= '0' && nm[5] <= '9')) {
-+	n = 10*n + (nm[5] - '0');
-+	if (nm[6] == '\0')
-+	  return n;
-+	if (nm[6] >= '0' && nm[6] <= '9') {
-+	  n = 10*n + (nm[6] - '0');
-+	  if (nm[7] == '\0' && n < 128)
-+	    return n;
-+	}
-+      }
-+    }
-+    // Unicode character?
-+    if (check_unicode_name(nm)) {
-+      char *ignore;
-+      return (int)strtol(nm + 1, &ignore, 16);
-+    }
-+    // If `nm' is a single letter `x', the glyph name is `\x'.
-+    char buf[] = { '\\', '\0', '\0' };
-+    if (nm[1] == '\0') {
-+      buf[1] = nm[0];
-+      nm = buf;
-+    }
-+    // groff glyphs that map to Unicode?
-+    const char *unicode = glyph_name_to_unicode(nm);
-+    if (unicode != NULL && strchr(unicode, '_') == NULL) {
-+      char *ignore;
-+      return (int)strtol(unicode, &ignore, 16);
-+    }
-+  }
-+  return -1;
-+}
-+
-+
- /* font functions */
- 
- font::font(const char *s)
-@@ -269,39 +313,10 @@ int font::contains(glyph *g)
-     return 1;
-   if (is_unicode) {
-     // Unicode font
--    const char *nm = glyph_to_name(g);
--    if (nm != NULL) {
--      // ASCII character?
--      if (nm[0] == 'c' && nm[1] == 'h' && nm[2] == 'a' && nm[3] == 'r'
--          && (nm[4] >= '0' && nm[4] <= '9')) {
--	int n = (nm[4] - '0');
--	if (nm[5] == '\0')
--	  return 1;
--	if (n > 0 && (nm[5] >= '0' && nm[5] <= '9')) {
--	  n = 10*n + (nm[5] - '0');
--	  if (nm[6] == '\0')
--	    return 1;
--	  if (nm[6] >= '0' && nm[6] <= '9') {
--	    n = 10*n + (nm[6] - '0');
--	    if (nm[7] == '\0' && n < 128)
--	      return 1;
--	  }
--	}
--      }
--      // Unicode character?
--      if (check_unicode_name(nm))
--	return 1;
--      // If `nm' is a single letter `x', the glyph name is `\x'.
--      char buf[] = { '\\', '\0', '\0' };
--      if (nm[1] == '\0') {
--	buf[1] = nm[0];
--        nm = buf;
--      }
--      // groff glyph name that maps to Unicode?
--      const char *unicode = glyph_name_to_unicode(nm);
--      if (unicode != NULL && strchr(unicode, '_') == NULL)
--	return 1;
--    }
-+    // ASCII or Unicode character, or groff glyph name that maps to Unicode?
-+    int uni = glyph_to_unicode(g);
-+    if (uni >= 0)
-+      return 1;
-     // Numbered character?
-     int n = glyph_to_number(g);
-     if (n >= 0)
-@@ -554,43 +569,10 @@ int font::get_code(glyph *g)
-   }
-   if (is_unicode) {
-     // Unicode font
--    const char *nm = glyph_to_name(g);
--    if (nm != NULL) {
--      // ASCII character?
--      if (nm[0] == 'c' && nm[1] == 'h' && nm[2] == 'a' && nm[3] == 'r'
--          && (nm[4] >= '0' && nm[4] <= '9')) {
--	int n = (nm[4] - '0');
--	if (nm[5] == '\0')
--	  return n;
--	if (n > 0 && (nm[5] >= '0' && nm[5] <= '9')) {
--	  n = 10*n + (nm[5] - '0');
--	  if (nm[6] == '\0')
--	    return n;
--	  if (nm[6] >= '0' && nm[6] <= '9') {
--	    n = 10*n + (nm[6] - '0');
--	    if (nm[7] == '\0' && n < 128)
--	      return n;
--	  }
--	}
--      }
--      // Unicode character?
--      if (check_unicode_name(nm)) {
--	char *ignore;
--	return (int)strtol(nm + 1, &ignore, 16);
--      }
--      // If `nm' is a single letter `x', the glyph name is `\x'.
--      char buf[] = { '\\', '\0', '\0' };
--      if (nm[1] == '\0') {
--	buf[1] = nm[0];
--        nm = buf;
--      }
--      // groff glyphs that map to Unicode?
--      const char *unicode = glyph_name_to_unicode(nm);
--      if (unicode != NULL && strchr(unicode, '_') == NULL) {
--	char *ignore;
--	return (int)strtol(unicode, &ignore, 16);
--      }
--    }
-+    // ASCII or Unicode character, or groff glyph name that maps to Unicode?
-+    int uni = glyph_to_unicode(g);
-+    if (uni >= 0)
-+      return uni;
-     // Numbered character?
-     int n = glyph_to_number(g);
-     if (n >= 0)
-@@ -790,6 +772,38 @@ again:
-   return 0;
- }
- 
-+void font::add_class(const char *name, glyph *g)
-+{
-+  int num = glyph_to_number(g);
-+
-+  if (num == -1)
-+    return;
-+
-+  single_char_class *ref = new single_char_class(num);
-+  class_map[name].push_back(ref);
-+}
-+
-+void font::add_class(const char *name, glyph *g1, glyph *g2)
-+{
-+  int num1 = glyph_to_number(g1);
-+  int num2 = glyph_to_number(g2);
-+
-+  if ((num1 == -1) || (num2 == -1))
-+    return;
-+
-+  range_char_class *ref = new range_char_class(num1, num2);
-+  class_map[name].push_back(ref);
-+}
-+
-+void font::add_class(const char *name, const char *oname)
-+{
-+  std::vector<char_class *> *vec = &class_map[oname];
-+  int nelems = vec->size();
-+  for (int i = 0; i < nelems; i++) {
-+    class_map[name].push_back((*vec)[i]);
-+  }
-+}
-+
- // If the font can't be found, then if not_found is non-NULL, it will be set
- // to 1 otherwise a message will be printed.
- 
-@@ -1020,6 +1034,55 @@ int font::load(int *not_found, int head_only)
- 	  return 0;
- 	}
-       }
-+      else if (strcmp(command, "classes") == 0) {
-+	if (head_only)
-+	  return 1;
-+	for (;;) {
-+	  if (!t.next()) {
-+	    command = 0;
-+	    break;
-+	  }
-+	  char *cname = strtok(t.buf, WS);
-+	  if (cname == 0)
-+	    continue;
-+	  char *equals = strtok(0, WS);
-+	  if (equals == 0) {
-+	    command = cname;
-+	    break;
-+	  }
-+	  p = strtok(0, WS);
-+	  if (p == 0) {
-+	    t.error("empty character classes not allowed");
-+	    return 0;
-+	  }
-+	  glyph *g1 = 0, *g2 = 0;
-+	  while (p != 0) {
-+	    if ((g1 != 0) && (p[0] == '-')) {
-+	      p = strtok(0, WS);
-+	      if (p == 0) {
-+		t.error("incomplete range in class definition");
-+		return 0;
-+	      }
-+	      g2 = name_to_glyph(p);
-+	      add_class(cname, g1, g2);
-+	      g1 = g2 = 0;
-+	    }
-+	    else if (g1 != 0) {
-+	      add_class(cname, g1);
-+	      g1 = 0;
-+	    }
-+	    if ((p[0] == '<') && (p[strlen(p)-1] == '>')) {
-+	      add_class(cname, p);
-+	    }
-+	    else if (p[0] != '-') {
-+	      g1 = name_to_glyph(p);
-+	    }
-+	    p = strtok(0, WS);
-+	  }
-+	  if (g1 != 0)
-+	    add_class(cname, g1);
-+	}
-+      }
-       else {
- 	t.error("unrecognised command `%1' "
- 		"after `kernpairs' or `charset' command",
-diff --git a/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh
-index d4bd8a0..22529f8 100644
---- a/src/roff/nroff/nroff.sh
-+++ b/src/roff/nroff/nroff.sh
-@@ -125,6 +125,12 @@ case $T in
-     T=-T$Tloc ;;
- esac
- 
-+case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
-+    ja*)
-+	opts="$opts -mja"
-+	;;
-+esac
-+
- # Set up the `GROFF_BIN_PATH' variable
- # to be exported in the current `GROFF_RUNTIME' environment.
- 
-diff --git a/src/roff/troff/charinfo.h b/src/roff/troff/charinfo.h
-index 2c2c268..71cd84d 100644
---- a/src/roff/troff/charinfo.h
-+++ b/src/roff/troff/charinfo.h
-@@ -18,6 +18,9 @@ for more details.
- 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 <vector>
-+#include <utility>
-+
- class macro;
- 
- class charinfo : glyph {
-@@ -35,6 +38,9 @@ class charinfo : glyph {
-   char translate_input;		// non-zero means that asciify_code is
- 				// active for .asciify (set by .trin)
-   char_mode mode;
-+  // Unicode character classes
-+  std::vector<std::pair<int, int> > ranges;
-+  std::vector<charinfo *> nested_classes;
- public:
-   enum {		// Values for the flags bitmask.  See groff
- 			// manual, description of the `.cflags' request.
-@@ -66,6 +72,7 @@ public:
-   unsigned char get_hyphenation_code();
-   unsigned char get_ascii_code();
-   unsigned char get_asciify_code();
-+  int get_unicode_code();
-   void set_hyphenation_code(unsigned char);
-   void set_ascii_code(unsigned char);
-   void set_asciify_code(unsigned char);
-@@ -73,6 +80,7 @@ public:
-   int get_translation_input();
-   charinfo *get_translation(int = 0);
-   void set_translation(charinfo *, int, int);
-+  unsigned char get_flags();
-   void set_flags(unsigned char);
-   void set_special_translation(int, int);
-   int get_special_translation(int = 0);
-@@ -87,6 +95,13 @@ public:
-   int is_fallback();
-   int is_special();
-   symbol *get_symbol();
-+  void add_to_class(int);
-+  void add_to_class(int, int);
-+  void add_to_class(charinfo *);
-+  bool is_class();
-+  bool contains(int);
-+  bool contains(symbol);
-+  bool contains(charinfo *);
- };
- 
- charinfo *get_charinfo(symbol);
-@@ -95,37 +110,37 @@ charinfo *get_charinfo_by_number(int);
- 
- inline int charinfo::overlaps_horizontally()
- {
--  return flags & OVERLAPS_HORIZONTALLY;
-+  return get_flags() & OVERLAPS_HORIZONTALLY;
- }
- 
- inline int charinfo::overlaps_vertically()
- {
--  return flags & OVERLAPS_VERTICALLY;
-+  return get_flags() & OVERLAPS_VERTICALLY;
- }
- 
- inline int charinfo::can_break_before()
- {
--  return flags & BREAK_BEFORE;
-+  return get_flags() & BREAK_BEFORE;
- }
- 
- inline int charinfo::can_break_after()
- {
--  return flags & BREAK_AFTER;
-+  return get_flags() & BREAK_AFTER;
- }
- 
- inline int charinfo::ends_sentence()
- {
--  return flags & ENDS_SENTENCE;
-+  return get_flags() & ENDS_SENTENCE;
- }
- 
- inline int charinfo::transparent()
- {
--  return flags & TRANSPARENT;
-+  return get_flags() & TRANSPARENT;
- }
- 
- inline int charinfo::ignore_hcodes()
- {
--  return flags & IGNORE_HCODES;
-+  return get_flags() & IGNORE_HCODES;
- }
- 
- inline int charinfo::numbered()
-@@ -216,3 +231,24 @@ inline symbol *charinfo::get_symbol()
- {
-   return( &nm );
- }
-+
-+inline void charinfo::add_to_class(int c)
-+{
-+  // TODO ranges cumbersome for single characters?
-+  ranges.push_back(std::pair<int, int>(c, c));
-+}
-+
-+inline void charinfo::add_to_class(int lo, int hi)
-+{
-+  ranges.push_back(std::pair<int, int>(lo, hi));
-+}
-+
-+inline void charinfo::add_to_class(charinfo *ci)
-+{
-+  nested_classes.push_back(ci);
-+}
-+
-+inline bool charinfo::is_class()
-+{
-+  return (!ranges.empty() || !nested_classes.empty());
-+}
-diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
-index 5335c1c..88782b1 100644
---- a/src/roff/troff/input.cpp
-+++ b/src/roff/troff/input.cpp
-@@ -6740,6 +6740,74 @@ void hyphenation_patterns_file_code()
-   skip_line();
- }
- 
-+dictionary char_class_dictionary(501);
-+
-+void define_class()
-+{
-+  tok.skip();
-+  symbol nm = get_name(1);
-+  if (nm.is_null()) {
-+    skip_line();
-+    return;
-+  }
-+  charinfo *ci = get_charinfo(nm);
-+  charinfo *child1 = 0, *child2 = 0;
-+  while (!tok.newline() && !tok.eof()) {
-+    tok.skip();
-+    if (child1 != 0 && tok.ch() == '-') {
-+      tok.next();
-+      child2 = tok.get_char(1);
-+      if (!child2) {
-+	warning(WARN_MISSING,
-+		"missing the end of character range in class `%1'",
-+		nm.contents());
-+	skip_line();
-+	return;
-+      }
-+      if (child1->is_class() || child2->is_class()) {
-+	warning(WARN_SYNTAX,
-+		"nested character class is not allowed in range definition");
-+	skip_line();
-+	return;
-+      }
-+      ci->add_to_class(child1->get_unicode_code(), child2->get_unicode_code());
-+      child1 = child2 = 0;
-+    }
-+    else if (child1 != 0) {
-+      if (child1->is_class()) {
-+	ci->add_to_class(child1);
-+      }
-+      else {
-+	ci->add_to_class(child1->get_unicode_code());
-+      }
-+      child1 = 0;
-+    }
-+    child1 = tok.get_char(1);
-+    tok.next();
-+    if (!child1) {
-+      if (!tok.newline())
-+	skip_line();
-+      break;
-+    }
-+  }
-+  if (child1 != 0) {
-+    if (child1->is_class()) {
-+      ci->add_to_class(child1);
-+    }
-+    else {
-+      ci->add_to_class(child1->get_unicode_code());
-+    }
-+    child1 = 0;
-+  }
-+  if (!ci->is_class()) {
-+    warning(WARN_SYNTAX,
-+	    "empty class definition for `%1'",
-+	    nm.contents());
-+    return;
-+  }
-+  (void)char_class_dictionary.lookup(nm, ci);
-+}
-+
- charinfo *token::get_char(int required)
- {
-   if (type == TOKEN_CHAR)
-@@ -7817,6 +7885,7 @@ void init_input_requests()
-   init_request("cflags", char_flags);
-   init_request("char", define_character);
-   init_request("chop", chop_macro);
-+  init_request("class", define_class);
-   init_request("close", close_request);
-   init_request("color", activate_color);
-   init_request("composite", composite_request);
-@@ -8367,6 +8436,13 @@ charinfo::charinfo(symbol s)
-   number = -1;
- }
- 
-+int charinfo::get_unicode_code()
-+{
-+  if (ascii_code != '\0')
-+    return ascii_code;
-+  return glyph_to_unicode(this);
-+}
-+
- void charinfo::set_hyphenation_code(unsigned char c)
- {
-   hyphenation_code = c;
-@@ -8388,6 +8464,25 @@ void charinfo::set_translation(charinfo *ci, int tt, int ti)
-   transparent_translate = tt;
- }
- 
-+// Get the union of all flags affecting this charinfo.
-+unsigned char charinfo::get_flags()
-+{
-+  unsigned char all_flags = flags;
-+  dictionary_iterator iter(char_class_dictionary);
-+  charinfo *cp;
-+  symbol s;
-+  while (iter.get(&s, (void **)&cp)) {
-+    assert(!s.is_null());
-+    if (cp->contains(get_unicode_code())) {
-+#if defined(DEBUGGING)
-+      fprintf(stderr, "charinfo::get_flags %p %s %d\n", cp, cp->nm.contents(), cp->flags);
-+#endif
-+      all_flags |= cp->flags;
-+    }
-+  }
-+  return all_flags;
-+}
-+
- void charinfo::set_special_translation(int c, int tt)
- {
-   special_translation = c;
-@@ -8432,6 +8527,49 @@ int charinfo::get_number()
-   return number;
- }
- 
-+bool charinfo::contains(int c)
-+{
-+  std::vector<std::pair<int, int> >::const_iterator ranges_iter;
-+  ranges_iter = ranges.begin();
-+  while (ranges_iter != ranges.end()) {
-+    if (c >= ranges_iter->first && c <= ranges_iter->second) {
-+#if defined(DEBUGGING)
-+      fprintf(stderr, "charinfo::contains(%d)\n", c);
-+#endif
-+      return true;
-+    }
-+    ++ranges_iter;
-+  }
-+
-+  std::vector<charinfo *>::const_iterator nested_iter;
-+  nested_iter = nested_classes.begin();
-+  while (nested_iter != nested_classes.end()) {
-+    if ((*nested_iter)->contains(c))
-+      return true;
-+    ++nested_iter;
-+  }
-+
-+  return false;
-+}
-+
-+bool charinfo::contains(symbol nm)
-+{
-+  const char *unicode = glyph_name_to_unicode(nm.contents());
-+  if (unicode != NULL && strchr(unicode, '_') == NULL) {
-+    char *ignore;
-+    int c = (int)strtol(unicode, &ignore, 16);
-+    return contains(c);
-+  }
-+  else
-+    return false;
-+}
-+
-+bool charinfo::contains(charinfo *)
-+{
-+  // TODO
-+  return false;
-+}
-+
- symbol UNNAMED_SYMBOL("---");
- 
- // For numbered characters not between 0 and 255, we make a symbol out
-diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
-index ef4b577..5900010 100644
---- a/tmac/Makefile.sub
-+++ b/tmac/Makefile.sub
-@@ -55,7 +55,8 @@ NORMALFILES=\
-   fr.tmac hyphen.fr \
-   sv.tmac hyphen.sv \
-   de.tmac den.tmac hyphen.det hyphen.den hyphenex.det \
--  cs.tmac hyphen.cs hyphenex.cs
-+  cs.tmac hyphen.cs hyphenex.cs \
-+  ja.tmac
- 
- # These files are handled specially during installation and deinstallation.
- SPECIALFILES=an.tmac s.tmac www.tmac
-diff --git a/tmac/ja.tmac b/tmac/ja.tmac
-new file mode 100644
-index 0000000..eed664b
---- /dev/null
-+++ b/tmac/ja.tmac
-@@ -0,0 +1,49 @@
-+.\" -*- mode: nroff; coding: utf-8; -*-
-+.\"
-+.\" Japanese localization for groff
-+.\"
-+.\" Copyright (C) 2009 Free Software Foundation, Inc.
-+.\"   Written by Fumitoshi UKAI <ukai@debian.or.jp> and
-+.\"   Colin Watson <cjwatson@debian.org>
-+.\"
-+.\" This file is part of groff.
-+.\"
-+.\" groff 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 of the License, or
-+.\" (at your option) any later version.
-+.\"
-+.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY
-+.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+.\" for more details.
-+.\"
-+.\" You should have received a copy of the GNU General Public License
-+.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
-+.\"
-+.\" Please send comments to groff@gnu.org.
-+.
-+.
-+.\" Locale string
-+.
-+.ds locale japanese\"
-+.
-+.
-+.class [CJKprepunct] \
-+  , : ; > } \
-+  \[u3001] \[u3002] \[uFF0C] \[uFF0E] \[u30FB] \[uFF1A] \[uFF1B] \[uFF1F] \
-+  \[uFF01] \[uFF09] \[u3015] \[uFF3D] \[uFF5D] \[u300D] \[u300F] \[u3011] \
-+  \[u3041] \[u3043] \[u3045] \[u3047] \[u3049] \[u3063] \[u3083] \[u3085] \
-+  \[u3087] \[u30FC] \
-+  \[u30A1] \[u30A3] \[u30A5] \[u30A7] \[u30A9] \[u30C3] \[u30E3] \[u30E5] \
-+  \[u30E7]
-+.class [CJKpostpunct] \
-+  \[uFF08] \[u3014] \[uFF3B] \[uFF5B] \[u300C] \[u300E] \[u3010]
-+.
-+.\" Hiragana, Katakana, and Kanji glyphs.
-+.class [CJKnormal] \
-+  \[u3041]-\[u3096] \[u30A0]-\[u30FF] \[u4E00]-\[u9FFF]
-+.
-+.cflags 2 \C'[CJKprepunct]'
-+.cflags 4 \C'[CJKpostpunct]'
-+.cflags 66 \C'[CJKnormal]'
--- 
-1.7.3.2
-
diff --git a/groff-japanese-wcwidth.patch b/groff-japanese-wcwidth.patch
deleted file mode 100644
index 5bd8663..0000000
--- a/groff-japanese-wcwidth.patch
+++ /dev/null
@@ -1,23721 +0,0 @@
-Resolves: #596900
-
-From cae3dafb993db05fef0bbc1188e5ee437c1c572d Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Thu, 5 Aug 2010 16:53:28 +0900
-Subject: [PATCH 2/2] Use wcwidth() to determine glyph width.
-
----
- Makefile.comm                         |    4 +-
- Makefile.in                           |   25 +-
- src/devices/grotty/Makefile.sub       |    2 +-
- src/devices/grotty/tty.cpp            |    1 +
- src/libs/gl/Makefile.am               |    7 +
- src/libs/gl/Makefile.in               |  785 ++++
- src/libs/gl/aclocal.m4                | 1005 ++++
- src/libs/gl/build-aux/arg-nonnull.h   |   26 +
- src/libs/gl/build-aux/c++defs.h       |  271 ++
- src/libs/gl/build-aux/compile         |  143 +
- src/libs/gl/build-aux/config.guess    | 1501 ++++++
- src/libs/gl/build-aux/config.sub      | 1705 +++++++
- src/libs/gl/build-aux/depcomp         |  630 +++
- src/libs/gl/build-aux/install-sh      |  520 +++
- src/libs/gl/build-aux/missing         |  376 ++
- src/libs/gl/build-aux/warn-on-use.h   |  109 +
- src/libs/gl/config.h.in               |  259 +
- src/libs/gl/configure                 | 8269 +++++++++++++++++++++++++++++++++
- src/libs/gl/configure.ac              |  135 +
- src/libs/gl/gllib/Makefile.am         |  458 ++
- src/libs/gl/gllib/Makefile.in         | 1049 +++++
- src/libs/gl/gllib/config.charset      |  683 +++
- src/libs/gl/gllib/localcharset.c      |  548 +++
- src/libs/gl/gllib/localcharset.h      |   41 +
- src/libs/gl/gllib/ref-add.sin         |   30 +
- src/libs/gl/gllib/ref-del.sin         |   25 +
- src/libs/gl/gllib/stddef.in.h         |   86 +
- src/libs/gl/gllib/stdint.in.h         |  568 +++
- src/libs/gl/gllib/streq.h             |  176 +
- src/libs/gl/gllib/unitypes.in.h       |   26 +
- src/libs/gl/gllib/uniwidth.in.h       |   65 +
- src/libs/gl/gllib/uniwidth/cjk.h      |   37 +
- src/libs/gl/gllib/uniwidth/width.c    |  359 ++
- src/libs/gl/gllib/wchar.in.h          |  428 ++
- src/libs/gl/gllib/wctype.in.h         |  377 ++
- src/libs/gl/gllib/wcwidth.c           |   50 +
- src/libs/gl/glm4/00gnulib.m4          |   30 +
- src/libs/gl/glm4/Makefile.am          |   22 +
- src/libs/gl/glm4/Makefile.in          |  425 ++
- src/libs/gl/glm4/codeset.m4           |   21 +
- src/libs/gl/glm4/extensions.m4        |  118 +
- src/libs/gl/glm4/fcntl-o.m4           |   85 +
- src/libs/gl/glm4/glibc21.m4           |   30 +
- src/libs/gl/glm4/gnulib-common.m4     |  201 +
- src/libs/gl/glm4/include_next.m4      |  187 +
- src/libs/gl/glm4/libunistring-base.m4 |  141 +
- src/libs/gl/glm4/localcharset.m4      |   17 +
- src/libs/gl/glm4/longlong.m4          |  106 +
- src/libs/gl/glm4/multiarch.m4         |   65 +
- src/libs/gl/glm4/stddef_h.m4          |   45 +
- src/libs/gl/glm4/stdint.m4            |  472 ++
- src/libs/gl/glm4/warn-on-use.m4       |   45 +
- src/libs/gl/glm4/wchar_h.m4           |  152 +
- src/libs/gl/glm4/wchar_t.m4           |   20 +
- src/libs/gl/glm4/wctype_h.m4          |   76 +
- src/libs/gl/glm4/wcwidth.m4           |   94 +
- src/libs/gl/glm4/wint_t.m4            |   28 +
- src/libs/libgroff/font.cpp            |    8 +
- src/roff/troff/Makefile.sub           |    2 +-
- src/roff/troff/input.cpp              |    1 +
- 60 files changed, 23165 insertions(+), 5 deletions(-)
- create mode 100644 src/libs/gl/Makefile.am
- create mode 100644 src/libs/gl/Makefile.in
- create mode 100644 src/libs/gl/aclocal.m4
- create mode 100644 src/libs/gl/build-aux/arg-nonnull.h
- create mode 100644 src/libs/gl/build-aux/c++defs.h
- create mode 100755 src/libs/gl/build-aux/compile
- create mode 100755 src/libs/gl/build-aux/config.guess
- create mode 100755 src/libs/gl/build-aux/config.sub
- create mode 100755 src/libs/gl/build-aux/depcomp
- create mode 100755 src/libs/gl/build-aux/install-sh
- create mode 100755 src/libs/gl/build-aux/missing
- create mode 100644 src/libs/gl/build-aux/warn-on-use.h
- create mode 100644 src/libs/gl/config.h.in
- create mode 100755 src/libs/gl/configure
- create mode 100644 src/libs/gl/configure.ac
- create mode 100644 src/libs/gl/gllib/Makefile.am
- create mode 100644 src/libs/gl/gllib/Makefile.in
- create mode 100644 src/libs/gl/gllib/config.charset
- create mode 100644 src/libs/gl/gllib/localcharset.c
- create mode 100644 src/libs/gl/gllib/localcharset.h
- create mode 100644 src/libs/gl/gllib/ref-add.sin
- create mode 100644 src/libs/gl/gllib/ref-del.sin
- create mode 100644 src/libs/gl/gllib/stddef.in.h
- create mode 100644 src/libs/gl/gllib/stdint.in.h
- create mode 100644 src/libs/gl/gllib/streq.h
- create mode 100644 src/libs/gl/gllib/unitypes.in.h
- create mode 100644 src/libs/gl/gllib/uniwidth.in.h
- create mode 100644 src/libs/gl/gllib/uniwidth/cjk.h
- create mode 100644 src/libs/gl/gllib/uniwidth/width.c
- create mode 100644 src/libs/gl/gllib/wchar.in.h
- create mode 100644 src/libs/gl/gllib/wctype.in.h
- create mode 100644 src/libs/gl/gllib/wcwidth.c
- create mode 100644 src/libs/gl/glm4/00gnulib.m4
- create mode 100644 src/libs/gl/glm4/Makefile.am
- create mode 100644 src/libs/gl/glm4/Makefile.in
- create mode 100644 src/libs/gl/glm4/codeset.m4
- create mode 100644 src/libs/gl/glm4/extensions.m4
- create mode 100644 src/libs/gl/glm4/fcntl-o.m4
- create mode 100644 src/libs/gl/glm4/glibc21.m4
- create mode 100644 src/libs/gl/glm4/gnulib-common.m4
- create mode 100644 src/libs/gl/glm4/include_next.m4
- create mode 100644 src/libs/gl/glm4/libunistring-base.m4
- create mode 100644 src/libs/gl/glm4/localcharset.m4
- create mode 100644 src/libs/gl/glm4/longlong.m4
- create mode 100644 src/libs/gl/glm4/multiarch.m4
- create mode 100644 src/libs/gl/glm4/stddef_h.m4
- create mode 100644 src/libs/gl/glm4/stdint.m4
- create mode 100644 src/libs/gl/glm4/warn-on-use.m4
- create mode 100644 src/libs/gl/glm4/wchar_h.m4
- create mode 100644 src/libs/gl/glm4/wchar_t.m4
- create mode 100644 src/libs/gl/glm4/wctype_h.m4
- create mode 100644 src/libs/gl/glm4/wcwidth.m4
- create mode 100644 src/libs/gl/glm4/wint_t.m4
-
-diff --git a/Makefile.comm b/Makefile.comm
-index 0408ef4..857c6e7 100644
---- a/Makefile.comm
-+++ b/Makefile.comm
-@@ -20,7 +20,8 @@
- # Makefile.comm
- #
- INCLUDES=-I. -I$(srcdir) \
--  -I$(top_builddir)/src/include -I$(top_srcdir)/src/include
-+  -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \
-+  -I$(tob_builddir)/src/libs/gl/gllib
- ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
- COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
- ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
-@@ -31,6 +32,7 @@ LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.$(LIBEXT)
- LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT)
- LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.$(LIBEXT)
- LIBXUTIL=$(top_builddir)/src/libs/libxutil/libxutil.$(LIBEXT)
-+LIBGNU=$(top_builddir)/src/libs/gl/gllib/libgnu.$(LIBEXT)
- MLIB=
- XLIBS=
- YTABH=
-diff --git a/Makefile.in b/Makefile.in
-index e66e66d..8bbb7a8 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -626,11 +626,17 @@ NOMAKEDIRS=\
-   contrib/mom/momdoc \
-   contrib/gdiffmk/tests \
-   src/libs/snprintf \
-+  src/libs/gl/gllib \
-+  src/libs/gl/gllib/uniwidth \
-+  src/libs/gl/glm4 \
-+  src/libs/gl/build-aux \
-+  src/libs/gl \
-   font/devps/old \
-   font/util
-+GLDIRS =src/libs/gl
- DISTDIRS=\
-   $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) \
--  $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
-+  $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS) $(GLDIRS)
- TARGETS=all install_bin install_data clean distclean mostlyclean \
-   realclean extraclean distfiles TAGS depend uninstall_sub fonts
- 
-@@ -658,7 +664,7 @@ dot: FORCE
- 	  -f $(top_srcdir)/Makefile.comm \
- 	  -f $(top_srcdir)/Makefile.sub $(do)
- 
--$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS)
-+$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS) $(GLDIRS)
- 	@$(ENVSETUP); \
- 	if test $(srcdir) = .; then \
- 	  srcdir=.; \
-@@ -720,6 +726,21 @@ $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCP
- 	  -f $$srcdir/Makefile.sub \
- 	  -f $(top_srcdir)/Makefile.dev $(do)
- 
-+$(GLDIRS): FORCE
-+	@$(ENVSETUP); \
-+	if test $(srcdir) = .; then \
-+	  srcdir=.; \
-+	else \
-+	  srcdir=`cd $(srcdir); pwd`/$@; \
-+	fi; \
-+	test -d $@ || $(mkinstalldirs) $@; \
-+	case $(do) in \
-+	all) \
-+	cd $@; \
-+	test -f Makefile || $(SHELL) $$srcdir/configure; \
-+	$(MAKE) $(do) ;; \
-+	esac
-+
- $(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
- 
- $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
-diff --git a/src/devices/grotty/Makefile.sub b/src/devices/grotty/Makefile.sub
-index 2ec77a5..0b5c6b2 100644
---- a/src/devices/grotty/Makefile.sub
-+++ b/src/devices/grotty/Makefile.sub
-@@ -1,6 +1,6 @@
- PROG=grotty$(EXEEXT)
- MAN1=grotty.n
--XLIBS=$(LIBDRIVER) $(LIBGROFF)
-+XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU)
- MLIB=$(LIBM)
- OBJS=tty.$(OBJEXT)
- CCSRCS=$(srcdir)/tty.cpp
-diff --git a/src/devices/grotty/tty.cpp b/src/devices/grotty/tty.cpp
-index 0ea7969..8765410 100644
---- a/src/devices/grotty/tty.cpp
-+++ b/src/devices/grotty/tty.cpp
-@@ -871,6 +871,7 @@ int main(int argc, char **argv)
-   if (getenv("GROFF_NO_SGR"))
-     old_drawing_scheme = 1;
-   setbuf(stderr, stderr_buf);
-+  setlocale(LC_CTYPE, "");
-   int c;
-   static const struct option long_options[] = {
-     { "help", no_argument, 0, CHAR_MAX + 1 },
-diff --git a/src/libs/gl/Makefile.am b/src/libs/gl/Makefile.am
-new file mode 100644
-index 0000000..6fc61b5
---- /dev/null
-+++ b/src/libs/gl/Makefile.am
-@@ -0,0 +1,7 @@
-+## Process this file with automake to produce Makefile.in.
-+
-+AUTOMAKE_OPTIONS = 1.5 foreign
-+
-+SUBDIRS = gllib glm4
-+
-+ACLOCAL_AMFLAGS = -I glm4
-diff --git a/src/libs/gl/Makefile.in b/src/libs/gl/Makefile.in
-new file mode 100644
-index 0000000..9b695f2
---- /dev/null
-+++ b/src/libs/gl/Makefile.in
-@@ -0,0 +1,785 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = .
-+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-+	$(top_srcdir)/configure build-aux/compile \
-+	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
-+	build-aux/install-sh build-aux/missing
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/glm4/00gnulib.m4 \
-+	$(top_srcdir)/glm4/codeset.m4 $(top_srcdir)/glm4/extensions.m4 \
-+	$(top_srcdir)/glm4/fcntl-o.m4 $(top_srcdir)/glm4/glibc21.m4 \
-+	$(top_srcdir)/glm4/gnulib-common.m4 \
-+	$(top_srcdir)/glm4/include_next.m4 \
-+	$(top_srcdir)/glm4/libunistring-base.m4 \
-+	$(top_srcdir)/glm4/localcharset.m4 \
-+	$(top_srcdir)/glm4/longlong.m4 $(top_srcdir)/glm4/multiarch.m4 \
-+	$(top_srcdir)/glm4/stddef_h.m4 $(top_srcdir)/glm4/stdint.m4 \
-+	$(top_srcdir)/glm4/warn-on-use.m4 \
-+	$(top_srcdir)/glm4/wchar_h.m4 $(top_srcdir)/glm4/wchar_t.m4 \
-+	$(top_srcdir)/glm4/wctype_h.m4 $(top_srcdir)/glm4/wcwidth.m4 \
-+	$(top_srcdir)/glm4/wint_t.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno config.status.lineno
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+	distdir dist dist-all distcheck
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d "$(distdir)" \
-+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr "$(distdir)"; }; }
-+am__relativize = \
-+  dir0=`pwd`; \
-+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+  sed_rest='s,^[^/]*/*,,'; \
-+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+  sed_butlast='s,/*[^/]*$$,,'; \
-+  while test -n "$$dir1"; do \
-+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+    if test "$$first" != "."; then \
-+      if test "$$first" = ".."; then \
-+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+      else \
-+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+        if test "$$first2" = "$$first"; then \
-+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+        else \
-+          dir2="../$$dir2"; \
-+        fi; \
-+        dir0="$$dir0"/"$$first"; \
-+      fi; \
-+    fi; \
-+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+  done; \
-+  reldir="$$dir2"
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMTAR = @AMTAR@
-+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
-+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
-+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
-+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
-+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+GLIBC21 = @GLIBC21@
-+GNULIB_BTOWC = @GNULIB_BTOWC@
-+GNULIB_MBRLEN = @GNULIB_MBRLEN@
-+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
-+GNULIB_MBSINIT = @GNULIB_MBSINIT@
-+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
-+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
-+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-+GNULIB_WCTOB = @GNULIB_WCTOB@
-+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-+GREP = @GREP@
-+HAVE_BTOWC = @HAVE_BTOWC@
-+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
-+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
-+HAVE_ISWBLANK = @HAVE_ISWBLANK@
-+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
-+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
-+HAVE_MBRLEN = @HAVE_MBRLEN@
-+HAVE_MBRTOWC = @HAVE_MBRTOWC@
-+HAVE_MBSINIT = @HAVE_MBSINIT@
-+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
-+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
-+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
-+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
-+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
-+HAVE_STDINT_H = @HAVE_STDINT_H@
-+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
-+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
-+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
-+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
-+HAVE_WCHAR_H = @HAVE_WCHAR_H@
-+HAVE_WCHAR_T = @HAVE_WCHAR_T@
-+HAVE_WCRTOMB = @HAVE_WCRTOMB@
-+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-+HAVE_WINT_T = @HAVE_WINT_T@
-+INCLUDE_NEXT = @INCLUDE_NEXT@
-+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
-+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
-+LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
-+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
-+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
-+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
-+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-+NEXT_STDDEF_H = @NEXT_STDDEF_H@
-+NEXT_STDINT_H = @NEXT_STDINT_H@
-+NEXT_WCHAR_H = @NEXT_WCHAR_H@
-+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
-+RANLIB = @RANLIB@
-+REPLACE_BTOWC = @REPLACE_BTOWC@
-+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-+REPLACE_MBRLEN = @REPLACE_MBRLEN@
-+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
-+REPLACE_MBSINIT = @REPLACE_MBSINIT@
-+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
-+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
-+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-+REPLACE_NULL = @REPLACE_NULL@
-+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
-+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
-+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-+REPLACE_WCTOB = @REPLACE_WCTOB@
-+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
-+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-+STDDEF_H = @STDDEF_H@
-+STDINT_H = @STDINT_H@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-+WINT_T_SUFFIX = @WINT_T_SUFFIX@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+gl_LIBOBJS = @gl_LIBOBJS@
-+gl_LTLIBOBJS = @gl_LTLIBOBJS@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+AUTOMAKE_OPTIONS = 1.5 foreign
-+SUBDIRS = gllib glm4
-+ACLOCAL_AMFLAGS = -I glm4
-+all: config.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+.SUFFIXES:
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	$(am__cd) $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+$(am__aclocal_m4_deps):
-+
-+config.h: stamp-h1
-+	@if test ! -f $@; then \
-+	  rm -f stamp-h1; \
-+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-+	else :; fi
-+
-+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-+$(srcdir)/config.h.in:  $(am__configure_deps) 
-+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-+	rm -f stamp-h1
-+	touch $@
-+
-+distclean-hdr:
-+	-rm -f config.h stamp-h1
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+$(RECURSIVE_CLEAN_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	$(am__remove_distdir)
-+	test -d "$(distdir)" || mkdir "$(distdir)"
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+	    $(am__relativize); \
-+	    new_distdir=$$reldir; \
-+	    dir1=$$subdir; dir2="$(top_distdir)"; \
-+	    $(am__relativize); \
-+	    new_top_distdir=$$reldir; \
-+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+	    ($(am__cd) $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$new_top_distdir" \
-+	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
-+		am__skip_mode_fix=: \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+	-test -n "$(am__skip_mode_fix)" \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r "$(distdir)"
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
-+
-+dist-lzma: distdir
-+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+	$(am__remove_distdir)
-+
-+dist-xz: distdir
-+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-+	$(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
-+
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
-+
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
-+
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.lzma*) \
-+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-+	*.tar.xz*) \
-+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	test -d $(distdir)/_build || exit 0; \
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && am__cwd=`pwd` \
-+	  && $(am__cd) $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-+	  && cd "$$am__cwd" \
-+	  || exit 1
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-+distuninstallcheck:
-+	@$(am__cd) '$(distuninstallcheck_dir)' \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile config.h
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+html: html-recursive
-+
-+html-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-recursive
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-recursive
-+
-+install-html-am:
-+
-+install-info: install-info-recursive
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-recursive
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-recursive
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-+	ctags-recursive install-am install-strip tags-recursive
-+
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am am--refresh check check-am clean clean-generic \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-+	distclean distclean-generic distclean-hdr distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff --git a/src/libs/gl/aclocal.m4 b/src/libs/gl/aclocal.m4
-new file mode 100644
-index 0000000..2245077
---- /dev/null
-+++ b/src/libs/gl/aclocal.m4
-@@ -0,0 +1,1005 @@
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
-+You have another version of autoconf.  It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-+
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.11'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version.  Point them to the right macro.
-+m4_if([$1], [1.11.1], [],
-+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too.  Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 9
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 10
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  am__universal=false
-+  m4_case([$1], [CC],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac],
-+    [CXX],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac])
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 5
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[{
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`AS_DIRNAME("$mf")`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`AS_DIRNAME(["$file"])`
-+      AS_MKDIR_P([$dirpart/$fdir])
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-+  done
-+}
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 16
-+
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.62])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+  fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+			     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+		  [_AM_DEPENDENCIES(CC)],
-+		  [define([AC_PROG_CC],
-+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+		  [_AM_DEPENDENCIES(CXX)],
-+		  [define([AC_PROG_CXX],
-+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+		  [_AM_DEPENDENCIES(OBJC)],
-+		  [define([AC_PROG_OBJC],
-+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+])
-+
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_arg=$1
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 6
-+
-+# AM_PROG_CC_C_O
-+# --------------
-+# Like AC_PROG_CC_C_O, but changed for automake.
-+AC_DEFUN([AM_PROG_CC_C_O],
-+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
-+# FIXME: we rely on the cache variable name because
-+# there is no other way.
-+set dummy $CC
-+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-+if test "$am_t" != yes; then
-+   # Losing compiler, so override with the script.
-+   # FIXME: It is wrong to rewrite CC.
-+   # But if we don't then we get into trouble of one sort or another.
-+   # A longer-term fix would be to have automake use am__CC in this case,
-+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+   CC="$am_aux_dir/compile $CC"
-+fi
-+dnl Make sure AC_PROG_CC is never called again, or it will override our
-+dnl setting of CC.
-+m4_define([AC_PROG_CC],
-+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 6
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+  [[\\/$]]* | ?:[[\\/]]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 5
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[[\\\"\#\$\&\'\`$am_lf]]*)
-+    AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-+esac
-+
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t "$srcdir/configure" conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([glm4/00gnulib.m4])
-+m4_include([glm4/codeset.m4])
-+m4_include([glm4/extensions.m4])
-+m4_include([glm4/fcntl-o.m4])
-+m4_include([glm4/glibc21.m4])
-+m4_include([glm4/gnulib-common.m4])
-+m4_include([glm4/include_next.m4])
-+m4_include([glm4/libunistring-base.m4])
-+m4_include([glm4/localcharset.m4])
-+m4_include([glm4/longlong.m4])
-+m4_include([glm4/multiarch.m4])
-+m4_include([glm4/stddef_h.m4])
-+m4_include([glm4/stdint.m4])
-+m4_include([glm4/warn-on-use.m4])
-+m4_include([glm4/wchar_h.m4])
-+m4_include([glm4/wchar_t.m4])
-+m4_include([glm4/wctype_h.m4])
-+m4_include([glm4/wcwidth.m4])
-+m4_include([glm4/wint_t.m4])
-diff --git a/src/libs/gl/build-aux/arg-nonnull.h b/src/libs/gl/build-aux/arg-nonnull.h
-new file mode 100644
-index 0000000..3179fdd
---- /dev/null
-+++ b/src/libs/gl/build-aux/arg-nonnull.h
-@@ -0,0 +1,26 @@
-+/* A C macro for declaring that specific arguments must not be NULL.
-+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-+
-+   This program 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 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
-+   that the values passed as arguments n, ..., m must be non-NULL pointers.
-+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
-+#ifndef _GL_ARG_NONNULL
-+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
-+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
-+# else
-+#  define _GL_ARG_NONNULL(params)
-+# endif
-+#endif
-diff --git a/src/libs/gl/build-aux/c++defs.h b/src/libs/gl/build-aux/c++defs.h
-new file mode 100644
-index 0000000..b2ef31a
---- /dev/null
-+++ b/src/libs/gl/build-aux/c++defs.h
-@@ -0,0 +1,271 @@
-+/* C++ compatible function declaration macros.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+
-+   This program 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 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef _GL_CXXDEFS_H
-+#define _GL_CXXDEFS_H
-+
-+/* The three most frequent use cases of these macros are:
-+
-+   * For providing a substitute for a function that is missing on some
-+     platforms, but is declared and works fine on the platforms on which
-+     it exists:
-+
-+       #if @GNULIB_FOO@
-+       # if !@HAVE_FOO@
-+       _GL_FUNCDECL_SYS (foo, ...);
-+       # endif
-+       _GL_CXXALIAS_SYS (foo, ...);
-+       _GL_CXXALIASWARN (foo);
-+       #elif defined GNULIB_POSIXCHECK
-+       ...
-+       #endif
-+
-+   * For providing a replacement for a function that exists on all platforms,
-+     but is broken/insufficient and needs to be replaced on some platforms:
-+
-+       #if @GNULIB_FOO@
-+       # if @REPLACE_FOO@
-+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+       #   undef foo
-+       #   define foo rpl_foo
-+       #  endif
-+       _GL_FUNCDECL_RPL (foo, ...);
-+       _GL_CXXALIAS_RPL (foo, ...);
-+       # else
-+       _GL_CXXALIAS_SYS (foo, ...);
-+       # endif
-+       _GL_CXXALIASWARN (foo);
-+       #elif defined GNULIB_POSIXCHECK
-+       ...
-+       #endif
-+
-+   * For providing a replacement for a function that exists on some platforms
-+     but is broken/insufficient and needs to be replaced on some of them and
-+     is additionally either missing or undeclared on some other platforms:
-+
-+       #if @GNULIB_FOO@
-+       # if @REPLACE_FOO@
-+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+       #   undef foo
-+       #   define foo rpl_foo
-+       #  endif
-+       _GL_FUNCDECL_RPL (foo, ...);
-+       _GL_CXXALIAS_RPL (foo, ...);
-+       # else
-+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
-+       _GL_FUNCDECL_SYS (foo, ...);
-+       #  endif
-+       _GL_CXXALIAS_SYS (foo, ...);
-+       # endif
-+       _GL_CXXALIASWARN (foo);
-+       #elif defined GNULIB_POSIXCHECK
-+       ...
-+       #endif
-+*/
-+
-+/* _GL_EXTERN_C declaration;
-+   performs the declaration with C linkage.  */
-+#if defined __cplusplus
-+# define _GL_EXTERN_C extern "C"
-+#else
-+# define _GL_EXTERN_C extern
-+#endif
-+
-+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
-+   declares a replacement function, named rpl_func, with the given prototype,
-+   consisting of return type, parameters, and attributes.
-+   Example:
-+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
-+                                  _GL_ARG_NONNULL ((1)));
-+ */
-+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
-+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
-+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
-+  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
-+
-+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
-+   declares the system function, named func, with the given prototype,
-+   consisting of return type, parameters, and attributes.
-+   Example:
-+     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
-+                                  _GL_ARG_NONNULL ((1)));
-+ */
-+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
-+  _GL_EXTERN_C rettype func parameters_and_attributes
-+
-+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
-+   declares a C++ alias called GNULIB_NAMESPACE::func
-+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
-+   Example:
-+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
-+ */
-+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
-+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
-+#if defined __cplusplus && defined GNULIB_NAMESPACE
-+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-+    namespace GNULIB_NAMESPACE                                \
-+    {                                                         \
-+      rettype (*const func) parameters = ::rpl_func;          \
-+    }                                                         \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#else
-+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#endif
-+
-+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
-+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
-+   except that the C function rpl_func may have a slightly different
-+   declaration.  A cast is used to silence the "invalid conversion" error
-+   that would otherwise occur.  */
-+#if defined __cplusplus && defined GNULIB_NAMESPACE
-+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-+    namespace GNULIB_NAMESPACE                                     \
-+    {                                                              \
-+      rettype (*const func) parameters =                           \
-+        reinterpret_cast<rettype(*)parameters>(::rpl_func);        \
-+    }                                                              \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#else
-+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#endif
-+
-+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
-+   declares a C++ alias called GNULIB_NAMESPACE::func
-+   that redirects to the system provided function func, if GNULIB_NAMESPACE
-+   is defined.
-+   Example:
-+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
-+ */
-+#if defined __cplusplus && defined GNULIB_NAMESPACE
-+  /* If we were to write
-+       rettype (*const func) parameters = ::func;
-+     like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls
-+     better (remove an indirection through a 'static' pointer variable),
-+     but then the _GL_CXXALIASWARN macro below would cause a warning not only
-+     for uses of ::func but also for uses of GNULIB_NAMESPACE::func.  */
-+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-+    namespace GNULIB_NAMESPACE                     \
-+    {                                              \
-+      static rettype (*func) parameters = ::func;  \
-+    }                                              \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#else
-+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#endif
-+
-+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
-+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-+   except that the C function func may have a slightly different declaration.
-+   A cast is used to silence the "invalid conversion" error that would
-+   otherwise occur.  */
-+#if defined __cplusplus && defined GNULIB_NAMESPACE
-+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-+    namespace GNULIB_NAMESPACE                          \
-+    {                                                   \
-+      static rettype (*func) parameters =               \
-+        reinterpret_cast<rettype(*)parameters>(::func); \
-+    }                                                   \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#else
-+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#endif
-+
-+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
-+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
-+   except that the C function is picked among a set of overloaded functions,
-+   namely the one with rettype2 and parameters2.  Two consecutive casts
-+   are used to silence the "cannot find a match" and "invalid conversion"
-+   errors that would otherwise occur.  */
-+#if defined __cplusplus && defined GNULIB_NAMESPACE
-+  /* The outer cast must be a reinterpret_cast.
-+     The inner cast: When the function is defined as a set of overloaded
-+     functions, it works as a static_cast<>, choosing the designated variant.
-+     When the function is defined as a single variant, it works as a
-+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
-+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-+    namespace GNULIB_NAMESPACE                                                \
-+    {                                                                         \
-+      static rettype (*func) parameters =                                     \
-+        reinterpret_cast<rettype(*)parameters>(                               \
-+          (rettype2(*)parameters2)(::func));                                  \
-+    }                                                                         \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#else
-+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#endif
-+
-+/* _GL_CXXALIASWARN (func);
-+   causes a warning to be emitted when ::func is used but not when
-+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
-+   variants.  */
-+#if defined __cplusplus && defined GNULIB_NAMESPACE
-+# define _GL_CXXALIASWARN(func) \
-+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
-+# define _GL_CXXALIASWARN_1(func,namespace) \
-+   _GL_CXXALIASWARN_2 (func, namespace)
-+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-+   we enable the warning only when not optimizing.  */
-+# if !__OPTIMIZE__
-+#  define _GL_CXXALIASWARN_2(func,namespace) \
-+    _GL_WARN_ON_USE (func, \
-+                     "The symbol ::" #func " refers to the system function. " \
-+                     "Use " #namespace "::" #func " instead.")
-+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-+#  define _GL_CXXALIASWARN_2(func,namespace) \
-+     extern __typeof__ (func) func
-+# else
-+#  define _GL_CXXALIASWARN_2(func,namespace) \
-+     _GL_EXTERN_C int _gl_cxxalias_dummy
-+# endif
-+#else
-+# define _GL_CXXALIASWARN(func) \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#endif
-+
-+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
-+   causes a warning to be emitted when the given overloaded variant of ::func
-+   is used but not when GNULIB_NAMESPACE::func is used.  */
-+#if defined __cplusplus && defined GNULIB_NAMESPACE
-+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
-+                        GNULIB_NAMESPACE)
-+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
-+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
-+/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>,
-+   we enable the warning only when not optimizing.  */
-+# if !__OPTIMIZE__
-+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-+    _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
-+                         "The symbol ::" #func " refers to the system function. " \
-+                         "Use " #namespace "::" #func " instead.")
-+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-+     extern __typeof__ (func) func
-+# else
-+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
-+     _GL_EXTERN_C int _gl_cxxalias_dummy
-+# endif
-+#else
-+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
-+    _GL_EXTERN_C int _gl_cxxalias_dummy
-+#endif
-+
-+#endif /* _GL_CXXDEFS_H */
-diff --git a/src/libs/gl/build-aux/compile b/src/libs/gl/build-aux/compile
-new file mode 100755
-index 0000000..c0096a7
---- /dev/null
-+++ b/src/libs/gl/build-aux/compile
-@@ -0,0 +1,143 @@
-+#! /bin/sh
-+# Wrapper for compilers which do not understand `-c -o'.
-+
-+scriptversion=2009-10-06.20; # UTC
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-+# Foundation, Inc.
-+# Written by Tom Tromey <tromey@cygnus.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: compile [--help] [--version] PROGRAM [ARGS]
-+
-+Wrapper for compilers which do not understand `-c -o'.
-+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-+arguments, and rename the output as expected.
-+
-+If you are trying to build a whole package this is not the
-+right script to run: please start by reading the file `INSTALL'.
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "compile $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+ofile=
-+cfile=
-+eat=
-+
-+for arg
-+do
-+  if test -n "$eat"; then
-+    eat=
-+  else
-+    case $1 in
-+      -o)
-+	# configure might choose to run compile as `compile cc -o foo foo.c'.
-+	# So we strip `-o arg' only if arg is an object.
-+	eat=1
-+	case $2 in
-+	  *.o | *.obj)
-+	    ofile=$2
-+	    ;;
-+	  *)
-+	    set x "$@" -o "$2"
-+	    shift
-+	    ;;
-+	esac
-+	;;
-+      *.c)
-+	cfile=$1
-+	set x "$@" "$1"
-+	shift
-+	;;
-+      *)
-+	set x "$@" "$1"
-+	shift
-+	;;
-+    esac
-+  fi
-+  shift
-+done
-+
-+if test -z "$ofile" || test -z "$cfile"; then
-+  # If no `-o' option was seen then we might have been invoked from a
-+  # pattern rule where we don't need one.  That is ok -- this is a
-+  # normal compilation that the losing compiler can handle.  If no
-+  # `.c' file was seen then we are probably linking.  That is also
-+  # ok.
-+  exec "$@"
-+fi
-+
-+# Name of file we expect compiler to create.
-+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-+
-+# Create the lock directory.
-+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
-+# that we are using for the .o file.  Also, base the name on the expected
-+# object file name, since that is what matters with a parallel build.
-+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-+while true; do
-+  if mkdir "$lockdir" >/dev/null 2>&1; then
-+    break
-+  fi
-+  sleep 1
-+done
-+# FIXME: race condition here if user kills between mkdir and trap.
-+trap "rmdir '$lockdir'; exit 1" 1 2 15
-+
-+# Run the compile.
-+"$@"
-+ret=$?
-+
-+if test -f "$cofile"; then
-+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-+fi
-+
-+rmdir "$lockdir"
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
-diff --git a/src/libs/gl/build-aux/config.guess b/src/libs/gl/build-aux/config.guess
-new file mode 100755
-index 0000000..dc84c68
---- /dev/null
-+++ b/src/libs/gl/build-aux/config.guess
-@@ -0,0 +1,1501 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+#   Free Software Foundation, Inc.
-+
-+timestamp='2009-11-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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-+# entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub.  If it succeeds, it prints the system name on stdout, and
-+# exits with 0.  Otherwise, it exits with 1.
-+#
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help" >&2
-+       exit 1 ;;
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+if test $# != 0; then
-+  echo "$me: too many arguments$help" >&2
-+  exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,)    echo "int x;" > $dummy.c ;
-+	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+	     CC_FOR_BUILD="$c"; break ;
-+	  fi ;
-+	done ;
-+	if test x"$CC_FOR_BUILD" = x ; then
-+	  CC_FOR_BUILD=no_compiler_found ;
-+	fi
-+	;;
-+ ,,*)   CC_FOR_BUILD=$CC ;;
-+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-+esac ; set_cc_for_build= ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+	PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+    *:NetBSD:*:*)
-+	# NetBSD (nbsd) targets should (where applicable) match one or
-+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-+	# switched to ELF, *-*-netbsd* would select the old
-+	# object file format.  This provides both forward
-+	# compatibility and a consistent mechanism for selecting the
-+	# object file format.
-+	#
-+	# Note: NetBSD doesn't particularly care about the vendor
-+	# portion of the name.  We always set it to "unknown".
-+	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    armeb) machine=armeb-unknown ;;
-+	    arm*) machine=arm-unknown ;;
-+	    sh3el) machine=shl-unknown ;;
-+	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
-+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+	esac
-+	# The Operating System including object format, if it has switched
-+	# to ELF recently, or will in the future.
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+		eval $set_cc_for_build
-+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+			| grep -q __ELF__
-+		then
-+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+		    # Return netbsd for either.  FIX?
-+		    os=netbsd
-+		else
-+		    os=netbsdelf
-+		fi
-+		;;
-+	    *)
-+	        os=netbsd
-+		;;
-+	esac
-+	# The OS release
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
-+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+	# contains redundant information, the shorter form:
-+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+	echo "${machine}-${os}${release}"
-+	exit ;;
-+    *:OpenBSD:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    alpha:OSF1:*:*)
-+	case $UNAME_RELEASE in
-+	*4.0)
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
-+	# A Vn.n version is a released version.
-+	# A Tn.n version is a released field test version.
-+	# A Xn.n version is an unreleased experimental baselevel.
-+	# 1.2 uses "1.2" for uname -r.
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-+    Alpha\ *:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# Should we change UNAME_MACHINE based on the output of uname instead
-+	# of the specific Alpha model?
-+	echo alpha-pc-interix
-+	exit ;;
-+    21064:Windows_NT:50:3)
-+	echo alpha-dec-winnt3.5
-+	exit ;;
-+    Amiga*:UNIX_System_V:4.0:*)
-+	echo m68k-unknown-sysv4
-+	exit ;;
-+    *:[Aa]miga[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-amigaos
-+	exit ;;
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit ;;
-+    *:OS/390:*:*)
-+	echo i370-ibm-openedition
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+	echo arm-acorn-riscix${UNAME_RELEASE}
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+	echo hppa1.1-hitachi-hiuxmpp
-+	exit ;;
-+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+		echo pyramid-pyramid-sysv3
-+	else
-+		echo pyramid-pyramid-bsd
-+	fi
-+	exit ;;
-+    NILE*:*:*:dcosx)
-+	echo pyramid-pyramid-svr4
-+	exit ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7; exit ;;
-+	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4H:SunOS:5.*:*)
-+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:6*:*)
-+	# According to config.sub, this is the proper way to canonicalize
-+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-+	# it's likely to be more like Solaris than SunOS4.
-+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:*:*)
-+	case "`/usr/bin/arch -k`" in
-+	    Series*|S4*)
-+		UNAME_RELEASE=`uname -v`
-+		;;
-+	esac
-+	# Japanese Language versions have a version number like `4.1.3-JL'.
-+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+	exit ;;
-+    sun3*:SunOS:*:*)
-+	echo m68k-sun-sunos${UNAME_RELEASE}
-+	exit ;;
-+    sun*:*:4.2BSD:*)
-+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+	case "`/bin/arch`" in
-+	    sun3)
-+		echo m68k-sun-sunos${UNAME_RELEASE}
-+		;;
-+	    sun4)
-+		echo sparc-sun-sunos${UNAME_RELEASE}
-+		;;
-+	esac
-+	exit ;;
-+    aushp:SunOS:*:*)
-+	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	exit ;;
-+    # The situation for MiNT is a little confusing.  The machine name
-+    # can be virtually everything (everything which is not
-+    # "atarist" or "atariste" at least should have a processor
-+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-+    # to the lowercase version "mint" (or "freemint").  Finally
-+    # the system name "TOS" denotes a system which is actually not
-+    # MiNT.  But MiNT is downward compatible to TOS, so this should
-+    # be no problem.
-+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
-+        exit ;;
-+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+        echo m68k-milan-mint${UNAME_RELEASE}
-+        exit ;;
-+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+        echo m68k-hades-mint${UNAME_RELEASE}
-+        exit ;;
-+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+        echo m68k-unknown-mint${UNAME_RELEASE}
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    powerpc:machten:*:*)
-+	echo powerpc-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    RISC*:Mach:*:*)
-+	echo mips-dec-mach_bsd4.3
-+	exit ;;
-+    RISC*:ULTRIX:*:*)
-+	echo mips-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    VAX*:ULTRIX*:*:*)
-+	echo vax-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    2020:CLIX:*:* | 2430:CLIX:*:*)
-+	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	exit ;;
-+    mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
-+	int main (int argc, char *argv[]) {
-+#else
-+	int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+	#if defined (host_mips) && defined (MIPSEB)
-+	#if defined (SYSTYPE_SYSV)
-+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_SVR4)
-+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+	#endif
-+	#endif
-+	  exit (-1);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
-+	echo mips-mips-riscos${UNAME_RELEASE}
-+	exit ;;
-+    Motorola:PowerMAX_OS:*:*)
-+	echo powerpc-motorola-powermax
-+	exit ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:Power_UNIX:*:*)
-+	echo powerpc-harris-powerunix
-+	exit ;;
-+    m88k:CX/UX:7*:*)
-+	echo m88k-harris-cxux7
-+	exit ;;
-+    m88k:*:4*:R4*)
-+	echo m88k-motorola-sysv4
-+	exit ;;
-+    m88k:*:3*:R3*)
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    AViiON:dgux:*:*)
-+        # DG/UX returns AViiON for all architectures
-+        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+	then
-+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-+	    then
-+		echo m88k-dg-dgux${UNAME_RELEASE}
-+	    else
-+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+	    fi
-+	else
-+	    echo i586-dg-dgux${UNAME_RELEASE}
-+	fi
-+ 	exit ;;
-+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-+	echo m88k-dolphin-sysv3
-+	exit ;;
-+    M88*:*:R3*:*)
-+	# Delta 88k system running SVR3
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+	echo m88k-tektronix-sysv3
-+	exit ;;
-+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+	echo m68k-tektronix-bsd
-+	exit ;;
-+    *:IRIX*:*:*)
-+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+	exit ;;
-+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-+    i*86:AIX:*:*)
-+	echo i386-ibm-aix
-+	exit ;;
-+    ia64:AIX:*:*)
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:2:3)
-+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		eval $set_cc_for_build
-+		sed 's/^		//' << EOF >$dummy.c
-+		#include <sys/systemcfg.h>
-+
-+		main()
-+			{
-+			if (!__power_pc())
-+				exit(1);
-+			puts("powerpc-ibm-aix3.2.5");
-+			exit(0);
-+			}
-+EOF
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
-+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+		echo rs6000-ibm-aix3.2.4
-+	else
-+		echo rs6000-ibm-aix3.2
-+	fi
-+	exit ;;
-+    *:AIX:*:[456])
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+		IBM_ARCH=rs6000
-+	else
-+		IBM_ARCH=powerpc
-+	fi
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:*:*)
-+	echo rs6000-ibm-aix
-+	exit ;;
-+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+	echo romp-ibm-bsd4.4
-+	exit ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	exit ;;                             # report: romp-ibm BSD 4.3
-+    *:BOSX:*:*)
-+	echo rs6000-bull-bosx
-+	exit ;;
-+    DPX/2?00:B.O.S.:*:*)
-+	echo m68k-bull-sysv3
-+	exit ;;
-+    9000/[34]??:4.3bsd:1.*:*)
-+	echo m68k-hp-bsd
-+	exit ;;
-+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+	echo m68k-hp-bsd4.4
-+	exit ;;
-+    9000/[34678]??:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	case "${UNAME_MACHINE}" in
-+	    9000/31? )            HP_ARCH=m68000 ;;
-+	    9000/[34]?? )         HP_ARCH=m68k ;;
-+	    9000/[678][0-9][0-9])
-+		if [ -x /usr/bin/getconf ]; then
-+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+                    case "${sc_cpu_version}" in
-+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+                      532)                      # CPU_PA_RISC2_0
-+                        case "${sc_kernel_bits}" in
-+                          32) HP_ARCH="hppa2.0n" ;;
-+                          64) HP_ARCH="hppa2.0w" ;;
-+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-+                        esac ;;
-+                    esac
-+		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^              //' << EOF >$dummy.c
-+
-+              #define _HPUX_SOURCE
-+              #include <stdlib.h>
-+              #include <unistd.h>
-+
-+              int main ()
-+              {
-+              #if defined(_SC_KERNEL_BITS)
-+                  long bits = sysconf(_SC_KERNEL_BITS);
-+              #endif
-+                  long cpu  = sysconf (_SC_CPU_VERSION);
-+
-+                  switch (cpu)
-+              	{
-+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+              	case CPU_PA_RISC2_0:
-+              #if defined(_SC_KERNEL_BITS)
-+              	    switch (bits)
-+              		{
-+              		case 64: puts ("hppa2.0w"); break;
-+              		case 32: puts ("hppa2.0n"); break;
-+              		default: puts ("hppa2.0"); break;
-+              		} break;
-+              #else  /* !defined(_SC_KERNEL_BITS) */
-+              	    puts ("hppa2.0"); break;
-+              #endif
-+              	default: puts ("hppa1.0"); break;
-+              	}
-+                  exit (0);
-+              }
-+EOF
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
-+	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep -q __LP64__
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
-+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	exit ;;
-+    ia64:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux${HPUX_REV}
-+	exit ;;
-+    3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <unistd.h>
-+	int
-+	main ()
-+	{
-+	  long cpu = sysconf (_SC_CPU_VERSION);
-+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-+	     results, however.  */
-+	  if (CPU_IS_PA_RISC (cpu))
-+	    {
-+	      switch (cpu)
-+		{
-+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-+		}
-+	    }
-+	  else if (CPU_IS_HP_MC68K (cpu))
-+	    puts ("m68k-hitachi-hiuxwe2");
-+	  else puts ("unknown-hitachi-hiuxwe2");
-+	  exit (0);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
-+	echo unknown-hitachi-hiuxwe2
-+	exit ;;
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+	echo hppa1.1-hp-bsd
-+	exit ;;
-+    9000/8??:4.3bsd:*:*)
-+	echo hppa1.0-hp-bsd
-+	exit ;;
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+	echo hppa1.0-hp-mpeix
-+	exit ;;
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+	echo hppa1.1-hp-osf
-+	exit ;;
-+    hp8??:OSF1:*:*)
-+	echo hppa1.0-hp-osf
-+	exit ;;
-+    i*86:OSF1:*:*)
-+	if [ -x /usr/sbin/sysversion ] ; then
-+	    echo ${UNAME_MACHINE}-unknown-osf1mk
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-osf1
-+	fi
-+	exit ;;
-+    parisc*:Lites*:*:*)
-+	echo hppa1.1-hp-lites
-+	exit ;;
-+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+	echo c1-convex-bsd
-+        exit ;;
-+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+        exit ;;
-+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+	echo c34-convex-bsd
-+        exit ;;
-+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+	echo c38-convex-bsd
-+        exit ;;
-+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+	echo c4-convex-bsd
-+        exit ;;
-+    CRAY*Y-MP:*:*:*)
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*[A-Z]90:*:*:*)
-+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*TS:*:*:*)
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*T3E:*:*:*)
-+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    sparc*:BSD/OS:*:*)
-+	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:BSD/OS:*:*)
-+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:FreeBSD:*:*)
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-+    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-cygwin
-+	exit ;;
-+    *:MINGW*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-+    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
-+	exit ;;
-+    *:Interix*:*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    authenticamd | genuineintel | EM64T)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+	# UNAME_MACHINE based on the output of uname instead of i386?
-+	echo i586-pc-interix
-+	exit ;;
-+    i*:UWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-uwin
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-+    p*:CYGWIN*:*)
-+	echo powerpcle-unknown-cygwin
-+	exit ;;
-+    prep*:SunOS:5.*:*)
-+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    *:GNU:*:*)
-+	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-+    i*86:Minix:*:*)
-+	echo ${UNAME_MACHINE}-pc-minix
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-+    arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+	exit ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    mips:Linux:*:* | mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=${UNAME_MACHINE}el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=${UNAME_MACHINE}
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-+    parisc:Linux:*:* | hppa:Linux:*:*)
-+	# Look for CPU level
-+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
-+	esac
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-+    s390:Linux:*:* | s390x:Linux:*:*)
-+	echo ${UNAME_MACHINE}-ibm-linux
-+	exit ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sh*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sparc:Linux:*:* | sparc64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-+    x86_64:Linux:*:*)
-+	echo x86_64-unknown-linux-gnu
-+	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    i*86:DYNIX/ptx:4*:*)
-+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+	# earlier versions are messed up and put the nodename in both
-+	# sysname and nodename.
-+	echo i386-sequent-sysv4
-+	exit ;;
-+    i*86:UNIX_SV:4.2MP:2.*)
-+        # Unixware is an offshoot of SVR4, but it has its own version
-+        # number series starting with 2...
-+        # I am not positive that other SVR4 systems won't match this,
-+	# I just have to hope.  -- rms.
-+        # Use sysv4.2uw... so that sysv4* matches it.
-+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+	exit ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit ;;
-+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+	fi
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	case `/bin/uname -X | grep "^Machine"` in
-+	    *486*)	     UNAME_MACHINE=i486 ;;
-+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+	exit ;;
-+    i*86:*:3.2:*)
-+	if test -f /usr/options/cb.name; then
-+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+			&& UNAME_MACHINE=i586
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv32
-+	fi
-+	exit ;;
-+    pc:*:*:*)
-+	# Left here for compatibility:
-+        # 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
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-+    Intel:Mach:3*:*)
-+	echo i386-pc-mach3
-+	exit ;;
-+    paragon:*:*:*)
-+	echo i860-intel-osf1
-+	exit ;;
-+    i860:*:4.*:*) # i860-SVR4
-+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+	else # Add other i860-SVR4 vendors below as they are discovered.
-+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-+	fi
-+	exit ;;
-+    mini*:CTIX:SYS*5:*)
-+	# "miniframe"
-+	echo m68010-convergent-sysv
-+	exit ;;
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-+	OS_REL=''
-+	test -r /etc/.relid \
-+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    mc68030:UNIX_System_V:4.*:*)
-+	echo m68k-atari-sysv4
-+	exit ;;
-+    TSUNAMI:LynxOS:2.*:*)
-+	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    rs6000:LynxOS:2.*:*)
-+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    SM[BE]S:UNIX_SV:*:*)
-+	echo mips-dde-sysv${UNAME_RELEASE}
-+	exit ;;
-+    RM*:ReliantUNIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    RM*:SINIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    *:SINIX-*:*:*)
-+	if uname -p 2>/dev/null >/dev/null ; then
-+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+		echo ${UNAME_MACHINE}-sni-sysv4
-+	else
-+		echo ns32k-sni-sysv
-+	fi
-+	exit ;;
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-+        echo i586-unisys-sysv4
-+        exit ;;
-+    *:UNIX_System_V:4*:FTX*)
-+	# From Gerald Hewes <hewes@openmarket.com>.
-+	# How about differentiating between stratus architectures? -djm
-+	echo hppa1.1-stratus-sysv4
-+	exit ;;
-+    *:*:*:FTX*)
-+	# From seanf@swdc.stratus.com.
-+	echo i860-stratus-sysv4
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-+    *:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo hppa1.1-stratus-vos
-+	exit ;;
-+    mc68*:A/UX:*:*)
-+	echo m68k-apple-aux${UNAME_RELEASE}
-+	exit ;;
-+    news*:NEWS-OS:6*:*)
-+	echo mips-sony-newsos6
-+	exit ;;
-+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+	if [ -d /usr/nec ]; then
-+	        echo mips-nec-sysv${UNAME_RELEASE}
-+	else
-+	        echo mips-unknown-sysv${UNAME_RELEASE}
-+	fi
-+        exit ;;
-+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-+	echo powerpc-be-beos
-+	exit ;;
-+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-+	echo powerpc-apple-beos
-+	exit ;;
-+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-+	echo i586-pc-beos
-+	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-+    SX-4:SUPER-UX:*:*)
-+	echo sx4-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-5:SUPER-UX:*:*)
-+	echo sx5-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    Power*:Rhapsody:*:*)
-+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Rhapsody:*:*)
-+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Darwin:*:*)
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    i386)
-+		eval $set_cc_for_build
-+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		      grep IS_64BIT_ARCH >/dev/null
-+		  then
-+		      UNAME_PROCESSOR="x86_64"
-+		  fi
-+		fi ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
-+		UNAME_PROCESSOR=i386
-+		UNAME_MACHINE=pc
-+	fi
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+	exit ;;
-+    *:QNX:*:4*)
-+	echo i386-pc-qnx
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    *:NonStop-UX:*:*)
-+	echo mips-compaq-nonstopux
-+	exit ;;
-+    BS2000:POSIX*:*:*)
-+	echo bs2000-siemens-sysv
-+	exit ;;
-+    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit ;;
-+    *:Plan9:*:*)
-+	# "uname -m" is not consistent, so use $cputype instead. 386
-+	# is converted to i386 for consistency with other x86
-+	# operating systems.
-+	if test "$cputype" = "386"; then
-+	    UNAME_MACHINE=i386
-+	else
-+	    UNAME_MACHINE="$cputype"
-+	fi
-+	echo ${UNAME_MACHINE}-unknown-plan9
-+	exit ;;
-+    *:TOPS-10:*:*)
-+	echo pdp10-unknown-tops10
-+	exit ;;
-+    *:TENEX:*:*)
-+	echo pdp10-unknown-tenex
-+	exit ;;
-+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+	echo pdp10-dec-tops20
-+	exit ;;
-+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+	echo pdp10-xkl-tops20
-+	exit ;;
-+    *:TOPS-20:*:*)
-+	echo pdp10-unknown-tops20
-+	exit ;;
-+    *:ITS:*:*)
-+	echo pdp10-unknown-its
-+	exit ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-+     I don't know....  */
-+  printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+  printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+          "4"
-+#else
-+	  ""
-+#endif
-+         ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+  printf ("arm-acorn-riscix\n"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+  printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+  int version;
-+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+  exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+  printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+  printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+  printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+  printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+  printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+  printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+    struct utsname un;
-+
-+    uname(&un);
-+
-+    if (strncmp(un.version, "V2", 2) == 0) {
-+	printf ("i386-sequent-ptx2\n"); exit (0);
-+    }
-+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+	printf ("i386-sequent-ptx1\n"); exit (0);
-+    }
-+    printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+#  include <sys/param.h>
-+#  if defined (BSD)
-+#   if BSD == 43
-+      printf ("vax-dec-bsd4.3\n"); exit (0);
-+#   else
-+#    if BSD == 199006
-+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+#    else
-+      printf ("vax-dec-bsd\n"); exit (0);
-+#    endif
-+#   endif
-+#  else
-+    printf ("vax-dec-bsd\n"); exit (0);
-+#  endif
-+# else
-+    printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+  printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+  exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+    case `getsysinfo -f cpu_type` in
-+    c1*)
-+	echo c1-convex-bsd
-+	exit ;;
-+    c2*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+	exit ;;
-+    c34*)
-+	echo c34-convex-bsd
-+	exit ;;
-+    c38*)
-+	echo c38-convex-bsd
-+	exit ;;
-+    c4*)
-+	echo c4-convex-bsd
-+	exit ;;
-+    esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo               = `(hostinfo) 2>/dev/null`
-+/bin/universe          = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch              = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM  = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff --git a/src/libs/gl/build-aux/config.sub b/src/libs/gl/build-aux/config.sub
-new file mode 100755
-index 0000000..2a55a50
---- /dev/null
-+++ b/src/libs/gl/build-aux/config.sub
-@@ -0,0 +1,1705 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+#   Free Software Foundation, Inc.
-+
-+timestamp='2009-11-20'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine.  It does not imply ALL GNU software can.
-+#
-+# 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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted GNU ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support.  The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help"
-+       exit 1 ;;
-+
-+    *local*)
-+       # First pass through any local machine types.
-+       echo $1
-+       exit ;;
-+
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+    exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+    exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-+case $maybe_os in
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-+    os=-$maybe_os
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-+    ;;
-+  *)
-+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+    if [ $basic_machine != $1 ]
-+    then os=`echo $1 | sed 's/.*-/-/'`
-+    else os=; fi
-+    ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work.  We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+	-sun*os*)
-+		# Prevent following clause from handling this invalid input.
-+		;;
-+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+	-apple | -axis | -knuth | -cray | -microblaze)
-+		os=
-+		basic_machine=$1
-+		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
-+	-sim | -cisco | -oki | -wec | -winbond)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-scout)
-+		;;
-+	-wrs)
-+		os=-vxworks
-+		basic_machine=$1
-+		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
-+	-hiux*)
-+		os=-hiuxwe2
-+		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5)
-+		os=-sco3.2v5
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco4)
-+		os=-sco3.2v4
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2.[4-9]*)
-+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2v[4-9]*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco*)
-+		os=-sco3.2v2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-udk*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-isc)
-+		os=-isc2.2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-clix*)
-+		basic_machine=clipper-intergraph
-+		;;
-+	-isc*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-lynx*)
-+		os=-lynxos
-+		;;
-+	-ptx*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+		;;
-+	-windowsnt*)
-+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+		;;
-+	-psos*)
-+		os=-psos
-+		;;
-+	-mint | -mint[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+	# Recognize the basic CPU types without company name.
-+	# Some are omitted here because they have special meanings below.
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| bfin \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fido | fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64octeon | mips64octeonel \
-+	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| moxie \
-+	| mt \
-+	| msp430 \
-+	| nios | nios2 \
-+	| ns16k | ns32k \
-+	| or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| rx \
-+	| score \
-+	| 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 \
-+	| spu | strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| ubicom32 \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-+		# Motorola 68HC11/12.
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
-+
-+	# We use `pc' rather than `unknown'
-+	# because (1) that's what they normally are, and
-+	# (2) the word "unknown" tends to confuse beginning users.
-+	i*86 | x86_64)
-+	  basic_machine=$basic_machine-pc
-+	  ;;
-+	# Object if more than one company name word.
-+	*-*-*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+	# Recognize the basic CPU types with company name.
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* | avr32-* \
-+	| bfin-* | bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64octeon-* | mips64octeonel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
-+	| msp430-* \
-+	| nios-* | nios2-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| 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-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+	| tron-* \
-+	| ubicom32-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
-+	| ymp-* \
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	# Recognize the various machine names and aliases which stand
-+	# for a CPU type and a company and sometimes even an OS.
-+	386bsd)
-+		basic_machine=i386-unknown
-+		os=-bsd
-+		;;
-+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+		basic_machine=m68000-att
-+		;;
-+	3b*)
-+		basic_machine=we32k-att
-+		;;
-+	a29khif)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
-+	adobe68k)
-+		basic_machine=m68010-adobe
-+		os=-scout
-+		;;
-+	alliant | fx80)
-+		basic_machine=fx80-alliant
-+		;;
-+	altos | altos3068)
-+		basic_machine=m68k-altos
-+		;;
-+	am29k)
-+		basic_machine=a29k-none
-+		os=-bsd
-+		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	amdahl)
-+		basic_machine=580-amdahl
-+		os=-sysv
-+		;;
-+	amiga | amiga-*)
-+		basic_machine=m68k-unknown
-+		;;
-+	amigaos | amigados)
-+		basic_machine=m68k-unknown
-+		os=-amigaos
-+		;;
-+	amigaunix | amix)
-+		basic_machine=m68k-unknown
-+		os=-sysv4
-+		;;
-+	apollo68)
-+		basic_machine=m68k-apollo
-+		os=-sysv
-+		;;
-+	apollo68bsd)
-+		basic_machine=m68k-apollo
-+		os=-bsd
-+		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
-+	aux)
-+		basic_machine=m68k-apple
-+		os=-aux
-+		;;
-+	balance)
-+		basic_machine=ns32k-sequent
-+		os=-dynix
-+		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
-+	convex-c1)
-+		basic_machine=c1-convex
-+		os=-bsd
-+		;;
-+	convex-c2)
-+		basic_machine=c2-convex
-+		os=-bsd
-+		;;
-+	convex-c32)
-+		basic_machine=c32-convex
-+		os=-bsd
-+		;;
-+	convex-c34)
-+		basic_machine=c34-convex
-+		os=-bsd
-+		;;
-+	convex-c38)
-+		basic_machine=c38-convex
-+		os=-bsd
-+		;;
-+	cray | j90)
-+		basic_machine=j90-cray
-+		os=-unicos
-+		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
-+	crds | unos)
-+		basic_machine=m68k-crds
-+		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
-+	cris | cris-* | etrax*)
-+		basic_machine=cris-axis
-+		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
-+	da30 | da30-*)
-+		basic_machine=m68k-da30
-+		;;
-+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+		basic_machine=mips-dec
-+		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
-+	delta | 3300 | motorola-3300 | motorola-delta \
-+	      | 3300-motorola | delta-motorola)
-+		basic_machine=m68k-motorola
-+		;;
-+	delta88)
-+		basic_machine=m88k-motorola
-+		os=-sysv3
-+		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
-+	dpx20 | dpx20-*)
-+		basic_machine=rs6000-bull
-+		os=-bosx
-+		;;
-+	dpx2* | dpx2*-bull)
-+		basic_machine=m68k-bull
-+		os=-sysv3
-+		;;
-+	ebmon29k)
-+		basic_machine=a29k-amd
-+		os=-ebmon
-+		;;
-+	elxsi)
-+		basic_machine=elxsi-elxsi
-+		os=-bsd
-+		;;
-+	encore | umax | mmax)
-+		basic_machine=ns32k-encore
-+		;;
-+	es1800 | OSE68k | ose68k | ose | OSE)
-+		basic_machine=m68k-ericsson
-+		os=-ose
-+		;;
-+	fx2800)
-+		basic_machine=i860-alliant
-+		;;
-+	genix)
-+		basic_machine=ns32k-ns
-+		;;
-+	gmicro)
-+		basic_machine=tron-gmicro
-+		os=-sysv
-+		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
-+	h3050r* | hiux*)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	h8300hms)
-+		basic_machine=h8300-hitachi
-+		os=-hms
-+		;;
-+	h8300xray)
-+		basic_machine=h8300-hitachi
-+		os=-xray
-+		;;
-+	h8500hms)
-+		basic_machine=h8500-hitachi
-+		os=-hms
-+		;;
-+	harris)
-+		basic_machine=m88k-harris
-+		os=-sysv3
-+		;;
-+	hp300-*)
-+		basic_machine=m68k-hp
-+		;;
-+	hp300bsd)
-+		basic_machine=m68k-hp
-+		os=-bsd
-+		;;
-+	hp300hpux)
-+		basic_machine=m68k-hp
-+		os=-hpux
-+		;;
-+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k2[0-9][0-9] | hp9k31[0-9])
-+		basic_machine=m68000-hp
-+		;;
-+	hp9k3[2-9][0-9])
-+		basic_machine=m68k-hp
-+		;;
-+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k78[0-9] | hp78[0-9])
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][13679] | hp8[0-9][13679])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hppa-next)
-+		os=-nextstep3
-+		;;
-+	hppaosf)
-+		basic_machine=hppa1.1-hp
-+		os=-osf
-+		;;
-+	hppro)
-+		basic_machine=hppa1.1-hp
-+		os=-proelf
-+		;;
-+	i370-ibm* | ibm*)
-+		basic_machine=i370-ibm
-+		;;
-+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-+	i*86v32)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv32
-+		;;
-+	i*86v4*)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv4
-+		;;
-+	i*86v)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv
-+		;;
-+	i*86sol2)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-solaris2
-+		;;
-+	i386mach)
-+		basic_machine=i386-mach
-+		os=-mach
-+		;;
-+	i386-vsta | vsta)
-+		basic_machine=i386-unknown
-+		os=-vsta
-+		;;
-+	iris | iris4d)
-+		basic_machine=mips-sgi
-+		case $os in
-+		    -irix*)
-+			;;
-+		    *)
-+			os=-irix4
-+			;;
-+		esac
-+		;;
-+	isi68 | isi)
-+		basic_machine=m68k-isi
-+		os=-sysv
-+		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	m88k-omron*)
-+		basic_machine=m88k-omron
-+		;;
-+	magnum | m3230)
-+		basic_machine=mips-mips
-+		os=-sysv
-+		;;
-+	merlin)
-+		basic_machine=ns32k-utek
-+		os=-sysv
-+		;;
-+        microblaze)
-+		basic_machine=microblaze-xilinx
-+		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
-+	miniframe)
-+		basic_machine=m68000-convergent
-+		;;
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+	mips3*-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+		;;
-+	mips3*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+		;;
-+	monitor)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
-+	msdos)
-+		basic_machine=i386-pc
-+		os=-msdos
-+		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
-+	mvs)
-+		basic_machine=i370-ibm
-+		os=-mvs
-+		;;
-+	ncr3000)
-+		basic_machine=i486-ncr
-+		os=-sysv4
-+		;;
-+	netbsd386)
-+		basic_machine=i386-unknown
-+		os=-netbsd
-+		;;
-+	netwinder)
-+		basic_machine=armv4l-rebel
-+		os=-linux
-+		;;
-+	news | news700 | news800 | news900)
-+		basic_machine=m68k-sony
-+		os=-newsos
-+		;;
-+	news1000)
-+		basic_machine=m68030-sony
-+		os=-newsos
-+		;;
-+	news-3600 | risc-news)
-+		basic_machine=mips-sony
-+		os=-newsos
-+		;;
-+	necv70)
-+		basic_machine=v70-nec
-+		os=-sysv
-+		;;
-+	next | m*-next )
-+		basic_machine=m68k-next
-+		case $os in
-+		    -nextstep* )
-+			;;
-+		    -ns2*)
-+		      os=-nextstep2
-+			;;
-+		    *)
-+		      os=-nextstep3
-+			;;
-+		esac
-+		;;
-+	nh3000)
-+		basic_machine=m68k-harris
-+		os=-cxux
-+		;;
-+	nh[45]000)
-+		basic_machine=m88k-harris
-+		os=-cxux
-+		;;
-+	nindy960)
-+		basic_machine=i960-intel
-+		os=-nindy
-+		;;
-+	mon960)
-+		basic_machine=i960-intel
-+		os=-mon960
-+		;;
-+	nonstopux)
-+		basic_machine=mips-compaq
-+		os=-nonstopux
-+		;;
-+	np1)
-+		basic_machine=np1-gould
-+		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	openrisc | openrisc-*)
-+		basic_machine=or32-unknown
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
-+	OSE68000 | ose68000)
-+		basic_machine=m68000-ericsson
-+		os=-ose
-+		;;
-+	os68k)
-+		basic_machine=m68k-none
-+		os=-os68k
-+		;;
-+	pa-hitachi)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	paragon)
-+		basic_machine=i860-intel
-+		os=-osf
-+		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	pbd)
-+		basic_machine=sparc-tti
-+		;;
-+	pbb)
-+		basic_machine=m68k-tti
-+		;;
-+	pc532 | pc532-*)
-+		basic_machine=ns32k-pc532
-+		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
-+		basic_machine=i586-pc
-+		;;
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+		basic_machine=i686-pc
-+		;;
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
-+		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pn)
-+		basic_machine=pn-gould
-+		;;
-+	power)	basic_machine=power-ibm
-+		;;
-+	ppc)	basic_machine=powerpc-unknown
-+		;;
-+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppcle | powerpclittle | ppc-le | powerpc-little)
-+		basic_machine=powerpcle-unknown
-+		;;
-+	ppcle-* | powerpclittle-*)
-+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ps2)
-+		basic_machine=i386-ibm
-+		;;
-+	pw32)
-+		basic_machine=i586-unknown
-+		os=-pw32
-+		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
-+	rom68k)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	rm[46]00)
-+		basic_machine=mips-siemens
-+		;;
-+	rtpc | rtpc-*)
-+		basic_machine=romp-ibm
-+		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
-+	sa29200)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
-+	sequent)
-+		basic_machine=i386-sequent
-+		;;
-+	sh)
-+		basic_machine=sh-hitachi
-+		os=-hms
-+		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
-+		basic_machine=sparclite-wrs
-+		os=-vxworks
-+		;;
-+	sps7)
-+		basic_machine=m68k-bull
-+		os=-sysv2
-+		;;
-+	spur)
-+		basic_machine=spur-unknown
-+		;;
-+	st2000)
-+		basic_machine=m68k-tandem
-+		;;
-+	stratus)
-+		basic_machine=i860-stratus
-+		os=-sysv4
-+		;;
-+	sun2)
-+		basic_machine=m68000-sun
-+		;;
-+	sun2os3)
-+		basic_machine=m68000-sun
-+		os=-sunos3
-+		;;
-+	sun2os4)
-+		basic_machine=m68000-sun
-+		os=-sunos4
-+		;;
-+	sun3os3)
-+		basic_machine=m68k-sun
-+		os=-sunos3
-+		;;
-+	sun3os4)
-+		basic_machine=m68k-sun
-+		os=-sunos4
-+		;;
-+	sun4os3)
-+		basic_machine=sparc-sun
-+		os=-sunos3
-+		;;
-+	sun4os4)
-+		basic_machine=sparc-sun
-+		os=-sunos4
-+		;;
-+	sun4sol2)
-+		basic_machine=sparc-sun
-+		os=-solaris2
-+		;;
-+	sun3 | sun3-*)
-+		basic_machine=m68k-sun
-+		;;
-+	sun4)
-+		basic_machine=sparc-sun
-+		;;
-+	sun386 | sun386i | roadrunner)
-+		basic_machine=i386-sun
-+		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
-+	symmetry)
-+		basic_machine=i386-sequent
-+		os=-dynix
-+		;;
-+	t3e)
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
-+		os=-unicos
-+		;;
-+	tic54x | c54x*)
-+		basic_machine=tic54x-unknown
-+		os=-coff
-+		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
-+	tx39)
-+		basic_machine=mipstx39-unknown
-+		;;
-+	tx39el)
-+		basic_machine=mipstx39el-unknown
-+		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
-+	tower | tower-32)
-+		basic_machine=m68k-ncr
-+		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
-+	udi29k)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	ultra3)
-+		basic_machine=a29k-nyu
-+		os=-sym1
-+		;;
-+	v810 | necv810)
-+		basic_machine=v810-nec
-+		os=-none
-+		;;
-+	vaxv)
-+		basic_machine=vax-dec
-+		os=-sysv
-+		;;
-+	vms)
-+		basic_machine=vax-dec
-+		os=-vms
-+		;;
-+	vpp*|vx|vx-*)
-+		basic_machine=f301-fujitsu
-+		;;
-+	vxworks960)
-+		basic_machine=i960-wrs
-+		os=-vxworks
-+		;;
-+	vxworks68)
-+		basic_machine=m68k-wrs
-+		os=-vxworks
-+		;;
-+	vxworks29k)
-+		basic_machine=a29k-wrs
-+		os=-vxworks
-+		;;
-+	w65*)
-+		basic_machine=w65-wdc
-+		os=-none
-+		;;
-+	w89k-*)
-+		basic_machine=hppa1.1-winbond
-+		os=-proelf
-+		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
-+	xps | xps100)
-+		basic_machine=xps100-honeywell
-+		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-unknown
-+		os=-sim
-+		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
-+	none)
-+		basic_machine=none-none
-+		os=-none
-+		;;
-+
-+# Here we handle the default manufacturer of certain CPU types.  It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+	w89k)
-+		basic_machine=hppa1.1-winbond
-+		;;
-+	op50n)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	op60c)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	romp)
-+		basic_machine=romp-ibm
-+		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
-+	rs6000)
-+		basic_machine=rs6000-ibm
-+		;;
-+	vax)
-+		basic_machine=vax-dec
-+		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
-+	pdp11)
-+		basic_machine=pdp11-dec
-+		;;
-+	we32k)
-+		basic_machine=we32k-att
-+		;;
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-+		basic_machine=sparc-sun
-+		;;
-+	cydra)
-+		basic_machine=cydra-cydrome
-+		;;
-+	orion)
-+		basic_machine=orion-highlevel
-+		;;
-+	orion105)
-+		basic_machine=clipper-highlevel
-+		;;
-+	mac | mpw | mac-mpw)
-+		basic_machine=m68k-apple
-+		;;
-+	pmac | pmac-mpw)
-+		basic_machine=powerpc-apple
-+		;;
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
-+		;;
-+	*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+	*-digital*)
-+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+		;;
-+	*-commodore*)
-+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+		;;
-+	*)
-+		;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+        # First match some system type aliases
-+        # that might get confused with valid system types.
-+	# -solaris* is a basic system type, with this one exception.
-+        -auroraux)
-+	        os=-auroraux
-+		;;
-+	-solaris1 | -solaris1.*)
-+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+		;;
-+	-solaris)
-+		os=-solaris2
-+		;;
-+	-svr4*)
-+		os=-sysv4
-+		;;
-+	-unixware*)
-+		os=-sysv4.2uw
-+		;;
-+	-gnu/linux*)
-+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+		;;
-+	# First accept the basic system types.
-+	# The portable systems comes first.
-+	# Each alternative MUST END IN A *, to match a version number.
-+	# -sysv* is not here because it comes later, after sysvr4.
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* \
-+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* | -aros* \
-+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
-+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-+	# Remember, each alternative MUST END IN *, to match a version number.
-+		;;
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i*86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto-qnx*)
-+		;;
-+	-nto*)
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+		;;
-+	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
-+		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
-+	-linux*)
-+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-+		;;
-+	-sunos5*)
-+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+		;;
-+	-sunos6*)
-+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+		;;
-+	-opened*)
-+		os=-openedition
-+		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
-+	-osfrose*)
-+		os=-osfrose
-+		;;
-+	-osf*)
-+		os=-osf
-+		;;
-+	-utek*)
-+		os=-bsd
-+		;;
-+	-dynix*)
-+		os=-bsd
-+		;;
-+	-acis*)
-+		os=-aos
-+		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
-+	-386bsd)
-+		os=-bsd
-+		;;
-+	-ctix* | -uts*)
-+		os=-sysv
-+		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
-+	-ns2 )
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
-+		;;
-+	# Preserve the version number of sinix5.
-+	-sinix5.*)
-+		os=`echo $os | sed -e 's|sinix|sysv|'`
-+		;;
-+	-sinix*)
-+		os=-sysv4
-+		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
-+	-triton*)
-+		os=-sysv3
-+		;;
-+	-oss*)
-+		os=-sysv3
-+		;;
-+	-svr4)
-+		os=-sysv4
-+		;;
-+	-svr3)
-+		os=-sysv3
-+		;;
-+	-sysvr4)
-+		os=-sysv4
-+		;;
-+	# This must come after -sysvr4.
-+	-sysv*)
-+		;;
-+	-ose*)
-+		os=-ose
-+		;;
-+	-es1800*)
-+		os=-ose
-+		;;
-+	-xenix)
-+		os=-xenix
-+		;;
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+	-none)
-+		;;
-+	*)
-+		# Get rid of the `-' at the beginning of $os.
-+		os=`echo $os | sed 's/[^-]*-//'`
-+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system.  Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
-+	*-acorn)
-+		os=-riscix1.2
-+		;;
-+	arm*-rebel)
-+		os=-linux
-+		;;
-+	arm*-semi)
-+		os=-aout
-+		;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
-+		os=-none
-+		;;
-+	*-dec | vax-*)
-+		os=-ultrix4.2
-+		;;
-+	m68*-apollo)
-+		os=-domain
-+		;;
-+	i386-sun)
-+		os=-sunos4.0.2
-+		;;
-+	m68000-sun)
-+		os=-sunos3
-+		# This also exists in the configure program, but was not the
-+		# default.
-+		# os=-sunos4
-+		;;
-+	m68*-cisco)
-+		os=-aout
-+		;;
-+        mep-*)
-+		os=-elf
-+		;;
-+	mips*-cisco)
-+		os=-elf
-+		;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	or32-*)
-+		os=-coff
-+		;;
-+	*-tti)	# must be before sparc entry or we get the wrong os.
-+		os=-sysv3
-+		;;
-+	sparc-* | *-sun)
-+		os=-sunos4.1.1
-+		;;
-+	*-be)
-+		os=-beos
-+		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
-+	*-ibm)
-+		os=-aix
-+		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
-+	*-wec)
-+		os=-proelf
-+		;;
-+	*-winbond)
-+		os=-proelf
-+		;;
-+	*-oki)
-+		os=-proelf
-+		;;
-+	*-hp)
-+		os=-hpux
-+		;;
-+	*-hitachi)
-+		os=-hiux
-+		;;
-+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+		os=-sysv
-+		;;
-+	*-cbm)
-+		os=-amigaos
-+		;;
-+	*-dg)
-+		os=-dgux
-+		;;
-+	*-dolphin)
-+		os=-sysv3
-+		;;
-+	m68k-ccur)
-+		os=-rtu
-+		;;
-+	m88k-omron*)
-+		os=-luna
-+		;;
-+	*-next )
-+		os=-nextstep
-+		;;
-+	*-sequent)
-+		os=-ptx
-+		;;
-+	*-crds)
-+		os=-unos
-+		;;
-+	*-ns)
-+		os=-genix
-+		;;
-+	i370-*)
-+		os=-mvs
-+		;;
-+	*-next)
-+		os=-nextstep3
-+		;;
-+	*-gould)
-+		os=-sysv
-+		;;
-+	*-highlevel)
-+		os=-bsd
-+		;;
-+	*-encore)
-+		os=-bsd
-+		;;
-+	*-sgi)
-+		os=-irix
-+		;;
-+	*-siemens)
-+		os=-sysv4
-+		;;
-+	*-masscomp)
-+		os=-rtu
-+		;;
-+	f30[01]-fujitsu | f700-fujitsu)
-+		os=-uxpv
-+		;;
-+	*-rom68k)
-+		os=-coff
-+		;;
-+	*-*bug)
-+		os=-coff
-+		;;
-+	*-apple)
-+		os=-macos
-+		;;
-+	*-atari*)
-+		os=-mint
-+		;;
-+	*)
-+		os=-none
-+		;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer.  We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+	*-unknown)
-+		case $os in
-+			-riscix*)
-+				vendor=acorn
-+				;;
-+			-sunos*)
-+				vendor=sun
-+				;;
-+			-cnk*|-aix*)
-+				vendor=ibm
-+				;;
-+			-beos*)
-+				vendor=be
-+				;;
-+			-hpux*)
-+				vendor=hp
-+				;;
-+			-mpeix*)
-+				vendor=hp
-+				;;
-+			-hiux*)
-+				vendor=hitachi
-+				;;
-+			-unos*)
-+				vendor=crds
-+				;;
-+			-dgux*)
-+				vendor=dg
-+				;;
-+			-luna*)
-+				vendor=omron
-+				;;
-+			-genix*)
-+				vendor=ns
-+				;;
-+			-mvs* | -opened*)
-+				vendor=ibm
-+				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
-+			-ptx*)
-+				vendor=sequent
-+				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
-+				vendor=wrs
-+				;;
-+			-aux*)
-+				vendor=apple
-+				;;
-+			-hms*)
-+				vendor=hitachi
-+				;;
-+			-mpw* | -macos*)
-+				vendor=apple
-+				;;
-+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+				vendor=atari
-+				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
-+		esac
-+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+		;;
-+esac
-+
-+echo $basic_machine$os
-+exit
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff --git a/src/libs/gl/build-aux/depcomp b/src/libs/gl/build-aux/depcomp
-new file mode 100755
-index 0000000..df8eea7
---- /dev/null
-+++ b/src/libs/gl/build-aux/depcomp
-@@ -0,0 +1,630 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2009-04-28.21; # UTC
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+cygpath_u="cygpath -u -f -"
-+if test "$depmode" = msvcmsys; then
-+   # This is just like msvisualcpp but w/o cygpath translation.
-+   # Just convert the backslash-escaped backslashes to single forward
-+   # slashes to satisfy depend.m4
-+   cygpath_u="sed s,\\\\\\\\,/,g"
-+   depmode=msvisualcpp
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am.  Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+  for arg
-+  do
-+    case $arg in
-+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+    *)  set fnord "$@" "$arg" ;;
-+    esac
-+    shift # fnord
-+    shift # $arg
-+  done
-+  "$@"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> "$depfile"
-+    echo >> "$depfile"
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$base.u
-+    tmpdepfile3=$dir.libs/$base.u
-+    "$@" -Wc,-M
-+  else
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$dir$base.u
-+    tmpdepfile3=$dir$base.u
-+    "$@" -M
-+  fi
-+  stat=$?
-+
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+    exit $stat
-+  fi
-+
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-+  if test -f "$tmpdepfile"; then
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+    # That's a tab and a space in the [].
-+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp2)
-+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+  # compilers, which have integrated preprocessors.  The correct option
-+  # to use with these is +Maked; it writes dependencies to a file named
-+  # 'foo.d', which lands next to the object file, wherever that
-+  # happens to be.
-+  # Much of this is similar to the tru64 case; see comments there.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir.libs/$base.d
-+    "$@" -Wc,+Maked
-+  else
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir$base.d
-+    "$@" +Maked
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+     rm -f "$tmpdepfile1" "$tmpdepfile2"
-+     exit $stat
-+  fi
-+
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-+  if test -f "$tmpdepfile"; then
-+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+    # Add `dependent.h:' lines.
-+    sed -ne '2,${
-+	       s/^ *//
-+	       s/ \\*$//
-+	       s/$/:/
-+	       p
-+	     }' "$tmpdepfile" >> "$depfile"
-+  else
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile" "$tmpdepfile2"
-+  ;;
-+
-+tru64)
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+   if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mechanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-+      "$@" -Wc,-MD
-+   else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+      exit $stat
-+   fi
-+
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no eat=no
-+  for arg
-+  do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    if test $eat = yes; then
-+      eat=no
-+      continue
-+    fi
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -arch)
-+      eat=yes ;;
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  "$@" -E |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
-+	set fnord "$@" "$arg"
-+	shift
-+	shift
-+	;;
-+    esac
-+  done
-+  "$@" -E 2>/dev/null |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvcmsys)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
-diff --git a/src/libs/gl/build-aux/install-sh b/src/libs/gl/build-aux/install-sh
-new file mode 100755
-index 0000000..6781b98
---- /dev/null
-+++ b/src/libs/gl/build-aux/install-sh
-@@ -0,0 +1,520 @@
-+#!/bin/sh
-+# install - install a program, script, or datafile
-+
-+scriptversion=2009-04-28.21; # UTC
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
-+#
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
-+#
-+# Calling this script install-sh is preferred over install.sh, to prevent
-+# `make' implicit rules from creating a file called install from it
-+# when there is no Makefile.
-+#
-+# This script is compatible with the BSD install script, but was written
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" ""	$nl"
-+
-+# set DOITPROG to echo to test this script
-+
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
-+doit=${DOITPROG-}
-+if test -z "$doit"; then
-+  doit_exec=exec
-+else
-+  doit_exec=$doit
-+fi
-+
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
-+
-+chgrpprog=${CHGRPPROG-chgrp}
-+chmodprog=${CHMODPROG-chmod}
-+chownprog=${CHOWNPROG-chown}
-+cmpprog=${CMPPROG-cmp}
-+cpprog=${CPPROG-cp}
-+mkdirprog=${MKDIRPROG-mkdir}
-+mvprog=${MVPROG-mv}
-+rmprog=${RMPROG-rm}
-+stripprog=${STRIPPROG-strip}
-+
-+posix_glob='?'
-+initialize_posix_glob='
-+  test "$posix_glob" != "?" || {
-+    if (set -f) 2>/dev/null; then
-+      posix_glob=
-+    else
-+      posix_glob=:
-+    fi
-+  }
-+'
-+
-+posix_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
-+
-+chgrpcmd=
-+chmodcmd=$chmodprog
-+chowncmd=
-+mvcmd=$mvprog
-+rmcmd="$rmprog -f"
-+stripcmd=
-+
-+src=
-+dst=
-+dir_arg=
-+dst_arg=
-+
-+copy_on_change=false
-+no_target_directory=
-+
-+usage="\
-+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
-+
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
-+
-+Options:
-+     --help     display this help and exit.
-+     --version  display version info and exit.
-+
-+  -c            (ignored)
-+  -C            install only if different (preserve the last data modification time)
-+  -d            create directories instead of installing files.
-+  -g GROUP      $chgrpprog installed files to GROUP.
-+  -m MODE       $chmodprog installed files to MODE.
-+  -o USER       $chownprog installed files to USER.
-+  -s            $stripprog installed files.
-+  -t DIRECTORY  install into DIRECTORY.
-+  -T            report an error if DSTFILE is a directory.
-+
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-+  RMPROG STRIPPROG
-+"
-+
-+while test $# -ne 0; do
-+  case $1 in
-+    -c) ;;
-+
-+    -C) copy_on_change=true;;
-+
-+    -d) dir_arg=true;;
-+
-+    -g) chgrpcmd="$chgrpprog $2"
-+	shift;;
-+
-+    --help) echo "$usage"; exit $?;;
-+
-+    -m) mode=$2
-+	case $mode in
-+	  *' '* | *'	'* | *'
-+'*	  | *'*'* | *'?'* | *'['*)
-+	    echo "$0: invalid mode: $mode" >&2
-+	    exit 1;;
-+	esac
-+	shift;;
-+
-+    -o) chowncmd="$chownprog $2"
-+	shift;;
-+
-+    -s) stripcmd=$stripprog;;
-+
-+    -t) dst_arg=$2
-+	shift;;
-+
-+    -T) no_target_directory=true;;
-+
-+    --version) echo "$0 $scriptversion"; exit $?;;
-+
-+    --)	shift
-+	break;;
-+
-+    -*)	echo "$0: invalid option: $1" >&2
-+	exit 1;;
-+
-+    *)  break;;
-+  esac
-+  shift
-+done
-+
-+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-+  # When -d is used, all remaining arguments are directories to create.
-+  # When -t is used, the destination is already specified.
-+  # Otherwise, the last argument is the destination.  Remove it from $@.
-+  for arg
-+  do
-+    if test -n "$dst_arg"; then
-+      # $@ is not empty: it contains at least $arg.
-+      set fnord "$@" "$dst_arg"
-+      shift # fnord
-+    fi
-+    shift # arg
-+    dst_arg=$arg
-+  done
-+fi
-+
-+if test $# -eq 0; then
-+  if test -z "$dir_arg"; then
-+    echo "$0: no input file specified." >&2
-+    exit 1
-+  fi
-+  # It's OK to call `install-sh -d' without argument.
-+  # This can happen when creating conditional directories.
-+  exit 0
-+fi
-+
-+if test -z "$dir_arg"; then
-+  trap '(exit $?); exit' 1 2 13 15
-+
-+  # Set umask so as not to create temps with too-generous modes.
-+  # However, 'strip' requires both read and write access to temps.
-+  case $mode in
-+    # Optimize common cases.
-+    *644) cp_umask=133;;
-+    *755) cp_umask=22;;
-+
-+    *[0-7])
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw='% 200'
-+      fi
-+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+    *)
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw=,u+rw
-+      fi
-+      cp_umask=$mode$u_plus_rw;;
-+  esac
-+fi
-+
-+for src
-+do
-+  # Protect names starting with `-'.
-+  case $src in
-+    -*) src=./$src;;
-+  esac
-+
-+  if test -n "$dir_arg"; then
-+    dst=$src
-+    dstdir=$dst
-+    test -d "$dstdir"
-+    dstdir_status=$?
-+  else
-+
-+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+    # might cause directories to be created, which would be especially bad
-+    # if $src (and thus $dsttmp) contains '*'.
-+    if test ! -f "$src" && test ! -d "$src"; then
-+      echo "$0: $src does not exist." >&2
-+      exit 1
-+    fi
-+
-+    if test -z "$dst_arg"; then
-+      echo "$0: no destination specified." >&2
-+      exit 1
-+    fi
-+
-+    dst=$dst_arg
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst;;
-+    esac
-+
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
-+    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dst_arg: Is a directory" >&2
-+	exit 1
-+      fi
-+      dstdir=$dst
-+      dst=$dstdir/`basename "$src"`
-+      dstdir_status=0
-+    else
-+      # Prefer dirname, but fall back on a substitute if dirname fails.
-+      dstdir=`
-+	(dirname "$dst") 2>/dev/null ||
-+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	     X"$dst" : 'X\(//\)[^/]' \| \
-+	     X"$dst" : 'X\(//\)$' \| \
-+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+	echo X"$dst" |
-+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)[^/].*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\).*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 s/.*/./; q'
-+      `
-+
-+      test -d "$dstdir"
-+      dstdir_status=$?
-+    fi
-+  fi
-+
-+  obsolete_mkdir_used=false
-+
-+  if test $dstdir_status != 0; then
-+    case $posix_mkdir in
-+      '')
-+	# Create intermediate dirs using mode 755 as modified by the umask.
-+	# This is like FreeBSD 'install' as of 1997-10-28.
-+	umask=`umask`
-+	case $stripcmd.$umask in
-+	  # Optimize common cases.
-+	  *[2367][2367]) mkdir_umask=$umask;;
-+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+	  *[0-7])
-+	    mkdir_umask=`expr $umask + 22 \
-+	      - $umask % 100 % 40 + $umask % 20 \
-+	      - $umask % 10 % 4 + $umask % 2
-+	    `;;
-+	  *) mkdir_umask=$umask,go-w;;
-+	esac
-+
-+	# With -d, create the new directory with the user-specified mode.
-+	# Otherwise, rely on $mkdir_umask.
-+	if test -n "$dir_arg"; then
-+	  mkdir_mode=-m$mode
-+	else
-+	  mkdir_mode=
-+	fi
-+
-+	posix_mkdir=false
-+	case $umask in
-+	  *[123567][0-7][0-7])
-+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+	    ;;
-+	  *)
-+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+	    if (umask $mkdir_umask &&
-+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+	    then
-+	      if test -z "$dir_arg" || {
-+		   # Check for POSIX incompatibilities with -m.
-+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+		   # other-writeable bit of parent directory when it shouldn't.
-+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+		   case $ls_ld_tmpdir in
-+		     d????-?r-*) different_mode=700;;
-+		     d????-?--*) different_mode=755;;
-+		     *) false;;
-+		   esac &&
-+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+		   }
-+		 }
-+	      then posix_mkdir=:
-+	      fi
-+	      rmdir "$tmpdir/d" "$tmpdir"
-+	    else
-+	      # Remove any dirs left behind by ancient mkdir implementations.
-+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+	    fi
-+	    trap '' 0;;
-+	esac;;
-+    esac
-+
-+    if
-+      $posix_mkdir && (
-+	umask $mkdir_umask &&
-+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+      )
-+    then :
-+    else
-+
-+      # The umask is ridiculous, or mkdir does not conform to POSIX,
-+      # or it failed possibly due to a race condition.  Create the
-+      # directory the slow way, step by step, checking for races as we go.
-+
-+      case $dstdir in
-+	/*) prefix='/';;
-+	-*) prefix='./';;
-+	*)  prefix='';;
-+      esac
-+
-+      eval "$initialize_posix_glob"
-+
-+      oIFS=$IFS
-+      IFS=/
-+      $posix_glob set -f
-+      set fnord $dstdir
-+      shift
-+      $posix_glob set +f
-+      IFS=$oIFS
-+
-+      prefixes=
-+
-+      for d
-+      do
-+	test -z "$d" && continue
-+
-+	prefix=$prefix$d
-+	if test -d "$prefix"; then
-+	  prefixes=
-+	else
-+	  if $posix_mkdir; then
-+	    (umask=$mkdir_umask &&
-+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+	    # Don't fail if two instances are running concurrently.
-+	    test -d "$prefix" || exit 1
-+	  else
-+	    case $prefix in
-+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+	      *) qprefix=$prefix;;
-+	    esac
-+	    prefixes="$prefixes '$qprefix'"
-+	  fi
-+	fi
-+	prefix=$prefix/
-+      done
-+
-+      if test -n "$prefixes"; then
-+	# Don't fail if two instances are running concurrently.
-+	(umask $mkdir_umask &&
-+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-+	  test -d "$dstdir" || exit 1
-+	obsolete_mkdir_used=true
-+      fi
-+    fi
-+  fi
-+
-+  if test -n "$dir_arg"; then
-+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-+  else
-+
-+    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
-+
-+    # Trap to clean up those temp files at exit.
-+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+
-+    # Copy the file name to the temp name.
-+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-+
-+    # and set any options; do chmod last to preserve setuid bits.
-+    #
-+    # If any of these fail, we abort the whole thing.  If we want to
-+    # ignore errors from any of these, just make sure not to ignore
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
-+    #
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-+
-+    # If -C, don't bother to copy if it wouldn't change the file.
-+    if $copy_on_change &&
-+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-+
-+       eval "$initialize_posix_glob" &&
-+       $posix_glob set -f &&
-+       set X $old && old=:$2:$4:$5:$6 &&
-+       set X $new && new=:$2:$4:$5:$6 &&
-+       $posix_glob set +f &&
-+
-+       test "$old" = "$new" &&
-+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-+    then
-+      rm -f "$dsttmp"
-+    else
-+      # Rename the file to the real destination.
-+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-+
-+      # The rename failed, perhaps because mv can't rename something else
-+      # to itself, or perhaps because mv is so ancient that it does not
-+      # support -f.
-+      {
-+	# Now remove or move aside any old file at destination location.
-+	# We try this two ways since rm can't unlink itself on some
-+	# systems and the destination file might be busy for other
-+	# reasons.  In this case, the final cleanup might fail but the new
-+	# file should still install successfully.
-+	{
-+	  test ! -f "$dst" ||
-+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-+	  } ||
-+	  { echo "$0: cannot unlink or rename $dst" >&2
-+	    (exit 1); exit 1
-+	  }
-+	} &&
-+
-+	# Now rename the file to the real destination.
-+	$doit $mvcmd "$dsttmp" "$dst"
-+      }
-+    fi || exit 1
-+
-+    trap '' 0
-+  fi
-+done
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
-diff --git a/src/libs/gl/build-aux/missing b/src/libs/gl/build-aux/missing
-new file mode 100755
-index 0000000..28055d2
---- /dev/null
-+++ b/src/libs/gl/build-aux/missing
-@@ -0,0 +1,376 @@
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+
-+scriptversion=2009-04-28.21; # UTC
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-+# 2008, 2009 Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+if test $# -eq 0; then
-+  echo 1>&2 "Try \`$0 --help' for more information"
-+  exit 1
-+fi
-+
-+run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+  configure_ac=configure.ac
-+else
-+  configure_ac=configure.in
-+fi
-+
-+msg="missing on your system"
-+
-+case $1 in
-+--run)
-+  # Try to run requested program, and just exit if it succeeds.
-+  run=
-+  shift
-+  "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-+  ;;
-+
-+  -h|--h|--he|--hel|--help)
-+    echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+  -h, --help      display this help and exit
-+  -v, --version   output version information and exit
-+  --run           try to run the given command, and emulate it if it fails
-+
-+Supported PROGRAM values:
-+  aclocal      touch file \`aclocal.m4'
-+  autoconf     touch file \`configure'
-+  autoheader   touch file \`config.h.in'
-+  autom4te     touch the output file, or create a stub one
-+  automake     touch all \`Makefile.in' files
-+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-+  flex         create \`lex.yy.c', if possible, from existing .c
-+  help2man     touch the output file
-+  lex          create \`lex.yy.c', if possible, from existing .c
-+  makeinfo     touch the output file
-+  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-+\`g' are ignored when checking the name.
-+
-+Send bug reports to <bug-automake@gnu.org>."
-+    exit $?
-+    ;;
-+
-+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+    echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-+    ;;
-+
-+  -*)
-+    echo 1>&2 "$0: Unknown \`$1' option"
-+    echo 1>&2 "Try \`$0 --help' for more information"
-+    exit 1
-+    ;;
-+
-+esac
-+
-+# normalize program name to check for.
-+program=`echo "$1" | sed '
-+  s/^gnu-//; t
-+  s/^gnu//; t
-+  s/^g//; t'`
-+
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).  This is about non-GNU programs, so use $1 not
-+# $program.
-+case $1 in
-+  lex*|yacc*)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
-+  tar*)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-+    fi
-+    ;;
-+esac
-+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case $program in
-+  aclocal*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-+         to install the \`Automake' and \`Perl' packages.  Grab them from
-+         any GNU archive site."
-+    touch aclocal.m4
-+    ;;
-+
-+  autoconf*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`${configure_ac}'.  You might want to install the
-+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-+         archive site."
-+    touch configure
-+    ;;
-+
-+  autoheader*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-+         from any GNU archive site."
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-+    test -z "$files" && files="config.h"
-+    touch_files=
-+    for f in $files; do
-+      case $f in
-+      *:*) touch_files="$touch_files "`echo "$f" |
-+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+      *) touch_files="$touch_files $f.in";;
-+      esac
-+    done
-+    touch $touch_files
-+    ;;
-+
-+  automake*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-+         You might want to install the \`Automake' and \`Perl' packages.
-+         Grab them from any GNU archive site."
-+    find . -type f -name Makefile.am -print |
-+	   sed 's/\.am$/.in/' |
-+	   while read f; do touch "$f"; done
-+    ;;
-+
-+  autom4te*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-+         archive site."
-+
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo "#! /bin/sh"
-+	echo "# Created by GNU Automake missing as a replacement of"
-+	echo "#  $ $@"
-+	echo "exit 0"
-+	chmod +x $file
-+	exit 1
-+    fi
-+    ;;
-+
-+  bison*|yacc*)
-+    echo 1>&2 "\
-+WARNING: \`$1' $msg.  You should only need it if
-+         you modified a \`.y' file.  You may need the \`Bison' package
-+         in order for those modifications to take effect.  You can get
-+         \`Bison' from any GNU archive site."
-+    rm -f y.tab.c y.tab.h
-+    if test $# -ne 1; then
-+        eval LASTARG="\${$#}"
-+	case $LASTARG in
-+	*.y)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+	    if test -f "$SRCFILE"; then
-+	         cp "$SRCFILE" y.tab.c
-+	    fi
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+	    if test -f "$SRCFILE"; then
-+	         cp "$SRCFILE" y.tab.h
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if test ! -f y.tab.h; then
-+	echo >y.tab.h
-+    fi
-+    if test ! -f y.tab.c; then
-+	echo 'main() { return 0; }' >y.tab.c
-+    fi
-+    ;;
-+
-+  lex*|flex*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified a \`.l' file.  You may need the \`Flex' package
-+         in order for those modifications to take effect.  You can get
-+         \`Flex' from any GNU archive site."
-+    rm -f lex.yy.c
-+    if test $# -ne 1; then
-+        eval LASTARG="\${$#}"
-+	case $LASTARG in
-+	*.l)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+	    if test -f "$SRCFILE"; then
-+	         cp "$SRCFILE" lex.yy.c
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if test ! -f lex.yy.c; then
-+	echo 'main() { return 0; }' >lex.yy.c
-+    fi
-+    ;;
-+
-+  help2man*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+	 you modified a dependency of a manual page.  You may need the
-+	 \`Help2man' package in order for those modifications to take
-+	 effect.  You can get \`Help2man' from any GNU archive site."
-+
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo ".ab help2man is required to generate this page"
-+	exit $?
-+    fi
-+    ;;
-+
-+  makeinfo*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified a \`.texi' or \`.texinfo' file, or any other file
-+         indirectly affecting the aspect of the manual.  The spurious
-+         call might also be the consequence of using a buggy \`make' (AIX,
-+         DU, IRIX).  You might want to install the \`Texinfo' package or
-+         the \`GNU make' package.  Grab either from any GNU archive site."
-+    # The file to touch is that specified with -o ...
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -z "$file"; then
-+      # ... or it is the one specified with @setfilename ...
-+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '
-+	/^@setfilename/{
-+	  s/.* \([^ ]*\) *$/\1/
-+	  p
-+	  q
-+	}' $infile`
-+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-+    fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-+    touch $file
-+    ;;
-+
-+  tar*)
-+    shift
-+
-+    # We have already tried tar in the generic part.
-+    # Look for gnutar/gtar before invocation to avoid ugly error
-+    # messages.
-+    if (gnutar --version > /dev/null 2>&1); then
-+       gnutar "$@" && exit 0
-+    fi
-+    if (gtar --version > /dev/null 2>&1); then
-+       gtar "$@" && exit 0
-+    fi
-+    firstarg="$1"
-+    if shift; then
-+	case $firstarg in
-+	*o*)
-+	    firstarg=`echo "$firstarg" | sed s/o//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+	case $firstarg in
-+	*h*)
-+	    firstarg=`echo "$firstarg" | sed s/h//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+         You may want to install GNU tar or Free paxutils, or check the
-+         command line arguments."
-+    exit 1
-+    ;;
-+
-+  *)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.  Check the \`README' file,
-+         it often tells you about the needed prerequisites for installing
-+         this package.  You may also peek at any GNU archive site, in case
-+         some other package would contain this missing \`$1' program."
-+    exit 1
-+    ;;
-+esac
-+
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
-diff --git a/src/libs/gl/build-aux/warn-on-use.h b/src/libs/gl/build-aux/warn-on-use.h
-new file mode 100644
-index 0000000..d418ad6
---- /dev/null
-+++ b/src/libs/gl/build-aux/warn-on-use.h
-@@ -0,0 +1,109 @@
-+/* A C macro for emitting warnings if a function is used.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+
-+   This program 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 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
-+   for FUNCTION which will then trigger a compiler warning containing
-+   the text of "literal string" anywhere that function is called, if
-+   supported by the compiler.  If the compiler does not support this
-+   feature, the macro expands to an unused extern declaration.
-+
-+   This macro is useful for marking a function as a potential
-+   portability trap, with the intent that "literal string" include
-+   instructions on the replacement function that should be used
-+   instead.  However, one of the reasons that a function is a
-+   portability trap is if it has the wrong signature.  Declaring
-+   FUNCTION with a different signature in C is a compilation error, so
-+   this macro must use the same type as any existing declaration so
-+   that programs that avoid the problematic FUNCTION do not fail to
-+   compile merely because they included a header that poisoned the
-+   function.  But this implies that _GL_WARN_ON_USE is only safe to
-+   use if FUNCTION is known to already have a declaration.  Use of
-+   this macro implies that there must not be any other macro hiding
-+   the declaration of FUNCTION; but undefining FUNCTION first is part
-+   of the poisoning process anyway (although for symbols that are
-+   provided only via a macro, the result is a compilation error rather
-+   than a warning containing "literal string").  Also note that in
-+   C++, it is only safe to use if FUNCTION has no overloads.
-+
-+   For an example, it is possible to poison 'getline' by:
-+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
-+     [getline]) in configure.ac, which potentially defines
-+     HAVE_RAW_DECL_GETLINE
-+   - adding this code to a header that wraps the system <stdio.h>:
-+     #undef getline
-+     #if HAVE_RAW_DECL_GETLINE
-+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
-+       "not universally present; use the gnulib module getline");
-+     #endif
-+
-+   It is not possible to directly poison global variables.  But it is
-+   possible to write a wrapper accessor function, and poison that
-+   (less common usage, like &environ, will cause a compilation error
-+   rather than issue the nice warning, but the end result of informing
-+   the developer about their portability problem is still achieved):
-+   #if HAVE_RAW_DECL_ENVIRON
-+   static inline char ***rpl_environ (void) { return &environ; }
-+   _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
-+   # undef environ
-+   # define environ (*rpl_environ ())
-+   #endif
-+   */
-+#ifndef _GL_WARN_ON_USE
-+
-+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
-+#  define _GL_WARN_ON_USE(function, message) \
-+extern __typeof__ (function) function __attribute__ ((__warning__ (message)))
-+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-+/* Verify the existence of the function.  */
-+#  define _GL_WARN_ON_USE(function, message) \
-+extern __typeof__ (function) function
-+# else /* Unsupported.  */
-+#  define _GL_WARN_ON_USE(function, message) \
-+_GL_WARN_EXTERN_C int _gl_warn_on_use
-+# endif
-+#endif
-+
-+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
-+   is like _GL_WARN_ON_USE (function, "string"), except that the function is
-+   declared with the given prototype, consisting of return type, parameters,
-+   and attributes.
-+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
-+   not work in this case.  */
-+#ifndef _GL_WARN_ON_USE_CXX
-+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
-+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-+extern rettype function parameters_and_attributes \
-+     __attribute__ ((__warning__ (msg)))
-+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
-+/* Verify the existence of the function.  */
-+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-+extern rettype function parameters_and_attributes
-+# else /* Unsupported.  */
-+#  define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
-+_GL_WARN_EXTERN_C int _gl_warn_on_use
-+# endif
-+#endif
-+
-+/* _GL_WARN_EXTERN_C declaration;
-+   performs the declaration with C linkage.  */
-+#ifndef _GL_WARN_EXTERN_C
-+# if defined __cplusplus
-+#  define _GL_WARN_EXTERN_C extern "C"
-+# else
-+#  define _GL_WARN_EXTERN_C extern
-+# endif
-+#endif
-diff --git a/src/libs/gl/config.h.in b/src/libs/gl/config.h.in
-new file mode 100644
-index 0000000..fba818f
---- /dev/null
-+++ b/src/libs/gl/config.h.in
-@@ -0,0 +1,259 @@
-+/* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define if the compiler is building for multiple architectures of Apple
-+   platforms at once. */
-+#undef AA_APPLE_UNIVERSAL_BUILD
-+
-+/* Define to the number of bits in type 'ptrdiff_t'. */
-+#undef BITSIZEOF_PTRDIFF_T
-+
-+/* Define to the number of bits in type 'sig_atomic_t'. */
-+#undef BITSIZEOF_SIG_ATOMIC_T
-+
-+/* Define to the number of bits in type 'size_t'. */
-+#undef BITSIZEOF_SIZE_T
-+
-+/* Define to the number of bits in type 'wchar_t'. */
-+#undef BITSIZEOF_WCHAR_T
-+
-+/* Define to the number of bits in type 'wint_t'. */
-+#undef BITSIZEOF_WINT_T
-+
-+/* Define to 1 when the gnulib module wcwidth should be tested. */
-+#undef GNULIB_TEST_WCWIDTH
-+
-+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_GETC_UNLOCKED
-+
-+/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_WCWIDTH
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the `iswblank' function. */
-+#undef HAVE_ISWBLANK
-+
-+/* Define to 1 if you have the `iswcntrl' function. */
-+#undef HAVE_ISWCNTRL
-+
-+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-+#undef HAVE_LANGINFO_CODESET
-+
-+/* Define to 1 if the system has the type `long long int'. */
-+#undef HAVE_LONG_LONG_INT
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if btowc is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_BTOWC
-+
-+/* Define to 1 if mbrlen is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_MBRLEN
-+
-+/* Define to 1 if mbrtowc is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_MBRTOWC
-+
-+/* Define to 1 if mbsinit is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_MBSINIT
-+
-+/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_MBSNRTOWCS
-+
-+/* Define to 1 if mbsrtowcs is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_MBSRTOWCS
-+
-+/* Define to 1 if wcrtomb is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_WCRTOMB
-+
-+/* Define to 1 if wcsnrtombs is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_WCSNRTOMBS
-+
-+/* Define to 1 if wcsrtombs is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_WCSRTOMBS
-+
-+/* Define to 1 if wctob is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_WCTOB
-+
-+/* Define to 1 if wcwidth is declared even after undefining macros. */
-+#undef HAVE_RAW_DECL_WCWIDTH
-+
-+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
-+#undef HAVE_SIGNED_SIG_ATOMIC_T
-+
-+/* Define to 1 if 'wchar_t' is a signed integer type. */
-+#undef HAVE_SIGNED_WCHAR_T
-+
-+/* Define to 1 if 'wint_t' is a signed integer type. */
-+#undef HAVE_SIGNED_WINT_T
-+
-+/* Define to 1 if you have the <stddef.h> header file. */
-+#undef HAVE_STDDEF_H
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/bitypes.h> header file. */
-+#undef HAVE_SYS_BITYPES_H
-+
-+/* Define to 1 if you have the <sys/inttypes.h> header file. */
-+#undef HAVE_SYS_INTTYPES_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if the system has the type `unsigned long long int'. */
-+#undef HAVE_UNSIGNED_LONG_LONG_INT
-+
-+/* Define to 1 if you have the <wchar.h> header file. */
-+#undef HAVE_WCHAR_H
-+
-+/* Define if you have the 'wchar_t' type. */
-+#undef HAVE_WCHAR_T
-+
-+/* Define to 1 if you have the <wctype.h> header file. */
-+#undef HAVE_WCTYPE_H
-+
-+/* Define to 1 if you have the `wcwidth' function. */
-+#undef HAVE_WCWIDTH
-+
-+/* Define if you have the 'wint_t' type. */
-+#undef HAVE_WINT_T
-+
-+/* Define to 1 if O_NOATIME works. */
-+#undef HAVE_WORKING_O_NOATIME
-+
-+/* Define to 1 if O_NOFOLLOW works. */
-+#undef HAVE_WORKING_O_NOFOLLOW
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'ptrdiff_t'. */
-+#undef PTRDIFF_T_SUFFIX
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'sig_atomic_t'. */
-+#undef SIG_ATOMIC_T_SUFFIX
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'size_t'. */
-+#undef SIZE_T_SUFFIX
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'wchar_t'. */
-+#undef WCHAR_T_SUFFIX
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'wint_t'. */
-+#undef WINT_T_SUFFIX
-+
-+/* Define to 1 if on MINIX. */
-+#undef _MINIX
-+
-+/* Define to 2 if the system does not provide POSIX.1 features except with
-+   this defined. */
-+#undef _POSIX_1_SOURCE
-+
-+/* Define to 1 if you need to in order for `stat' and other things to work. */
-+#undef _POSIX_SOURCE
-+
-+/* Define to 500 only on HP-UX. */
-+#undef _XOPEN_SOURCE
-+
-+/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-+   __APPLE__ && __MACH__ test for MacOS X.
-+   __APPLE_CC__ tests for the Apple compiler and its version.
-+   __STDC_VERSION__ tests for the C99 mode.  */
-+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-+# define __GNUC_STDC_INLINE__ 1
-+#endif
-+
-+/* Define as a marker that can be attached to declarations that might not
-+    be used.  This helps to reduce warnings, such as from
-+    GCC -Wunused-parameter.  */
-+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-+# define _GL_UNUSED __attribute__ ((__unused__))
-+#else
-+# define _GL_UNUSED
-+#endif
-+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
-+   is a misnomer outside of parameter lists.  */
-+#define _UNUSED_PARAMETER_ _GL_UNUSED
-+
-diff --git a/src/libs/gl/configure b/src/libs/gl/configure
-new file mode 100755
-index 0000000..1d05f66
---- /dev/null
-+++ b/src/libs/gl/configure
-@@ -0,0 +1,8269 @@
-+#! /bin/sh
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.65 for dummy 0.
-+#
-+#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
-+#
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in #(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in #((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test "x$CONFIG_SHELL" = x; then
-+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case \`(set -o) 2>/dev/null\` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
-+fi
-+"
-+  as_required="as_fn_return () { (exit \$1); }
-+as_fn_success () { as_fn_return 0; }
-+as_fn_failure () { as_fn_return 1; }
-+as_fn_ret_success () { return 0; }
-+as_fn_ret_failure () { return 1; }
-+
-+exitcode=0
-+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-+
-+else
-+  exitcode=1; echo positional parameters were not saved.
-+fi
-+test x\$exitcode = x0 || exit 1"
-+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-+test \$(( 1 + 1 )) = 2 || exit 1"
-+  if (eval "$as_required") 2>/dev/null; then :
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
-+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-+
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_found=false
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  as_found=:
-+  case $as_dir in #(
-+	 /*)
-+	   for as_base in sh bash ksh sh5; do
-+	     # Try only shells that exist, to save several forks.
-+	     as_shell=$as_dir/$as_base
-+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$as_shell as_have_required=yes
-+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  break 2
-+fi
-+fi
-+	   done;;
-+       esac
-+  as_found=false
-+done
-+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$SHELL as_have_required=yes
-+fi; }
-+IFS=$as_save_IFS
-+
-+
-+      if test "x$CONFIG_SHELL" != x; then :
-+  # We cannot yet assume a decent shell, so we have to provide a
-+	# neutralization value for shells without unset; and this also
-+	# works around shells that cannot unset nonexistent variables.
-+	BASH_ENV=/dev/null
-+	ENV=/dev/null
-+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+    if test x$as_have_required = xno; then :
-+  $as_echo "$0: This script requires a shell more modern than all"
-+  $as_echo "$0: the shells that I found on your system."
-+  if test x${ZSH_VERSION+set} = xset ; then
-+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-+  else
-+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-+$0: including any error possibly output before this
-+$0: message. Then install a modern shell, or manually run
-+$0: the script under such a shell if you do have one."
-+  fi
-+  exit 1
-+fi
-+fi
-+fi
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+export SHELL
-+# Unset more variables known to interfere with behavior of common tools.
-+CLICOLOR_FORCE= GREP_OPTIONS=
-+unset CLICOLOR_FORCE GREP_OPTIONS
-+
-+## --------------------- ##
-+## M4sh Shell Functions. ##
-+## --------------------- ##
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
-+
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} # as_fn_mkdir_p
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+# 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
-+
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+
-+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-+    sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-+      N
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
-+      s/-\n.*//
-+    ' >$as_me.lineno &&
-+  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; }
-+
-+  # 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).
-+  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in #(((((
-+-n*)
-+  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p='mkdir -p "$as_dir"'
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
-+	case $1 in #(
-+	-*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_clean_files=
-+ac_config_libobj_dir=.
-+LIBOBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+
-+# Identity of this package.
-+PACKAGE_NAME='dummy'
-+PACKAGE_TARNAME='dummy'
-+PACKAGE_VERSION='0'
-+PACKAGE_STRING='dummy 0'
-+PACKAGE_BUGREPORT=''
-+PACKAGE_URL=''
-+
-+# 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_header_list=
-+ac_func_list=
-+ac_subst_vars='gl_LTLIBOBJS
-+gl_LIBOBJS
-+am__EXEEXT_FALSE
-+am__EXEEXT_TRUE
-+LTLIBOBJS
-+LIBOBJS
-+LIBGNU_LTLIBDEPS
-+LIBGNU_LIBDEPS
-+REPLACE_ISWCNTRL
-+HAVE_WCTYPE_H
-+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H
-+NEXT_WCTYPE_H
-+HAVE_ISWBLANK
-+HAVE_ISWCNTRL
-+HAVE_WINT_T
-+HAVE_WCHAR_H
-+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H
-+NEXT_WCHAR_H
-+REPLACE_WCWIDTH
-+REPLACE_WCSNRTOMBS
-+REPLACE_WCSRTOMBS
-+REPLACE_WCRTOMB
-+REPLACE_MBSNRTOWCS
-+REPLACE_MBSRTOWCS
-+REPLACE_MBRLEN
-+REPLACE_MBRTOWC
-+REPLACE_MBSINIT
-+REPLACE_WCTOB
-+REPLACE_BTOWC
-+REPLACE_MBSTATE_T
-+HAVE_DECL_WCWIDTH
-+HAVE_DECL_WCTOB
-+HAVE_WCSNRTOMBS
-+HAVE_WCSRTOMBS
-+HAVE_WCRTOMB
-+HAVE_MBSNRTOWCS
-+HAVE_MBSRTOWCS
-+HAVE_MBRLEN
-+HAVE_MBRTOWC
-+HAVE_MBSINIT
-+HAVE_BTOWC
-+GNULIB_WCWIDTH
-+GNULIB_WCSNRTOMBS
-+GNULIB_WCSRTOMBS
-+GNULIB_WCRTOMB
-+GNULIB_MBSNRTOWCS
-+GNULIB_MBSRTOWCS
-+GNULIB_MBRLEN
-+GNULIB_MBRTOWC
-+GNULIB_MBSINIT
-+GNULIB_WCTOB
-+GNULIB_BTOWC
-+LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE
-+LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE
-+LIBUNISTRING_UNIWIDTH_H
-+LIBUNISTRING_UNITYPES_H
-+STDINT_H
-+WINT_T_SUFFIX
-+WCHAR_T_SUFFIX
-+SIG_ATOMIC_T_SUFFIX
-+SIZE_T_SUFFIX
-+PTRDIFF_T_SUFFIX
-+HAVE_SIGNED_WINT_T
-+HAVE_SIGNED_WCHAR_T
-+HAVE_SIGNED_SIG_ATOMIC_T
-+BITSIZEOF_WINT_T
-+BITSIZEOF_WCHAR_T
-+BITSIZEOF_SIG_ATOMIC_T
-+BITSIZEOF_SIZE_T
-+BITSIZEOF_PTRDIFF_T
-+HAVE_SYS_BITYPES_H
-+HAVE_SYS_INTTYPES_H
-+HAVE_STDINT_H
-+NEXT_AS_FIRST_DIRECTIVE_STDINT_H
-+NEXT_STDINT_H
-+HAVE_SYS_TYPES_H
-+HAVE_INTTYPES_H
-+HAVE_UNSIGNED_LONG_LONG_INT
-+HAVE_LONG_LONG_INT
-+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
-+NEXT_STDDEF_H
-+PRAGMA_SYSTEM_HEADER
-+INCLUDE_NEXT_AS_FIRST_DIRECTIVE
-+INCLUDE_NEXT
-+STDDEF_H
-+HAVE_WCHAR_T
-+REPLACE_NULL
-+APPLE_UNIVERSAL_BUILD
-+LOCALCHARSET_TESTS_ENVIRONMENT
-+GLIBC21
-+GL_COND_LIBTOOL_FALSE
-+GL_COND_LIBTOOL_TRUE
-+EGREP
-+GREP
-+CPP
-+RANLIB
-+host_os
-+host_vendor
-+host_cpu
-+host
-+build_os
-+build_vendor
-+build_cpu
-+build
-+am__fastdepCC_FALSE
-+am__fastdepCC_TRUE
-+CCDEPMODE
-+AMDEPBACKSLASH
-+AMDEP_FALSE
-+AMDEP_TRUE
-+am__quote
-+am__include
-+DEPDIR
-+OBJEXT
-+EXEEXT
-+ac_ct_CC
-+CPPFLAGS
-+LDFLAGS
-+CFLAGS
-+CC
-+am__untar
-+am__tar
-+AMTAR
-+am__leading_dot
-+SET_MAKE
-+AWK
-+mkdir_p
-+MKDIR_P
-+INSTALL_STRIP_PROGRAM
-+STRIP
-+install_sh
-+MAKEINFO
-+AUTOHEADER
-+AUTOMAKE
-+AUTOCONF
-+ACLOCAL
-+VERSION
-+PACKAGE
-+CYGPATH_W
-+am__isrc
-+INSTALL_DATA
-+INSTALL_SCRIPT
-+INSTALL_PROGRAM
-+target_alias
-+host_alias
-+build_alias
-+LIBS
-+ECHO_T
-+ECHO_N
-+ECHO_C
-+DEFS
-+mandir
-+localedir
-+libdir
-+psdir
-+pdfdir
-+dvidir
-+htmldir
-+infodir
-+docdir
-+oldincludedir
-+includedir
-+localstatedir
-+sharedstatedir
-+sysconfdir
-+datadir
-+datarootdir
-+libexecdir
-+sbindir
-+bindir
-+program_transform_name
-+prefix
-+exec_prefix
-+PACKAGE_URL
-+PACKAGE_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
-+ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+enable_dependency_tracking
-+'
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+ac_unrecognized_opts=
-+ac_unrecognized_sep=
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-+
-+ac_prev=
-+ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
-+  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-+  -disable-* | --disable-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=\$ac_optarg ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=\$ac_optarg ;;
-+
-+  -without-* | --without-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=no ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries=$ac_optarg ;;
-+
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
-+    ;;
-+
-+  *=*)
-+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+    # Reject names that are not valid shell variable names.
-+    case $ac_envvar in #(
-+      '' | [0-9]* | *[!_$as_cr_alnum]* )
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-+    esac
-+    eval $ac_envvar=\$ac_optarg
-+    export $ac_envvar ;;
-+
-+  *)
-+    # FIXME: should be removed in autoconf 3.0.
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+  as_fn_error "missing argument to $ac_option"
-+fi
-+
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-+  esac
-+fi
-+
-+# Check all directory arguments for consistency.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
-+do
-+  eval ac_val=\$$ac_var
-+  # Remove trailing slashes.
-+  case $ac_val in
-+    */ )
-+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-+      eval $ac_var=\$ac_val;;
-+  esac
-+  # Be sure to have absolute directory names.
-+  case $ac_val in
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+  esac
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+  if test "x$build_alias" = x; then
-+    cross_compiling=maybe
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-+  elif test "x$build_alias" != "x$host_alias"; then
-+    cross_compiling=yes
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  as_fn_error "working directory cannot be determined"
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  as_fn_error "pwd does not report name of working directory"
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$as_myself" ||
-+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_myself" : 'X\(//\)[^/]' \| \
-+	 X"$as_myself" : 'X\(//\)$' \| \
-+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_myself" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  srcdir=$ac_confdir
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+  # Omit some internal or obsolete options to make the list less imposing.
-+  # This message is too long to be a string in the A/UX 3.1 sh.
-+  cat <<_ACEOF
-+\`configure' configures dummy 0 to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+                          [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+                          [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+  --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR            object code libraries [EPREFIX/lib]
-+  --includedir=DIR        C header files [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR            man documentation [DATAROOTDIR/man]
-+  --docdir=DIR            documentation root [DATAROOTDIR/doc/dummy]
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+Program names:
-+  --program-prefix=PREFIX            prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX            append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+  case $ac_init_help in
-+     short | recursive ) echo "Configuration of dummy 0:";;
-+   esac
-+  cat <<\_ACEOF
-+
-+Optional Features:
-+  --disable-option-checking  ignore unrecognized --enable/--with options
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-+
-+Some influential environment variables:
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-+  CPP         C preprocessor
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+Report bugs to the package provider.
-+_ACEOF
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    test -d "$ac_dir" ||
-+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+      continue
-+    ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+dummy configure 0
-+generated by GNU Autoconf 2.65
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit
-+fi
-+
-+## ------------------------ ##
-+## Autoconf initialization. ##
-+## ------------------------ ##
-+
-+# ac_fn_c_try_compile LINENO
-+# --------------------------
-+# Try to compile conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext
-+  if { { ac_try="$ac_compile"
-+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_compile") 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; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; 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_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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+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 { as_var=$3; eval "test \"\${$as_var+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
-+# INCLUDES, setting the cache variable VAR accordingly.
-+ac_fn_c_check_header_compile ()
-+{
-+  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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+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;}
-+
-+} # ac_fn_c_check_header_compile
-+
-+# ac_fn_c_try_link LINENO
-+# -----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_link ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext 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:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 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; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-+  # interfere with the next link command; also delete a directory that is
-+  # left behind by Apple's compiler.  We do this before executing the actions.
-+  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_link
-+
-+# ac_fn_c_check_decl LINENO SYMBOL VAR
-+# ------------------------------------
-+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-+ac_fn_c_check_decl ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-+$as_echo_n "checking whether $2 is declared... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+#ifndef $2
-+  (void) $2;
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+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;}
-+
-+} # ac_fn_c_check_decl
-+
-+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-+# --------------------------------------------
-+# Tries to find the compile-time value of EXPR in a program that includes
-+# INCLUDES, setting VAR accordingly. Returns whether the value could be
-+# computed
-+ac_fn_c_compute_int ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if test "$cross_compiling" = yes; then
-+    # Depending upon the size, compute the lo and hi bounds.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_hi=$ac_mid; break
-+else
-+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_lo=$ac_mid; break
-+else
-+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  ac_lo= ac_hi=
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_hi=$ac_mid
-+else
-+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in #((
-+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-+'') ac_retval=1 ;;
-+esac
-+  else
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+static long int longval () { return $2; }
-+static unsigned long int ulongval () { return $2; }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (($2) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ($2))
-+	return 1;
-+      fprintf (f, "%ld", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ($2))
-+	return 1;
-+      fprintf (f, "%lu", i);
-+    }
-+  /* Do not output a trailing newline, as this causes \r\n confusion
-+     on some platforms.  */
-+  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-+else
-+  ac_retval=1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+rm -f conftest.val
-+
-+  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_compute_int
-+
-+# ac_fn_c_check_func LINENO FUNC VAR
-+# ----------------------------------
-+# Tests whether FUNC exists, setting the cache variable VAR accordingly
-+ac_fn_c_check_func ()
-+{
-+  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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $2 innocuous_$2
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $2 (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $2
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $2 ();
-+/* 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_$2 || defined __stub___$2
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $2 ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+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;}
-+
-+} # ac_fn_c_check_func
-+cat >config.log <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by dummy $as_me 0, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
-+exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    $as_echo "PATH: $as_dir"
-+  done
-+IFS=$as_save_IFS
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *\'*)
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-+    2)
-+      as_fn_append ac_configure_args1 " '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      as_fn_append ac_configure_args " '$ac_arg'"
-+      ;;
-+    esac
-+  done
-+done
-+{ ac_configure_args0=; unset ac_configure_args0;}
-+{ ac_configure_args1=; unset ac_configure_args1;}
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log.  We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      sed -n \
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-+    *)
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+)
-+    echo
-+
-+    cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      $as_echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	$as_echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
-+      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      $as_echo "$as_me: caught signal $ac_signal"
-+    $as_echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-+    exit $exit_status
-+' 0
-+for ac_signal in 1 2 13 15; do
-+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -f -r conftest* confdefs.h
-+
-+$as_echo "/* confdefs.h */" > confdefs.h
-+
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_URL "$PACKAGE_URL"
-+_ACEOF
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
-+if test -n "$CONFIG_SITE"; then
-+  ac_site_file1=$CONFIG_SITE
-+elif test "x$prefix" != xNONE; then
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
-+else
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
-+fi
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+do
-+  test "x$ac_site_file" = xNONE && continue
-+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-+    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special files
-+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-+$as_echo "$as_me: loading cache $cache_file" >&6;}
-+    case $cache_file in
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-+    esac
-+  fi
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
-+  >$cache_file
-+fi
-+
-+as_fn_append ac_header_list " stddef.h"
-+as_fn_append ac_header_list " stdint.h"
-+as_fn_append ac_header_list " wchar.h"
-+as_fn_append ac_func_list " iswcntrl"
-+as_fn_append ac_func_list " iswblank"
-+as_fn_append ac_header_list " wctype.h"
-+as_fn_append ac_func_list " wcwidth"
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-+  case $ac_old_set,$ac_new_set in
-+    set,)
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,set)
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-+$as_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
-+	# differences in whitespace do not lead to failure.
-+	ac_old_val_w=`echo x $ac_old_val`
-+	ac_new_val_w=`echo x $ac_new_val`
-+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	  ac_cache_corrupted=:
-+	else
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-+	  eval $ac_var=\$ac_old_val
-+	fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-+      fi;;
-+  esac
-+  # Pass precious variables to config.status.
-+  if test "$ac_new_set" = set; then
-+    case $ac_new_val in
-+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *) ac_arg=$ac_var=$ac_new_val ;;
-+    esac
-+    case " $ac_configure_args " in
-+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-+    esac
-+  fi
-+done
-+if $ac_cache_corrupted; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+fi
-+## -------------------- ##
-+## Main body of script. ##
-+## -------------------- ##
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+ac_aux_dir=
-+for ac_dir in build-aux "$srcdir"/build-aux; do
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
-+done
-+if test -z "$ac_aux_dir"; then
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
-+am__api_version='1.11'
-+
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
-+# ./install, which can be erroneously created by make from ./install.sh.
-+# Reject install programs that cannot install multiple files.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-+$as_echo_n "checking for a BSD-compatible install... " >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in #((
-+  ./ | .// | /[cC]/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  if test $ac_prog = install &&
-+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # program-specific install script used by HP pwplus--don't use.
-+	    :
-+	  else
-+	    rm -rf conftest.one conftest.two conftest.dir
-+	    echo one > conftest.one
-+	    echo two > conftest.two
-+	    mkdir conftest.dir
-+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-+	      test -s conftest.one && test -s conftest.two &&
-+	      test -s conftest.dir/conftest.one &&
-+	      test -s conftest.dir/conftest.two
-+	    then
-+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	      break 3
-+	    fi
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+
-+  done
-+IFS=$as_save_IFS
-+
-+rm -rf conftest.one conftest.two conftest.dir
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-+$as_echo "$INSTALL" >&6; }
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-+$as_echo_n "checking whether build environment is sane... " >&6; }
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[\\\"\#\$\&\'\`$am_lf]*)
-+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+esac
-+case $srcdir in
-+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+esac
-+
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t "$srcdir/configure" conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" "$LINENO" 5
-+   fi
-+
-+   test "$2" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   as_fn_error "newly created file is older than distributed files!
-+Check your system clock" "$LINENO" 5
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+test "$program_prefix" != NONE &&
-+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-+# Double any \ or $.
-+# By default was `s,x,x', remove it if useless.
-+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-+
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in mkdir gmkdir; do
-+	 for ac_exec_ext in '' $ac_executable_extensions; do
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+
-+  test -d ./--version && rmdir ./--version
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+    MKDIR_P="$ac_cv_path_mkdir -p"
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for MKDIR_P within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    MKDIR_P="$ac_install_sh -d"
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-+$as_echo "$MKDIR_P" >&6; }
-+
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+  [\\/$]* | ?:[\\/]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$AWK" && break
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
-+all:
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
-+rm -f conftest.make
-+fi
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  SET_MAKE=
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  am__isrc=' -I$(srcdir)'
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+  fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE='dummy'
-+ VERSION='0'
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define VERSION "$VERSION"
-+_ACEOF
-+
-+# Some tools Automake needs.
-+
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
-+
-+ac_config_headers="$ac_config_headers config.h"
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $# != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-+
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
-+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+
-+# The possible output files:
-+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-+
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { { ac_try="$ac_link_default"
-+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_default") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-+	;;
-+    [ab].out )
-+	# We found the default executable, but exeext='' is most
-+	# certainly right.
-+	break;;
-+    *.* )
-+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
-+else
-+  ac_file=''
-+fi
-+if test -z "$ac_file"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
-+ac_exeext=$ac_cv_exeext
-+
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&6; }
-+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; }; then :
-+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	  break;;
-+    * ) break;;
-+  esac
-+done
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+rm -f conftest conftest$ac_cv_exeext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { 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; }
-+  if { ac_try='./conftest$ac_cv_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
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
-+if test "${ac_cv_objext+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { { ac_try="$ac_compile"
-+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_compile") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  for ac_file in conftest.o conftest.obj conftest.*; do
-+  test -f "$ac_file" || continue;
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-+$as_echo "$ac_cv_objext" >&6; }
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+else
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_c89=$ac_arg
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+  xno)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-+
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+DEPDIR="${am__leading_dot}deps"
-+
-+ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-+$as_echo_n "checking for style of include used by $am_make... " >&6; }
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
-+rm -f confinc confmf
-+
-+# Check whether --enable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then :
-+  enableval=$enable_dependency_tracking;
-+fi
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+ if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
-+depcc="$CC"   am_compiler_list=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
-+all:
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
-+rm -f conftest.make
-+fi
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  SET_MAKE=
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+
-+# For autobuild.
-+# Make sure we can run config.sub.
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-+$as_echo_n "checking build system type... " >&6; }
-+if test "${ac_cv_build+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
-+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-+$as_echo "$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-+esac
-+build=$ac_cv_build
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-+$as_echo_n "checking host system type... " >&6; }
-+if test "${ac_cv_host+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-+$as_echo "$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-+esac
-+host=$ac_cv_host
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+
-+
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+
-+if test "x$CC" != xcc; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-+fi
-+set dummy $CC; ac_cc=`$as_echo "$2" |
-+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+# Make sure it works both with $CC and with simple cc.
-+# 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'
-+rm -f conftest2.*
-+if { { 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; } &&
-+   test -f conftest2.$ac_objext && { { 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
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-+  if test "x$CC" != xcc; then
-+    # Test first that cc exists at all.
-+    if { ac_try='cc -c conftest.$ac_ext >&5'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+      rm -f conftest2.*
-+      if { { 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; } &&
-+	 test -f conftest2.$ac_objext && { { 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
-+	# cc works too.
-+	:
-+      else
-+	# cc exists but doesn't like -o.
-+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+      fi
-+    fi
-+  fi
-+else
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+fi
-+rm -f core conftest*
-+
-+fi
-+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-+
-+fi
-+
-+# FIXME: we rely on the cache variable name because
-+# there is no other way.
-+set dummy $CC
-+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-+if test "$am_t" != yes; then
-+   # Losing compiler, so override with the script.
-+   # FIXME: It is wrong to rewrite CC.
-+   # But if we don't then we get into trouble of one sort or another.
-+   # A longer-term fix would be to have automake use am__CC in this case,
-+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+   CC="$am_aux_dir/compile $CC"
-+fi
-+
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CPP needs to be expanded
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CPP=$CPP
-+
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+{ $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
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+
-+
-+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
-+  MINIX=yes
-+else
-+  MINIX=
-+fi
-+
-+
-+  if test "$MINIX" = yes; then
-+
-+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-+
-+
-+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-+
-+
-+$as_echo "#define _MINIX 1" >>confdefs.h
-+
-+  fi
-+
-+        case "$host_os" in
-+    hpux*)
-+
-+$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-+
-+      ;;
-+  esac
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#         define __EXTENSIONS__ 1
-+          $ac_includes_default
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_safe_to_define___extensions__=yes
-+else
-+  ac_cv_safe_to_define___extensions__=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-+
-+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-+
-+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-+
-+
-+
-+
-+
-+
-+
-+
-+ if false; then
-+  GL_COND_LIBTOOL_TRUE=
-+  GL_COND_LIBTOOL_FALSE='#'
-+else
-+  GL_COND_LIBTOOL_TRUE='#'
-+  GL_COND_LIBTOOL_FALSE=
-+fi
-+
-+gl_cond_libtool=false
-+gl_libdeps=
-+gl_ltlibdeps=
-+
-+
-+# Like AC_LIBOBJ, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+
-+
-+# Like AC_REPLACE_FUNCS, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+
-+
-+# Like AC_LIBSOURCES, except the directory where the source file is
-+# expected is derived from the gnulib-tool parameterization,
-+# and alloca is special cased (for the alloca-opt module).
-+# We could also entirely rely on EXTRA_lib..._SOURCES.
-+
-+
-+
-+
-+
-+
-+          LIBC_FATAL_STDERR_=1
-+  export LIBC_FATAL_STDERR_
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
-+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-+if test "${am_cv_langinfo_codeset+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <langinfo.h>
-+int
-+main ()
-+{
-+char* cs = nl_langinfo(CODESET); return !cs;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  am_cv_langinfo_codeset=yes
-+else
-+  am_cv_langinfo_codeset=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: $am_cv_langinfo_codeset" >&5
-+$as_echo "$am_cv_langinfo_codeset" >&6; }
-+  if test $am_cv_langinfo_codeset = yes; then
-+
-+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
-+
-+  fi
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
-+$as_echo_n "checking for working fcntl.h... " >&6; }
-+if test "${gl_cv_header_working_fcntl_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  gl_cv_header_working_fcntl_h=cross-compiling
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+           #include <sys/stat.h>
-+           #include <unistd.h>
-+           #include <fcntl.h>
-+           #ifndef O_NOATIME
-+            #define O_NOATIME 0
-+           #endif
-+           #ifndef O_NOFOLLOW
-+            #define O_NOFOLLOW 0
-+           #endif
-+           static int const constants[] =
-+            {
-+              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-+              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-+            };
-+
-+int
-+main ()
-+{
-+
-+            int status = !constants;
-+            {
-+              static char const sym[] = "conftest.sym";
-+              if (symlink (".", sym) != 0
-+                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
-+                status |= 32;
-+              unlink (sym);
-+            }
-+            {
-+              static char const file[] = "confdefs.h";
-+              int fd = open (file, O_RDONLY | O_NOATIME);
-+              char c;
-+              struct stat st0, st1;
-+              if (fd < 0
-+                  || fstat (fd, &st0) != 0
-+                  || sleep (1) != 0
-+                  || read (fd, &c, 1) != 1
-+                  || close (fd) != 0
-+                  || stat (file, &st1) != 0
-+                  || st0.st_atime != st1.st_atime)
-+                status |= 64;
-+            }
-+            return status;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  gl_cv_header_working_fcntl_h=yes
-+else
-+  case $? in #(
-+        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-+        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-+        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-+         *) gl_cv_header_working_fcntl_h='no';;
-+        esac
-+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: $gl_cv_header_working_fcntl_h" >&5
-+$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
-+
-+  case $gl_cv_header_working_fcntl_h in #(
-+  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-+  *) ac_val=1;;
-+  esac
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_WORKING_O_NOATIME $ac_val
-+_ACEOF
-+
-+
-+  case $gl_cv_header_working_fcntl_h in #(
-+  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-+  *) ac_val=1;;
-+  esac
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_WORKING_O_NOFOLLOW $ac_val
-+_ACEOF
-+
-+
-+ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
-+_ACEOF
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
-+$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
-+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-+  Lucky GNU user
-+ #endif
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
-+  ac_cv_gnu_library_2_1=yes
-+else
-+  ac_cv_gnu_library_2_1=no
-+fi
-+rm -f conftest*
-+
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
-+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
-+
-+    GLIBC21="$ac_cv_gnu_library_2_1"
-+
-+
-+
-+    gl_cv_c_multiarch=no
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifndef __APPLE_CC__
-+         not a universal capable compiler
-+        #endif
-+        typedef int dummy;
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+               arch=
-+     prev=
-+     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
-+       if test -n "$prev"; then
-+         case $word in
-+           i?86 | x86_64 | ppc | ppc64)
-+             if test -z "$arch" || test "$arch" = "$word"; then
-+               arch="$word"
-+             else
-+               gl_cv_c_multiarch=yes
-+             fi
-+             ;;
-+         esac
-+         prev=
-+       else
-+         if test "x$word" = "x-arch"; then
-+           prev=arch
-+         fi
-+       fi
-+     done
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  if test $gl_cv_c_multiarch = yes; then
-+
-+$as_echo "#define AA_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-+
-+    APPLE_UNIVERSAL_BUILD=1
-+  else
-+    APPLE_UNIVERSAL_BUILD=0
-+  fi
-+
-+
-+
-+    REPLACE_NULL=0;
-+  HAVE_WCHAR_T=1;
-+  STDDEF_H='';
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
-+$as_echo_n "checking for wchar_t... " >&6; }
-+if test "${gt_cv_c_wchar_t+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stddef.h>
-+       wchar_t foo = (wchar_t)'\0';
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gt_cv_c_wchar_t=yes
-+else
-+  gt_cv_c_wchar_t=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
-+$as_echo "$gt_cv_c_wchar_t" >&6; }
-+  if test $gt_cv_c_wchar_t = yes; then
-+
-+$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
-+
-+  fi
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
-+$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-+if test "${gl_cv_have_include_next+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  rm -rf conftestd1a conftestd1b conftestd2
-+     mkdir conftestd1a conftestd1b conftestd2
-+                                                  cat <<EOF > conftestd1a/conftest.h
-+#define DEFINED_IN_CONFTESTD1
-+#include_next <conftest.h>
-+#ifdef DEFINED_IN_CONFTESTD2
-+int foo;
-+#else
-+#error "include_next doesn't work"
-+#endif
-+EOF
-+     cat <<EOF > conftestd1b/conftest.h
-+#define DEFINED_IN_CONFTESTD1
-+#include <stdio.h>
-+#include_next <conftest.h>
-+#ifdef DEFINED_IN_CONFTESTD2
-+int foo;
-+#else
-+#error "include_next doesn't work"
-+#endif
-+EOF
-+     cat <<EOF > conftestd2/conftest.h
-+#ifndef DEFINED_IN_CONFTESTD1
-+#error "include_next test doesn't work"
-+#endif
-+#define DEFINED_IN_CONFTESTD2
-+EOF
-+     gl_save_CPPFLAGS="$CPPFLAGS"
-+     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <conftest.h>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gl_cv_have_include_next=yes
-+else
-+  CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <conftest.h>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gl_cv_have_include_next=buggy
-+else
-+  gl_cv_have_include_next=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+     CPPFLAGS="$gl_save_CPPFLAGS"
-+     rm -rf conftestd1a conftestd1b conftestd2
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-+$as_echo "$gl_cv_have_include_next" >&6; }
-+  PRAGMA_SYSTEM_HEADER=
-+  if test $gl_cv_have_include_next = yes; then
-+    INCLUDE_NEXT=include_next
-+    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
-+    if test -n "$GCC"; then
-+      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
-+    fi
-+  else
-+    if test $gl_cv_have_include_next = buggy; then
-+      INCLUDE_NEXT=include
-+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
-+    else
-+      INCLUDE_NEXT=include
-+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
-+    fi
-+  fi
-+
-+
-+
-+
-+
-+
-+
-+  for ac_header in $ac_header_list
-+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
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
-+$as_echo_n "checking for long long int... " >&6; }
-+if test "${ac_cv_type_long_long_int+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+  /* For now, do not test the preprocessor; as of 2007 there are too many
-+         implementations with broken preprocessors.  Perhaps this can
-+         be revisited in 2012.  In the meantime, code should not expect
-+         #if to work with literals wider than 32 bits.  */
-+      /* Test literals.  */
-+      long long int ll = 9223372036854775807ll;
-+      long long int nll = -9223372036854775807LL;
-+      unsigned long long int ull = 18446744073709551615ULL;
-+      /* Test constant expressions.   */
-+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-+                     ? 1 : -1)];
-+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-+                     ? 1 : -1)];
-+      int i = 63;
-+int
-+main ()
-+{
-+/* Test availability of runtime routines for shift and division.  */
-+      long long int llmax = 9223372036854775807ll;
-+      unsigned long long int ullmax = 18446744073709551615ull;
-+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-+              | (llmax / ll) | (llmax % ll)
-+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-+              | (ullmax / ull) | (ullmax % ull));
-+  ;
-+  return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+                          if test "$cross_compiling" = yes; then :
-+  ac_cv_type_long_long_int=yes
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <limits.h>
-+               #ifndef LLONG_MAX
-+               # define HALF \
-+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-+               # define LLONG_MAX (HALF - 1 + HALF)
-+               #endif
-+int
-+main ()
-+{
-+long long int n = 1;
-+               int i;
-+               for (i = 0; ; i++)
-+                 {
-+                   long long int m = n << i;
-+                   if (m >> i != n)
-+                     return 1;
-+                   if (LLONG_MAX / 2 < m)
-+                     break;
-+                 }
-+               return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_type_long_long_int=yes
-+else
-+  ac_cv_type_long_long_int=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+else
-+  ac_cv_type_long_long_int=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_type_long_long_int" >&5
-+$as_echo "$ac_cv_type_long_long_int" >&6; }
-+  if test $ac_cv_type_long_long_int = yes; then
-+
-+$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
-+
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
-+$as_echo_n "checking for unsigned long long int... " >&6; }
-+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+  /* For now, do not test the preprocessor; as of 2007 there are too many
-+         implementations with broken preprocessors.  Perhaps this can
-+         be revisited in 2012.  In the meantime, code should not expect
-+         #if to work with literals wider than 32 bits.  */
-+      /* Test literals.  */
-+      long long int ll = 9223372036854775807ll;
-+      long long int nll = -9223372036854775807LL;
-+      unsigned long long int ull = 18446744073709551615ULL;
-+      /* Test constant expressions.   */
-+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-+                     ? 1 : -1)];
-+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-+                     ? 1 : -1)];
-+      int i = 63;
-+int
-+main ()
-+{
-+/* Test availability of runtime routines for shift and division.  */
-+      long long int llmax = 9223372036854775807ll;
-+      unsigned long long int ullmax = 18446744073709551615ull;
-+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-+              | (llmax / ll) | (llmax % ll)
-+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-+              | (ullmax / ull) | (ullmax % ull));
-+  ;
-+  return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_type_unsigned_long_long_int=yes
-+else
-+  ac_cv_type_unsigned_long_long_int=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_type_unsigned_long_long_int" >&5
-+$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
-+  if test $ac_cv_type_unsigned_long_long_int = yes; then
-+
-+$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
-+
-+  fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
-+i\
-+0
-+q
-+'
-+gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
-+i\
-+0
-+q
-+'
-+gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
-+i\
-+0
-+q
-+'
-+
-+
-+  if test "$HAVE_LIBUNISTRING" = yes; then
-+    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
-+    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
-+    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
-+  fi
-+
-+
-+  GNULIB_BTOWC=0;
-+  GNULIB_WCTOB=0;
-+  GNULIB_MBSINIT=0;
-+  GNULIB_MBRTOWC=0;
-+  GNULIB_MBRLEN=0;
-+  GNULIB_MBSRTOWCS=0;
-+  GNULIB_MBSNRTOWCS=0;
-+  GNULIB_WCRTOMB=0;
-+  GNULIB_WCSRTOMBS=0;
-+  GNULIB_WCSNRTOMBS=0;
-+  GNULIB_WCWIDTH=0;
-+    HAVE_BTOWC=1;
-+  HAVE_MBSINIT=1;
-+  HAVE_MBRTOWC=1;
-+  HAVE_MBRLEN=1;
-+  HAVE_MBSRTOWCS=1;
-+  HAVE_MBSNRTOWCS=1;
-+  HAVE_WCRTOMB=1;
-+  HAVE_WCSRTOMBS=1;
-+  HAVE_WCSNRTOMBS=1;
-+  HAVE_DECL_WCTOB=1;
-+  HAVE_DECL_WCWIDTH=1;
-+  REPLACE_MBSTATE_T=0;
-+  REPLACE_BTOWC=0;
-+  REPLACE_WCTOB=0;
-+  REPLACE_MBSINIT=0;
-+  REPLACE_MBRTOWC=0;
-+  REPLACE_MBRLEN=0;
-+  REPLACE_MBSRTOWCS=0;
-+  REPLACE_MBSNRTOWCS=0;
-+  REPLACE_WCRTOMB=0;
-+  REPLACE_WCSRTOMBS=0;
-+  REPLACE_WCSNRTOMBS=0;
-+  REPLACE_WCWIDTH=0;
-+
-+
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
-+$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
-+if test "${gl_cv_header_wchar_h_correct_inline+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  gl_cv_header_wchar_h_correct_inline=yes
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+       #define wcstod renamed_wcstod
-+#include <wchar.h>
-+extern int zero (void);
-+int main () { return zero(); }
-+
-+_ACEOF
-+     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+       mv conftest.$ac_objext conftest1.$ac_objext
-+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+         #define wcstod renamed_wcstod
-+#include <wchar.h>
-+int zero (void) { return 0; }
-+
-+_ACEOF
-+       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+         mv conftest.$ac_objext conftest2.$ac_objext
-+         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
-+           :
-+         else
-+           gl_cv_header_wchar_h_correct_inline=no
-+         fi
-+       fi
-+     fi
-+     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-+$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
-+  if test $gl_cv_header_wchar_h_correct_inline = no; then
-+    as_fn_error "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
-+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
-+C99 mode. You have four options:
-+  - Add the flag -fgnu89-inline to CC and reconfigure, or
-+  - Fix your include files, using parts of
-+    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
-+  - Use a gcc version older than 4.3, or
-+  - Don't use the flags -std=c99 or -std=gnu99.
-+Configuration aborted." "$LINENO" 5
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
-+$as_echo_n "checking for wint_t... " >&6; }
-+if test "${gt_cv_c_wint_t+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-+   before <wchar.h>.  */
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <time.h>
-+#include <wchar.h>
-+       wint_t foo = (wchar_t)'\0';
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gt_cv_c_wint_t=yes
-+else
-+  gt_cv_c_wint_t=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
-+$as_echo "$gt_cv_c_wint_t" >&6; }
-+  if test $gt_cv_c_wint_t = yes; then
-+
-+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
-+
-+  fi
-+
-+
-+
-+
-+  for ac_func in $ac_func_list
-+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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_c_inline=$ac_kw
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  test "$ac_cv_c_inline" != no && break
-+done
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
-+
-+case $ac_cv_c_inline in
-+  inline | yes) ;;
-+  *)
-+    case $ac_cv_c_inline in
-+      no) ac_val=;;
-+      *) ac_val=$ac_cv_c_inline;;
-+    esac
-+    cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+    ;;
-+esac
-+
-+
-+
-+
-+gl_m4_base='glm4'
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+gl_source_base='gllib'
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
-+
-+
-+
-+
-+
-+
-+
-+  if test $gt_cv_c_wchar_t = no; then
-+    HAVE_WCHAR_T=0
-+    STDDEF_H=stddef.h
-+  fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
-+$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-+if test "${gl_cv_decl_null_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stddef.h>
-+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gl_cv_decl_null_works=yes
-+else
-+  gl_cv_decl_null_works=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-+$as_echo "$gl_cv_decl_null_works" >&6; }
-+  if test $gl_cv_decl_null_works = no; then
-+    REPLACE_NULL=1
-+    STDDEF_H=stddef.h
-+  fi
-+  if test -n "$STDDEF_H"; then
-+
-+
-+
-+
-+
-+
-+     if test $gl_cv_have_include_next = yes; then
-+       gl_cv_next_stddef_h='<'stddef.h'>'
-+     else
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
-+$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-+if test "${gl_cv_next_stddef_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+          if test $ac_cv_header_stddef_h = yes; then
-+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stddef.h>
-+
-+_ACEOF
-+                                                                                                case "$host_os" in
-+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
-+              *)    gl_absname_cpp="$ac_cpp" ;;
-+            esac
-+                                                gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-+               sed -n '\#/stddef.h#{
-+                 s#.*"\(.*/stddef.h\)".*#\1#
-+                 s#^/[^/]#//&#
-+                 p
-+                 q
-+               }'`'"'
-+          else
-+            gl_cv_next_stddef_h='<'stddef.h'>'
-+          fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-+$as_echo "$gl_cv_next_stddef_h" >&6; }
-+     fi
-+     NEXT_STDDEF_H=$gl_cv_next_stddef_h
-+
-+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-+       gl_next_as_first_directive='<'stddef.h'>'
-+     else
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-+       gl_next_as_first_directive=$gl_cv_next_stddef_h
-+     fi
-+     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
-+
-+
-+
-+  fi
-+
-+
-+
-+
-+
-+  if test $ac_cv_type_long_long_int = yes; then
-+    HAVE_LONG_LONG_INT=1
-+  else
-+    HAVE_LONG_LONG_INT=0
-+  fi
-+
-+
-+  if test $ac_cv_type_unsigned_long_long_int = yes; then
-+    HAVE_UNSIGNED_LONG_LONG_INT=1
-+  else
-+    HAVE_UNSIGNED_LONG_LONG_INT=0
-+  fi
-+
-+
-+      if test $ac_cv_header_inttypes_h = yes; then
-+    HAVE_INTTYPES_H=1
-+  else
-+    HAVE_INTTYPES_H=0
-+  fi
-+
-+
-+      if test $ac_cv_header_sys_types_h = yes; then
-+    HAVE_SYS_TYPES_H=1
-+  else
-+    HAVE_SYS_TYPES_H=0
-+  fi
-+
-+
-+
-+
-+
-+
-+
-+
-+     if test $gl_cv_have_include_next = yes; then
-+       gl_cv_next_stdint_h='<'stdint.h'>'
-+     else
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
-+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
-+if test "${gl_cv_next_stdint_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+          if test $ac_cv_header_stdint_h = yes; then
-+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdint.h>
-+
-+_ACEOF
-+                                                                                                case "$host_os" in
-+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
-+              *)    gl_absname_cpp="$ac_cpp" ;;
-+            esac
-+                                                gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-+               sed -n '\#/stdint.h#{
-+                 s#.*"\(.*/stdint.h\)".*#\1#
-+                 s#^/[^/]#//&#
-+                 p
-+                 q
-+               }'`'"'
-+          else
-+            gl_cv_next_stdint_h='<'stdint.h'>'
-+          fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-+$as_echo "$gl_cv_next_stdint_h" >&6; }
-+     fi
-+     NEXT_STDINT_H=$gl_cv_next_stdint_h
-+
-+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-+       gl_next_as_first_directive='<'stdint.h'>'
-+     else
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-+       gl_next_as_first_directive=$gl_cv_next_stdint_h
-+     fi
-+     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
-+
-+
-+
-+  if test $ac_cv_header_stdint_h = yes; then
-+    HAVE_STDINT_H=1
-+  else
-+    HAVE_STDINT_H=0
-+  fi
-+
-+
-+    if test $ac_cv_header_stdint_h = yes; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
-+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
-+if test "${gl_cv_header_working_stdint_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  gl_cv_header_working_stdint_h=no
-+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+
-+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
-+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-+#include <stdint.h>
-+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
-+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
-+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
-+#endif
-+
-+
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+
-+
-+#ifdef INT8_MAX
-+int8_t a1 = INT8_MAX;
-+int8_t a1min = INT8_MIN;
-+#endif
-+#ifdef INT16_MAX
-+int16_t a2 = INT16_MAX;
-+int16_t a2min = INT16_MIN;
-+#endif
-+#ifdef INT32_MAX
-+int32_t a3 = INT32_MAX;
-+int32_t a3min = INT32_MIN;
-+#endif
-+#ifdef INT64_MAX
-+int64_t a4 = INT64_MAX;
-+int64_t a4min = INT64_MIN;
-+#endif
-+#ifdef UINT8_MAX
-+uint8_t b1 = UINT8_MAX;
-+#else
-+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
-+#endif
-+#ifdef UINT16_MAX
-+uint16_t b2 = UINT16_MAX;
-+#endif
-+#ifdef UINT32_MAX
-+uint32_t b3 = UINT32_MAX;
-+#endif
-+#ifdef UINT64_MAX
-+uint64_t b4 = UINT64_MAX;
-+#endif
-+int_least8_t c1 = INT8_C (0x7f);
-+int_least8_t c1max = INT_LEAST8_MAX;
-+int_least8_t c1min = INT_LEAST8_MIN;
-+int_least16_t c2 = INT16_C (0x7fff);
-+int_least16_t c2max = INT_LEAST16_MAX;
-+int_least16_t c2min = INT_LEAST16_MIN;
-+int_least32_t c3 = INT32_C (0x7fffffff);
-+int_least32_t c3max = INT_LEAST32_MAX;
-+int_least32_t c3min = INT_LEAST32_MIN;
-+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
-+int_least64_t c4max = INT_LEAST64_MAX;
-+int_least64_t c4min = INT_LEAST64_MIN;
-+uint_least8_t d1 = UINT8_C (0xff);
-+uint_least8_t d1max = UINT_LEAST8_MAX;
-+uint_least16_t d2 = UINT16_C (0xffff);
-+uint_least16_t d2max = UINT_LEAST16_MAX;
-+uint_least32_t d3 = UINT32_C (0xffffffff);
-+uint_least32_t d3max = UINT_LEAST32_MAX;
-+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
-+uint_least64_t d4max = UINT_LEAST64_MAX;
-+int_fast8_t e1 = INT_FAST8_MAX;
-+int_fast8_t e1min = INT_FAST8_MIN;
-+int_fast16_t e2 = INT_FAST16_MAX;
-+int_fast16_t e2min = INT_FAST16_MIN;
-+int_fast32_t e3 = INT_FAST32_MAX;
-+int_fast32_t e3min = INT_FAST32_MIN;
-+int_fast64_t e4 = INT_FAST64_MAX;
-+int_fast64_t e4min = INT_FAST64_MIN;
-+uint_fast8_t f1 = UINT_FAST8_MAX;
-+uint_fast16_t f2 = UINT_FAST16_MAX;
-+uint_fast32_t f3 = UINT_FAST32_MAX;
-+uint_fast64_t f4 = UINT_FAST64_MAX;
-+#ifdef INTPTR_MAX
-+intptr_t g = INTPTR_MAX;
-+intptr_t gmin = INTPTR_MIN;
-+#endif
-+#ifdef UINTPTR_MAX
-+uintptr_t h = UINTPTR_MAX;
-+#endif
-+intmax_t i = INTMAX_MAX;
-+uintmax_t j = UINTMAX_MAX;
-+
-+#include <limits.h> /* for CHAR_BIT */
-+#define TYPE_MINIMUM(t) \
-+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
-+#define TYPE_MAXIMUM(t) \
-+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
-+struct s {
-+  int check_PTRDIFF:
-+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
-+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
-+      ? 1 : -1;
-+  /* Detect bug in FreeBSD 6.0 / ia64.  */
-+  int check_SIG_ATOMIC:
-+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
-+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
-+      ? 1 : -1;
-+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
-+  int check_WCHAR:
-+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
-+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
-+      ? 1 : -1;
-+  /* Detect bug in mingw.  */
-+  int check_WINT:
-+      WINT_MIN == TYPE_MINIMUM (wint_t)
-+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
-+      ? 1 : -1;
-+
-+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
-+  int check_UINT8_C:
-+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
-+  int check_UINT16_C:
-+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
-+
-+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
-+#ifdef UINT8_MAX
-+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
-+#endif
-+#ifdef UINT16_MAX
-+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
-+#endif
-+#ifdef UINT32_MAX
-+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
-+#endif
-+#ifdef UINT64_MAX
-+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
-+#endif
-+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
-+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
-+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
-+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
-+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
-+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
-+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
-+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
-+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
-+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
-+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
-+};
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+                                                    if test "$cross_compiling" = yes; then :
-+                 gl_cv_header_working_stdint_h=yes
-+
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+
-+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
-+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-+#include <stdint.h>
-+
-+
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+
-+
-+#include <stdio.h>
-+#include <string.h>
-+#define MVAL(macro) MVAL1(macro)
-+#define MVAL1(expression) #expression
-+static const char *macro_values[] =
-+  {
-+#ifdef INT8_MAX
-+    MVAL (INT8_MAX),
-+#endif
-+#ifdef INT16_MAX
-+    MVAL (INT16_MAX),
-+#endif
-+#ifdef INT32_MAX
-+    MVAL (INT32_MAX),
-+#endif
-+#ifdef INT64_MAX
-+    MVAL (INT64_MAX),
-+#endif
-+#ifdef UINT8_MAX
-+    MVAL (UINT8_MAX),
-+#endif
-+#ifdef UINT16_MAX
-+    MVAL (UINT16_MAX),
-+#endif
-+#ifdef UINT32_MAX
-+    MVAL (UINT32_MAX),
-+#endif
-+#ifdef UINT64_MAX
-+    MVAL (UINT64_MAX),
-+#endif
-+    NULL
-+  };
-+
-+int
-+main ()
-+{
-+
-+  const char **mv;
-+  for (mv = macro_values; *mv != NULL; mv++)
-+    {
-+      const char *value = *mv;
-+      /* Test whether it looks like a cast expression.  */
-+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
-+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
-+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
-+          || strncmp (value, "((int)"/*)*/, 6) == 0
-+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
-+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-+        return 1;
-+    }
-+  return 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  gl_cv_header_working_stdint_h=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
-+  fi
-+  if test "$gl_cv_header_working_stdint_h" = yes; then
-+    STDINT_H=
-+  else
-+            for ac_header in sys/inttypes.h sys/bitypes.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+    if test $ac_cv_header_sys_inttypes_h = yes; then
-+      HAVE_SYS_INTTYPES_H=1
-+    else
-+      HAVE_SYS_INTTYPES_H=0
-+    fi
-+
-+    if test $ac_cv_header_sys_bitypes_h = yes; then
-+      HAVE_SYS_BITYPES_H=1
-+    else
-+      HAVE_SYS_BITYPES_H=0
-+    fi
-+
-+
-+
-+
-+
-+
-+  if test $APPLE_UNIVERSAL_BUILD = 0; then
-+
-+
-+  for gltype in ptrdiff_t size_t ; do
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-+$as_echo_n "checking for bit size of $gltype... " >&6; }
-+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+
-+#include <limits.h>"; then :
-+
-+else
-+  result=unknown
-+fi
-+
-+       eval gl_cv_bitsizeof_${gltype}=\$result
-+
-+fi
-+eval ac_res=\$gl_cv_bitsizeof_${gltype}
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+    eval result=\$gl_cv_bitsizeof_${gltype}
-+    if test $result = unknown; then
-+                                                result=0
-+    fi
-+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    cat >>confdefs.h <<_ACEOF
-+#define BITSIZEOF_${GLTYPE} $result
-+_ACEOF
-+
-+    eval BITSIZEOF_${GLTYPE}=\$result
-+  done
-+
-+
-+  fi
-+
-+
-+  for gltype in sig_atomic_t wchar_t wint_t ; do
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-+$as_echo_n "checking for bit size of $gltype... " >&6; }
-+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+
-+#include <limits.h>"; then :
-+
-+else
-+  result=unknown
-+fi
-+
-+       eval gl_cv_bitsizeof_${gltype}=\$result
-+
-+fi
-+eval ac_res=\$gl_cv_bitsizeof_${gltype}
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+    eval result=\$gl_cv_bitsizeof_${gltype}
-+    if test $result = unknown; then
-+                                                result=0
-+    fi
-+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    cat >>confdefs.h <<_ACEOF
-+#define BITSIZEOF_${GLTYPE} $result
-+_ACEOF
-+
-+    eval BITSIZEOF_${GLTYPE}=\$result
-+  done
-+
-+
-+
-+
-+  for gltype in sig_atomic_t wchar_t wint_t ; do
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
-+$as_echo_n "checking whether $gltype is signed... " >&6; }
-+if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+
-+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  result=yes
-+else
-+  result=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+       eval gl_cv_type_${gltype}_signed=\$result
-+
-+fi
-+eval ac_res=\$gl_cv_type_${gltype}_signed
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+    eval result=\$gl_cv_type_${gltype}_signed
-+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    if test "$result" = yes; then
-+      cat >>confdefs.h <<_ACEOF
-+#define HAVE_SIGNED_${GLTYPE} 1
-+_ACEOF
-+
-+      eval HAVE_SIGNED_${GLTYPE}=1
-+    else
-+      eval HAVE_SIGNED_${GLTYPE}=0
-+    fi
-+  done
-+
-+
-+  gl_cv_type_ptrdiff_t_signed=yes
-+  gl_cv_type_size_t_signed=no
-+  if test $APPLE_UNIVERSAL_BUILD = 0; then
-+
-+
-+  for gltype in ptrdiff_t size_t ; do
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
-+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  eval gl_cv_type_${gltype}_suffix=no
-+       eval result=\$gl_cv_type_${gltype}_signed
-+       if test "$result" = yes; then
-+         glsufu=
-+       else
-+         glsufu=u
-+       fi
-+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-+         case $glsuf in
-+           '')  gltype1='int';;
-+           l)   gltype1='long int';;
-+           ll)  gltype1='long long int';;
-+           i64) gltype1='__int64';;
-+           u)   gltype1='unsigned int';;
-+           ul)  gltype1='unsigned long int';;
-+           ull) gltype1='unsigned long long int';;
-+           ui64)gltype1='unsigned __int64';;
-+         esac
-+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+
-+              extern $gltype foo;
-+              extern $gltype1 foo;
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval gl_cv_type_${gltype}_suffix=\$glsuf
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+         eval result=\$gl_cv_type_${gltype}_suffix
-+         test "$result" != no && break
-+       done
-+fi
-+eval ac_res=\$gl_cv_type_${gltype}_suffix
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    eval result=\$gl_cv_type_${gltype}_suffix
-+    test "$result" = no && result=
-+    eval ${GLTYPE}_SUFFIX=\$result
-+    cat >>confdefs.h <<_ACEOF
-+#define ${GLTYPE}_SUFFIX $result
-+_ACEOF
-+
-+  done
-+
-+
-+  fi
-+
-+
-+  for gltype in sig_atomic_t wchar_t wint_t ; do
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
-+$as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  eval gl_cv_type_${gltype}_suffix=no
-+       eval result=\$gl_cv_type_${gltype}_signed
-+       if test "$result" = yes; then
-+         glsufu=
-+       else
-+         glsufu=u
-+       fi
-+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-+         case $glsuf in
-+           '')  gltype1='int';;
-+           l)   gltype1='long int';;
-+           ll)  gltype1='long long int';;
-+           i64) gltype1='__int64';;
-+           u)   gltype1='unsigned int';;
-+           ul)  gltype1='unsigned long int';;
-+           ull) gltype1='unsigned long long int';;
-+           ui64)gltype1='unsigned __int64';;
-+         esac
-+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+
-+              extern $gltype foo;
-+              extern $gltype1 foo;
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval gl_cv_type_${gltype}_suffix=\$glsuf
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+         eval result=\$gl_cv_type_${gltype}_suffix
-+         test "$result" != no && break
-+       done
-+fi
-+eval ac_res=\$gl_cv_type_${gltype}_suffix
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    eval result=\$gl_cv_type_${gltype}_suffix
-+    test "$result" = no && result=
-+    eval ${GLTYPE}_SUFFIX=\$result
-+    cat >>confdefs.h <<_ACEOF
-+#define ${GLTYPE}_SUFFIX $result
-+_ACEOF
-+
-+  done
-+
-+
-+
-+    STDINT_H=stdint.h
-+  fi
-+
-+
-+
-+
-+
-+
-+      if  { test "$HAVE_LIBUNISTRING" != yes \
-+    || {
-+
-+
-+
-+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
-+                         }
-+                    }
-+               }
-+
-+
-+
-+
-+       }
-+  }; then
-+    LIBUNISTRING_UNITYPES_H='unitypes.h'
-+  else
-+    LIBUNISTRING_UNITYPES_H=
-+  fi
-+
-+
-+
-+
-+
-+      if  { test "$HAVE_LIBUNISTRING" != yes \
-+    || {
-+
-+
-+
-+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
-+                         }
-+                    }
-+               }
-+
-+
-+
-+
-+       }
-+  }; then
-+    LIBUNISTRING_UNIWIDTH_H='uniwidth.h'
-+  else
-+    LIBUNISTRING_UNIWIDTH_H=
-+  fi
-+
-+
-+
-+
-+
-+       if  { test "$HAVE_LIBUNISTRING" != yes \
-+    || {
-+
-+
-+
-+            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
-+                         }
-+                    }
-+               }
-+
-+
-+
-+
-+       }
-+  }; then
-+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE=
-+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE='#'
-+else
-+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE='#'
-+  LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE=
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+     if test $gl_cv_have_include_next = yes; then
-+       gl_cv_next_wchar_h='<'wchar.h'>'
-+     else
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
-+$as_echo_n "checking absolute name of <wchar.h>... " >&6; }
-+if test "${gl_cv_next_wchar_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+          if test $ac_cv_header_wchar_h = yes; then
-+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <wchar.h>
-+
-+_ACEOF
-+                                                                                                case "$host_os" in
-+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
-+              *)    gl_absname_cpp="$ac_cpp" ;;
-+            esac
-+                                                gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-+               sed -n '\#/wchar.h#{
-+                 s#.*"\(.*/wchar.h\)".*#\1#
-+                 s#^/[^/]#//&#
-+                 p
-+                 q
-+               }'`'"'
-+          else
-+            gl_cv_next_wchar_h='<'wchar.h'>'
-+          fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
-+$as_echo "$gl_cv_next_wchar_h" >&6; }
-+     fi
-+     NEXT_WCHAR_H=$gl_cv_next_wchar_h
-+
-+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-+       gl_next_as_first_directive='<'wchar.h'>'
-+     else
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-+       gl_next_as_first_directive=$gl_cv_next_wchar_h
-+     fi
-+     NEXT_AS_FIRST_DIRECTIVE_WCHAR_H=$gl_next_as_first_directive
-+
-+
-+
-+  if test $ac_cv_header_wchar_h = yes; then
-+    HAVE_WCHAR_H=1
-+  else
-+    HAVE_WCHAR_H=0
-+  fi
-+
-+
-+
-+  if test $gt_cv_c_wint_t = yes; then
-+    HAVE_WINT_T=1
-+  else
-+    HAVE_WINT_T=0
-+  fi
-+
-+
-+
-+    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb     wcsrtombs wcsnrtombs wcwidth; do
-+    as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
-+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Some systems require additional headers.  */
-+#ifndef __GLIBC__
-+# include <stddef.h>
-+# include <stdio.h>
-+# include <time.h>
-+#endif
-+#include <wchar.h>
-+
-+int
-+main ()
-+{
-+#undef $gl_func
-+  (void) $gl_func;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$as_gl_Symbol=yes"
-+else
-+  eval "$as_gl_Symbol=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$as_gl_Symbol
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+     eval as_val=\$$as_gl_Symbol
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+                     eval ac_cv_have_decl_$gl_func=yes
-+fi
-+      done
-+
-+
-+
-+
-+
-+
-+
-+  if test $ac_cv_func_iswcntrl = yes; then
-+    HAVE_ISWCNTRL=1
-+  else
-+    HAVE_ISWCNTRL=0
-+  fi
-+
-+
-+  if test $ac_cv_func_iswblank = yes; then
-+    HAVE_ISWBLANK=1
-+  else
-+    HAVE_ISWBLANK=0
-+  fi
-+
-+
-+
-+
-+
-+  if test $gt_cv_c_wint_t = yes; then
-+    HAVE_WINT_T=1
-+  else
-+    HAVE_WINT_T=0
-+  fi
-+
-+
-+  if test $ac_cv_header_wctype_h = yes; then
-+    if test $ac_cv_func_iswcntrl = yes; then
-+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
-+$as_echo_n "checking whether iswcntrl works... " >&6; }
-+if test "${gl_cv_func_iswcntrl_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+          if test "$cross_compiling" = yes; then :
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+                          #if __GNU_LIBRARY__ == 1
-+                          Linux libc5 i18n is broken.
-+                          #endif
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gl_cv_func_iswcntrl_works=yes
-+else
-+  gl_cv_func_iswcntrl_works=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+                            #include <stddef.h>
-+                            #include <stdio.h>
-+                            #include <time.h>
-+                            #include <wchar.h>
-+                            #include <wctype.h>
-+                            int main () { return iswprint ('x') == 0; }
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  gl_cv_func_iswcntrl_works=yes
-+else
-+  gl_cv_func_iswcntrl_works=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
-+$as_echo "$gl_cv_func_iswcntrl_works" >&6; }
-+    fi
-+
-+
-+
-+
-+
-+
-+     if test $gl_cv_have_include_next = yes; then
-+       gl_cv_next_wctype_h='<'wctype.h'>'
-+     else
-+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
-+$as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-+if test "${gl_cv_next_wctype_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+          if test $ac_cv_header_wctype_h = yes; then
-+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <wctype.h>
-+
-+_ACEOF
-+                                                                                                case "$host_os" in
-+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
-+              *)    gl_absname_cpp="$ac_cpp" ;;
-+            esac
-+                                                gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-+               sed -n '\#/wctype.h#{
-+                 s#.*"\(.*/wctype.h\)".*#\1#
-+                 s#^/[^/]#//&#
-+                 p
-+                 q
-+               }'`'"'
-+          else
-+            gl_cv_next_wctype_h='<'wctype.h'>'
-+          fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
-+$as_echo "$gl_cv_next_wctype_h" >&6; }
-+     fi
-+     NEXT_WCTYPE_H=$gl_cv_next_wctype_h
-+
-+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-+       gl_next_as_first_directive='<'wctype.h'>'
-+     else
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-+       gl_next_as_first_directive=$gl_cv_next_wctype_h
-+     fi
-+     NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive
-+
-+
-+
-+    HAVE_WCTYPE_H=1
-+  else
-+    HAVE_WCTYPE_H=0
-+  fi
-+
-+
-+  if test "$gl_cv_func_iswcntrl_works" = no; then
-+    REPLACE_ISWCNTRL=1
-+  else
-+    REPLACE_ISWCNTRL=0
-+  fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+  ac_fn_c_check_decl "$LINENO" "wcwidth" "ac_cv_have_decl_wcwidth" "
-+/* AIX 3.2.5 declares wcwidth in <string.h>. */
-+#include <string.h>
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-+   before <wchar.h>.  */
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <time.h>
-+#include <wchar.h>
-+
-+"
-+if test "x$ac_cv_have_decl_wcwidth" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_WCWIDTH $ac_have_decl
-+_ACEOF
-+
-+  if test $ac_cv_have_decl_wcwidth != yes; then
-+    HAVE_DECL_WCWIDTH=0
-+  fi
-+
-+  if test $ac_cv_func_wcwidth = yes; then
-+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
-+$as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
-+if test "${gl_cv_func_wcwidth_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+        if test "$cross_compiling" = yes; then :
-+
-+           case "$host_os" in
-+                     # Guess yes on glibc and AIX 7 systems.
-+             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-+             *)                  gl_cv_func_wcwidth_works="guessing no";;
-+           esac
-+
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <locale.h>
-+/* AIX 3.2.5 declares wcwidth in <string.h>. */
-+#include <string.h>
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-+   before <wchar.h>.  */
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <time.h>
-+#include <wchar.h>
-+#if !HAVE_DECL_WCWIDTH
-+extern
-+# ifdef __cplusplus
-+"C"
-+# endif
-+int wcwidth (int);
-+#endif
-+int main ()
-+{
-+  if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
-+      return 1;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  gl_cv_func_wcwidth_works=yes
-+else
-+  gl_cv_func_wcwidth_works=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_works" >&5
-+$as_echo "$gl_cv_func_wcwidth_works" >&6; }
-+    case "$gl_cv_func_wcwidth_works" in
-+      *yes) ;;
-+      *no) REPLACE_WCWIDTH=1 ;;
-+    esac
-+  fi
-+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
-+
-+
-+
-+
-+
-+
-+
-+
-+  gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext"
-+
-+  fi
-+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
-+     || test $HAVE_DECL_WCWIDTH = 0; then
-+
-+    :
-+
-+  fi
-+
-+
-+
-+
-+  GNULIB_WCWIDTH=1
-+
-+
-+
-+$as_echo "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+  LIBGNU_LIBDEPS="$gl_libdeps"
-+
-+  LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
-+
-+
-+
-+ac_config_files="$ac_config_files Makefile gllib/Makefile glm4/Makefile"
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+ if test -n "$EXEEXT"; then
-+  am__EXEEXT_TRUE=
-+  am__EXEEXT_FALSE='#'
-+else
-+  am__EXEEXT_TRUE='#'
-+  am__EXEEXT_FALSE=
-+fi
-+
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  as_fn_error "conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-+  as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE}"; then
-+  as_fn_error "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+
-+    gl_libobjs=
-+    gl_ltlibobjs=
-+    if test -n "$gl_LIBOBJS"; then
-+      # Remove the extension.
-+      sed_drop_objext='s/\.o$//;s/\.obj$//'
-+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
-+        gl_libobjs="$gl_libobjs $i.$ac_objext"
-+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
-+      done
-+    fi
-+    gl_LIBOBJS=$gl_libobjs
-+
-+    gl_LTLIBOBJS=$gl_ltlibobjs
-+
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+as_write_fail=0
-+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in #(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in #((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
-+
-+
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
-+
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+# 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
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in #(((((
-+-n*)
-+  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} # as_fn_mkdir_p
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p='mkdir -p "$as_dir"'
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
-+	case $1 in #(
-+	-*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&1
-+## ----------------------------------- ##
-+## Main body of $CONFIG_STATUS script. ##
-+## ----------------------------------- ##
-+_ASEOF
-+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# Save the log message, to keep $0 and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling.
-+ac_log="
-+This file was extended by dummy $as_me 0, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
-+_ACEOF
-+
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-+
-+case $ac_config_headers in *"
-+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-+esac
-+
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+ac_cs_usage="\
-+\`$as_me' instantiates files and other configuration actions
-+from templates according to the current configuration.  Unless the files
-+and actions are specified as TAGs, all are instantiated by default.
-+
-+Usage: $0 [OPTION]... [TAG]...
-+
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, then exit
-+      --config     print configuration, then exit
-+  -q, --quiet, --silent
-+                   do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+      --file=FILE[:TEMPLATE]
-+                   instantiate the configuration file FILE
-+      --header=FILE[:TEMPLATE]
-+                   instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to the package provider."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-+ac_cs_version="\\
-+dummy config.status 0
-+configured by $0, generated by GNU Autoconf 2.65,
-+  with options \\"\$ac_cs_config\\"
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# The default lists apply if the user does not specify any file.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    $as_echo "$ac_cs_version"; exit ;;
-+  --config | --confi | --conf | --con | --co | --c )
-+    $as_echo "$ac_cs_config"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_FILES " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    as_fn_error "ambiguous option: \`$1'
-+Try \`$0 --help' for more information.";;
-+  --help | --hel | -h )
-+    $as_echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # This is an error.
-+  -*) as_fn_error "unrecognized option: \`$1'
-+Try \`$0 --help' for more information." ;;
-+
-+  *) as_fn_append ac_config_targets " $1"
-+     ac_need_defaults=false ;;
-+
-+  esac
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+if \$ac_cs_recheck; then
-+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  shift
-+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-+  CONFIG_SHELL='$SHELL'
-+  export CONFIG_SHELL
-+  exec "\$@"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+  $as_echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+#
-+# INIT-COMMANDS
-+#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "gllib/Makefile") CONFIG_FILES="$CONFIG_FILES gllib/Makefile" ;;
-+    "glm4/Makefile") CONFIG_FILES="$CONFIG_FILES glm4/Makefile" ;;
-+
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  esac
-+done
-+
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used.  Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-+  trap 'as_fn_exit 1' 1 2 13 15
-+}
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-+
-+# Set up the scripts for CONFIG_FILES section.
-+# No need to generate them if there are no CONFIG_FILES.
-+# This happens for instance with `./config.status config.h'.
-+if test -n "$CONFIG_FILES"; then
-+
-+
-+ac_cr=`echo X | tr X '\015'`
-+# On cygwin, bash can eat \r inside `` if the user requested igncr.
-+# But we know of no other shell where ac_cr would be empty at this
-+# point, so we can use a bashism as a fallback.
-+if test "x$ac_cr" = x; then
-+  eval ac_cr=\$\'\\r\'
-+fi
-+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\r'
-+else
-+  ac_cs_awk_cr=$ac_cr
-+fi
-+
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+_ACEOF
-+
-+
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  . ./conf$$subs.sh ||
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+
-+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-+  if test $ac_delim_n = $ac_delim_num; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+rm -f conf$$subs.sh
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-+_ACEOF
-+sed -n '
-+h
-+s/^/S["/; s/!.*/"]=/
-+p
-+g
-+s/^[^!]*!//
-+:repl
-+t repl
-+s/'"$ac_delim"'$//
-+t delim
-+:nl
-+h
-+s/\(.\{148\}\)..*/\1/
-+t more1
-+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-+p
-+n
-+b repl
-+:more1
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t nl
-+:delim
-+h
-+s/\(.\{148\}\)..*/\1/
-+t more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"/
-+p
-+b
-+:more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t delim
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$CONFIG_STATUS || ac_write_fail=1
-+rm -f conf$$subs.awk
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+  for (key in S) S_is_set[key] = 1
-+  FS = ""
-+
-+}
-+{
-+  line = $ 0
-+  nfields = split(line, field, "@")
-+  substed = 0
-+  len = length(field[1])
-+  for (i = 2; i < nfields; i++) {
-+    key = field[i]
-+    keylen = length(key)
-+    if (S_is_set[key]) {
-+      value = S[key]
-+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-+      len += length(value) + length(field[++i])
-+      substed = 1
-+    } else
-+      len += 1 + keylen
-+  }
-+
-+  print line
-+}
-+
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-+else
-+  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-+_ACEOF
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+fi # test -n "$CONFIG_FILES"
-+
-+# Set up the scripts for CONFIG_HEADERS section.
-+# No need to generate them if there are no CONFIG_HEADERS.
-+# This happens for instance with `./config.status Makefile'.
-+if test -n "$CONFIG_HEADERS"; then
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
-+BEGIN {
-+_ACEOF
-+
-+# Transform confdefs.h into an awk script `defines.awk', embedded as
-+# here-document in config.status, that substitutes the proper values into
-+# config.h.in to produce config.h.
-+
-+# Create a delimiter string that does not exist in confdefs.h, to ease
-+# handling of long lines.
-+ac_delim='%!_!# '
-+for ac_last_try in false false :; do
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+# For the awk script, D is an array of macro values keyed by name,
-+# likewise P contains macro parameters if any.  Preserve backslash
-+# newline sequences.
-+
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+sed -n '
-+s/.\{148\}/&'"$ac_delim"'/g
-+t rset
-+:rset
-+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-+t def
-+d
-+:def
-+s/\\$//
-+t bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3"/p
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-+d
-+:bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3\\\\\\n"\\/p
-+t cont
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-+t cont
-+d
-+:cont
-+n
-+s/.\{148\}/&'"$ac_delim"'/g
-+t clear
-+:clear
-+s/\\$//
-+t bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/"/p
-+d
-+:bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-+b cont
-+' <confdefs.h | sed '
-+s/'"$ac_delim"'/"\\\
-+"/g' >>$CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  for (key in D) D_is_set[key] = 1
-+  FS = ""
-+}
-+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-+  line = \$ 0
-+  split(line, arg, " ")
-+  if (arg[1] == "#") {
-+    defundef = arg[2]
-+    mac1 = arg[3]
-+  } else {
-+    defundef = substr(arg[1], 2)
-+    mac1 = arg[2]
-+  }
-+  split(mac1, mac2, "(") #)
-+  macro = mac2[1]
-+  prefix = substr(line, 1, index(line, defundef) - 1)
-+  if (D_is_set[macro]) {
-+    # Preserve the white space surrounding the "#".
-+    print prefix "define", macro P[macro] D[macro]
-+    next
-+  } else {
-+    # Replace #undef with comments.  This is necessary, for example,
-+    # in the case of _POSIX_SOURCE, which is predefined and required
-+    # on some systems where configure will not decide to define it.
-+    if (defundef == "undef") {
-+      print "/*", prefix defundef, macro, "*/"
-+      next
-+    }
-+  }
-+}
-+{ print }
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-+fi # test -n "$CONFIG_HEADERS"
-+
-+
-+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-+shift
-+for ac_tag
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+      esac
-+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-+      as_fn_append ac_file_inputs " '$ac_f'"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input='Generated from '`
-+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-+	`' by configure.'
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-+$as_echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+    # Neutralize special characters interpreted by sed in replacement strings.
-+    case $configure_input in #(
-+    *\&* | *\|* | *\\* )
-+       ac_sed_conf_input=`$as_echo "$configure_input" |
-+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-+    *) ac_sed_conf_input=$configure_input;;
-+    esac
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$ac_file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  as_dir="$ac_dir"; as_fn_mkdir_p
-+  ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+  ac_MKDIR_P=$MKDIR_P
-+  case $MKDIR_P in
-+  [\\/$]* | ?:[\\/]* ) ;;
-+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+  esac
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+ac_sed_dataroot='
-+/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+  s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@top_build_prefix@&$ac_top_build_prefix&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
-+$ac_datarootdir_hack
-+"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
-+
-+  rm -f "$tmp/stdin"
-+  case $ac_file in
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
-+  if test x"$ac_file" != x-; then
-+    {
-+      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-+$as_echo "$as_me: $ac_file is unchanged" >&6;}
-+    else
-+      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-+    fi
-+  else
-+    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+      || as_fn_error "could not create -" "$LINENO" 5
-+  fi
-+# Compute "$ac_file"'s index in $config_headers.
-+_am_arg="$ac_file"
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-+	 X"$_am_arg" : 'X\(//\)$' \| \
-+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$_am_arg" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
-+
-+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-+$as_echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
-+
-+
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-+  done
-+}
-+ ;;
-+
-+  esac
-+done # for ac_tag
-+
-+
-+as_fn_exit 0
-+_ACEOF
-+ac_clean_files=$ac_clean_files_save
-+
-+test $ac_write_fail = 0 ||
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  exec 5>>config.log
-+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+  # would make configure fail if this is the last instruction.
-+  $ac_cs_success || as_fn_exit $?
-+fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-+fi
-+
-diff --git a/src/libs/gl/configure.ac b/src/libs/gl/configure.ac
-new file mode 100644
-index 0000000..3631f7d
---- /dev/null
-+++ b/src/libs/gl/configure.ac
-@@ -0,0 +1,135 @@
-+# Process this file with autoconf to produce a configure script.
-+AC_INIT([dummy], [0])
-+AC_CONFIG_AUX_DIR([build-aux])
-+AM_INIT_AUTOMAKE
-+
-+AC_CONFIG_HEADERS([config.h])
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_MAKE_SET
-+
-+# For autobuild.
-+AC_CANONICAL_BUILD
-+AC_CANONICAL_HOST
-+
-+m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
-+m4_pattern_allow([^gl_ES$])dnl a valid locale name
-+m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
-+m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-+
-+AC_PROG_RANLIB
-+
-+AM_PROG_CC_C_O
-+
-+gl_USE_SYSTEM_EXTENSIONS
-+AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
-+gl_cond_libtool=false
-+gl_libdeps=
-+gl_ltlibdeps=
-+AC_DEFUN([gl_INIT], [
-+gl_m4_base='glm4'
-+  m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
-+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
-+  m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
-+  m4_pushdef([gl_LIBSOURCES_LIST], [])
-+  m4_pushdef([gl_LIBSOURCES_DIR], [])
-+  gl_COMMON
-+gl_source_base='gllib'
-+
-+
-+
-+
-+
-+gl_LOCALCHARSET
-+LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
-+AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
-+
-+gl_MULTIARCH
-+
-+gl_STDDEF_H
-+
-+gl_STDINT_H
-+
-+
-+gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
-+
-+gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
-+
-+gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width])
-+
-+
-+gl_WCHAR_H
-+
-+gl_WCTYPE_H
-+
-+gl_FUNC_WCWIDTH
-+gl_WCHAR_MODULE_INDICATOR([wcwidth])
-+
-+  m4_ifval(gl_LIBSOURCES_LIST, [
-+    m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
-+      for gl_file in ]gl_LIBSOURCES_LIST[ ; do
-+        if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then
-+          echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2
-+          exit 1
-+        fi
-+      done])dnl
-+      m4_if(m4_sysval, [0], [],
-+        [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
-+  ])
-+  m4_popdef([gl_LIBSOURCES_DIR])
-+  m4_popdef([gl_LIBSOURCES_LIST])
-+  m4_popdef([AC_LIBSOURCES])
-+  m4_popdef([AC_REPLACE_FUNCS])
-+  m4_popdef([AC_LIBOBJ])
-+  AC_CONFIG_COMMANDS_PRE([
-+    gl_libobjs=
-+    gl_ltlibobjs=
-+    if test -n "$gl_LIBOBJS"; then
-+      # Remove the extension.
-+      sed_drop_objext='s/\.o$//;s/\.obj$//'
-+      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
-+        gl_libobjs="$gl_libobjs $i.$ac_objext"
-+        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
-+      done
-+    fi
-+    AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
-+    AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
-+  ])
-+  LIBGNU_LIBDEPS="$gl_libdeps"
-+  AC_SUBST([LIBGNU_LIBDEPS])
-+  LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
-+  AC_SUBST([LIBGNU_LTLIBDEPS])
-+])
-+
-+# Like AC_LIBOBJ, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gl_LIBOBJ], [
-+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
-+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
-+])
-+
-+# Like AC_REPLACE_FUNCS, except that the module name goes
-+# into gl_LIBOBJS instead of into LIBOBJS.
-+AC_DEFUN([gl_REPLACE_FUNCS], [
-+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
-+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
-+])
-+
-+# Like AC_LIBSOURCES, except the directory where the source file is
-+# expected is derived from the gnulib-tool parameterization,
-+# and alloca is special cased (for the alloca-opt module).
-+# We could also entirely rely on EXTRA_lib..._SOURCES.
-+AC_DEFUN([gl_LIBSOURCES], [
-+  m4_foreach([_gl_NAME], [$1], [
-+    m4_if(_gl_NAME, [alloca.c], [], [
-+      m4_define([gl_LIBSOURCES_DIR], [gllib])
-+      m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
-+    ])
-+  ])
-+])
-+
-+gl_INIT
-+
-+AC_CONFIG_FILES([Makefile gllib/Makefile glm4/Makefile])
-+AC_OUTPUT
-diff --git a/src/libs/gl/gllib/Makefile.am b/src/libs/gl/gllib/Makefile.am
-new file mode 100644
-index 0000000..5a56539
---- /dev/null
-+++ b/src/libs/gl/gllib/Makefile.am
-@@ -0,0 +1,458 @@
-+## DO NOT EDIT! GENERATED AUTOMATICALLY!
-+## Process this file with automake to produce Makefile.in.
-+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License.  As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+
-+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
-+
-+SUBDIRS =
-+noinst_HEADERS =
-+noinst_LIBRARIES =
-+noinst_LTLIBRARIES =
-+EXTRA_DIST =
-+BUILT_SOURCES =
-+SUFFIXES =
-+MOSTLYCLEANFILES = core *.stackdump
-+MOSTLYCLEANDIRS =
-+CLEANFILES =
-+DISTCLEANFILES =
-+MAINTAINERCLEANFILES =
-+
-+AM_CPPFLAGS = -DGNULIB_STRICT_CHECKING=1
-+AM_CFLAGS =
-+
-+noinst_LIBRARIES += libgnu.a
-+
-+libgnu_a_SOURCES =
-+libgnu_a_LIBADD = $(gl_LIBOBJS)
-+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
-+EXTRA_libgnu_a_SOURCES =
-+
-+## begin gnulib module arg-nonnull
-+
-+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-+# statements but through direct file reference. Therefore this snippet must be
-+# present in all Makefile.am that need it. This is ensured by the applicability
-+# 'all' defined above.
-+
-+BUILT_SOURCES += arg-nonnull.h
-+# The arg-nonnull.h that gets inserted into generated .h files is the same as
-+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
-+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-+	  < $(top_srcdir)/build-aux/arg-nonnull.h \
-+	  > $@-t && \
-+	mv $@-t $@
-+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-+
-+ARG_NONNULL_H=arg-nonnull.h
-+
-+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h
-+
-+## end   gnulib module arg-nonnull
-+
-+## begin gnulib module c++defs
-+
-+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-+# statements but through direct file reference. Therefore this snippet must be
-+# present in all Makefile.am that need it. This is ensured by the applicability
-+# 'all' defined above.
-+
-+BUILT_SOURCES += c++defs.h
-+# The c++defs.h that gets inserted into generated .h files is the same as
-+# build-aux/c++defs.h, except that it has the copyright header cut off.
-+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	sed -n -e '/_GL_CXXDEFS/,$$p' \
-+	  < $(top_srcdir)/build-aux/c++defs.h \
-+	  > $@-t && \
-+	mv $@-t $@
-+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
-+
-+CXXDEFS_H=c++defs.h
-+
-+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h
-+
-+## end   gnulib module c++defs
-+
-+## begin gnulib module configmake
-+
-+# Retrieve values of the variables through 'configure' followed by
-+# 'make', not directly through 'configure', so that a user who
-+# sets some of these variables consistently on the 'make' command
-+# line gets correct results.
-+#
-+# One advantage of this approach, compared to the classical
-+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
-+# is that it protects against the use of undefined variables.
-+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
-+# defined by this module, and code using LIBDIR gives a
-+# compilation error.
-+#
-+# Another advantage is that 'make' output is shorter.
-+#
-+# Listed in the same order as the GNU makefile conventions.
-+# The Automake-defined pkg* macros are appended, in the order
-+# listed in the Automake 1.10a+ documentation.
-+configmake.h: Makefile
-+	$(AM_V_GEN)rm -f $@-t && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  echo '#define PREFIX "$(prefix)"'; \
-+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
-+	  echo '#define BINDIR "$(bindir)"'; \
-+	  echo '#define SBINDIR "$(sbindir)"'; \
-+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
-+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
-+	  echo '#define DATADIR "$(datadir)"'; \
-+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
-+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
-+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-+	  echo '#define INCLUDEDIR "$(includedir)"'; \
-+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
-+	  echo '#define DOCDIR "$(docdir)"'; \
-+	  echo '#define INFODIR "$(infodir)"'; \
-+	  echo '#define HTMLDIR "$(htmldir)"'; \
-+	  echo '#define DVIDIR "$(dvidir)"'; \
-+	  echo '#define PDFDIR "$(pdfdir)"'; \
-+	  echo '#define PSDIR "$(psdir)"'; \
-+	  echo '#define LIBDIR "$(libdir)"'; \
-+	  echo '#define LISPDIR "$(lispdir)"'; \
-+	  echo '#define LOCALEDIR "$(localedir)"'; \
-+	  echo '#define MANDIR "$(mandir)"'; \
-+	  echo '#define MANEXT "$(manext)"'; \
-+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
-+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
-+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
-+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
-+	} | sed '/""/d' > $@-t && \
-+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
-+	  rm -f $@-t; \
-+	else \
-+	  rm -f $@; mv $@-t $@; \
-+	fi
-+
-+BUILT_SOURCES += configmake.h
-+CLEANFILES += configmake.h configmake.h-t
-+
-+## end   gnulib module configmake
-+
-+## begin gnulib module localcharset
-+
-+libgnu_a_SOURCES += localcharset.h localcharset.c
-+
-+# We need the following in order to install a simple file in $(libdir)
-+# which is shared with other installed packages. We use a list of referencing
-+# packages so that "make uninstall" will remove the file if and only if it
-+# is not used by another installed package.
-+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
-+# avoid installing it.
-+
-+all-local: charset.alias ref-add.sed ref-del.sed
-+
-+charset_alias = $(DESTDIR)$(libdir)/charset.alias
-+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-+install-exec-local: install-exec-localcharset
-+install-exec-localcharset: all-local
-+	if test $(GLIBC21) = no; then \
-+	  case '$(host_os)' in \
-+	    darwin[56]*) \
-+	      need_charset_alias=true ;; \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	      need_charset_alias=false ;; \
-+	    *) \
-+	      need_charset_alias=true ;; \
-+	  esac ; \
-+	else \
-+	  need_charset_alias=false ; \
-+	fi ; \
-+	if $$need_charset_alias; then \
-+	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
-+	fi ; \
-+	if test -f $(charset_alias); then \
-+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-+	  rm -f $(charset_tmp) ; \
-+	else \
-+	  if $$need_charset_alias; then \
-+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-+	    rm -f $(charset_tmp) ; \
-+	  fi ; \
-+	fi
-+
-+uninstall-local: uninstall-localcharset
-+uninstall-localcharset: all-local
-+	if test -f $(charset_alias); then \
-+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
-+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-+	      > /dev/null; then \
-+	    rm -f $(charset_alias); \
-+	  else \
-+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-+	  fi; \
-+	  rm -f $(charset_tmp); \
-+	fi
-+
-+charset.alias: config.charset
-+	$(AM_V_GEN)rm -f t-$@ $@ && \
-+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
-+	mv t-$@ $@
-+
-+SUFFIXES += .sed .sin
-+.sin.sed:
-+	$(AM_V_GEN)rm -f t-$@ $@ && \
-+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
-+	mv t-$@ $@
-+
-+CLEANFILES += charset.alias ref-add.sed ref-del.sed
-+
-+EXTRA_DIST += config.charset ref-add.sin ref-del.sin
-+
-+## end   gnulib module localcharset
-+
-+## begin gnulib module stddef
-+
-+BUILT_SOURCES += $(STDDEF_H)
-+
-+# We need the following in order to create <stddef.h> when the system
-+# doesn't have one that works with the given compiler.
-+stddef.h: stddef.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
-+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
-+	      < $(srcdir)/stddef.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+MOSTLYCLEANFILES += stddef.h stddef.h-t
-+
-+EXTRA_DIST += stddef.in.h
-+
-+## end   gnulib module stddef
-+
-+## begin gnulib module stdint
-+
-+BUILT_SOURCES += $(STDINT_H)
-+
-+# We need the following in order to create <stdint.h> when the system
-+# doesn't have one that works with the given compiler.
-+stdint.h: stdint.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-+	      < $(srcdir)/stdint.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+MOSTLYCLEANFILES += stdint.h stdint.h-t
-+
-+EXTRA_DIST += stdint.in.h
-+
-+## end   gnulib module stdint
-+
-+## begin gnulib module streq
-+
-+
-+EXTRA_DIST += streq.h
-+
-+## end   gnulib module streq
-+
-+## begin gnulib module unitypes
-+
-+BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
-+
-+unitypes.h: unitypes.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  cat $(srcdir)/unitypes.in.h; \
-+	} > $@-t && \
-+	mv -f $@-t $@
-+MOSTLYCLEANFILES += unitypes.h unitypes.h-t
-+
-+EXTRA_DIST += unitypes.in.h
-+
-+## end   gnulib module unitypes
-+
-+## begin gnulib module uniwidth/base
-+
-+BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)
-+
-+uniwidth.h: uniwidth.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  cat $(srcdir)/uniwidth.in.h; \
-+	} > $@-t && \
-+	mv -f $@-t $@
-+MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t
-+
-+EXTRA_DIST += localcharset.h uniwidth.in.h
-+
-+## end   gnulib module uniwidth/base
-+
-+## begin gnulib module uniwidth/width
-+
-+if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH
-+libgnu_a_SOURCES += uniwidth/width.c
-+endif
-+
-+EXTRA_DIST += uniwidth/cjk.h
-+
-+## end   gnulib module uniwidth/width
-+
-+## begin gnulib module warn-on-use
-+
-+BUILT_SOURCES += warn-on-use.h
-+# The warn-on-use.h that gets inserted into generated .h files is the same as
-+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
-+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	sed -n -e '/^.ifndef/,$$p' \
-+	  < $(top_srcdir)/build-aux/warn-on-use.h \
-+	  > $@-t && \
-+	mv $@-t $@
-+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
-+
-+WARN_ON_USE_H=warn-on-use.h
-+
-+EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h
-+
-+## end   gnulib module warn-on-use
-+
-+## begin gnulib module wchar
-+
-+BUILT_SOURCES += wchar.h
-+
-+# We need the following in order to create <wchar.h> when the system
-+# version does not work standalone.
-+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-+	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
-+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
-+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
-+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
-+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
-+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
-+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
-+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
-+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
-+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
-+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
-+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
-+	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
-+	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
-+	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
-+	      -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
-+	      -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
-+	      -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
-+	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
-+	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
-+	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-+	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
-+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
-+	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
-+	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
-+	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
-+	      -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
-+	      -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
-+	      -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
-+	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
-+	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
-+	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
-+	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
-+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-+	    < $(srcdir)/wchar.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+MOSTLYCLEANFILES += wchar.h wchar.h-t
-+
-+EXTRA_DIST += wchar.in.h
-+
-+## end   gnulib module wchar
-+
-+## begin gnulib module wctype
-+
-+BUILT_SOURCES += wctype.h
-+
-+# We need the following in order to create <wctype.h> when the system
-+# doesn't have one that works with the given compiler.
-+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-+	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
-+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-+	      < $(srcdir)/wctype.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+MOSTLYCLEANFILES += wctype.h wctype.h-t
-+
-+EXTRA_DIST += wctype.in.h
-+
-+## end   gnulib module wctype
-+
-+## begin gnulib module wcwidth
-+
-+
-+EXTRA_DIST += wcwidth.c
-+
-+EXTRA_libgnu_a_SOURCES += wcwidth.c
-+
-+## end   gnulib module wcwidth
-+
-+
-+mostlyclean-local: mostlyclean-generic
-+	@for dir in '' $(MOSTLYCLEANDIRS); do \
-+	  if test -n "$$dir" && test -d $$dir; then \
-+	    echo "rmdir $$dir"; rmdir $$dir; \
-+	  fi; \
-+	done; \
-+	:
-diff --git a/src/libs/gl/gllib/Makefile.in b/src/libs/gl/gllib/Makefile.in
-new file mode 100644
-index 0000000..2b4da49
---- /dev/null
-+++ b/src/libs/gl/gllib/Makefile.in
-@@ -0,0 +1,1049 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+# Copyright (C) 2002-2010 Free Software Foundation, Inc.
-+#
-+# This file is free software, distributed under the terms of the GNU
-+# General Public License.  As a special exception to the GNU General
-+# Public License, this file may be distributed as part of a program
-+# that contains a configuration script generated by Autoconf, under
-+# the same distribution terms as the rest of that program.
-+#
-+# Generated by gnulib-tool.
-+
-+
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_1 = uniwidth/width.c
-+subdir = gllib
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/glm4/00gnulib.m4 \
-+	$(top_srcdir)/glm4/codeset.m4 $(top_srcdir)/glm4/extensions.m4 \
-+	$(top_srcdir)/glm4/fcntl-o.m4 $(top_srcdir)/glm4/glibc21.m4 \
-+	$(top_srcdir)/glm4/gnulib-common.m4 \
-+	$(top_srcdir)/glm4/include_next.m4 \
-+	$(top_srcdir)/glm4/libunistring-base.m4 \
-+	$(top_srcdir)/glm4/localcharset.m4 \
-+	$(top_srcdir)/glm4/longlong.m4 $(top_srcdir)/glm4/multiarch.m4 \
-+	$(top_srcdir)/glm4/stddef_h.m4 $(top_srcdir)/glm4/stdint.m4 \
-+	$(top_srcdir)/glm4/warn-on-use.m4 \
-+	$(top_srcdir)/glm4/wchar_h.m4 $(top_srcdir)/glm4/wchar_t.m4 \
-+	$(top_srcdir)/glm4/wctype_h.m4 $(top_srcdir)/glm4/wcwidth.m4 \
-+	$(top_srcdir)/glm4/wint_t.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+LIBRARIES = $(noinst_LIBRARIES)
-+AR = ar
-+ARFLAGS = cru
-+libgnu_a_AR = $(AR) $(ARFLAGS)
-+am__DEPENDENCIES_1 =
-+am__libgnu_a_SOURCES_DIST = localcharset.h localcharset.c \
-+	uniwidth/width.c
-+am__dirstamp = $(am__leading_dot)dirstamp
-+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_1 = uniwidth/width.$(OBJEXT)
-+am_libgnu_a_OBJECTS = localcharset.$(OBJEXT) $(am__objects_1)
-+libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES)
-+DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+HEADERS = $(noinst_HEADERS)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+	distdir
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+  dir0=`pwd`; \
-+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+  sed_rest='s,^[^/]*/*,,'; \
-+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+  sed_butlast='s,/*[^/]*$$,,'; \
-+  while test -n "$$dir1"; do \
-+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+    if test "$$first" != "."; then \
-+      if test "$$first" = ".."; then \
-+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+      else \
-+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+        if test "$$first2" = "$$first"; then \
-+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+        else \
-+          dir2="../$$dir2"; \
-+        fi; \
-+        dir0="$$dir0"/"$$first"; \
-+      fi; \
-+    fi; \
-+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+  done; \
-+  reldir="$$dir2"
-+ACLOCAL = @ACLOCAL@
-+AMTAR = @AMTAR@
-+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
-+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
-+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
-+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
-+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+GLIBC21 = @GLIBC21@
-+GNULIB_BTOWC = @GNULIB_BTOWC@
-+GNULIB_MBRLEN = @GNULIB_MBRLEN@
-+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
-+GNULIB_MBSINIT = @GNULIB_MBSINIT@
-+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
-+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
-+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-+GNULIB_WCTOB = @GNULIB_WCTOB@
-+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-+GREP = @GREP@
-+HAVE_BTOWC = @HAVE_BTOWC@
-+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
-+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
-+HAVE_ISWBLANK = @HAVE_ISWBLANK@
-+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
-+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
-+HAVE_MBRLEN = @HAVE_MBRLEN@
-+HAVE_MBRTOWC = @HAVE_MBRTOWC@
-+HAVE_MBSINIT = @HAVE_MBSINIT@
-+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
-+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
-+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
-+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
-+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
-+HAVE_STDINT_H = @HAVE_STDINT_H@
-+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
-+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
-+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
-+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
-+HAVE_WCHAR_H = @HAVE_WCHAR_H@
-+HAVE_WCHAR_T = @HAVE_WCHAR_T@
-+HAVE_WCRTOMB = @HAVE_WCRTOMB@
-+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-+HAVE_WINT_T = @HAVE_WINT_T@
-+INCLUDE_NEXT = @INCLUDE_NEXT@
-+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
-+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
-+LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
-+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
-+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
-+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
-+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-+NEXT_STDDEF_H = @NEXT_STDDEF_H@
-+NEXT_STDINT_H = @NEXT_STDINT_H@
-+NEXT_WCHAR_H = @NEXT_WCHAR_H@
-+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
-+RANLIB = @RANLIB@
-+REPLACE_BTOWC = @REPLACE_BTOWC@
-+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-+REPLACE_MBRLEN = @REPLACE_MBRLEN@
-+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
-+REPLACE_MBSINIT = @REPLACE_MBSINIT@
-+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
-+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
-+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-+REPLACE_NULL = @REPLACE_NULL@
-+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
-+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
-+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-+REPLACE_WCTOB = @REPLACE_WCTOB@
-+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
-+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-+STDDEF_H = @STDDEF_H@
-+STDINT_H = @STDINT_H@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-+WINT_T_SUFFIX = @WINT_T_SUFFIX@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+gl_LIBOBJS = @gl_LIBOBJS@
-+gl_LTLIBOBJS = @gl_LTLIBOBJS@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
-+SUBDIRS = 
-+noinst_HEADERS = 
-+noinst_LIBRARIES = libgnu.a
-+noinst_LTLIBRARIES = 
-+EXTRA_DIST = $(top_srcdir)/build-aux/arg-nonnull.h \
-+	$(top_srcdir)/build-aux/c++defs.h config.charset ref-add.sin \
-+	ref-del.sin stddef.in.h stdint.in.h streq.h unitypes.in.h \
-+	localcharset.h uniwidth.in.h uniwidth/cjk.h \
-+	$(top_srcdir)/build-aux/warn-on-use.h wchar.in.h wctype.in.h \
-+	wcwidth.c
-+
-+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-+# statements but through direct file reference. Therefore this snippet must be
-+# present in all Makefile.am that need it. This is ensured by the applicability
-+# 'all' defined above.
-+
-+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-+# statements but through direct file reference. Therefore this snippet must be
-+# present in all Makefile.am that need it. This is ensured by the applicability
-+# 'all' defined above.
-+BUILT_SOURCES = arg-nonnull.h c++defs.h configmake.h $(STDDEF_H) \
-+	$(STDINT_H) $(LIBUNISTRING_UNITYPES_H) \
-+	$(LIBUNISTRING_UNIWIDTH_H) warn-on-use.h wchar.h wctype.h
-+SUFFIXES = .sed .sin
-+MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \
-+	c++defs.h c++defs.h-t stddef.h stddef.h-t stdint.h stdint.h-t \
-+	unitypes.h unitypes.h-t uniwidth.h uniwidth.h-t warn-on-use.h \
-+	warn-on-use.h-t wchar.h wchar.h-t wctype.h wctype.h-t
-+MOSTLYCLEANDIRS = 
-+CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
-+	ref-del.sed
-+DISTCLEANFILES = 
-+MAINTAINERCLEANFILES = 
-+AM_CPPFLAGS = -DGNULIB_STRICT_CHECKING=1
-+AM_CFLAGS = 
-+libgnu_a_SOURCES = localcharset.h localcharset.c $(am__append_1)
-+libgnu_a_LIBADD = $(gl_LIBOBJS)
-+libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
-+EXTRA_libgnu_a_SOURCES = wcwidth.c
-+ARG_NONNULL_H = arg-nonnull.h
-+CXXDEFS_H = c++defs.h
-+charset_alias = $(DESTDIR)$(libdir)/charset.alias
-+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-+WARN_ON_USE_H = warn-on-use.h
-+all: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+.SUFFIXES:
-+.SUFFIXES: .sed .sin .c .o .obj
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gllib/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnits gllib/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+
-+clean-noinstLIBRARIES:
-+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+uniwidth/$(am__dirstamp):
-+	@$(MKDIR_P) uniwidth
-+	@: > uniwidth/$(am__dirstamp)
-+uniwidth/$(DEPDIR)/$(am__dirstamp):
-+	@$(MKDIR_P) uniwidth/$(DEPDIR)
-+	@: > uniwidth/$(DEPDIR)/$(am__dirstamp)
-+uniwidth/width.$(OBJEXT): uniwidth/$(am__dirstamp) \
-+	uniwidth/$(DEPDIR)/$(am__dirstamp)
-+libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) 
-+	-rm -f libgnu.a
-+	$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD)
-+	$(RANLIB) libgnu.a
-+
-+clean-noinstLTLIBRARIES:
-+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+	-rm -f uniwidth/width.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/width.Po@am__quote@
-+
-+.c.o:
-+@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+$(RECURSIVE_CLEAN_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+	    $(am__relativize); \
-+	    new_distdir=$$reldir; \
-+	    dir1=$$subdir; dir2="$(top_distdir)"; \
-+	    $(am__relativize); \
-+	    new_top_distdir=$$reldir; \
-+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+	    ($(am__cd) $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$new_top_distdir" \
-+	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
-+		am__skip_mode_fix=: \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+	-rm -f uniwidth/$(DEPDIR)/$(am__dirstamp)
-+	-rm -f uniwidth/$(am__dirstamp)
-+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-+clean: clean-recursive
-+
-+clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \
-+	mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+html: html-recursive
-+
-+html-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-recursive
-+
-+install-dvi-am:
-+
-+install-exec-am: install-exec-local
-+
-+install-html: install-html-recursive
-+
-+install-html-am:
-+
-+install-info: install-info-recursive
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-recursive
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-recursive
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-local
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-local
-+
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-+	ctags-recursive install install-am install-strip \
-+	tags-recursive
-+
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am all-local check check-am clean clean-generic \
-+	clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \
-+	ctags-recursive distclean distclean-compile distclean-generic \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-exec-local \
-+	install-html install-html-am install-info install-info-am \
-+	install-man install-pdf install-pdf-am install-ps \
-+	install-ps-am install-strip installcheck installcheck-am \
-+	installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \
-+	tags-recursive uninstall uninstall-am uninstall-local
-+
-+# The arg-nonnull.h that gets inserted into generated .h files is the same as
-+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
-+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-+	  < $(top_srcdir)/build-aux/arg-nonnull.h \
-+	  > $@-t && \
-+	mv $@-t $@
-+# The c++defs.h that gets inserted into generated .h files is the same as
-+# build-aux/c++defs.h, except that it has the copyright header cut off.
-+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	sed -n -e '/_GL_CXXDEFS/,$$p' \
-+	  < $(top_srcdir)/build-aux/c++defs.h \
-+	  > $@-t && \
-+	mv $@-t $@
-+
-+# Retrieve values of the variables through 'configure' followed by
-+# 'make', not directly through 'configure', so that a user who
-+# sets some of these variables consistently on the 'make' command
-+# line gets correct results.
-+#
-+# One advantage of this approach, compared to the classical
-+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
-+# is that it protects against the use of undefined variables.
-+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
-+# defined by this module, and code using LIBDIR gives a
-+# compilation error.
-+#
-+# Another advantage is that 'make' output is shorter.
-+#
-+# Listed in the same order as the GNU makefile conventions.
-+# The Automake-defined pkg* macros are appended, in the order
-+# listed in the Automake 1.10a+ documentation.
-+configmake.h: Makefile
-+	$(AM_V_GEN)rm -f $@-t && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  echo '#define PREFIX "$(prefix)"'; \
-+	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
-+	  echo '#define BINDIR "$(bindir)"'; \
-+	  echo '#define SBINDIR "$(sbindir)"'; \
-+	  echo '#define LIBEXECDIR "$(libexecdir)"'; \
-+	  echo '#define DATAROOTDIR "$(datarootdir)"'; \
-+	  echo '#define DATADIR "$(datadir)"'; \
-+	  echo '#define SYSCONFDIR "$(sysconfdir)"'; \
-+	  echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
-+	  echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
-+	  echo '#define INCLUDEDIR "$(includedir)"'; \
-+	  echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
-+	  echo '#define DOCDIR "$(docdir)"'; \
-+	  echo '#define INFODIR "$(infodir)"'; \
-+	  echo '#define HTMLDIR "$(htmldir)"'; \
-+	  echo '#define DVIDIR "$(dvidir)"'; \
-+	  echo '#define PDFDIR "$(pdfdir)"'; \
-+	  echo '#define PSDIR "$(psdir)"'; \
-+	  echo '#define LIBDIR "$(libdir)"'; \
-+	  echo '#define LISPDIR "$(lispdir)"'; \
-+	  echo '#define LOCALEDIR "$(localedir)"'; \
-+	  echo '#define MANDIR "$(mandir)"'; \
-+	  echo '#define MANEXT "$(manext)"'; \
-+	  echo '#define PKGDATADIR "$(pkgdatadir)"'; \
-+	  echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
-+	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
-+	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
-+	} | sed '/""/d' > $@-t && \
-+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
-+	  rm -f $@-t; \
-+	else \
-+	  rm -f $@; mv $@-t $@; \
-+	fi
-+
-+# We need the following in order to install a simple file in $(libdir)
-+# which is shared with other installed packages. We use a list of referencing
-+# packages so that "make uninstall" will remove the file if and only if it
-+# is not used by another installed package.
-+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
-+# avoid installing it.
-+
-+all-local: charset.alias ref-add.sed ref-del.sed
-+install-exec-local: install-exec-localcharset
-+install-exec-localcharset: all-local
-+	if test $(GLIBC21) = no; then \
-+	  case '$(host_os)' in \
-+	    darwin[56]*) \
-+	      need_charset_alias=true ;; \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	      need_charset_alias=false ;; \
-+	    *) \
-+	      need_charset_alias=true ;; \
-+	  esac ; \
-+	else \
-+	  need_charset_alias=false ; \
-+	fi ; \
-+	if $$need_charset_alias; then \
-+	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
-+	fi ; \
-+	if test -f $(charset_alias); then \
-+	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-+	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-+	  rm -f $(charset_tmp) ; \
-+	else \
-+	  if $$need_charset_alias; then \
-+	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-+	    rm -f $(charset_tmp) ; \
-+	  fi ; \
-+	fi
-+
-+uninstall-local: uninstall-localcharset
-+uninstall-localcharset: all-local
-+	if test -f $(charset_alias); then \
-+	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
-+	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-+	      > /dev/null; then \
-+	    rm -f $(charset_alias); \
-+	  else \
-+	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-+	  fi; \
-+	  rm -f $(charset_tmp); \
-+	fi
-+
-+charset.alias: config.charset
-+	$(AM_V_GEN)rm -f t-$@ $@ && \
-+	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
-+	mv t-$@ $@
-+.sin.sed:
-+	$(AM_V_GEN)rm -f t-$@ $@ && \
-+	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
-+	mv t-$@ $@
-+
-+# We need the following in order to create <stddef.h> when the system
-+# doesn't have one that works with the given compiler.
-+stddef.h: stddef.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
-+	      -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
-+	      -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
-+	      < $(srcdir)/stddef.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+
-+# We need the following in order to create <stdint.h> when the system
-+# doesn't have one that works with the given compiler.
-+stdint.h: stdint.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
-+	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-+	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-+	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-+	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-+	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-+	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
-+	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
-+	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-+	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-+	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-+	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-+	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-+	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-+	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-+	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-+	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-+	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-+	      < $(srcdir)/stdint.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+
-+unitypes.h: unitypes.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  cat $(srcdir)/unitypes.in.h; \
-+	} > $@-t && \
-+	mv -f $@-t $@
-+
-+uniwidth.h: uniwidth.in.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  cat $(srcdir)/uniwidth.in.h; \
-+	} > $@-t && \
-+	mv -f $@-t $@
-+# The warn-on-use.h that gets inserted into generated .h files is the same as
-+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
-+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	sed -n -e '/^.ifndef/,$$p' \
-+	  < $(top_srcdir)/build-aux/warn-on-use.h \
-+	  > $@-t && \
-+	mv $@-t $@
-+
-+# We need the following in order to create <wchar.h> when the system
-+# version does not work standalone.
-+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-+	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
-+	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
-+	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
-+	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
-+	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
-+	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
-+	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
-+	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
-+	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
-+	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
-+	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
-+	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
-+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
-+	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
-+	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
-+	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
-+	      -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
-+	      -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
-+	      -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
-+	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
-+	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
-+	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
-+	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
-+	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
-+	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
-+	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
-+	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
-+	      -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
-+	      -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
-+	      -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
-+	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
-+	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
-+	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
-+	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
-+	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-+	    < $(srcdir)/wchar.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+
-+# We need the following in order to create <wctype.h> when the system
-+# doesn't have one that works with the given compiler.
-+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
-+	$(AM_V_GEN)rm -f $@-t $@ && \
-+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-+	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-+	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
-+	      -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
-+	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
-+	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-+	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
-+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-+	      < $(srcdir)/wctype.in.h; \
-+	} > $@-t && \
-+	mv $@-t $@
-+
-+mostlyclean-local: mostlyclean-generic
-+	@for dir in '' $(MOSTLYCLEANDIRS); do \
-+	  if test -n "$$dir" && test -d $$dir; then \
-+	    echo "rmdir $$dir"; rmdir $$dir; \
-+	  fi; \
-+	done; \
-+	:
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff --git a/src/libs/gl/gllib/config.charset b/src/libs/gl/gllib/config.charset
-new file mode 100644
-index 0000000..722b704
---- /dev/null
-+++ b/src/libs/gl/gllib/config.charset
-@@ -0,0 +1,683 @@
-+#! /bin/sh
-+# Output a system dependent table of character encoding aliases.
-+#
-+#   Copyright (C) 2000-2004, 2006-2010 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, or (at your option)
-+#   any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program; if not, write to the Free Software Foundation,
-+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# The table consists of lines of the form
-+#    ALIAS  CANONICAL
-+#
-+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-+# ALIAS is compared in a case sensitive way.
-+#
-+# CANONICAL is the GNU canonical name for this character encoding.
-+# It must be an encoding supported by libiconv. Support by GNU libc is
-+# also desirable. CANONICAL is case insensitive. Usually an upper case
-+# MIME charset name is preferred.
-+# The current list of GNU canonical charset names is as follows.
-+#
-+#       name              MIME?             used by which systems
-+#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
-+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-+#   ISO-8859-3              Y   glibc solaris cygwin
-+#   ISO-8859-4              Y   osf solaris freebsd netbsd openbsd darwin
-+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-+#   ISO-8859-6              Y   glibc aix hpux solaris cygwin
-+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd openbsd darwin cygwin
-+#   ISO-8859-8              Y   glibc aix hpux osf solaris cygwin
-+#   ISO-8859-9              Y   glibc aix hpux irix osf solaris darwin cygwin
-+#   ISO-8859-13                 glibc netbsd openbsd darwin cygwin
-+#   ISO-8859-14                 glibc cygwin
-+#   ISO-8859-15                 glibc aix osf solaris freebsd netbsd openbsd darwin cygwin
-+#   KOI8-R                  Y   glibc solaris freebsd netbsd openbsd darwin
-+#   KOI8-U                  Y   glibc freebsd netbsd openbsd darwin cygwin
-+#   KOI8-T                      glibc
-+#   CP437                       dos
-+#   CP775                       dos
-+#   CP850                       aix osf dos
-+#   CP852                       dos
-+#   CP855                       dos
-+#   CP856                       aix
-+#   CP857                       dos
-+#   CP861                       dos
-+#   CP862                       dos
-+#   CP864                       dos
-+#   CP865                       dos
-+#   CP866                       freebsd netbsd openbsd darwin dos
-+#   CP869                       dos
-+#   CP874                       woe32 dos
-+#   CP922                       aix
-+#   CP932                       aix cygwin woe32 dos
-+#   CP943                       aix
-+#   CP949                       osf darwin woe32 dos
-+#   CP950                       woe32 dos
-+#   CP1046                      aix
-+#   CP1124                      aix
-+#   CP1125                      dos
-+#   CP1129                      aix
-+#   CP1131                      darwin
-+#   CP1250                      woe32
-+#   CP1251                      glibc solaris netbsd openbsd darwin cygwin woe32
-+#   CP1252                      aix woe32
-+#   CP1253                      woe32
-+#   CP1254                      woe32
-+#   CP1255                      glibc woe32
-+#   CP1256                      woe32
-+#   CP1257                      woe32
-+#   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin
-+#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
-+#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
-+#   EUC-TW                      glibc aix hpux irix osf solaris netbsd
-+#   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin cygwin
-+#   BIG5-HKSCS                  glibc solaris darwin
-+#   GBK                         glibc aix osf solaris darwin cygwin woe32 dos
-+#   GB18030                     glibc solaris netbsd darwin
-+#   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
-+#   JOHAB                       glibc solaris woe32
-+#   TIS-620                     glibc aix hpux osf solaris cygwin
-+#   VISCII                  Y   glibc
-+#   TCVN5712-1                  glibc
-+#   ARMSCII-8                   glibc darwin
-+#   GEORGIAN-PS                 glibc cygwin
-+#   PT154                       glibc
-+#   HP-ROMAN8                   hpux
-+#   HP-ARABIC8                  hpux
-+#   HP-GREEK8                   hpux
-+#   HP-HEBREW8                  hpux
-+#   HP-TURKISH8                 hpux
-+#   HP-KANA8                    hpux
-+#   DEC-KANJI                   osf
-+#   DEC-HANYU                   osf
-+#   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin cygwin
-+#
-+# Note: Names which are not marked as being a MIME name should not be used in
-+# Internet protocols for information interchange (mail, news, etc.).
-+#
-+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-+# must understand both names and treat them as equivalent.
-+#
-+# The first argument passed to this file is the canonical host specification,
-+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or
-+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+
-+host="$1"
-+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-+echo "# This file contains a table of character encoding aliases,"
-+echo "# suitable for operating system '${os}'."
-+echo "# It was automatically generated from config.charset."
-+# List of references, updated during installation:
-+echo "# Packages using this file: "
-+case "$os" in
-+  linux-gnulibc1*)
-+    # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
-+    # localcharset.c falls back to using the full locale name
-+    # from the environment variables.
-+    echo "C ASCII"
-+    echo "POSIX ASCII"
-+    for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
-+             en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
-+             en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
-+             es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
-+             et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
-+             fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
-+             it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
-+             sv_FI sv_SE; do
-+      echo "$l ISO-8859-1"
-+      echo "$l.iso-8859-1 ISO-8859-1"
-+      echo "$l.iso-8859-15 ISO-8859-15"
-+      echo "$l.iso-8859-15@euro ISO-8859-15"
-+      echo "$l@euro ISO-8859-15"
-+      echo "$l.cp-437 CP437"
-+      echo "$l.cp-850 CP850"
-+      echo "$l.cp-1252 CP1252"
-+      echo "$l.cp-1252@euro CP1252"
-+      #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
-+      echo "$l.utf-8 UTF-8"
-+      echo "$l.utf-8@euro UTF-8"
-+    done
-+    for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
-+             sl_SI sr sr_CS sr_YU; do
-+      echo "$l ISO-8859-2"
-+      echo "$l.iso-8859-2 ISO-8859-2"
-+      echo "$l.cp-852 CP852"
-+      echo "$l.cp-1250 CP1250"
-+      echo "$l.utf-8 UTF-8"
-+    done
-+    for l in mk mk_MK ru ru_RU; do
-+      echo "$l ISO-8859-5"
-+      echo "$l.iso-8859-5 ISO-8859-5"
-+      echo "$l.koi8-r KOI8-R"
-+      echo "$l.cp-866 CP866"
-+      echo "$l.cp-1251 CP1251"
-+      echo "$l.utf-8 UTF-8"
-+    done
-+    for l in ar ar_SA; do
-+      echo "$l ISO-8859-6"
-+      echo "$l.iso-8859-6 ISO-8859-6"
-+      echo "$l.cp-864 CP864"
-+      #echo "$l.cp-868 CP868" # not a commonly used encoding
-+      echo "$l.cp-1256 CP1256"
-+      echo "$l.utf-8 UTF-8"
-+    done
-+    for l in el el_GR gr gr_GR; do
-+      echo "$l ISO-8859-7"
-+      echo "$l.iso-8859-7 ISO-8859-7"
-+      echo "$l.cp-869 CP869"
-+      echo "$l.cp-1253 CP1253"
-+      echo "$l.cp-1253@euro CP1253"
-+      echo "$l.utf-8 UTF-8"
-+      echo "$l.utf-8@euro UTF-8"
-+    done
-+    for l in he he_IL iw iw_IL; do
-+      echo "$l ISO-8859-8"
-+      echo "$l.iso-8859-8 ISO-8859-8"
-+      echo "$l.cp-862 CP862"
-+      echo "$l.cp-1255 CP1255"
-+      echo "$l.utf-8 UTF-8"
-+    done
-+    for l in tr tr_TR; do
-+      echo "$l ISO-8859-9"
-+      echo "$l.iso-8859-9 ISO-8859-9"
-+      echo "$l.cp-857 CP857"
-+      echo "$l.cp-1254 CP1254"
-+      echo "$l.utf-8 UTF-8"
-+    done
-+    for l in lt lt_LT lv lv_LV; do
-+      #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
-+      echo "$l ISO-8859-13"
-+    done
-+    for l in ru_UA uk uk_UA; do
-+      echo "$l KOI8-U"
-+    done
-+    for l in zh zh_CN; do
-+      #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
-+      echo "$l GB2312"
-+    done
-+    for l in ja ja_JP ja_JP.EUC; do
-+      echo "$l EUC-JP"
-+    done
-+    for l in ko ko_KR; do
-+      echo "$l EUC-KR"
-+    done
-+    for l in th th_TH; do
-+      echo "$l TIS-620"
-+    done
-+    for l in fa fa_IR; do
-+      #echo "$l ISIRI-3342" # a broken encoding
-+      echo "$l.utf-8 UTF-8"
-+    done
-+    ;;
-+  linux* | *-gnu*)
-+    # With glibc-2.1 or newer, we don't need any canonicalization,
-+    # because glibc has iconv and both glibc and libiconv support all
-+    # GNU canonical names directly. Therefore, the Makefile does not
-+    # need to install the alias file at all.
-+    # The following applies only to glibc-2.0.x and older libcs.
-+    echo "ISO_646.IRV:1983 ASCII"
-+    ;;
-+  aix*)
-+    echo "ISO8859-1 ISO-8859-1"
-+    echo "ISO8859-2 ISO-8859-2"
-+    echo "ISO8859-5 ISO-8859-5"
-+    echo "ISO8859-6 ISO-8859-6"
-+    echo "ISO8859-7 ISO-8859-7"
-+    echo "ISO8859-8 ISO-8859-8"
-+    echo "ISO8859-9 ISO-8859-9"
-+    echo "ISO8859-15 ISO-8859-15"
-+    echo "IBM-850 CP850"
-+    echo "IBM-856 CP856"
-+    echo "IBM-921 ISO-8859-13"
-+    echo "IBM-922 CP922"
-+    echo "IBM-932 CP932"
-+    echo "IBM-943 CP943"
-+    echo "IBM-1046 CP1046"
-+    echo "IBM-1124 CP1124"
-+    echo "IBM-1129 CP1129"
-+    echo "IBM-1252 CP1252"
-+    echo "IBM-eucCN GB2312"
-+    echo "IBM-eucJP EUC-JP"
-+    echo "IBM-eucKR EUC-KR"
-+    echo "IBM-eucTW EUC-TW"
-+    echo "big5 BIG5"
-+    echo "GBK GBK"
-+    echo "TIS-620 TIS-620"
-+    echo "UTF-8 UTF-8"
-+    ;;
-+  hpux*)
-+    echo "iso88591 ISO-8859-1"
-+    echo "iso88592 ISO-8859-2"
-+    echo "iso88595 ISO-8859-5"
-+    echo "iso88596 ISO-8859-6"
-+    echo "iso88597 ISO-8859-7"
-+    echo "iso88598 ISO-8859-8"
-+    echo "iso88599 ISO-8859-9"
-+    echo "iso885915 ISO-8859-15"
-+    echo "roman8 HP-ROMAN8"
-+    echo "arabic8 HP-ARABIC8"
-+    echo "greek8 HP-GREEK8"
-+    echo "hebrew8 HP-HEBREW8"
-+    echo "turkish8 HP-TURKISH8"
-+    echo "kana8 HP-KANA8"
-+    echo "tis620 TIS-620"
-+    echo "big5 BIG5"
-+    echo "eucJP EUC-JP"
-+    echo "eucKR EUC-KR"
-+    echo "eucTW EUC-TW"
-+    echo "hp15CN GB2312"
-+    #echo "ccdc ?" # what is this?
-+    echo "SJIS SHIFT_JIS"
-+    echo "utf8 UTF-8"
-+    ;;
-+  irix*)
-+    echo "ISO8859-1 ISO-8859-1"
-+    echo "ISO8859-2 ISO-8859-2"
-+    echo "ISO8859-5 ISO-8859-5"
-+    echo "ISO8859-7 ISO-8859-7"
-+    echo "ISO8859-9 ISO-8859-9"
-+    echo "eucCN GB2312"
-+    echo "eucJP EUC-JP"
-+    echo "eucKR EUC-KR"
-+    echo "eucTW EUC-TW"
-+    ;;
-+  osf*)
-+    echo "ISO8859-1 ISO-8859-1"
-+    echo "ISO8859-2 ISO-8859-2"
-+    echo "ISO8859-4 ISO-8859-4"
-+    echo "ISO8859-5 ISO-8859-5"
-+    echo "ISO8859-7 ISO-8859-7"
-+    echo "ISO8859-8 ISO-8859-8"
-+    echo "ISO8859-9 ISO-8859-9"
-+    echo "ISO8859-15 ISO-8859-15"
-+    echo "cp850 CP850"
-+    echo "big5 BIG5"
-+    echo "dechanyu DEC-HANYU"
-+    echo "dechanzi GB2312"
-+    echo "deckanji DEC-KANJI"
-+    echo "deckorean EUC-KR"
-+    echo "eucJP EUC-JP"
-+    echo "eucKR EUC-KR"
-+    echo "eucTW EUC-TW"
-+    echo "GBK GBK"
-+    echo "KSC5601 CP949"
-+    echo "sdeckanji EUC-JP"
-+    echo "SJIS SHIFT_JIS"
-+    echo "TACTIS TIS-620"
-+    echo "UTF-8 UTF-8"
-+    ;;
-+  solaris*)
-+    echo "646 ASCII"
-+    echo "ISO8859-1 ISO-8859-1"
-+    echo "ISO8859-2 ISO-8859-2"
-+    echo "ISO8859-3 ISO-8859-3"
-+    echo "ISO8859-4 ISO-8859-4"
-+    echo "ISO8859-5 ISO-8859-5"
-+    echo "ISO8859-6 ISO-8859-6"
-+    echo "ISO8859-7 ISO-8859-7"
-+    echo "ISO8859-8 ISO-8859-8"
-+    echo "ISO8859-9 ISO-8859-9"
-+    echo "ISO8859-15 ISO-8859-15"
-+    echo "koi8-r KOI8-R"
-+    echo "ansi-1251 CP1251"
-+    echo "BIG5 BIG5"
-+    echo "Big5-HKSCS BIG5-HKSCS"
-+    echo "gb2312 GB2312"
-+    echo "GBK GBK"
-+    echo "GB18030 GB18030"
-+    echo "cns11643 EUC-TW"
-+    echo "5601 EUC-KR"
-+    echo "ko_KR.johap92 JOHAB"
-+    echo "eucJP EUC-JP"
-+    echo "PCK SHIFT_JIS"
-+    echo "TIS620.2533 TIS-620"
-+    #echo "sun_eu_greek ?" # what is this?
-+    echo "UTF-8 UTF-8"
-+    ;;
-+  freebsd* | os2*)
-+    # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
-+    # localcharset.c falls back to using the full locale name
-+    # from the environment variables.
-+    # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
-+    # reuse FreeBSD's locale data for OS/2.
-+    echo "C ASCII"
-+    echo "US-ASCII ASCII"
-+    for l in la_LN lt_LN; do
-+      echo "$l.ASCII ASCII"
-+    done
-+    for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-+             fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-+             lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
-+      echo "$l.ISO_8859-1 ISO-8859-1"
-+      echo "$l.DIS_8859-15 ISO-8859-15"
-+    done
-+    for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
-+      echo "$l.ISO_8859-2 ISO-8859-2"
-+    done
-+    for l in la_LN lt_LT; do
-+      echo "$l.ISO_8859-4 ISO-8859-4"
-+    done
-+    for l in ru_RU ru_SU; do
-+      echo "$l.KOI8-R KOI8-R"
-+      echo "$l.ISO_8859-5 ISO-8859-5"
-+      echo "$l.CP866 CP866"
-+    done
-+    echo "uk_UA.KOI8-U KOI8-U"
-+    echo "zh_TW.BIG5 BIG5"
-+    echo "zh_TW.Big5 BIG5"
-+    echo "zh_CN.EUC GB2312"
-+    echo "ja_JP.EUC EUC-JP"
-+    echo "ja_JP.SJIS SHIFT_JIS"
-+    echo "ja_JP.Shift_JIS SHIFT_JIS"
-+    echo "ko_KR.EUC EUC-KR"
-+    ;;
-+  netbsd*)
-+    echo "646 ASCII"
-+    echo "ISO8859-1 ISO-8859-1"
-+    echo "ISO8859-2 ISO-8859-2"
-+    echo "ISO8859-4 ISO-8859-4"
-+    echo "ISO8859-5 ISO-8859-5"
-+    echo "ISO8859-7 ISO-8859-7"
-+    echo "ISO8859-13 ISO-8859-13"
-+    echo "ISO8859-15 ISO-8859-15"
-+    echo "eucCN GB2312"
-+    echo "eucJP EUC-JP"
-+    echo "eucKR EUC-KR"
-+    echo "eucTW EUC-TW"
-+    echo "BIG5 BIG5"
-+    echo "SJIS SHIFT_JIS"
-+    ;;
-+  openbsd*)
-+    echo "646 ASCII"
-+    echo "ISO8859-1 ISO-8859-1"
-+    echo "ISO8859-2 ISO-8859-2"
-+    echo "ISO8859-4 ISO-8859-4"
-+    echo "ISO8859-5 ISO-8859-5"
-+    echo "ISO8859-7 ISO-8859-7"
-+    echo "ISO8859-13 ISO-8859-13"
-+    echo "ISO8859-15 ISO-8859-15"
-+    ;;
-+  darwin[56]*)
-+    # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
-+    # localcharset.c falls back to using the full locale name
-+    # from the environment variables.
-+    echo "C ASCII"
-+    for l in en_AU en_CA en_GB en_US la_LN; do
-+      echo "$l.US-ASCII ASCII"
-+    done
-+    for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-+             fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
-+             nl_NL no_NO pt_PT sv_SE; do
-+      echo "$l ISO-8859-1"
-+      echo "$l.ISO8859-1 ISO-8859-1"
-+      echo "$l.ISO8859-15 ISO-8859-15"
-+    done
-+    for l in la_LN; do
-+      echo "$l.ISO8859-1 ISO-8859-1"
-+      echo "$l.ISO8859-15 ISO-8859-15"
-+    done
-+    for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
-+      echo "$l.ISO8859-2 ISO-8859-2"
-+    done
-+    for l in la_LN lt_LT; do
-+      echo "$l.ISO8859-4 ISO-8859-4"
-+    done
-+    for l in ru_RU; do
-+      echo "$l.KOI8-R KOI8-R"
-+      echo "$l.ISO8859-5 ISO-8859-5"
-+      echo "$l.CP866 CP866"
-+    done
-+    for l in bg_BG; do
-+      echo "$l.CP1251 CP1251"
-+    done
-+    echo "uk_UA.KOI8-U KOI8-U"
-+    echo "zh_TW.BIG5 BIG5"
-+    echo "zh_TW.Big5 BIG5"
-+    echo "zh_CN.EUC GB2312"
-+    echo "ja_JP.EUC EUC-JP"
-+    echo "ja_JP.SJIS SHIFT_JIS"
-+    echo "ko_KR.EUC EUC-KR"
-+    ;;
-+  darwin*)
-+    # Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is
-+    # useless:
-+    # - It returns the empty string when LANG is set to a locale of the
-+    #   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
-+    #   LC_CTYPE file.
-+    # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by
-+    #   the system; nl_langinfo(CODESET) returns "US-ASCII" in this case.
-+    # - The documentation says:
-+    #     "... all code that calls BSD system routines should ensure
-+    #      that the const *char parameters of these routines are in UTF-8
-+    #      encoding. All BSD system functions expect their string
-+    #      parameters to be in UTF-8 encoding and nothing else."
-+    #   It also says
-+    #     "An additional caveat is that string parameters for files,
-+    #      paths, and other file-system entities must be in canonical
-+    #      UTF-8. In a canonical UTF-8 Unicode string, all decomposable
-+    #      characters are decomposed ..."
-+    #   but this is not true: You can pass non-decomposed UTF-8 strings
-+    #   to file system functions, and it is the OS which will convert
-+    #   them to decomposed UTF-8 before accessing the file system.
-+    # - The Apple Terminal application displays UTF-8 by default.
-+    # - However, other applications are free to use different encodings:
-+    #   - xterm uses ISO-8859-1 by default.
-+    #   - TextEdit uses MacRoman by default.
-+    # We prefer UTF-8 over decomposed UTF-8-MAC because one should
-+    # minimize the use of decomposed Unicode. Unfortunately, through the
-+    # Darwin file system, decomposed UTF-8 strings are leaked into user
-+    # space nevertheless.
-+    # Then there are also the locales with encodings other than US-ASCII
-+    # and UTF-8. These locales can be occasionally useful to users (e.g.
-+    # when grepping through ISO-8859-1 encoded text files), when all their
-+    # file names are in US-ASCII.
-+    echo "ISO8859-1 ISO-8859-1"
-+    echo "ISO8859-2 ISO-8859-2"
-+    echo "ISO8859-4 ISO-8859-4"
-+    echo "ISO8859-5 ISO-8859-5"
-+    echo "ISO8859-7 ISO-8859-7"
-+    echo "ISO8859-9 ISO-8859-9"
-+    echo "ISO8859-13 ISO-8859-13"
-+    echo "ISO8859-15 ISO-8859-15"
-+    echo "KOI8-R KOI8-R"
-+    echo "KOI8-U KOI8-U"
-+    echo "CP866 CP866"
-+    echo "CP949 CP949"
-+    echo "CP1131 CP1131"
-+    echo "CP1251 CP1251"
-+    echo "eucCN GB2312"
-+    echo "GB2312 GB2312"
-+    echo "eucJP EUC-JP"
-+    echo "eucKR EUC-KR"
-+    echo "Big5 BIG5"
-+    echo "Big5HKSCS BIG5-HKSCS"
-+    echo "GBK GBK"
-+    echo "GB18030 GB18030"
-+    echo "SJIS SHIFT_JIS"
-+    echo "ARMSCII-8 ARMSCII-8"
-+    echo "PT154 PT154"
-+    #echo "ISCII-DEV ?"
-+    echo "* UTF-8"
-+    ;;
-+  beos* | haiku*)
-+    # BeOS and Haiku have a single locale, and it has UTF-8 encoding.
-+    echo "* UTF-8"
-+    ;;
-+  msdosdjgpp*)
-+    # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
-+    # localcharset.c falls back to using the full locale name
-+    # from the environment variables.
-+    echo "#"
-+    echo "# The encodings given here may not all be correct."
-+    echo "# If you find that the encoding given for your language and"
-+    echo "# country is not the one your DOS machine actually uses, just"
-+    echo "# correct it in this file, and send a mail to"
-+    echo "# Juan Manuel Guerrero <juan.guerrero@gmx.de>"
-+    echo "# and Bruno Haible <bruno@clisp.org>."
-+    echo "#"
-+    echo "C ASCII"
-+    # ISO-8859-1 languages
-+    echo "ca CP850"
-+    echo "ca_ES CP850"
-+    echo "da CP865"    # not CP850 ??
-+    echo "da_DK CP865" # not CP850 ??
-+    echo "de CP850"
-+    echo "de_AT CP850"
-+    echo "de_CH CP850"
-+    echo "de_DE CP850"
-+    echo "en CP850"
-+    echo "en_AU CP850" # not CP437 ??
-+    echo "en_CA CP850"
-+    echo "en_GB CP850"
-+    echo "en_NZ CP437"
-+    echo "en_US CP437"
-+    echo "en_ZA CP850" # not CP437 ??
-+    echo "es CP850"
-+    echo "es_AR CP850"
-+    echo "es_BO CP850"
-+    echo "es_CL CP850"
-+    echo "es_CO CP850"
-+    echo "es_CR CP850"
-+    echo "es_CU CP850"
-+    echo "es_DO CP850"
-+    echo "es_EC CP850"
-+    echo "es_ES CP850"
-+    echo "es_GT CP850"
-+    echo "es_HN CP850"
-+    echo "es_MX CP850"
-+    echo "es_NI CP850"
-+    echo "es_PA CP850"
-+    echo "es_PY CP850"
-+    echo "es_PE CP850"
-+    echo "es_SV CP850"
-+    echo "es_UY CP850"
-+    echo "es_VE CP850"
-+    echo "et CP850"
-+    echo "et_EE CP850"
-+    echo "eu CP850"
-+    echo "eu_ES CP850"
-+    echo "fi CP850"
-+    echo "fi_FI CP850"
-+    echo "fr CP850"
-+    echo "fr_BE CP850"
-+    echo "fr_CA CP850"
-+    echo "fr_CH CP850"
-+    echo "fr_FR CP850"
-+    echo "ga CP850"
-+    echo "ga_IE CP850"
-+    echo "gd CP850"
-+    echo "gd_GB CP850"
-+    echo "gl CP850"
-+    echo "gl_ES CP850"
-+    echo "id CP850"    # not CP437 ??
-+    echo "id_ID CP850" # not CP437 ??
-+    echo "is CP861"    # not CP850 ??
-+    echo "is_IS CP861" # not CP850 ??
-+    echo "it CP850"
-+    echo "it_CH CP850"
-+    echo "it_IT CP850"
-+    echo "lt CP775"
-+    echo "lt_LT CP775"
-+    echo "lv CP775"
-+    echo "lv_LV CP775"
-+    echo "nb CP865"    # not CP850 ??
-+    echo "nb_NO CP865" # not CP850 ??
-+    echo "nl CP850"
-+    echo "nl_BE CP850"
-+    echo "nl_NL CP850"
-+    echo "nn CP865"    # not CP850 ??
-+    echo "nn_NO CP865" # not CP850 ??
-+    echo "no CP865"    # not CP850 ??
-+    echo "no_NO CP865" # not CP850 ??
-+    echo "pt CP850"
-+    echo "pt_BR CP850"
-+    echo "pt_PT CP850"
-+    echo "sv CP850"
-+    echo "sv_SE CP850"
-+    # ISO-8859-2 languages
-+    echo "cs CP852"
-+    echo "cs_CZ CP852"
-+    echo "hr CP852"
-+    echo "hr_HR CP852"
-+    echo "hu CP852"
-+    echo "hu_HU CP852"
-+    echo "pl CP852"
-+    echo "pl_PL CP852"
-+    echo "ro CP852"
-+    echo "ro_RO CP852"
-+    echo "sk CP852"
-+    echo "sk_SK CP852"
-+    echo "sl CP852"
-+    echo "sl_SI CP852"
-+    echo "sq CP852"
-+    echo "sq_AL CP852"
-+    echo "sr CP852"    # CP852 or CP866 or CP855 ??
-+    echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
-+    echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
-+    # ISO-8859-3 languages
-+    echo "mt CP850"
-+    echo "mt_MT CP850"
-+    # ISO-8859-5 languages
-+    echo "be CP866"
-+    echo "be_BE CP866"
-+    echo "bg CP866"    # not CP855 ??
-+    echo "bg_BG CP866" # not CP855 ??
-+    echo "mk CP866"    # not CP855 ??
-+    echo "mk_MK CP866" # not CP855 ??
-+    echo "ru CP866"
-+    echo "ru_RU CP866"
-+    echo "uk CP1125"
-+    echo "uk_UA CP1125"
-+    # ISO-8859-6 languages
-+    echo "ar CP864"
-+    echo "ar_AE CP864"
-+    echo "ar_DZ CP864"
-+    echo "ar_EG CP864"
-+    echo "ar_IQ CP864"
-+    echo "ar_IR CP864"
-+    echo "ar_JO CP864"
-+    echo "ar_KW CP864"
-+    echo "ar_MA CP864"
-+    echo "ar_OM CP864"
-+    echo "ar_QA CP864"
-+    echo "ar_SA CP864"
-+    echo "ar_SY CP864"
-+    # ISO-8859-7 languages
-+    echo "el CP869"
-+    echo "el_GR CP869"
-+    # ISO-8859-8 languages
-+    echo "he CP862"
-+    echo "he_IL CP862"
-+    # ISO-8859-9 languages
-+    echo "tr CP857"
-+    echo "tr_TR CP857"
-+    # Japanese
-+    echo "ja CP932"
-+    echo "ja_JP CP932"
-+    # Chinese
-+    echo "zh_CN GBK"
-+    echo "zh_TW CP950" # not CP938 ??
-+    # Korean
-+    echo "kr CP949"    # not CP934 ??
-+    echo "kr_KR CP949" # not CP934 ??
-+    # Thai
-+    echo "th CP874"
-+    echo "th_TH CP874"
-+    # Other
-+    echo "eo CP850"
-+    echo "eo_EO CP850"
-+    ;;
-+esac
-diff --git a/src/libs/gl/gllib/localcharset.c b/src/libs/gl/gllib/localcharset.c
-new file mode 100644
-index 0000000..5610a22
---- /dev/null
-+++ b/src/libs/gl/gllib/localcharset.c
-@@ -0,0 +1,548 @@
-+/* Determine a canonical name for the current locale's character encoding.
-+
-+   Copyright (C) 2000-2006, 2008-2010 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, or (at your option)
-+   any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License along
-+   with this program; if not, write to the Free Software Foundation,
-+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+
-+/* Written by Bruno Haible <bruno@clisp.org>.  */
-+
-+#include <config.h>
-+
-+/* Specification.  */
-+#include "localcharset.h"
-+
-+#include <fcntl.h>
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+
-+#if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
-+# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
-+#endif
-+
-+#if defined _WIN32 || defined __WIN32__
-+# define WIN32_NATIVE
-+#endif
-+
-+#if defined __EMX__
-+/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
-+# ifndef OS2
-+#  define OS2
-+# endif
-+#endif
-+
-+#if !defined WIN32_NATIVE
-+# include <unistd.h>
-+# if HAVE_LANGINFO_CODESET
-+#  include <langinfo.h>
-+# else
-+#  if 0 /* see comment below */
-+#   include <locale.h>
-+#  endif
-+# endif
-+# ifdef __CYGWIN__
-+#  define WIN32_LEAN_AND_MEAN
-+#  include <windows.h>
-+# endif
-+#elif defined WIN32_NATIVE
-+# define WIN32_LEAN_AND_MEAN
-+# include <windows.h>
-+#endif
-+#if defined OS2
-+# define INCL_DOS
-+# include <os2.h>
-+#endif
-+
-+#if ENABLE_RELOCATABLE
-+# include "relocatable.h"
-+#else
-+# define relocate(pathname) (pathname)
-+#endif
-+
-+/* Get LIBDIR.  */
-+#ifndef LIBDIR
-+# include "configmake.h"
-+#endif
-+
-+/* Define O_NOFOLLOW to 0 on platforms where it does not exist.  */
-+#ifndef O_NOFOLLOW
-+# define O_NOFOLLOW 0
-+#endif
-+
-+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-+  /* Win32, Cygwin, OS/2, DOS */
-+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-+#endif
-+
-+#ifndef DIRECTORY_SEPARATOR
-+# define DIRECTORY_SEPARATOR '/'
-+#endif
-+
-+#ifndef ISSLASH
-+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-+#endif
-+
-+#if HAVE_DECL_GETC_UNLOCKED
-+# undef getc
-+# define getc getc_unlocked
-+#endif
-+
-+/* The following static variable is declared 'volatile' to avoid a
-+   possible multithread problem in the function get_charset_aliases. If we
-+   are running in a threaded environment, and if two threads initialize
-+   'charset_aliases' simultaneously, both will produce the same value,
-+   and everything will be ok if the two assignments to 'charset_aliases'
-+   are atomic. But I don't know what will happen if the two assignments mix.  */
-+#if __STDC__ != 1
-+# define volatile /* empty */
-+#endif
-+/* Pointer to the contents of the charset.alias file, if it has already been
-+   read, else NULL.  Its format is:
-+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-+static const char * volatile charset_aliases;
-+
-+/* Return a pointer to the contents of the charset.alias file.  */
-+static const char *
-+get_charset_aliases (void)
-+{
-+  const char *cp;
-+
-+  cp = charset_aliases;
-+  if (cp == NULL)
-+    {
-+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
-+      const char *dir;
-+      const char *base = "charset.alias";
-+      char *file_name;
-+
-+      /* Make it possible to override the charset.alias location.  This is
-+         necessary for running the testsuite before "make install".  */
-+      dir = getenv ("CHARSETALIASDIR");
-+      if (dir == NULL || dir[0] == '\0')
-+        dir = relocate (LIBDIR);
-+
-+      /* Concatenate dir and base into freshly allocated file_name.  */
-+      {
-+        size_t dir_len = strlen (dir);
-+        size_t base_len = strlen (base);
-+        int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
-+        file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
-+        if (file_name != NULL)
-+          {
-+            memcpy (file_name, dir, dir_len);
-+            if (add_slash)
-+              file_name[dir_len] = DIRECTORY_SEPARATOR;
-+            memcpy (file_name + dir_len + add_slash, base, base_len + 1);
-+          }
-+      }
-+
-+      if (file_name == NULL)
-+        /* Out of memory.  Treat the file as empty.  */
-+        cp = "";
-+      else
-+        {
-+          int fd;
-+
-+          /* Open the file.  Reject symbolic links on platforms that support
-+             O_NOFOLLOW.  This is a security feature.  Without it, an attacker
-+             could retrieve parts of the contents (namely, the tail of the
-+             first line that starts with "* ") of an arbitrary file by placing
-+             a symbolic link to that file under the name "charset.alias" in
-+             some writable directory and defining the environment variable
-+             CHARSETALIASDIR to point to that directory.  */
-+          fd = open (file_name,
-+                     O_RDONLY | (HAVE_WORKING_O_NOFOLLOW ? O_NOFOLLOW : 0));
-+          if (fd < 0)
-+            /* File not found.  Treat it as empty.  */
-+            cp = "";
-+          else
-+            {
-+              FILE *fp;
-+
-+              fp = fdopen (fd, "r");
-+              if (fp == NULL)
-+                {
-+                  /* Out of memory.  Treat the file as empty.  */
-+                  close (fd);
-+                  cp = "";
-+                }
-+              else
-+                {
-+                  /* Parse the file's contents.  */
-+                  char *res_ptr = NULL;
-+                  size_t res_size = 0;
-+
-+                  for (;;)
-+                    {
-+                      int c;
-+                      char buf1[50+1];
-+                      char buf2[50+1];
-+                      size_t l1, l2;
-+                      char *old_res_ptr;
-+
-+                      c = getc (fp);
-+                      if (c == EOF)
-+                        break;
-+                      if (c == '\n' || c == ' ' || c == '\t')
-+                        continue;
-+                      if (c == '#')
-+                        {
-+                          /* Skip comment, to end of line.  */
-+                          do
-+                            c = getc (fp);
-+                          while (!(c == EOF || c == '\n'));
-+                          if (c == EOF)
-+                            break;
-+                          continue;
-+                        }
-+                      ungetc (c, fp);
-+                      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
-+                        break;
-+                      l1 = strlen (buf1);
-+                      l2 = strlen (buf2);
-+                      old_res_ptr = res_ptr;
-+                      if (res_size == 0)
-+                        {
-+                          res_size = l1 + 1 + l2 + 1;
-+                          res_ptr = (char *) malloc (res_size + 1);
-+                        }
-+                      else
-+                        {
-+                          res_size += l1 + 1 + l2 + 1;
-+                          res_ptr = (char *) realloc (res_ptr, res_size + 1);
-+                        }
-+                      if (res_ptr == NULL)
-+                        {
-+                          /* Out of memory. */
-+                          res_size = 0;
-+                          if (old_res_ptr != NULL)
-+                            free (old_res_ptr);
-+                          break;
-+                        }
-+                      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
-+                      strcpy (res_ptr + res_size - (l2 + 1), buf2);
-+                    }
-+                  fclose (fp);
-+                  if (res_size == 0)
-+                    cp = "";
-+                  else
-+                    {
-+                      *(res_ptr + res_size) = '\0';
-+                      cp = res_ptr;
-+                    }
-+                }
-+            }
-+
-+          free (file_name);
-+        }
-+
-+#else
-+
-+# if defined DARWIN7
-+      /* To avoid the trouble of installing a file that is shared by many
-+         GNU packages -- many packaging systems have problems with this --,
-+         simply inline the aliases here.  */
-+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
-+           "ISO8859-2" "\0" "ISO-8859-2" "\0"
-+           "ISO8859-4" "\0" "ISO-8859-4" "\0"
-+           "ISO8859-5" "\0" "ISO-8859-5" "\0"
-+           "ISO8859-7" "\0" "ISO-8859-7" "\0"
-+           "ISO8859-9" "\0" "ISO-8859-9" "\0"
-+           "ISO8859-13" "\0" "ISO-8859-13" "\0"
-+           "ISO8859-15" "\0" "ISO-8859-15" "\0"
-+           "KOI8-R" "\0" "KOI8-R" "\0"
-+           "KOI8-U" "\0" "KOI8-U" "\0"
-+           "CP866" "\0" "CP866" "\0"
-+           "CP949" "\0" "CP949" "\0"
-+           "CP1131" "\0" "CP1131" "\0"
-+           "CP1251" "\0" "CP1251" "\0"
-+           "eucCN" "\0" "GB2312" "\0"
-+           "GB2312" "\0" "GB2312" "\0"
-+           "eucJP" "\0" "EUC-JP" "\0"
-+           "eucKR" "\0" "EUC-KR" "\0"
-+           "Big5" "\0" "BIG5" "\0"
-+           "Big5HKSCS" "\0" "BIG5-HKSCS" "\0"
-+           "GBK" "\0" "GBK" "\0"
-+           "GB18030" "\0" "GB18030" "\0"
-+           "SJIS" "\0" "SHIFT_JIS" "\0"
-+           "ARMSCII-8" "\0" "ARMSCII-8" "\0"
-+           "PT154" "\0" "PT154" "\0"
-+         /*"ISCII-DEV" "\0" "?" "\0"*/
-+           "*" "\0" "UTF-8" "\0";
-+# endif
-+
-+# if defined VMS
-+      /* To avoid the troubles of an extra file charset.alias_vms in the
-+         sources of many GNU packages, simply inline the aliases here.  */
-+      /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
-+         "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
-+         section 10.7 "Handling Different Character Sets".  */
-+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
-+           "ISO8859-2" "\0" "ISO-8859-2" "\0"
-+           "ISO8859-5" "\0" "ISO-8859-5" "\0"
-+           "ISO8859-7" "\0" "ISO-8859-7" "\0"
-+           "ISO8859-8" "\0" "ISO-8859-8" "\0"
-+           "ISO8859-9" "\0" "ISO-8859-9" "\0"
-+           /* Japanese */
-+           "eucJP" "\0" "EUC-JP" "\0"
-+           "SJIS" "\0" "SHIFT_JIS" "\0"
-+           "DECKANJI" "\0" "DEC-KANJI" "\0"
-+           "SDECKANJI" "\0" "EUC-JP" "\0"
-+           /* Chinese */
-+           "eucTW" "\0" "EUC-TW" "\0"
-+           "DECHANYU" "\0" "DEC-HANYU" "\0"
-+           "DECHANZI" "\0" "GB2312" "\0"
-+           /* Korean */
-+           "DECKOREAN" "\0" "EUC-KR" "\0";
-+# endif
-+
-+# if defined WIN32_NATIVE || defined __CYGWIN__
-+      /* To avoid the troubles of installing a separate file in the same
-+         directory as the DLL and of retrieving the DLL's directory at
-+         runtime, simply inline the aliases here.  */
-+
-+      cp = "CP936" "\0" "GBK" "\0"
-+           "CP1361" "\0" "JOHAB" "\0"
-+           "CP20127" "\0" "ASCII" "\0"
-+           "CP20866" "\0" "KOI8-R" "\0"
-+           "CP20936" "\0" "GB2312" "\0"
-+           "CP21866" "\0" "KOI8-RU" "\0"
-+           "CP28591" "\0" "ISO-8859-1" "\0"
-+           "CP28592" "\0" "ISO-8859-2" "\0"
-+           "CP28593" "\0" "ISO-8859-3" "\0"
-+           "CP28594" "\0" "ISO-8859-4" "\0"
-+           "CP28595" "\0" "ISO-8859-5" "\0"
-+           "CP28596" "\0" "ISO-8859-6" "\0"
-+           "CP28597" "\0" "ISO-8859-7" "\0"
-+           "CP28598" "\0" "ISO-8859-8" "\0"
-+           "CP28599" "\0" "ISO-8859-9" "\0"
-+           "CP28605" "\0" "ISO-8859-15" "\0"
-+           "CP38598" "\0" "ISO-8859-8" "\0"
-+           "CP51932" "\0" "EUC-JP" "\0"
-+           "CP51936" "\0" "GB2312" "\0"
-+           "CP51949" "\0" "EUC-KR" "\0"
-+           "CP51950" "\0" "EUC-TW" "\0"
-+           "CP54936" "\0" "GB18030" "\0"
-+           "CP65001" "\0" "UTF-8" "\0";
-+# endif
-+#endif
-+
-+      charset_aliases = cp;
-+    }
-+
-+  return cp;
-+}
-+
-+/* Determine the current locale's character encoding, and canonicalize it
-+   into one of the canonical names listed in config.charset.
-+   The result must not be freed; it is statically allocated.
-+   If the canonical name cannot be determined, the result is a non-canonical
-+   name.  */
-+
-+#ifdef STATIC
-+STATIC
-+#endif
-+const char *
-+locale_charset (void)
-+{
-+  const char *codeset;
-+  const char *aliases;
-+
-+#if !(defined WIN32_NATIVE || defined OS2)
-+
-+# if HAVE_LANGINFO_CODESET
-+
-+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
-+  codeset = nl_langinfo (CODESET);
-+
-+#  ifdef __CYGWIN__
-+  /* Cygwin < 1.7 does not have locales.  nl_langinfo (CODESET) always
-+     returns "US-ASCII".  Return the suffix of the locale name from the
-+     environment variables (if present) or the codepage as a number.  */
-+  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
-+    {
-+      const char *locale;
-+      static char buf[2 + 10 + 1];
-+
-+      locale = getenv ("LC_ALL");
-+      if (locale == NULL || locale[0] == '\0')
-+        {
-+          locale = getenv ("LC_CTYPE");
-+          if (locale == NULL || locale[0] == '\0')
-+            locale = getenv ("LANG");
-+        }
-+      if (locale != NULL && locale[0] != '\0')
-+        {
-+          /* If the locale name contains an encoding after the dot, return
-+             it.  */
-+          const char *dot = strchr (locale, '.');
-+
-+          if (dot != NULL)
-+            {
-+              const char *modifier;
-+
-+              dot++;
-+              /* Look for the possible @... trailer and remove it, if any.  */
-+              modifier = strchr (dot, '@');
-+              if (modifier == NULL)
-+                return dot;
-+              if (modifier - dot < sizeof (buf))
-+                {
-+                  memcpy (buf, dot, modifier - dot);
-+                  buf [modifier - dot] = '\0';
-+                  return buf;
-+                }
-+            }
-+        }
-+
-+      /* Woe32 has a function returning the locale's codepage as a number:
-+         GetACP().  This encoding is used by Cygwin, unless the user has set
-+         the environment variable CYGWIN=codepage:oem (which very few people
-+         do).
-+         Output directed to console windows needs to be converted (to
-+         GetOEMCP() if the console is using a raster font, or to
-+         GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
-+         this conversion transparently (see winsup/cygwin/fhandler_console.cc),
-+         converting to GetConsoleOutputCP().  This leads to correct results,
-+         except when SetConsoleOutputCP has been called and a raster font is
-+         in use.  */
-+      sprintf (buf, "CP%u", GetACP ());
-+      codeset = buf;
-+    }
-+#  endif
-+
-+# else
-+
-+  /* On old systems which lack it, use setlocale or getenv.  */
-+  const char *locale = NULL;
-+
-+  /* But most old systems don't have a complete set of locales.  Some
-+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
-+     use setlocale here; it would return "C" when it doesn't support the
-+     locale name the user has set.  */
-+#  if 0
-+  locale = setlocale (LC_CTYPE, NULL);
-+#  endif
-+  if (locale == NULL || locale[0] == '\0')
-+    {
-+      locale = getenv ("LC_ALL");
-+      if (locale == NULL || locale[0] == '\0')
-+        {
-+          locale = getenv ("LC_CTYPE");
-+          if (locale == NULL || locale[0] == '\0')
-+            locale = getenv ("LANG");
-+        }
-+    }
-+
-+  /* On some old systems, one used to set locale = "iso8859_1". On others,
-+     you set it to "language_COUNTRY.charset". In any case, we resolve it
-+     through the charset.alias file.  */
-+  codeset = locale;
-+
-+# endif
-+
-+#elif defined WIN32_NATIVE
-+
-+  static char buf[2 + 10 + 1];
-+
-+  /* Woe32 has a function returning the locale's codepage as a number:
-+     GetACP().
-+     When the output goes to a console window, it needs to be provided in
-+     GetOEMCP() encoding if the console is using a raster font, or in
-+     GetConsoleOutputCP() encoding if it is using a TrueType font.
-+     But in GUI programs and for output sent to files and pipes, GetACP()
-+     encoding is the best bet.  */
-+  sprintf (buf, "CP%u", GetACP ());
-+  codeset = buf;
-+
-+#elif defined OS2
-+
-+  const char *locale;
-+  static char buf[2 + 10 + 1];
-+  ULONG cp[3];
-+  ULONG cplen;
-+
-+  /* Allow user to override the codeset, as set in the operating system,
-+     with standard language environment variables.  */
-+  locale = getenv ("LC_ALL");
-+  if (locale == NULL || locale[0] == '\0')
-+    {
-+      locale = getenv ("LC_CTYPE");
-+      if (locale == NULL || locale[0] == '\0')
-+        locale = getenv ("LANG");
-+    }
-+  if (locale != NULL && locale[0] != '\0')
-+    {
-+      /* If the locale name contains an encoding after the dot, return it.  */
-+      const char *dot = strchr (locale, '.');
-+
-+      if (dot != NULL)
-+        {
-+          const char *modifier;
-+
-+          dot++;
-+          /* Look for the possible @... trailer and remove it, if any.  */
-+          modifier = strchr (dot, '@');
-+          if (modifier == NULL)
-+            return dot;
-+          if (modifier - dot < sizeof (buf))
-+            {
-+              memcpy (buf, dot, modifier - dot);
-+              buf [modifier - dot] = '\0';
-+              return buf;
-+            }
-+        }
-+
-+      /* Resolve through the charset.alias file.  */
-+      codeset = locale;
-+    }
-+  else
-+    {
-+      /* OS/2 has a function returning the locale's codepage as a number.  */
-+      if (DosQueryCp (sizeof (cp), cp, &cplen))
-+        codeset = "";
-+      else
-+        {
-+          sprintf (buf, "CP%u", cp[0]);
-+          codeset = buf;
-+        }
-+    }
-+
-+#endif
-+
-+  if (codeset == NULL)
-+    /* The canonical name cannot be determined.  */
-+    codeset = "";
-+
-+  /* Resolve alias. */
-+  for (aliases = get_charset_aliases ();
-+       *aliases != '\0';
-+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-+    if (strcmp (codeset, aliases) == 0
-+        || (aliases[0] == '*' && aliases[1] == '\0'))
-+      {
-+        codeset = aliases + strlen (aliases) + 1;
-+        break;
-+      }
-+
-+  /* Don't return an empty string.  GNU libc and GNU libiconv interpret
-+     the empty string as denoting "the locale's character encoding",
-+     thus GNU libiconv would call this function a second time.  */
-+  if (codeset[0] == '\0')
-+    codeset = "ASCII";
-+
-+  return codeset;
-+}
-diff --git a/src/libs/gl/gllib/localcharset.h b/src/libs/gl/gllib/localcharset.h
-new file mode 100644
-index 0000000..653ad0f
---- /dev/null
-+++ b/src/libs/gl/gllib/localcharset.h
-@@ -0,0 +1,41 @@
-+/* Determine a canonical name for the current locale's character encoding.
-+   Copyright (C) 2000-2003, 2009-2010 Free Software Foundation, Inc.
-+   This file is part of the GNU CHARSET Library.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License along
-+   with this program; if not, write to the Free Software Foundation,
-+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+
-+#ifndef _LOCALCHARSET_H
-+#define _LOCALCHARSET_H
-+
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+/* Determine the current locale's character encoding, and canonicalize it
-+   into one of the canonical names listed in config.charset.
-+   The result must not be freed; it is statically allocated.
-+   If the canonical name cannot be determined, the result is a non-canonical
-+   name.  */
-+extern const char * locale_charset (void);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+
-+#endif /* _LOCALCHARSET_H */
-diff --git a/src/libs/gl/gllib/ref-add.sin b/src/libs/gl/gllib/ref-add.sin
-new file mode 100644
-index 0000000..f70fadc
---- /dev/null
-+++ b/src/libs/gl/gllib/ref-add.sin
-@@ -0,0 +1,30 @@
-+# Add this package to a list of references stored in a text file.
-+#
-+#   Copyright (C) 2000, 2009, 2010 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, or (at your option)
-+#   any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program; if not, write to the Free Software Foundation,
-+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# Written by Bruno Haible <haible@clisp.cons.org>.
-+#
-+/^# Packages using this file: / {
-+  s/# Packages using this file://
-+  ta
-+  :a
-+  s/ @PACKAGE@ / @PACKAGE@ /
-+  tb
-+  s/ $/ @PACKAGE@ /
-+  :b
-+  s/^/# Packages using this file:/
-+}
-diff --git a/src/libs/gl/gllib/ref-del.sin b/src/libs/gl/gllib/ref-del.sin
-new file mode 100644
-index 0000000..76af5e0
---- /dev/null
-+++ b/src/libs/gl/gllib/ref-del.sin
-@@ -0,0 +1,25 @@
-+# Remove this package from a list of references stored in a text file.
-+#
-+#   Copyright (C) 2000, 2009, 2010 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, or (at your option)
-+#   any later version.
-+#
-+#   This program is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program; if not, write to the Free Software Foundation,
-+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# Written by Bruno Haible <haible@clisp.cons.org>.
-+#
-+/^# Packages using this file: / {
-+  s/# Packages using this file://
-+  s/ @PACKAGE@ / /
-+  s/^/# Packages using this file:/
-+}
-diff --git a/src/libs/gl/gllib/stddef.in.h b/src/libs/gl/gllib/stddef.in.h
-new file mode 100644
-index 0000000..4bfd866
---- /dev/null
-+++ b/src/libs/gl/gllib/stddef.in.h
-@@ -0,0 +1,86 @@
-+/* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
-+
-+   Copyright (C) 2009, 2010 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, or (at your option)
-+   any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software Foundation,
-+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+
-+/* Written by Eric Blake.  */
-+
-+/*
-+ * POSIX 2008 <stddef.h> for platforms that have issues.
-+ * <http://www.opengroup.org/susv3xbd/stddef.h.html>
-+ */
-+
-+#if __GNUC__ >= 3
-+@PRAGMA_SYSTEM_HEADER@
-+#endif
-+
-+#if defined __need_wchar_t || defined __need_size_t  \
-+  || defined __need_ptrdiff_t || defined __need_NULL \
-+  || defined __need_wint_t
-+/* Special invocation convention inside gcc header files.  In
-+   particular, gcc provides a version of <stddef.h> that blindly
-+   redefines NULL even when __need_wint_t was defined, even though
-+   wint_t is not normally provided by <stddef.h>.  Hence, we must
-+   remember if special invocation has ever been used to obtain wint_t,
-+   in which case we need to clean up NULL yet again.  */
-+
-+# if !(defined _GL_STDDEF_H && defined _GL_STDDEF_WINT_T)
-+#  ifdef __need_wint_t
-+#   undef _GL_STDDEF_H
-+#   define _GL_STDDEF_WINT_T
-+#  endif
-+#  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
-+# endif
-+
-+#else
-+/* Normal invocation convention.  */
-+
-+# ifndef _GL_STDDEF_H
-+
-+/* The include_next requires a split double-inclusion guard.  */
-+
-+#  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
-+
-+#  ifndef _GL_STDDEF_H
-+#   define _GL_STDDEF_H
-+
-+/* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
-+#if @REPLACE_NULL@
-+# undef NULL
-+# ifdef __cplusplus
-+   /* ISO C++ says that the macro NULL must expand to an integer constant
-+      expression, hence '((void *) 0)' is not allowed in C++.  */
-+#  if __GNUG__ >= 3
-+    /* GNU C++ has a __null macro that behaves like an integer ('int' or
-+       'long') but has the same size as a pointer.  Use that, to avoid
-+       warnings.  */
-+#   define NULL __null
-+#  else
-+#   define NULL 0L
-+#  endif
-+# else
-+#  define NULL ((void *) 0)
-+# endif
-+#endif
-+
-+/* Some platforms lack wchar_t.  */
-+#if !@HAVE_WCHAR_T@
-+# define wchar_t int
-+#endif
-+
-+#  endif /* _GL_STDDEF_H */
-+# endif /* _GL_STDDEF_H */
-+#endif /* __need_XXX */
-diff --git a/src/libs/gl/gllib/stdint.in.h b/src/libs/gl/gllib/stdint.in.h
-new file mode 100644
-index 0000000..a861c07
---- /dev/null
-+++ b/src/libs/gl/gllib/stdint.in.h
-@@ -0,0 +1,568 @@
-+/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
-+   Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
-+   This file is part of gnulib.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software Foundation,
-+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+
-+/*
-+ * ISO C 99 <stdint.h> for platforms that lack it.
-+ * <http://www.opengroup.org/susv3xbd/stdint.h.html>
-+ */
-+
-+#ifndef _GL_STDINT_H
-+
-+#if __GNUC__ >= 3
-+@PRAGMA_SYSTEM_HEADER@
-+#endif
-+
-+/* When including a system file that in turn includes <inttypes.h>,
-+   use the system <inttypes.h>, not our substitute.  This avoids
-+   problems with (for example) VMS, whose <sys/bitypes.h> includes
-+   <inttypes.h>.  */
-+#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
-+
-+/* Get those types that are already defined in other system include
-+   files, so that we can "#define int8_t signed char" below without
-+   worrying about a later system include file containing a "typedef
-+   signed char int8_t;" that will get messed up by our macro.  Our
-+   macros should all be consistent with the system versions, except
-+   for the "fast" types and macros, which we recommend against using
-+   in public interfaces due to compiler differences.  */
-+
-+#if @HAVE_STDINT_H@
-+# if defined __sgi && ! defined __c99
-+   /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users
-+      with "This header file is to be used only for c99 mode compilations"
-+      diagnostics.  */
-+#  define __STDINT_H__
-+# endif
-+  /* Other systems may have an incomplete or buggy <stdint.h>.
-+     Include it before <inttypes.h>, since any "#include <stdint.h>"
-+     in <inttypes.h> would reinclude us, skipping our contents because
-+     _GL_STDINT_H is defined.
-+     The include_next requires a split double-inclusion guard.  */
-+# @INCLUDE_NEXT@ @NEXT_STDINT_H@
-+#endif
-+
-+#if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
-+#define _GL_STDINT_H
-+
-+/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
-+   IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
-+   AIX 5.2 <sys/types.h> isn't needed and causes troubles.
-+   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
-+   relies on the system <stdint.h> definitions, so include
-+   <sys/types.h> after @NEXT_STDINT_H@.  */
-+#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
-+# include <sys/types.h>
-+#endif
-+
-+/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
-+#include <limits.h>
-+
-+#if @HAVE_INTTYPES_H@
-+  /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
-+     int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
-+     <inttypes.h> also defines intptr_t and uintptr_t.  */
-+# include <inttypes.h>
-+#elif @HAVE_SYS_INTTYPES_H@
-+  /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
-+     the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
-+# include <sys/inttypes.h>
-+#endif
-+
-+#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
-+  /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
-+     int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
-+     included by <sys/types.h>.  */
-+# include <sys/bitypes.h>
-+#endif
-+
-+#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
-+
-+/* Minimum and maximum values for a integer type under the usual assumption.
-+   Return an unspecified value if BITS == 0, adding a check to pacify
-+   picky compilers.  */
-+
-+#define _STDINT_MIN(signed, bits, zero) \
-+  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
-+
-+#define _STDINT_MAX(signed, bits, zero) \
-+  ((signed) \
-+   ? ~ _STDINT_MIN (signed, bits, zero) \
-+   : /* The expression for the unsigned case.  The subtraction of (signed) \
-+        is a nop in the unsigned case and avoids "signed integer overflow" \
-+        warnings in the signed case.  */ \
-+     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
-+
-+/* 7.18.1.1. Exact-width integer types */
-+
-+/* Here we assume a standard architecture where the hardware integer
-+   types have 8, 16, 32, optionally 64 bits.  */
-+
-+#undef int8_t
-+#undef uint8_t
-+typedef signed char gl_int8_t;
-+typedef unsigned char gl_uint8_t;
-+#define int8_t gl_int8_t
-+#define uint8_t gl_uint8_t
-+
-+#undef int16_t
-+#undef uint16_t
-+typedef short int gl_int16_t;
-+typedef unsigned short int gl_uint16_t;
-+#define int16_t gl_int16_t
-+#define uint16_t gl_uint16_t
-+
-+#undef int32_t
-+#undef uint32_t
-+typedef int gl_int32_t;
-+typedef unsigned int gl_uint32_t;
-+#define int32_t gl_int32_t
-+#define uint32_t gl_uint32_t
-+
-+/* Do not undefine int64_t if gnulib is not being used with 64-bit
-+   types, since otherwise it breaks platforms like Tandem/NSK.  */
-+#if LONG_MAX >> 31 >> 31 == 1
-+# undef int64_t
-+typedef long int gl_int64_t;
-+# define int64_t gl_int64_t
-+# define GL_INT64_T
-+#elif defined _MSC_VER
-+# undef int64_t
-+typedef __int64 gl_int64_t;
-+# define int64_t gl_int64_t
-+# define GL_INT64_T
-+#elif @HAVE_LONG_LONG_INT@
-+# undef int64_t
-+typedef long long int gl_int64_t;
-+# define int64_t gl_int64_t
-+# define GL_INT64_T
-+#endif
-+
-+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
-+# undef uint64_t
-+typedef unsigned long int gl_uint64_t;
-+# define uint64_t gl_uint64_t
-+# define GL_UINT64_T
-+#elif defined _MSC_VER
-+# undef uint64_t
-+typedef unsigned __int64 gl_uint64_t;
-+# define uint64_t gl_uint64_t
-+# define GL_UINT64_T
-+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
-+# undef uint64_t
-+typedef unsigned long long int gl_uint64_t;
-+# define uint64_t gl_uint64_t
-+# define GL_UINT64_T
-+#endif
-+
-+/* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
-+#define _UINT8_T
-+#define _UINT32_T
-+#define _UINT64_T
-+
-+
-+/* 7.18.1.2. Minimum-width integer types */
-+
-+/* Here we assume a standard architecture where the hardware integer
-+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
-+   are the same as the corresponding N_t types.  */
-+
-+#undef int_least8_t
-+#undef uint_least8_t
-+#undef int_least16_t
-+#undef uint_least16_t
-+#undef int_least32_t
-+#undef uint_least32_t
-+#undef int_least64_t
-+#undef uint_least64_t
-+#define int_least8_t int8_t
-+#define uint_least8_t uint8_t
-+#define int_least16_t int16_t
-+#define uint_least16_t uint16_t
-+#define int_least32_t int32_t
-+#define uint_least32_t uint32_t
-+#ifdef GL_INT64_T
-+# define int_least64_t int64_t
-+#endif
-+#ifdef GL_UINT64_T
-+# define uint_least64_t uint64_t
-+#endif
-+
-+/* 7.18.1.3. Fastest minimum-width integer types */
-+
-+/* Note: Other <stdint.h> substitutes may define these types differently.
-+   It is not recommended to use these types in public header files. */
-+
-+/* Here we assume a standard architecture where the hardware integer
-+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
-+   are taken from the same list of types.  Assume that 'long int'
-+   is fast enough for all narrower integers.  */
-+
-+#undef int_fast8_t
-+#undef uint_fast8_t
-+#undef int_fast16_t
-+#undef uint_fast16_t
-+#undef int_fast32_t
-+#undef uint_fast32_t
-+#undef int_fast64_t
-+#undef uint_fast64_t
-+typedef long int gl_int_fast8_t;
-+typedef unsigned long int gl_uint_fast8_t;
-+typedef long int gl_int_fast16_t;
-+typedef unsigned long int gl_uint_fast16_t;
-+typedef long int gl_int_fast32_t;
-+typedef unsigned long int gl_uint_fast32_t;
-+#define int_fast8_t gl_int_fast8_t
-+#define uint_fast8_t gl_uint_fast8_t
-+#define int_fast16_t gl_int_fast16_t
-+#define uint_fast16_t gl_uint_fast16_t
-+#define int_fast32_t gl_int_fast32_t
-+#define uint_fast32_t gl_uint_fast32_t
-+#ifdef GL_INT64_T
-+# define int_fast64_t int64_t
-+#endif
-+#ifdef GL_UINT64_T
-+# define uint_fast64_t uint64_t
-+#endif
-+
-+/* 7.18.1.4. Integer types capable of holding object pointers */
-+
-+#undef intptr_t
-+#undef uintptr_t
-+typedef long int gl_intptr_t;
-+typedef unsigned long int gl_uintptr_t;
-+#define intptr_t gl_intptr_t
-+#define uintptr_t gl_uintptr_t
-+
-+/* 7.18.1.5. Greatest-width integer types */
-+
-+/* Note: These types are compiler dependent. It may be unwise to use them in
-+   public header files. */
-+
-+#undef intmax_t
-+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-+typedef long long int gl_intmax_t;
-+# define intmax_t gl_intmax_t
-+#elif defined GL_INT64_T
-+# define intmax_t int64_t
-+#else
-+typedef long int gl_intmax_t;
-+# define intmax_t gl_intmax_t
-+#endif
-+
-+#undef uintmax_t
-+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-+typedef unsigned long long int gl_uintmax_t;
-+# define uintmax_t gl_uintmax_t
-+#elif defined GL_UINT64_T
-+# define uintmax_t uint64_t
-+#else
-+typedef unsigned long int gl_uintmax_t;
-+# define uintmax_t gl_uintmax_t
-+#endif
-+
-+/* Verify that intmax_t and uintmax_t have the same size.  Too much code
-+   breaks if this is not the case.  If this check fails, the reason is likely
-+   to be found in the autoconf macros.  */
-+typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
-+
-+/* 7.18.2. Limits of specified-width integer types */
-+
-+#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
-+
-+/* 7.18.2.1. Limits of exact-width integer types */
-+
-+/* Here we assume a standard architecture where the hardware integer
-+   types have 8, 16, 32, optionally 64 bits.  */
-+
-+#undef INT8_MIN
-+#undef INT8_MAX
-+#undef UINT8_MAX
-+#define INT8_MIN  (~ INT8_MAX)
-+#define INT8_MAX  127
-+#define UINT8_MAX  255
-+
-+#undef INT16_MIN
-+#undef INT16_MAX
-+#undef UINT16_MAX
-+#define INT16_MIN  (~ INT16_MAX)
-+#define INT16_MAX  32767
-+#define UINT16_MAX  65535
-+
-+#undef INT32_MIN
-+#undef INT32_MAX
-+#undef UINT32_MAX
-+#define INT32_MIN  (~ INT32_MAX)
-+#define INT32_MAX  2147483647
-+#define UINT32_MAX  4294967295U
-+
-+#undef INT64_MIN
-+#undef INT64_MAX
-+#ifdef GL_INT64_T
-+/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
-+   evaluates the latter incorrectly in preprocessor expressions.  */
-+# define INT64_MIN  (- INTMAX_C (1) << 63)
-+# define INT64_MAX  INTMAX_C (9223372036854775807)
-+#endif
-+
-+#undef UINT64_MAX
-+#ifdef GL_UINT64_T
-+# define UINT64_MAX  UINTMAX_C (18446744073709551615)
-+#endif
-+
-+/* 7.18.2.2. Limits of minimum-width integer types */
-+
-+/* Here we assume a standard architecture where the hardware integer
-+   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
-+   are the same as the corresponding N_t types.  */
-+
-+#undef INT_LEAST8_MIN
-+#undef INT_LEAST8_MAX
-+#undef UINT_LEAST8_MAX
-+#define INT_LEAST8_MIN  INT8_MIN
-+#define INT_LEAST8_MAX  INT8_MAX
-+#define UINT_LEAST8_MAX  UINT8_MAX
-+
-+#undef INT_LEAST16_MIN
-+#undef INT_LEAST16_MAX
-+#undef UINT_LEAST16_MAX
-+#define INT_LEAST16_MIN  INT16_MIN
-+#define INT_LEAST16_MAX  INT16_MAX
-+#define UINT_LEAST16_MAX  UINT16_MAX
-+
-+#undef INT_LEAST32_MIN
-+#undef INT_LEAST32_MAX
-+#undef UINT_LEAST32_MAX
-+#define INT_LEAST32_MIN  INT32_MIN
-+#define INT_LEAST32_MAX  INT32_MAX
-+#define UINT_LEAST32_MAX  UINT32_MAX
-+
-+#undef INT_LEAST64_MIN
-+#undef INT_LEAST64_MAX
-+#ifdef GL_INT64_T
-+# define INT_LEAST64_MIN  INT64_MIN
-+# define INT_LEAST64_MAX  INT64_MAX
-+#endif
-+
-+#undef UINT_LEAST64_MAX
-+#ifdef GL_UINT64_T
-+# define UINT_LEAST64_MAX  UINT64_MAX
-+#endif
-+
-+/* 7.18.2.3. Limits of fastest minimum-width integer types */
-+
-+/* Here we assume a standard architecture where the hardware integer
-+   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
-+   are taken from the same list of types.  */
-+
-+#undef INT_FAST8_MIN
-+#undef INT_FAST8_MAX
-+#undef UINT_FAST8_MAX
-+#define INT_FAST8_MIN  LONG_MIN
-+#define INT_FAST8_MAX  LONG_MAX
-+#define UINT_FAST8_MAX  ULONG_MAX
-+
-+#undef INT_FAST16_MIN
-+#undef INT_FAST16_MAX
-+#undef UINT_FAST16_MAX
-+#define INT_FAST16_MIN  LONG_MIN
-+#define INT_FAST16_MAX  LONG_MAX
-+#define UINT_FAST16_MAX  ULONG_MAX
-+
-+#undef INT_FAST32_MIN
-+#undef INT_FAST32_MAX
-+#undef UINT_FAST32_MAX
-+#define INT_FAST32_MIN  LONG_MIN
-+#define INT_FAST32_MAX  LONG_MAX
-+#define UINT_FAST32_MAX  ULONG_MAX
-+
-+#undef INT_FAST64_MIN
-+#undef INT_FAST64_MAX
-+#ifdef GL_INT64_T
-+# define INT_FAST64_MIN  INT64_MIN
-+# define INT_FAST64_MAX  INT64_MAX
-+#endif
-+
-+#undef UINT_FAST64_MAX
-+#ifdef GL_UINT64_T
-+# define UINT_FAST64_MAX  UINT64_MAX
-+#endif
-+
-+/* 7.18.2.4. Limits of integer types capable of holding object pointers */
-+
-+#undef INTPTR_MIN
-+#undef INTPTR_MAX
-+#undef UINTPTR_MAX
-+#define INTPTR_MIN  LONG_MIN
-+#define INTPTR_MAX  LONG_MAX
-+#define UINTPTR_MAX  ULONG_MAX
-+
-+/* 7.18.2.5. Limits of greatest-width integer types */
-+
-+#undef INTMAX_MIN
-+#undef INTMAX_MAX
-+#ifdef INT64_MAX
-+# define INTMAX_MIN  INT64_MIN
-+# define INTMAX_MAX  INT64_MAX
-+#else
-+# define INTMAX_MIN  INT32_MIN
-+# define INTMAX_MAX  INT32_MAX
-+#endif
-+
-+#undef UINTMAX_MAX
-+#ifdef UINT64_MAX
-+# define UINTMAX_MAX  UINT64_MAX
-+#else
-+# define UINTMAX_MAX  UINT32_MAX
-+#endif
-+
-+/* 7.18.3. Limits of other integer types */
-+
-+/* ptrdiff_t limits */
-+#undef PTRDIFF_MIN
-+#undef PTRDIFF_MAX
-+#if @APPLE_UNIVERSAL_BUILD@
-+# ifdef _LP64
-+#  define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
-+#  define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
-+# else
-+#  define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
-+#  define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
-+# endif
-+#else
-+# define PTRDIFF_MIN  \
-+    _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
-+# define PTRDIFF_MAX  \
-+    _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
-+#endif
-+
-+/* sig_atomic_t limits */
-+#undef SIG_ATOMIC_MIN
-+#undef SIG_ATOMIC_MAX
-+#define SIG_ATOMIC_MIN  \
-+   _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
-+                0@SIG_ATOMIC_T_SUFFIX@)
-+#define SIG_ATOMIC_MAX  \
-+   _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
-+                0@SIG_ATOMIC_T_SUFFIX@)
-+
-+
-+/* size_t limit */
-+#undef SIZE_MAX
-+#if @APPLE_UNIVERSAL_BUILD@
-+# ifdef _LP64
-+#  define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
-+# else
-+#  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
-+# endif
-+#else
-+# define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
-+#endif
-+
-+/* wchar_t limits */
-+/* Get WCHAR_MIN, WCHAR_MAX.
-+   This include is not on the top, above, because on OSF/1 4.0 we have a sequence of nested
-+   includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
-+   <stdint.h> and assumes its types are already defined.  */
-+#if ! (defined WCHAR_MIN && defined WCHAR_MAX)
-+# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
-+# include <wchar.h>
-+# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
-+#endif
-+#undef WCHAR_MIN
-+#undef WCHAR_MAX
-+#define WCHAR_MIN  \
-+   _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
-+#define WCHAR_MAX  \
-+   _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
-+
-+/* wint_t limits */
-+#undef WINT_MIN
-+#undef WINT_MAX
-+#define WINT_MIN  \
-+   _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
-+#define WINT_MAX  \
-+   _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
-+
-+#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
-+
-+/* 7.18.4. Macros for integer constants */
-+
-+#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
-+
-+/* 7.18.4.1. Macros for minimum-width integer constants */
-+/* According to ISO C 99 Technical Corrigendum 1 */
-+
-+/* Here we assume a standard architecture where the hardware integer
-+   types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
-+
-+#undef INT8_C
-+#undef UINT8_C
-+#define INT8_C(x) x
-+#define UINT8_C(x) x
-+
-+#undef INT16_C
-+#undef UINT16_C
-+#define INT16_C(x) x
-+#define UINT16_C(x) x
-+
-+#undef INT32_C
-+#undef UINT32_C
-+#define INT32_C(x) x
-+#define UINT32_C(x) x ## U
-+
-+#undef INT64_C
-+#undef UINT64_C
-+#if LONG_MAX >> 31 >> 31 == 1
-+# define INT64_C(x) x##L
-+#elif defined _MSC_VER
-+# define INT64_C(x) x##i64
-+#elif @HAVE_LONG_LONG_INT@
-+# define INT64_C(x) x##LL
-+#endif
-+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
-+# define UINT64_C(x) x##UL
-+#elif defined _MSC_VER
-+# define UINT64_C(x) x##ui64
-+#elif @HAVE_UNSIGNED_LONG_LONG_INT@
-+# define UINT64_C(x) x##ULL
-+#endif
-+
-+/* 7.18.4.2. Macros for greatest-width integer constants */
-+
-+#undef INTMAX_C
-+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-+# define INTMAX_C(x)   x##LL
-+#elif defined GL_INT64_T
-+# define INTMAX_C(x)   INT64_C(x)
-+#else
-+# define INTMAX_C(x)   x##L
-+#endif
-+
-+#undef UINTMAX_C
-+#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-+# define UINTMAX_C(x)  x##ULL
-+#elif defined GL_UINT64_T
-+# define UINTMAX_C(x)  UINT64_C(x)
-+#else
-+# define UINTMAX_C(x)  x##UL
-+#endif
-+
-+#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
-+
-+#endif /* _GL_STDINT_H */
-+#endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
-diff --git a/src/libs/gl/gllib/streq.h b/src/libs/gl/gllib/streq.h
-new file mode 100644
-index 0000000..8791598
---- /dev/null
-+++ b/src/libs/gl/gllib/streq.h
-@@ -0,0 +1,176 @@
-+/* Optimized string comparison.
-+   Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc.
-+
-+   This program 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 3 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+/* Written by Bruno Haible <bruno@clisp.org>.  */
-+
-+#ifndef _GL_STREQ_H
-+#define _GL_STREQ_H
-+
-+#include <string.h>
-+
-+/* STREQ allows to optimize string comparison with a small literal string.
-+     STREQ (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-+   is semantically equivalent to
-+     strcmp (s, "EUC-KR") == 0
-+   just faster.  */
-+
-+/* Help GCC to generate good code for string comparisons with
-+   immediate strings. */
-+#if defined (__GNUC__) && defined (__OPTIMIZE__)
-+
-+static inline int
-+streq9 (const char *s1, const char *s2)
-+{
-+  return strcmp (s1 + 9, s2 + 9) == 0;
-+}
-+
-+static inline int
-+streq8 (const char *s1, const char *s2, char s28)
-+{
-+  if (s1[8] == s28)
-+    {
-+      if (s28 == 0)
-+        return 1;
-+      else
-+        return streq9 (s1, s2);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq7 (const char *s1, const char *s2, char s27, char s28)
-+{
-+  if (s1[7] == s27)
-+    {
-+      if (s27 == 0)
-+        return 1;
-+      else
-+        return streq8 (s1, s2, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq6 (const char *s1, const char *s2, char s26, char s27, char s28)
-+{
-+  if (s1[6] == s26)
-+    {
-+      if (s26 == 0)
-+        return 1;
-+      else
-+        return streq7 (s1, s2, s27, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq5 (const char *s1, const char *s2, char s25, char s26, char s27, char s28)
-+{
-+  if (s1[5] == s25)
-+    {
-+      if (s25 == 0)
-+        return 1;
-+      else
-+        return streq6 (s1, s2, s26, s27, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq4 (const char *s1, const char *s2, char s24, char s25, char s26, char s27, char s28)
-+{
-+  if (s1[4] == s24)
-+    {
-+      if (s24 == 0)
-+        return 1;
-+      else
-+        return streq5 (s1, s2, s25, s26, s27, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq3 (const char *s1, const char *s2, char s23, char s24, char s25, char s26, char s27, char s28)
-+{
-+  if (s1[3] == s23)
-+    {
-+      if (s23 == 0)
-+        return 1;
-+      else
-+        return streq4 (s1, s2, s24, s25, s26, s27, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq2 (const char *s1, const char *s2, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
-+{
-+  if (s1[2] == s22)
-+    {
-+      if (s22 == 0)
-+        return 1;
-+      else
-+        return streq3 (s1, s2, s23, s24, s25, s26, s27, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq1 (const char *s1, const char *s2, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
-+{
-+  if (s1[1] == s21)
-+    {
-+      if (s21 == 0)
-+        return 1;
-+      else
-+        return streq2 (s1, s2, s22, s23, s24, s25, s26, s27, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+static inline int
-+streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28)
-+{
-+  if (s1[0] == s20)
-+    {
-+      if (s20 == 0)
-+        return 1;
-+      else
-+        return streq1 (s1, s2, s21, s22, s23, s24, s25, s26, s27, s28);
-+    }
-+  else
-+    return 0;
-+}
-+
-+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
-+  streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28)
-+
-+#else
-+
-+#define STREQ(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \
-+  (strcmp (s1, s2) == 0)
-+
-+#endif
-+
-+#endif /* _GL_STREQ_H */
-diff --git a/src/libs/gl/gllib/unitypes.in.h b/src/libs/gl/gllib/unitypes.in.h
-new file mode 100644
-index 0000000..3e524f8
---- /dev/null
-+++ b/src/libs/gl/gllib/unitypes.in.h
-@@ -0,0 +1,26 @@
-+/* Elementary types for the GNU UniString library.
-+   Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc.
-+
-+   This program 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 3 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef _UNITYPES_H
-+#define _UNITYPES_H
-+
-+/* Get uint8_t, uint16_t, uint32_t.  */
-+#include <stdint.h>
-+
-+/* Type representing a Unicode character.  */
-+typedef uint32_t ucs4_t;
-+
-+#endif /* _UNITYPES_H */
-diff --git a/src/libs/gl/gllib/uniwidth.in.h b/src/libs/gl/gllib/uniwidth.in.h
-new file mode 100644
-index 0000000..d48a775
---- /dev/null
-+++ b/src/libs/gl/gllib/uniwidth.in.h
-@@ -0,0 +1,65 @@
-+/* Display width functions.
-+   Copyright (C) 2001-2002, 2005, 2007, 2009-2010 Free Software Foundation,
-+   Inc.
-+
-+   This program 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 3 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef _UNIWIDTH_H
-+#define _UNIWIDTH_H
-+
-+#include "unitypes.h"
-+
-+/* Get size_t.  */
-+#include <stddef.h>
-+
-+/* Get locale_charset() declaration.  */
-+#include "localcharset.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+/* Display width.  */
-+
-+/* These functions are locale dependent.  The encoding argument identifies
-+   the encoding (e.g. "ISO-8859-2" for Polish).  */
-+
-+/* Determine number of column positions required for UC.  */
-+extern int
-+       uc_width (ucs4_t uc, const char *encoding);
-+
-+/* Determine number of column positions required for first N units
-+   (or fewer if S ends before this) in S.  */
-+extern int
-+       u8_width (const uint8_t *s, size_t n, const char *encoding);
-+extern int
-+       u16_width (const uint16_t *s, size_t n, const char *encoding);
-+extern int
-+       u32_width (const uint32_t *s, size_t n, const char *encoding);
-+
-+/* Determine number of column positions required for S.  */
-+extern int
-+       u8_strwidth (const uint8_t *s, const char *encoding);
-+extern int
-+       u16_strwidth (const uint16_t *s, const char *encoding);
-+extern int
-+       u32_strwidth (const uint32_t *s, const char *encoding);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _UNIWIDTH_H */
-diff --git a/src/libs/gl/gllib/uniwidth/cjk.h b/src/libs/gl/gllib/uniwidth/cjk.h
-new file mode 100644
-index 0000000..5d8ef12
---- /dev/null
-+++ b/src/libs/gl/gllib/uniwidth/cjk.h
-@@ -0,0 +1,37 @@
-+/* Test for CJK encoding.
-+   Copyright (C) 2001-2002, 2005-2007, 2009-2010 Free Software Foundation, Inc.
-+   Written by Bruno Haible <bruno@clisp.org>, 2002.
-+
-+   This program 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 3 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#include "streq.h"
-+
-+static int
-+is_cjk_encoding (const char *encoding)
-+{
-+  if (0
-+      /* Legacy Japanese encodings */
-+      || STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
-+      /* Legacy Chinese encodings */
-+      || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-+      || STREQ (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
-+      || STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
-+      || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
-+      /* Legacy Korean encodings */
-+      || STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-+      || STREQ (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
-+      || STREQ (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
-+    return 1;
-+  return 0;
-+}
-diff --git a/src/libs/gl/gllib/uniwidth/width.c b/src/libs/gl/gllib/uniwidth/width.c
-new file mode 100644
-index 0000000..c88fdb6
---- /dev/null
-+++ b/src/libs/gl/gllib/uniwidth/width.c
-@@ -0,0 +1,359 @@
-+/* Determine display width of Unicode character.
-+   Copyright (C) 2001-2002, 2006-2010 Free Software Foundation, Inc.
-+   Written by Bruno Haible <bruno@clisp.org>, 2002.
-+
-+   This program 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 3 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#include <config.h>
-+
-+/* Specification.  */
-+#include "uniwidth.h"
-+
-+#include "cjk.h"
-+
-+/*
-+ * Non-spacing attribute table.
-+ * Consists of:
-+ * - Non-spacing characters; generated from PropList.txt or
-+ *   "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt"
-+ * - Format control characters; generated from
-+ *   "grep '^[^;]*;[^;]*;Cf;' UnicodeData.txt"
-+ * - Zero width characters; generated from
-+ *   "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
-+ */
-+static const unsigned char nonspacing_table_data[26*64] = {
-+  /* 0x0000-0x01ff */
-+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
-+  0xff, 0xff, 0xff, 0xff, 0x00, 0x20, 0x00, 0x00, /* 0x0080-0x00bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00c0-0x00ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x013f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0140-0x017f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0180-0x01bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01c0-0x01ff */
-+  /* 0x0200-0x03ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0200-0x023f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0240-0x027f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0280-0x02bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02c0-0x02ff */
-+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x0300-0x033f */
-+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /* 0x0340-0x037f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0380-0x03bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x03c0-0x03ff */
-+  /* 0x0400-0x05ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0400-0x043f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0440-0x047f */
-+  0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0480-0x04bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04c0-0x04ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0500-0x053f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0540-0x057f */
-+  0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */
-+  0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */
-+  /* 0x0600-0x07ff */
-+  0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */
-+  0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */
-+  0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
-+  0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */
-+  0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */
-+  0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */
-+  /* 0x0800-0x09ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0800-0x083f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */
-+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0900-0x093f */
-+  0xfe, 0x21, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
-+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
-+  0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */
-+  /* 0x0a00-0x0bff */
-+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a00-0x0a3f */
-+  0x86, 0x39, 0x02, 0x00, 0x00, 0x00, 0x23, 0x00, /* 0x0a40-0x0a7f */
-+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a80-0x0abf */
-+  0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0ac0-0x0aff */
-+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0x0b00-0x0b3f */
-+  0x1e, 0x20, 0x40, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */
-+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */
-+  0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0bc0-0x0bff */
-+  /* 0x0c00-0x0dff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x0c00-0x0c3f */
-+  0xc1, 0x3d, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */
-+  0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */
-+  0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */
-+  0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */
-+  /* 0x0e00-0x0fff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x07, /* 0x0e00-0x0e3f */
-+  0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0e40-0x0e7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x1b, /* 0x0e80-0x0ebf */
-+  0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */
-+  0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */
-+  0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
-+  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */
-+  /* 0x1000-0x11ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */
-+  0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */
-+  0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1180-0x11bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c0-0x11ff */
-+  /* 0x1200-0x13ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1200-0x123f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1240-0x127f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */
-+  0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */
-+  /* 0x1600-0x17ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1600-0x163f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1640-0x167f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1680-0x16bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16c0-0x16ff */
-+  0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 0x00, /* 0x1700-0x173f */
-+  0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, /* 0x1740-0x177f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x3f, /* 0x1780-0x17bf */
-+  0x40, 0xfe, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x17c0-0x17ff */
-+  /* 0x1800-0x19ff */
-+  0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */
-+  0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x04, 0x0e, /* 0x1900-0x193f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1980-0x19bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */
-+  /* 0x1a00-0x1bff */
-+  0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a40-0x1a7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */
-+  0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */
-+  0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */
-+  0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */
-+  /* 0x1c00-0x1dff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
-+  0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */
-+  /* 0x2000-0x21ff */
-+  0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
-+  0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2080-0x20bf */
-+  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, /* 0x20c0-0x20ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2100-0x213f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2140-0x217f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2180-0x21bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x21c0-0x21ff */
-+  /* 0x2c00-0x2dff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2cc0-0x2cff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d40-0x2d7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */
-+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */
-+  /* 0x3000-0x31ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, /* 0x3000-0x303f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3040-0x307f */
-+  0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, /* 0x3080-0x30bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30c0-0x30ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3100-0x313f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3140-0x317f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3180-0x31bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x31c0-0x31ff */
-+  /* 0xa600-0xa7ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa6c0-0xa6ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa7c0-0xa7ff */
-+  /* 0xa800-0xa9ff */
-+  0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
-+  0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */
-+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */
-+  0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */
-+  /* 0xaa00-0xabff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */
-+  0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa80-0xaabf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xabc0-0xabff */
-+  /* 0xfa00-0xfbff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa80-0xfabf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfac0-0xfaff */
-+  0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0xfb00-0xfb3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb40-0xfb7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb80-0xfbbf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfbc0-0xfbff */
-+  /* 0xfe00-0xffff */
-+  0xff, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, /* 0xfe00-0xfe3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe40-0xfe7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe80-0xfebf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0xfec0-0xfeff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff00-0xff3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff40-0xff7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff80-0xffbf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, /* 0xffc0-0xffff */
-+  /* 0x10000-0x101ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10000-0x1003f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10040-0x1007f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10080-0x100bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x100c0-0x100ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10100-0x1013f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10140-0x1017f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10180-0x101bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, /* 0x101c0-0x101ff */
-+  /* 0x10a00-0x10bff */
-+  0x6e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, /* 0x10a00-0x10a3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a40-0x10a7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a80-0x10abf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10ac0-0x10aff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b00-0x10b3f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */
-+  /* 0x1d000-0x1d1ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */
-+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xf8, /* 0x1d140-0x1d17f */
-+  0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */
-+  /* 0x1d200-0x1d3ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d200-0x1d23f */
-+  0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d240-0x1d27f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d280-0x1d2bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d2c0-0x1d2ff */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d300-0x1d33f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d340-0x1d37f */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d380-0x1d3bf */
-+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* 0x1d3c0-0x1d3ff */
-+};
-+static const signed char nonspacing_table_ind[240] = {
-+   0,  1,  2,  3,  4,  5,  6,  7, /* 0x0000-0x0fff */
-+   8,  9, -1, 10, 11, 12, 13, -1, /* 0x1000-0x1fff */
-+  14, -1, -1, -1, -1, -1, 15, -1, /* 0x2000-0x2fff */
-+  16, -1, -1, -1, -1, -1, -1, -1, /* 0x3000-0x3fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x4000-0x4fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x5000-0x5fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x6000-0x6fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x7000-0x7fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x8000-0x8fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x9000-0x9fff */
-+  -1, -1, -1, 17, 18, 19, -1, -1, /* 0xa000-0xafff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb000-0xbfff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc000-0xcfff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd000-0xdfff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
-+  -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */
-+  22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x16000-0x16fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */
-+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */
-+  24, 25, -1, -1, -1, -1, -1, -1  /* 0x1d000-0x1dfff */
-+};
-+
-+/* Determine number of column positions required for UC.  */
-+int
-+uc_width (ucs4_t uc, const char *encoding)
-+{
-+  /* Test for non-spacing or control character.  */
-+  if ((uc >> 9) < 240)
-+    {
-+      int ind = nonspacing_table_ind[uc >> 9];
-+      if (ind >= 0)
-+        if ((nonspacing_table_data[64*ind + ((uc >> 3) & 63)] >> (uc & 7)) & 1)
-+          {
-+            if (uc > 0 && uc < 0xa0)
-+              return -1;
-+            else
-+              return 0;
-+          }
-+    }
-+  else if ((uc >> 9) == (0xe0000 >> 9))
-+    {
-+      if (uc >= 0xe0100)
-+        {
-+          if (uc <= 0xe01ef)
-+            return 0;
-+        }
-+      else
-+        {
-+          if (uc >= 0xe0020 ? uc <= 0xe007f : uc == 0xe0001)
-+            return 0;
-+        }
-+    }
-+  /* Test for double-width character.
-+   * Generated from "grep '^....;[WF]' EastAsianWidth.txt"
-+   * and            "grep '^....;[^WF]' EastAsianWidth.txt"
-+   */
-+  if (uc >= 0x1100
-+      && ((uc < 0x1160) /* Hangul Jamo */
-+          || (uc >= 0x2329 && uc < 0x232b) /* Angle Brackets */
-+          || (uc >= 0x2e80 && uc < 0xa4d0  /* CJK ... Yi */
-+              && !(uc == 0x303f) && !(uc >= 0x4dc0 && uc < 0x4e00))
-+          || (uc >= 0xac00 && uc < 0xd7a4) /* Hangul Syllables */
-+          || (uc >= 0xf900 && uc < 0xfb00) /* CJK Compatibility Ideographs */
-+          || (uc >= 0xfe10 && uc < 0xfe20) /* Presentation Forms for Vertical */
-+          || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */
-+          || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */
-+          || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */
-+          || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */
-+          || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */
-+     )   )
-+    return 2;
-+  /* In ancient CJK encodings, Cyrillic and most other characters are
-+     double-width as well.  */
-+  if (uc >= 0x00A1 && uc < 0xFF61 && uc != 0x20A9
-+      && is_cjk_encoding (encoding))
-+    return 2;
-+  return 1;
-+}
-diff --git a/src/libs/gl/gllib/wchar.in.h b/src/libs/gl/gllib/wchar.in.h
-new file mode 100644
-index 0000000..342a9d2
---- /dev/null
-+++ b/src/libs/gl/gllib/wchar.in.h
-@@ -0,0 +1,428 @@
-+/* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
-+
-+   Copyright (C) 2007-2010 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, or (at your option)
-+   any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software Foundation,
-+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+
-+/* Written by Eric Blake.  */
-+
-+/*
-+ * ISO C 99 <wchar.h> for platforms that have issues.
-+ * <http://www.opengroup.org/susv3xbd/wchar.h.html>
-+ *
-+ * For now, this just ensures proper prerequisite inclusion order and
-+ * the declaration of wcwidth().
-+ */
-+
-+#if __GNUC__ >= 3
-+@PRAGMA_SYSTEM_HEADER@
-+#endif
-+
-+#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
-+/* Special invocation convention:
-+   - Inside glibc and uClibc header files.
-+   - On HP-UX 11.00 we have a sequence of nested includes
-+     <wchar.h> -> <stdlib.h> -> <stdint.h>, and the latter includes <wchar.h>,
-+     once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h>
-+     and once directly.  In both situations 'wint_t' is not yet defined,
-+     therefore we cannot provide the function overrides; instead include only
-+     the system's <wchar.h>.
-+   - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and
-+     the latter includes <wchar.h>.  But here, we have no way to detect whether
-+     <wctype.h> is completely included or is still being included.  */
-+
-+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
-+
-+#else
-+/* Normal invocation convention.  */
-+
-+#ifndef _GL_WCHAR_H
-+
-+#define _GL_ALREADY_INCLUDING_WCHAR_H
-+
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+   included before <wchar.h>.
-+   But avoid namespace pollution on glibc systems.  */
-+#ifndef __GLIBC__
-+# include <stddef.h>
-+# include <stdio.h>
-+# include <time.h>
-+#endif
-+
-+/* Include the original <wchar.h> if it exists.
-+   Some builds of uClibc lack it.  */
-+/* The include_next requires a split double-inclusion guard.  */
-+#if @HAVE_WCHAR_H@
-+# @INCLUDE_NEXT@ @NEXT_WCHAR_H@
-+#endif
-+
-+#undef _GL_ALREADY_INCLUDING_WCHAR_H
-+
-+#ifndef _GL_WCHAR_H
-+#define _GL_WCHAR_H
-+
-+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-+
-+/* The definition of _GL_ARG_NONNULL is copied here.  */
-+
-+/* The definition of _GL_WARN_ON_USE is copied here.  */
-+
-+
-+/* Define wint_t and WEOF.  (Also done in wctype.in.h.)  */
-+#if !@HAVE_WINT_T@ && !defined wint_t
-+# define wint_t int
-+# ifndef WEOF
-+#  define WEOF -1
-+# endif
-+#else
-+# ifndef WEOF
-+#  define WEOF ((wint_t) -1)
-+# endif
-+#endif
-+
-+
-+/* Override mbstate_t if it is too small.
-+   On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
-+   implementing mbrtowc for encodings like UTF-8.  */
-+#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
-+typedef int rpl_mbstate_t;
-+# undef mbstate_t
-+# define mbstate_t rpl_mbstate_t
-+# define GNULIB_defined_mbstate_t 1
-+#endif
-+
-+
-+/* Convert a single-byte character to a wide character.  */
-+#if @GNULIB_BTOWC@
-+# if @REPLACE_BTOWC@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef btowc
-+#   define btowc rpl_btowc
-+#  endif
-+_GL_FUNCDECL_RPL (btowc, wint_t, (int c));
-+_GL_CXXALIAS_RPL (btowc, wint_t, (int c));
-+# else
-+#  if !@HAVE_BTOWC@
-+_GL_FUNCDECL_SYS (btowc, wint_t, (int c));
-+#  endif
-+_GL_CXXALIAS_SYS (btowc, wint_t, (int c));
-+# endif
-+_GL_CXXALIASWARN (btowc);
-+#elif defined GNULIB_POSIXCHECK
-+# undef btowc
-+# if HAVE_RAW_DECL_BTOWC
-+_GL_WARN_ON_USE (btowc, "btowc is unportable - "
-+                 "use gnulib module btowc for portability");
-+# endif
-+#endif
-+
-+
-+/* Convert a wide character to a single-byte character.  */
-+#if @GNULIB_WCTOB@
-+# if @REPLACE_WCTOB@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef wctob
-+#   define wctob rpl_wctob
-+#  endif
-+_GL_FUNCDECL_RPL (wctob, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
-+# else
-+#  if !defined wctob && !@HAVE_DECL_WCTOB@
-+/* wctob is provided by gnulib, or wctob exists but is not declared.  */
-+_GL_FUNCDECL_SYS (wctob, int, (wint_t wc));
-+#  endif
-+_GL_CXXALIAS_SYS (wctob, int, (wint_t wc));
-+# endif
-+_GL_CXXALIASWARN (wctob);
-+#elif defined GNULIB_POSIXCHECK
-+# undef wctob
-+# if HAVE_RAW_DECL_WCTOB
-+_GL_WARN_ON_USE (wctob, "wctob is unportable - "
-+                 "use gnulib module wctob for portability");
-+# endif
-+#endif
-+
-+
-+/* Test whether *PS is in the initial state.  */
-+#if @GNULIB_MBSINIT@
-+# if @REPLACE_MBSINIT@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef mbsinit
-+#   define mbsinit rpl_mbsinit
-+#  endif
-+_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps));
-+_GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps));
-+# else
-+#  if !@HAVE_MBSINIT@
-+_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps));
-+#  endif
-+_GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (mbsinit);
-+#elif defined GNULIB_POSIXCHECK
-+# undef mbsinit
-+# if HAVE_RAW_DECL_MBSINIT
-+_GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - "
-+                 "use gnulib module mbsinit for portability");
-+# endif
-+#endif
-+
-+
-+/* Convert a multibyte character to a wide character.  */
-+#if @GNULIB_MBRTOWC@
-+# if @REPLACE_MBRTOWC@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef mbrtowc
-+#   define mbrtowc rpl_mbrtowc
-+#  endif
-+_GL_FUNCDECL_RPL (mbrtowc, size_t,
-+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
-+_GL_CXXALIAS_RPL (mbrtowc, size_t,
-+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
-+# else
-+#  if !@HAVE_MBRTOWC@
-+_GL_FUNCDECL_SYS (mbrtowc, size_t,
-+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
-+#  endif
-+_GL_CXXALIAS_SYS (mbrtowc, size_t,
-+                  (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (mbrtowc);
-+#elif defined GNULIB_POSIXCHECK
-+# undef mbrtowc
-+# if HAVE_RAW_DECL_MBRTOWC
-+_GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - "
-+                 "use gnulib module mbrtowc for portability");
-+# endif
-+#endif
-+
-+
-+/* Recognize a multibyte character.  */
-+#if @GNULIB_MBRLEN@
-+# if @REPLACE_MBRLEN@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef mbrlen
-+#   define mbrlen rpl_mbrlen
-+#  endif
-+_GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
-+_GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
-+# else
-+#  if !@HAVE_MBRLEN@
-+_GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
-+#  endif
-+_GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (mbrlen);
-+#elif defined GNULIB_POSIXCHECK
-+# undef mbrlen
-+# if HAVE_RAW_DECL_MBRLEN
-+_GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - "
-+                 "use gnulib module mbrlen for portability");
-+# endif
-+#endif
-+
-+
-+/* Convert a string to a wide string.  */
-+#if @GNULIB_MBSRTOWCS@
-+# if @REPLACE_MBSRTOWCS@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef mbsrtowcs
-+#   define mbsrtowcs rpl_mbsrtowcs
-+#  endif
-+_GL_FUNCDECL_RPL (mbsrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+_GL_CXXALIAS_RPL (mbsrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t len,
-+                   mbstate_t *ps));
-+# else
-+#  if !@HAVE_MBSRTOWCS@
-+_GL_FUNCDECL_SYS (mbsrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+#  endif
-+_GL_CXXALIAS_SYS (mbsrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t len,
-+                   mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (mbsrtowcs);
-+#elif defined GNULIB_POSIXCHECK
-+# undef mbsrtowcs
-+# if HAVE_RAW_DECL_MBSRTOWCS
-+_GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - "
-+                 "use gnulib module mbsrtowcs for portability");
-+# endif
-+#endif
-+
-+
-+/* Convert a string to a wide string.  */
-+#if @GNULIB_MBSNRTOWCS@
-+# if @REPLACE_MBSNRTOWCS@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef mbsnrtowcs
-+#   define mbsnrtowcs rpl_mbsnrtowcs
-+#  endif
-+_GL_FUNCDECL_RPL (mbsnrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+_GL_CXXALIAS_RPL (mbsnrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps));
-+# else
-+#  if !@HAVE_MBSNRTOWCS@
-+_GL_FUNCDECL_SYS (mbsnrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+#  endif
-+_GL_CXXALIAS_SYS (mbsnrtowcs, size_t,
-+                  (wchar_t *dest, const char **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (mbsnrtowcs);
-+#elif defined GNULIB_POSIXCHECK
-+# undef mbsnrtowcs
-+# if HAVE_RAW_DECL_MBSNRTOWCS
-+_GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - "
-+                 "use gnulib module mbsnrtowcs for portability");
-+# endif
-+#endif
-+
-+
-+/* Convert a wide character to a multibyte character.  */
-+#if @GNULIB_WCRTOMB@
-+# if @REPLACE_WCRTOMB@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef wcrtomb
-+#   define wcrtomb rpl_wcrtomb
-+#  endif
-+_GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
-+_GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
-+# else
-+#  if !@HAVE_WCRTOMB@
-+_GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
-+#  endif
-+_GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (wcrtomb);
-+#elif defined GNULIB_POSIXCHECK
-+# undef wcrtomb
-+# if HAVE_RAW_DECL_WCRTOMB
-+_GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - "
-+                 "use gnulib module wcrtomb for portability");
-+# endif
-+#endif
-+
-+
-+/* Convert a wide string to a string.  */
-+#if @GNULIB_WCSRTOMBS@
-+# if @REPLACE_WCSRTOMBS@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef wcsrtombs
-+#   define wcsrtombs rpl_wcsrtombs
-+#  endif
-+_GL_FUNCDECL_RPL (wcsrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+_GL_CXXALIAS_RPL (wcsrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t len,
-+                   mbstate_t *ps));
-+# else
-+#  if !@HAVE_WCSRTOMBS@
-+_GL_FUNCDECL_SYS (wcsrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+#  endif
-+_GL_CXXALIAS_SYS (wcsrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t len,
-+                   mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (wcsrtombs);
-+#elif defined GNULIB_POSIXCHECK
-+# undef wcsrtombs
-+# if HAVE_RAW_DECL_WCSRTOMBS
-+_GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - "
-+                 "use gnulib module wcsrtombs for portability");
-+# endif
-+#endif
-+
-+
-+/* Convert a wide string to a string.  */
-+#if @GNULIB_WCSNRTOMBS@
-+# if @REPLACE_WCSNRTOMBS@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef wcsnrtombs
-+#   define wcsnrtombs rpl_wcsnrtombs
-+#  endif
-+_GL_FUNCDECL_RPL (wcsnrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+_GL_CXXALIAS_RPL (wcsnrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps));
-+# else
-+#  if !@HAVE_WCSNRTOMBS@
-+_GL_FUNCDECL_SYS (wcsnrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps)
-+                  _GL_ARG_NONNULL ((2)));
-+#  endif
-+_GL_CXXALIAS_SYS (wcsnrtombs, size_t,
-+                  (char *dest, const wchar_t **srcp, size_t srclen, size_t len,
-+                   mbstate_t *ps));
-+# endif
-+_GL_CXXALIASWARN (wcsnrtombs);
-+#elif defined GNULIB_POSIXCHECK
-+# undef wcsnrtombs
-+# if HAVE_RAW_DECL_WCSNRTOMBS
-+_GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - "
-+                 "use gnulib module wcsnrtombs for portability");
-+# endif
-+#endif
-+
-+
-+/* Return the number of screen columns needed for WC.  */
-+#if @GNULIB_WCWIDTH@
-+# if @REPLACE_WCWIDTH@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   undef wcwidth
-+#   define wcwidth rpl_wcwidth
-+#  endif
-+_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t));
-+_GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
-+# else
-+#  if !@HAVE_DECL_WCWIDTH@
-+/* wcwidth exists but is not declared.  */
-+_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t));
-+#  endif
-+_GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
-+# endif
-+_GL_CXXALIASWARN (wcwidth);
-+#elif defined GNULIB_POSIXCHECK
-+# undef wcwidth
-+# if HAVE_RAW_DECL_WCWIDTH
-+_GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - "
-+                 "use gnulib module wcwidth for portability");
-+# endif
-+#endif
-+
-+
-+#endif /* _GL_WCHAR_H */
-+#endif /* _GL_WCHAR_H */
-+#endif
-diff --git a/src/libs/gl/gllib/wctype.in.h b/src/libs/gl/gllib/wctype.in.h
-new file mode 100644
-index 0000000..6782478
---- /dev/null
-+++ b/src/libs/gl/gllib/wctype.in.h
-@@ -0,0 +1,377 @@
-+/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
-+
-+   Copyright (C) 2006-2010 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, or (at your option)
-+   any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software Foundation,
-+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+
-+/* Written by Bruno Haible and Paul Eggert.  */
-+
-+/*
-+ * ISO C 99 <wctype.h> for platforms that lack it.
-+ * <http://www.opengroup.org/susv3xbd/wctype.h.html>
-+ *
-+ * iswctype, towctrans, towlower, towupper, wctrans, wctype,
-+ * wctrans_t, and wctype_t are not yet implemented.
-+ */
-+
-+#ifndef _GL_WCTYPE_H
-+
-+#if __GNUC__ >= 3
-+@PRAGMA_SYSTEM_HEADER@
-+#endif
-+
-+#if @HAVE_WINT_T@
-+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
-+   Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+   included before <wchar.h>.  */
-+# include <stddef.h>
-+# include <stdio.h>
-+# include <time.h>
-+# include <wchar.h>
-+#endif
-+
-+/* Include the original <wctype.h> if it exists.
-+   BeOS 5 has the functions but no <wctype.h>.  */
-+/* The include_next requires a split double-inclusion guard.  */
-+#if @HAVE_WCTYPE_H@
-+# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
-+#endif
-+
-+#ifndef _GL_WCTYPE_H
-+#define _GL_WCTYPE_H
-+
-+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
-+
-+/* The definition of _GL_WARN_ON_USE is copied here.  */
-+
-+/* Define wint_t and WEOF.  (Also done in wchar.in.h.)  */
-+#if !@HAVE_WINT_T@ && !defined wint_t
-+# define wint_t int
-+# ifndef WEOF
-+#  define WEOF -1
-+# endif
-+#else
-+# ifndef WEOF
-+#  define WEOF ((wint_t) -1)
-+# endif
-+#endif
-+
-+
-+/* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
-+   Linux libc5 has <wctype.h> and the functions but they are broken.
-+   Assume all 11 functions (all isw* except iswblank) are implemented the
-+   same way, or not at all.  */
-+#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
-+
-+/* IRIX 5.3 has macros but no functions, its isw* macros refer to an
-+   undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
-+   refer to system functions like _iswctype that are not in the
-+   standard C library.  Rather than try to get ancient buggy
-+   implementations like this to work, just disable them.  */
-+# undef iswalnum
-+# undef iswalpha
-+# undef iswblank
-+# undef iswcntrl
-+# undef iswdigit
-+# undef iswgraph
-+# undef iswlower
-+# undef iswprint
-+# undef iswpunct
-+# undef iswspace
-+# undef iswupper
-+# undef iswxdigit
-+# undef towlower
-+# undef towupper
-+
-+/* Linux libc5 has <wctype.h> and the functions but they are broken.  */
-+# if @REPLACE_ISWCNTRL@
-+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#   define iswalnum rpl_iswalnum
-+#   define iswalpha rpl_iswalpha
-+#   define iswblank rpl_iswblank
-+#   define iswcntrl rpl_iswcntrl
-+#   define iswdigit rpl_iswdigit
-+#   define iswgraph rpl_iswgraph
-+#   define iswlower rpl_iswlower
-+#   define iswprint rpl_iswprint
-+#   define iswpunct rpl_iswpunct
-+#   define iswspace rpl_iswspace
-+#   define iswupper rpl_iswupper
-+#   define iswxdigit rpl_iswxdigit
-+#   define towlower rpl_towlower
-+#   define towupper rpl_towupper
-+#  endif
-+# endif
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswalnum
-+# else
-+iswalnum
-+# endif
-+         (wint_t wc)
-+{
-+  return ((wc >= '0' && wc <= '9')
-+          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswalpha
-+# else
-+iswalpha
-+# endif
-+         (wint_t wc)
-+{
-+  return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswblank
-+# else
-+iswblank
-+# endif
-+         (wint_t wc)
-+{
-+  return wc == ' ' || wc == '\t';
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswcntrl
-+# else
-+iswcntrl
-+# endif
-+        (wint_t wc)
-+{
-+  return (wc & ~0x1f) == 0 || wc == 0x7f;
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswdigit
-+# else
-+iswdigit
-+# endif
-+         (wint_t wc)
-+{
-+  return wc >= '0' && wc <= '9';
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswgraph
-+# else
-+iswgraph
-+# endif
-+         (wint_t wc)
-+{
-+  return wc >= '!' && wc <= '~';
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswlower
-+# else
-+iswlower
-+# endif
-+         (wint_t wc)
-+{
-+  return wc >= 'a' && wc <= 'z';
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswprint
-+# else
-+iswprint
-+# endif
-+         (wint_t wc)
-+{
-+  return wc >= ' ' && wc <= '~';
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswpunct
-+# else
-+iswpunct
-+# endif
-+         (wint_t wc)
-+{
-+  return (wc >= '!' && wc <= '~'
-+          && !((wc >= '0' && wc <= '9')
-+               || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswspace
-+# else
-+iswspace
-+# endif
-+         (wint_t wc)
-+{
-+  return (wc == ' ' || wc == '\t'
-+          || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswupper
-+# else
-+iswupper
-+# endif
-+         (wint_t wc)
-+{
-+  return wc >= 'A' && wc <= 'Z';
-+}
-+
-+static inline int
-+# if @REPLACE_ISWCNTRL@
-+rpl_iswxdigit
-+# else
-+iswxdigit
-+# endif
-+          (wint_t wc)
-+{
-+  return ((wc >= '0' && wc <= '9')
-+          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
-+}
-+
-+static inline wint_t
-+# if @REPLACE_ISWCNTRL@
-+rpl_towlower
-+# else
-+towlower
-+# endif
-+         (wint_t wc)
-+{
-+  return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
-+}
-+
-+static inline wint_t
-+# if @REPLACE_ISWCNTRL@
-+rpl_towupper
-+# else
-+towupper
-+# endif
-+         (wint_t wc)
-+{
-+  return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc);
-+}
-+
-+#elif ! @HAVE_ISWBLANK@
-+/* Only the iswblank function is missing.  */
-+
-+static inline int
-+iswblank (wint_t wc)
-+{
-+  return wc == ' ' || wc == '\t';
-+}
-+
-+#endif
-+
-+#if defined __MINGW32__
-+
-+/* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t.
-+   The functions towlower and towupper are implemented in the MSVCRT library
-+   to take a wchar_t argument and return a wchar_t result.  mingw declares
-+   these functions to take a wint_t argument and return a wint_t result.
-+   This means that:
-+   1. When the user passes an argument outside the range 0x0000..0xFFFF, the
-+      function will look only at the lower 16 bits.  This is allowed according
-+      to POSIX.
-+   2. The return value is returned in the lower 16 bits of the result register.
-+      The upper 16 bits are random: whatever happened to be in that part of the
-+      result register.  We need to fix this by adding a zero-extend from
-+      wchar_t to wint_t after the call.  */
-+
-+static inline wint_t
-+rpl_towlower (wint_t wc)
-+{
-+  return (wint_t) (wchar_t) towlower (wc);
-+}
-+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#  define towlower rpl_towlower
-+# endif
-+
-+static inline wint_t
-+rpl_towupper (wint_t wc)
-+{
-+  return (wint_t) (wchar_t) towupper (wc);
-+}
-+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-+#  define towupper rpl_towupper
-+# endif
-+
-+#endif /* __MINGW32__ */
-+
-+#if @REPLACE_ISWCNTRL@
-+_GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswlower, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswprint, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswspace, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswupper, int, (wint_t wc));
-+_GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc));
-+#else
-+_GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswlower, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswprint, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswpunct, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswspace, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswupper, int, (wint_t wc));
-+_GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc));
-+#endif
-+_GL_CXXALIASWARN (iswalnum);
-+_GL_CXXALIASWARN (iswalpha);
-+_GL_CXXALIASWARN (iswblank);
-+_GL_CXXALIASWARN (iswcntrl);
-+_GL_CXXALIASWARN (iswdigit);
-+_GL_CXXALIASWARN (iswgraph);
-+_GL_CXXALIASWARN (iswlower);
-+_GL_CXXALIASWARN (iswprint);
-+_GL_CXXALIASWARN (iswpunct);
-+_GL_CXXALIASWARN (iswspace);
-+_GL_CXXALIASWARN (iswupper);
-+_GL_CXXALIASWARN (iswxdigit);
-+
-+#if @REPLACE_ISWCNTRL@ || defined __MINGW32__
-+_GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc));
-+_GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc));
-+#else
-+_GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc));
-+_GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc));
-+#endif
-+_GL_CXXALIASWARN (towlower);
-+_GL_CXXALIASWARN (towupper);
-+
-+
-+#endif /* _GL_WCTYPE_H */
-+#endif /* _GL_WCTYPE_H */
-diff --git a/src/libs/gl/gllib/wcwidth.c b/src/libs/gl/gllib/wcwidth.c
-new file mode 100644
-index 0000000..66b5b15
---- /dev/null
-+++ b/src/libs/gl/gllib/wcwidth.c
-@@ -0,0 +1,50 @@
-+/* Determine the number of screen columns needed for a character.
-+   Copyright (C) 2006-2007, 2010 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 3 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, see <http://www.gnu.org/licenses/>.  */
-+
-+#include <config.h>
-+
-+/* Specification.  */
-+#include <wchar.h>
-+
-+/* Get iswprint.  */
-+#include <wctype.h>
-+
-+#include "localcharset.h"
-+#include "streq.h"
-+#include "uniwidth.h"
-+
-+int
-+wcwidth (wchar_t wc)
-+#undef wcwidth
-+{
-+  /* In UTF-8 locales, use a Unicode aware width function.  */
-+  const char *encoding = locale_charset ();
-+  if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0))
-+    {
-+      /* We assume that in a UTF-8 locale, a wide character is the same as a
-+         Unicode character.  */
-+      return uc_width (wc, encoding);
-+    }
-+  else
-+    {
-+      /* Otherwise, fall back to the system's wcwidth function.  */
-+#if HAVE_WCWIDTH
-+      return wcwidth (wc);
-+#else
-+      return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
-+#endif
-+    }
-+}
-diff --git a/src/libs/gl/glm4/00gnulib.m4 b/src/libs/gl/glm4/00gnulib.m4
-new file mode 100644
-index 0000000..301469b
---- /dev/null
-+++ b/src/libs/gl/glm4/00gnulib.m4
-@@ -0,0 +1,30 @@
-+# 00gnulib.m4 serial 2
-+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This file must be named something that sorts before all other
-+dnl gnulib-provided .m4 files.  It is needed until such time as we can
-+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
-+
-+# AC_DEFUN_ONCE([NAME], VALUE)
-+# ----------------------------
-+# Define NAME to expand to VALUE on the first use (whether by direct
-+# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
-+# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier.  This
-+# definition is slower than the version in Autoconf 2.64, because it
-+# can only use interfaces that existed since 2.59; but it achieves the
-+# same effect.  Quoting is necessary to avoid confusing Automake.
-+m4_version_prereq([2.63.263], [],
-+[m4_define([AC][_DEFUN_ONCE],
-+  [AC][_DEFUN([$1],
-+    [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
-+      [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
-+[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
-+
-+# gl_00GNULIB
-+# -----------
-+# Witness macro that this file has been included.  Needed to force
-+# Automake to include this file prior to all other gnulib .m4 files.
-+AC_DEFUN([gl_00GNULIB])
-diff --git a/src/libs/gl/glm4/Makefile.am b/src/libs/gl/glm4/Makefile.am
-new file mode 100644
-index 0000000..6665d8a
---- /dev/null
-+++ b/src/libs/gl/glm4/Makefile.am
-@@ -0,0 +1,22 @@
-+## Process this file with automake to produce Makefile.in.
-+
-+EXTRA_DIST =
-+EXTRA_DIST += 00gnulib.m4
-+EXTRA_DIST += codeset.m4
-+EXTRA_DIST += extensions.m4
-+EXTRA_DIST += fcntl-o.m4
-+EXTRA_DIST += glibc21.m4
-+EXTRA_DIST += gnulib-common.m4
-+EXTRA_DIST += include_next.m4
-+EXTRA_DIST += libunistring-base.m4
-+EXTRA_DIST += localcharset.m4
-+EXTRA_DIST += longlong.m4
-+EXTRA_DIST += multiarch.m4
-+EXTRA_DIST += stddef_h.m4
-+EXTRA_DIST += stdint.m4
-+EXTRA_DIST += warn-on-use.m4
-+EXTRA_DIST += wchar_h.m4
-+EXTRA_DIST += wchar_t.m4
-+EXTRA_DIST += wctype_h.m4
-+EXTRA_DIST += wcwidth.m4
-+EXTRA_DIST += wint_t.m4
-diff --git a/src/libs/gl/glm4/Makefile.in b/src/libs/gl/glm4/Makefile.in
-new file mode 100644
-index 0000000..cf65a38
---- /dev/null
-+++ b/src/libs/gl/glm4/Makefile.in
-@@ -0,0 +1,425 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = glm4
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/glm4/00gnulib.m4 \
-+	$(top_srcdir)/glm4/codeset.m4 $(top_srcdir)/glm4/extensions.m4 \
-+	$(top_srcdir)/glm4/fcntl-o.m4 $(top_srcdir)/glm4/glibc21.m4 \
-+	$(top_srcdir)/glm4/gnulib-common.m4 \
-+	$(top_srcdir)/glm4/include_next.m4 \
-+	$(top_srcdir)/glm4/libunistring-base.m4 \
-+	$(top_srcdir)/glm4/localcharset.m4 \
-+	$(top_srcdir)/glm4/longlong.m4 $(top_srcdir)/glm4/multiarch.m4 \
-+	$(top_srcdir)/glm4/stddef_h.m4 $(top_srcdir)/glm4/stdint.m4 \
-+	$(top_srcdir)/glm4/warn-on-use.m4 \
-+	$(top_srcdir)/glm4/wchar_h.m4 $(top_srcdir)/glm4/wchar_t.m4 \
-+	$(top_srcdir)/glm4/wctype_h.m4 $(top_srcdir)/glm4/wcwidth.m4 \
-+	$(top_srcdir)/glm4/wint_t.m4 $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMTAR = @AMTAR@
-+APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
-+BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
-+BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
-+BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
-+BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+GLIBC21 = @GLIBC21@
-+GNULIB_BTOWC = @GNULIB_BTOWC@
-+GNULIB_MBRLEN = @GNULIB_MBRLEN@
-+GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
-+GNULIB_MBSINIT = @GNULIB_MBSINIT@
-+GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
-+GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
-+GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
-+GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
-+GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
-+GNULIB_WCTOB = @GNULIB_WCTOB@
-+GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-+GREP = @GREP@
-+HAVE_BTOWC = @HAVE_BTOWC@
-+HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
-+HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
-+HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
-+HAVE_ISWBLANK = @HAVE_ISWBLANK@
-+HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
-+HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
-+HAVE_MBRLEN = @HAVE_MBRLEN@
-+HAVE_MBRTOWC = @HAVE_MBRTOWC@
-+HAVE_MBSINIT = @HAVE_MBSINIT@
-+HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
-+HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
-+HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
-+HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
-+HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
-+HAVE_STDINT_H = @HAVE_STDINT_H@
-+HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
-+HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
-+HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
-+HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
-+HAVE_WCHAR_H = @HAVE_WCHAR_H@
-+HAVE_WCHAR_T = @HAVE_WCHAR_T@
-+HAVE_WCRTOMB = @HAVE_WCRTOMB@
-+HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
-+HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
-+HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
-+HAVE_WINT_T = @HAVE_WINT_T@
-+INCLUDE_NEXT = @INCLUDE_NEXT@
-+INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
-+LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@
-+LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
-+LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
-+NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
-+NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
-+NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
-+NEXT_STDDEF_H = @NEXT_STDDEF_H@
-+NEXT_STDINT_H = @NEXT_STDINT_H@
-+NEXT_WCHAR_H = @NEXT_WCHAR_H@
-+NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
-+PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
-+RANLIB = @RANLIB@
-+REPLACE_BTOWC = @REPLACE_BTOWC@
-+REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
-+REPLACE_MBRLEN = @REPLACE_MBRLEN@
-+REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
-+REPLACE_MBSINIT = @REPLACE_MBSINIT@
-+REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
-+REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
-+REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
-+REPLACE_NULL = @REPLACE_NULL@
-+REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
-+REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
-+REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
-+REPLACE_WCTOB = @REPLACE_WCTOB@
-+REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
-+SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-+STDDEF_H = @STDDEF_H@
-+STDINT_H = @STDINT_H@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-+WINT_T_SUFFIX = @WINT_T_SUFFIX@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+gl_LIBOBJS = @gl_LIBOBJS@
-+gl_LTLIBOBJS = @gl_LTLIBOBJS@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+EXTRA_DIST = 00gnulib.m4 codeset.m4 extensions.m4 fcntl-o.m4 \
-+	glibc21.m4 gnulib-common.m4 include_next.m4 \
-+	libunistring-base.m4 localcharset.m4 longlong.m4 multiarch.m4 \
-+	stddef_h.m4 stdint.m4 warn-on-use.m4 wchar_h.m4 wchar_t.m4 \
-+	wctype_h.m4 wcwidth.m4 wint_t.m4
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign glm4/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign glm4/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff --git a/src/libs/gl/glm4/codeset.m4 b/src/libs/gl/glm4/codeset.m4
-new file mode 100644
-index 0000000..a53c042
---- /dev/null
-+++ b/src/libs/gl/glm4/codeset.m4
-@@ -0,0 +1,21 @@
-+# codeset.m4 serial 4 (gettext-0.18)
-+dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_LANGINFO_CODESET],
-+[
-+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
-+    [AC_TRY_LINK([#include <langinfo.h>],
-+      [char* cs = nl_langinfo(CODESET); return !cs;],
-+      [am_cv_langinfo_codeset=yes],
-+      [am_cv_langinfo_codeset=no])
-+    ])
-+  if test $am_cv_langinfo_codeset = yes; then
-+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
-+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-+  fi
-+])
-diff --git a/src/libs/gl/glm4/extensions.m4 b/src/libs/gl/glm4/extensions.m4
-new file mode 100644
-index 0000000..7d9458a
---- /dev/null
-+++ b/src/libs/gl/glm4/extensions.m4
-@@ -0,0 +1,118 @@
-+# serial 9  -*- Autoconf -*-
-+# Enable extensions on systems that normally disable them.
-+
-+# Copyright (C) 2003, 2006-2010 Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
-+# Autoconf.  Perhaps we can remove this once we can assume Autoconf
-+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
-+# enough in this area it's likely we'll need to redefine
-+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
-+
-+# If autoconf reports a warning
-+#     warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
-+# or  warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
-+# the fix is
-+#   1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
-+#      but always AC_REQUIREd,
-+#   2) to ensure that for each occurrence of
-+#        AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-+#      or
-+#        AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-+#      the corresponding gnulib module description has 'extensions' among
-+#      its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS
-+#      invocation occurs in gl_EARLY, not in gl_INIT.
-+
-+# AC_USE_SYSTEM_EXTENSIONS
-+# ------------------------
-+# Enable extensions on systems that normally disable them,
-+# typically due to standards-conformance issues.
-+# Remember that #undef in AH_VERBATIM gets replaced with #define by
-+# AC_DEFINE.  The goal here is to define all known feature-enabling
-+# macros, then, if reports of conflicts are made, disable macros that
-+# cause problems on some platforms (such as __EXTENSIONS__).
-+AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
-+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-+
-+  AC_REQUIRE([AC_CANONICAL_HOST])
-+
-+  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
-+  if test "$MINIX" = yes; then
-+    AC_DEFINE([_POSIX_SOURCE], [1],
-+      [Define to 1 if you need to in order for `stat' and other
-+       things to work.])
-+    AC_DEFINE([_POSIX_1_SOURCE], [2],
-+      [Define to 2 if the system does not provide POSIX.1 features
-+       except with this defined.])
-+    AC_DEFINE([_MINIX], [1],
-+      [Define to 1 if on MINIX.])
-+  fi
-+
-+  dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
-+  dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
-+  dnl provided.
-+  case "$host_os" in
-+    hpux*)
-+      AC_DEFINE([_XOPEN_SOURCE], [500],
-+        [Define to 500 only on HP-UX.])
-+      ;;
-+  esac
-+
-+  AH_VERBATIM([__EXTENSIONS__],
-+[/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+])
-+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-+    [ac_cv_safe_to_define___extensions__],
-+    [AC_COMPILE_IFELSE(
-+       [AC_LANG_PROGRAM([[
-+#         define __EXTENSIONS__ 1
-+          ]AC_INCLUDES_DEFAULT])],
-+       [ac_cv_safe_to_define___extensions__=yes],
-+       [ac_cv_safe_to_define___extensions__=no])])
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    AC_DEFINE([__EXTENSIONS__])
-+  AC_DEFINE([_ALL_SOURCE])
-+  AC_DEFINE([_GNU_SOURCE])
-+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-+  AC_DEFINE([_TANDEM_SOURCE])
-+])# AC_USE_SYSTEM_EXTENSIONS
-+
-+# gl_USE_SYSTEM_EXTENSIONS
-+# ------------------------
-+# Enable extensions on systems that normally disable them,
-+# typically due to standards-conformance issues.
-+AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
-+[
-+  dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS.
-+  dnl gnulib does not need it. But if it gets required by third-party macros
-+  dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a
-+  dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
-+  dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE,
-+  dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck.
-+  AC_REQUIRE([AC_GNU_SOURCE])
-+
-+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-+])
-diff --git a/src/libs/gl/glm4/fcntl-o.m4 b/src/libs/gl/glm4/fcntl-o.m4
-new file mode 100644
-index 0000000..1adacc8
---- /dev/null
-+++ b/src/libs/gl/glm4/fcntl-o.m4
-@@ -0,0 +1,85 @@
-+# fcntl-o.m4 serial 2
-+dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl Written by Paul Eggert.
-+
-+# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
-+# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
-+# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
-+AC_DEFUN([gl_FCNTL_O_FLAGS],
-+[
-+  dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
-+  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
-+  dnl AC_GNU_SOURCE.
-+  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-+    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
-+    [AC_REQUIRE([AC_GNU_SOURCE])])
-+  AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
-+    [AC_RUN_IFELSE(
-+       [AC_LANG_PROGRAM(
-+          [[#include <sys/types.h>
-+           #include <sys/stat.h>
-+           #include <unistd.h>
-+           #include <fcntl.h>
-+           #ifndef O_NOATIME
-+            #define O_NOATIME 0
-+           #endif
-+           #ifndef O_NOFOLLOW
-+            #define O_NOFOLLOW 0
-+           #endif
-+           static int const constants[] =
-+            {
-+              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-+              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-+            };
-+          ]],
-+          [[
-+            int status = !constants;
-+            {
-+              static char const sym[] = "conftest.sym";
-+              if (symlink (".", sym) != 0
-+                  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
-+                status |= 32;
-+              unlink (sym);
-+            }
-+            {
-+              static char const file[] = "confdefs.h";
-+              int fd = open (file, O_RDONLY | O_NOATIME);
-+              char c;
-+              struct stat st0, st1;
-+              if (fd < 0
-+                  || fstat (fd, &st0) != 0
-+                  || sleep (1) != 0
-+                  || read (fd, &c, 1) != 1
-+                  || close (fd) != 0
-+                  || stat (file, &st1) != 0
-+                  || st0.st_atime != st1.st_atime)
-+                status |= 64;
-+            }
-+            return status;]])],
-+       [gl_cv_header_working_fcntl_h=yes],
-+       [case $? in #(
-+        32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-+        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-+        96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-+         *) gl_cv_header_working_fcntl_h='no';;
-+        esac],
-+       [gl_cv_header_working_fcntl_h=cross-compiling])])
-+
-+  case $gl_cv_header_working_fcntl_h in #(
-+  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-+  *) ac_val=1;;
-+  esac
-+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
-+    [Define to 1 if O_NOATIME works.])
-+
-+  case $gl_cv_header_working_fcntl_h in #(
-+  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-+  *) ac_val=1;;
-+  esac
-+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
-+    [Define to 1 if O_NOFOLLOW works.])
-+])
-diff --git a/src/libs/gl/glm4/glibc21.m4 b/src/libs/gl/glm4/glibc21.m4
-new file mode 100644
-index 0000000..68ada9d
---- /dev/null
-+++ b/src/libs/gl/glm4/glibc21.m4
-@@ -0,0 +1,30 @@
-+# glibc21.m4 serial 4
-+dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# Test for the GNU C Library, version 2.1 or newer.
-+# From Bruno Haible.
-+
-+AC_DEFUN([gl_GLIBC21],
-+  [
-+    AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer],
-+      [ac_cv_gnu_library_2_1],
-+      [AC_EGREP_CPP([Lucky GNU user],
-+        [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-+  Lucky GNU user
-+ #endif
-+#endif
-+        ],
-+        [ac_cv_gnu_library_2_1=yes],
-+        [ac_cv_gnu_library_2_1=no])
-+      ]
-+    )
-+    AC_SUBST([GLIBC21])
-+    GLIBC21="$ac_cv_gnu_library_2_1"
-+  ]
-+)
-diff --git a/src/libs/gl/glm4/gnulib-common.m4 b/src/libs/gl/glm4/gnulib-common.m4
-new file mode 100644
-index 0000000..4c7ac30
---- /dev/null
-+++ b/src/libs/gl/glm4/gnulib-common.m4
-@@ -0,0 +1,201 @@
-+# gnulib-common.m4 serial 20
-+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# gl_COMMON
-+# is expanded unconditionally through gnulib-tool magic.
-+AC_DEFUN([gl_COMMON], [
-+  dnl Use AC_REQUIRE here, so that the code is expanded once only.
-+  AC_REQUIRE([gl_00GNULIB])
-+  AC_REQUIRE([gl_COMMON_BODY])
-+])
-+AC_DEFUN([gl_COMMON_BODY], [
-+  AH_VERBATIM([isoc99_inline],
-+[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-+   __APPLE__ && __MACH__ test for MacOS X.
-+   __APPLE_CC__ tests for the Apple compiler and its version.
-+   __STDC_VERSION__ tests for the C99 mode.  */
-+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-+# define __GNUC_STDC_INLINE__ 1
-+#endif])
-+  AH_VERBATIM([unused_parameter],
-+[/* Define as a marker that can be attached to declarations that might not
-+    be used.  This helps to reduce warnings, such as from
-+    GCC -Wunused-parameter.  */
-+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-+# define _GL_UNUSED __attribute__ ((__unused__))
-+#else
-+# define _GL_UNUSED
-+#endif
-+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
-+   is a misnomer outside of parameter lists.  */
-+#define _UNUSED_PARAMETER_ _GL_UNUSED
-+])
-+  dnl Preparation for running test programs:
-+  dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not
-+  dnl to /dev/tty, so they can be redirected to log files.  Such diagnostics
-+  dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N.
-+  LIBC_FATAL_STDERR_=1
-+  export LIBC_FATAL_STDERR_
-+])
-+
-+# gl_MODULE_INDICATOR_CONDITION
-+# expands to a C preprocessor expression that evaluates to 1 or 0, depending
-+# whether a gnulib module that has been requested shall be considered present
-+# or not.
-+AC_DEFUN([gl_MODULE_INDICATOR_CONDITION], [1])
-+
-+# gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
-+# sets the shell variable that indicates the presence of the given module to
-+# a C preprocessor expression that will evaluate to 1.
-+AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
-+[
-+  GNULIB_[]m4_translit([[$1]],
-+    [abcdefghijklmnopqrstuvwxyz./-],
-+    [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=gl_MODULE_INDICATOR_CONDITION
-+])
-+
-+# gl_MODULE_INDICATOR([modulename])
-+# defines a C macro indicating the presence of the given module
-+# in a location where it can be used.
-+#                                             |  Value  |   Value   |
-+#                                             | in lib/ | in tests/ |
-+# --------------------------------------------+---------+-----------+
-+# Module present among main modules:          |    1    |     1     |
-+# --------------------------------------------+---------+-----------+
-+# Module present among tests-related modules: |    0    |     1     |
-+# --------------------------------------------+---------+-----------+
-+# Module not present at all:                  |    0    |     0     |
-+# --------------------------------------------+---------+-----------+
-+AC_DEFUN([gl_MODULE_INDICATOR],
-+[
-+  AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]],
-+      [abcdefghijklmnopqrstuvwxyz./-],
-+      [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]),
-+    [gl_MODULE_INDICATOR_CONDITION],
-+    [Define to a C preprocessor expression that evaluates to 1 or 0,
-+     depending whether the gnulib module $1 shall be considered present.])
-+])
-+
-+# gl_MODULE_INDICATOR_FOR_TESTS([modulename])
-+# defines a C macro indicating the presence of the given module
-+# in lib or tests. This is useful to determine whether the module
-+# should be tested.
-+#                                             |  Value  |   Value   |
-+#                                             | in lib/ | in tests/ |
-+# --------------------------------------------+---------+-----------+
-+# Module present among main modules:          |    1    |     1     |
-+# --------------------------------------------+---------+-----------+
-+# Module present among tests-related modules: |    1    |     1     |
-+# --------------------------------------------+---------+-----------+
-+# Module not present at all:                  |    0    |     0     |
-+# --------------------------------------------+---------+-----------+
-+AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS],
-+[
-+  AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]],
-+      [abcdefghijklmnopqrstuvwxyz./-],
-+      [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1],
-+    [Define to 1 when the gnulib module $1 should be tested.])
-+])
-+
-+# m4_foreach_w
-+# is a backport of autoconf-2.59c's m4_foreach_w.
-+# Remove this macro when we can assume autoconf >= 2.60.
-+m4_ifndef([m4_foreach_w],
-+  [m4_define([m4_foreach_w],
-+    [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])])
-+
-+# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH])
-+# ----------------------------------------------------
-+# Backport of autoconf-2.63b's macro.
-+# Remove this macro when we can assume autoconf >= 2.64.
-+m4_ifndef([AS_VAR_IF],
-+[m4_define([AS_VAR_IF],
-+[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])])
-+
-+# AC_PROG_MKDIR_P
-+# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix
-+# for interoperability with automake-1.9.6 from autoconf-2.62.
-+# Remove this macro when we can assume autoconf >= 2.62 or
-+# autoconf >= 2.60 && automake >= 1.10.
-+m4_ifdef([AC_PROG_MKDIR_P], [
-+  dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
-+  m4_define([AC_PROG_MKDIR_P],
-+    m4_defn([AC_PROG_MKDIR_P])[
-+    AC_SUBST([MKDIR_P])])], [
-+  dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P.
-+  AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
-+    [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
-+     MKDIR_P='$(mkdir_p)'
-+     AC_SUBST([MKDIR_P])])])
-+
-+# AC_C_RESTRICT
-+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-+# works.
-+# This definition can be removed once autoconf >= 2.62 can be assumed.
-+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
-+AC_DEFUN([AC_C_RESTRICT],
-+[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
-+  [ac_cv_c_restrict=no
-+   # The order here caters to the fact that C++ does not require restrict.
-+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
-+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-+      [[typedef int * int_ptr;
-+        int foo (int_ptr $ac_kw ip) {
-+        return ip[0];
-+       }]],
-+      [[int s[1];
-+        int * $ac_kw t = s;
-+        t[0] = 0;
-+        return foo(t)]])],
-+      [ac_cv_c_restrict=$ac_kw])
-+     test "$ac_cv_c_restrict" != no && break
-+   done
-+  ])
-+ AH_VERBATIM([restrict],
-+[/* Define to the equivalent of the C99 'restrict' keyword, or to
-+   nothing if this is not supported.  Do not define if restrict is
-+   supported directly.  */
-+#undef restrict
-+/* Work around a bug in Sun C++: it does not support _Restrict, even
-+   though the corresponding Sun C compiler does, which causes
-+   "#define restrict _Restrict" in the previous line.  Perhaps some future
-+   version of Sun C++ will work with _Restrict; if so, it'll probably
-+   define __RESTRICT, just as Sun C does.  */
-+#if defined __SUNPRO_CC && !defined __RESTRICT
-+# define _Restrict
-+#endif])
-+ case $ac_cv_c_restrict in
-+   restrict) ;;
-+   no) AC_DEFINE([restrict], []) ;;
-+   *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
-+ esac
-+])
-+])
-+
-+# gl_BIGENDIAN
-+# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
-+# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
-+# macros invoke AC_C_BIGENDIAN with arguments.
-+AC_DEFUN([gl_BIGENDIAN],
-+[
-+  AC_C_BIGENDIAN
-+])
-+
-+# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
-+# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
-+# output a spurious "(cached)" mark in the midst of other configure output.
-+# This macro should be used instead of AC_CACHE_VAL when it is not surrounded
-+# by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
-+AC_DEFUN([gl_CACHE_VAL_SILENT],
-+[
-+  saved_as_echo_n="$as_echo_n"
-+  as_echo_n=':'
-+  AC_CACHE_VAL([$1], [$2])
-+  as_echo_n="$saved_as_echo_n"
-+])
-diff --git a/src/libs/gl/glm4/include_next.m4 b/src/libs/gl/glm4/include_next.m4
-new file mode 100644
-index 0000000..c7e0672
---- /dev/null
-+++ b/src/libs/gl/glm4/include_next.m4
-@@ -0,0 +1,187 @@
-+# include_next.m4 serial 14
-+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Paul Eggert and Derek Price.
-+
-+dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER.
-+dnl
-+dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to
-+dnl 'include' otherwise.
-+dnl
-+dnl INCLUDE_NEXT_AS_FIRST_DIRECTIVE expands to 'include_next' if the compiler
-+dnl supports it in the special case that it is the first include directive in
-+dnl the given file, or to 'include' otherwise.
-+dnl
-+dnl PRAGMA_SYSTEM_HEADER can be used in files that contain #include_next,
-+dnl so as to avoid GCC warnings when the gcc option -pedantic is used.
-+dnl '#pragma GCC system_header' has the same effect as if the file was found
-+dnl through the include search path specified with '-isystem' options (as
-+dnl opposed to the search path specified with '-I' options). Namely, gcc
-+dnl does not warn about some things, and on some systems (Solaris and Interix)
-+dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side
-+dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead
-+dnl of plain '__STDC__'.
-+
-+AC_DEFUN([gl_INCLUDE_NEXT],
-+[
-+  AC_LANG_PREPROC_REQUIRE()
-+  AC_CACHE_CHECK([whether the preprocessor supports include_next],
-+    [gl_cv_have_include_next],
-+    [rm -rf conftestd1a conftestd1b conftestd2
-+     mkdir conftestd1a conftestd1b conftestd2
-+     dnl IBM C 9.0, 10.1 (original versions, prior to the 2009-01 updates) on
-+     dnl AIX 6.1 support include_next when used as first preprocessor directive
-+     dnl in a file, but not when preceded by another include directive. Check
-+     dnl for this bug by including <stdio.h>.
-+     dnl Additionally, with this same compiler, include_next is a no-op when
-+     dnl used in a header file that was included by specifying its absolute
-+     dnl file name. Despite these two bugs, include_next is used in the
-+     dnl compiler's <math.h>. By virtue of the second bug, we need to use
-+     dnl include_next as well in this case.
-+     cat <<EOF > conftestd1a/conftest.h
-+#define DEFINED_IN_CONFTESTD1
-+#include_next <conftest.h>
-+#ifdef DEFINED_IN_CONFTESTD2
-+int foo;
-+#else
-+#error "include_next doesn't work"
-+#endif
-+EOF
-+     cat <<EOF > conftestd1b/conftest.h
-+#define DEFINED_IN_CONFTESTD1
-+#include <stdio.h>
-+#include_next <conftest.h>
-+#ifdef DEFINED_IN_CONFTESTD2
-+int foo;
-+#else
-+#error "include_next doesn't work"
-+#endif
-+EOF
-+     cat <<EOF > conftestd2/conftest.h
-+#ifndef DEFINED_IN_CONFTESTD1
-+#error "include_next test doesn't work"
-+#endif
-+#define DEFINED_IN_CONFTESTD2
-+EOF
-+     gl_save_CPPFLAGS="$CPPFLAGS"
-+     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
-+     AC_COMPILE_IFELSE([#include <conftest.h>],
-+       [gl_cv_have_include_next=yes],
-+       [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
-+        AC_COMPILE_IFELSE([#include <conftest.h>],
-+          [gl_cv_have_include_next=buggy],
-+          [gl_cv_have_include_next=no])
-+       ])
-+     CPPFLAGS="$gl_save_CPPFLAGS"
-+     rm -rf conftestd1a conftestd1b conftestd2
-+    ])
-+  PRAGMA_SYSTEM_HEADER=
-+  if test $gl_cv_have_include_next = yes; then
-+    INCLUDE_NEXT=include_next
-+    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
-+    if test -n "$GCC"; then
-+      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
-+    fi
-+  else
-+    if test $gl_cv_have_include_next = buggy; then
-+      INCLUDE_NEXT=include
-+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
-+    else
-+      INCLUDE_NEXT=include
-+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
-+    fi
-+  fi
-+  AC_SUBST([INCLUDE_NEXT])
-+  AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE])
-+  AC_SUBST([PRAGMA_SYSTEM_HEADER])
-+])
-+
-+# gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...)
-+# ------------------------------------------
-+# For each arg foo.h, if #include_next works, define NEXT_FOO_H to be
-+# '<foo.h>'; otherwise define it to be
-+# '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
-+# Also, if #include_next works as first preprocessing directive in a file,
-+# define NEXT_AS_FIRST_DIRECTIVE_FOO_H to be '<foo.h>'; otherwise define it to
-+# be
-+# '"///usr/include/foo.h"', or whatever other absolute file name is suitable.
-+# That way, a header file with the following line:
-+#       #@INCLUDE_NEXT@ @NEXT_FOO_H@
-+# or
-+#       #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@
-+# behaves (after sed substitution) as if it contained
-+#       #include_next <foo.h>
-+# even if the compiler does not support include_next.
-+# The three "///" are to pacify Sun C 5.8, which otherwise would say
-+# "warning: #include of /usr/include/... may be non-portable".
-+# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
-+# Note: This macro assumes that the header file is not empty after
-+# preprocessing, i.e. it does not only define preprocessor macros but also
-+# provides some type/enum definitions or function/variable declarations.
-+AC_DEFUN([gl_CHECK_NEXT_HEADERS],
-+[
-+  AC_REQUIRE([gl_INCLUDE_NEXT])
-+  AC_REQUIRE([AC_CANONICAL_HOST])
-+  AC_CHECK_HEADERS_ONCE([$1])
-+
-+  m4_foreach_w([gl_HEADER_NAME], [$1],
-+    [AS_VAR_PUSHDEF([gl_next_header],
-+                    [gl_cv_next_]m4_defn([gl_HEADER_NAME]))
-+     if test $gl_cv_have_include_next = yes; then
-+       AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
-+     else
-+       AC_CACHE_CHECK(
-+         [absolute name of <]m4_defn([gl_HEADER_NAME])[>],
-+         m4_defn([gl_next_header]),
-+         [AS_VAR_PUSHDEF([gl_header_exists],
-+                         [ac_cv_header_]m4_defn([gl_HEADER_NAME]))
-+          if test AS_VAR_GET(gl_header_exists) = yes; then
-+            AC_LANG_CONFTEST(
-+              [AC_LANG_SOURCE(
-+                 [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
-+               )])
-+            dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
-+            dnl that contain only a #include of other header files and no
-+            dnl non-comment tokens of their own. This leads to a failure to
-+            dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
-+            dnl and others. The workaround is to force preservation of comments
-+            dnl through option -C. This ensures all necessary #line directives
-+            dnl are present. GCC supports option -C as well.
-+            case "$host_os" in
-+              aix*) gl_absname_cpp="$ac_cpp -C" ;;
-+              *)    gl_absname_cpp="$ac_cpp" ;;
-+            esac
-+            dnl eval is necessary to expand gl_absname_cpp.
-+            dnl Ultrix and Pyramid sh refuse to redirect output of eval,
-+            dnl so use subshell.
-+            AS_VAR_SET([gl_next_header],
-+              ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-+               sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{
-+                 s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1#
-+                 s#^/[^/]#//&#
-+                 p
-+                 q
-+               }'`'"'])
-+          else
-+            AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>'])
-+          fi
-+          AS_VAR_POPDEF([gl_header_exists])])
-+     fi
-+     AC_SUBST(
-+       AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
-+       [AS_VAR_GET([gl_next_header])])
-+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-+       gl_next_as_first_directive='<'gl_HEADER_NAME'>'
-+     else
-+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-+       gl_next_as_first_directive=AS_VAR_GET([gl_next_header])
-+     fi
-+     AC_SUBST(
-+       AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])),
-+       [$gl_next_as_first_directive])
-+     AS_VAR_POPDEF([gl_next_header])])
-+])
-diff --git a/src/libs/gl/glm4/libunistring-base.m4 b/src/libs/gl/glm4/libunistring-base.m4
-new file mode 100644
-index 0000000..8335ec5
---- /dev/null
-+++ b/src/libs/gl/glm4/libunistring-base.m4
-@@ -0,0 +1,141 @@
-+# libunistring-base.m4 serial 5
-+dnl Copyright (C) 2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Paolo Bonzini and Bruno Haible.
-+
-+dnl gl_LIBUNISTRING_MODULE([VERSION], [Module])
-+dnl Declares that the source files of Module should be compiled, unless we
-+dnl are linking with libunistring and its version is >= the given VERSION.
-+dnl Defines an automake conditional LIBUNISTRING_COMPILE_$MODULE that is
-+dnl true if the source files of Module should be compiled.
-+dnl This macro is to be used for public libunistring API, not for
-+dnl undocumented API.
-+dnl
-+dnl You have to bump the VERSION argument to the next projected version
-+dnl number each time you make a change that affects the behaviour of the
-+dnl functions defined in Module (even if the sources of Module itself do not
-+dnl change).
-+
-+AC_DEFUN([gl_LIBUNISTRING_MODULE],
-+[
-+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
-+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
-+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
-+  AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]),
-+    [gl_LIBUNISTRING_VERSION_CMP([$1])])
-+])
-+
-+dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile])
-+dnl Declares that HeaderFile should be created, unless we are linking
-+dnl with libunistring and its version is >= the given VERSION.
-+dnl HeaderFile should be relative to the lib directory and end in '.h'.
-+dnl Prepares for substituting LIBUNISTRING_HEADERFILE (to HeaderFile or empty).
-+dnl
-+dnl When we are linking with the already installed libunistring and its version
-+dnl is < VERSION, we create HeaderFile here, because we may compile functions
-+dnl (via gl_LIBUNISTRING_MODULE above) that are not contained in the installed
-+dnl version.
-+dnl When we are linking with the already installed libunistring and its version
-+dnl is > VERSION, we don't create HeaderFile here: it could cause compilation
-+dnl errors in other libunistring header files if some types are missing.
-+dnl
-+dnl You have to bump the VERSION argument to the next projected version
-+dnl number each time you make a non-comment change to the HeaderFile.
-+
-+AC_DEFUN([gl_LIBUNISTRING_LIBHEADER],
-+[
-+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
-+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
-+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
-+  if gl_LIBUNISTRING_VERSION_CMP([$1]); then
-+    LIBUNISTRING_[]AS_TR_CPP([$2])='$2'
-+  else
-+    LIBUNISTRING_[]AS_TR_CPP([$2])=
-+  fi
-+  AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2]))
-+])
-+
-+dnl Miscellaneous preparations/initializations.
-+
-+AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE],
-+[
-+  dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point.
-+  m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])])
-+
-+  AC_REQUIRE([AC_PROG_AWK])
-+
-+dnl Sed expressions to extract the parts of a version number.
-+changequote(,)
-+gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
-+i\
-+0
-+q
-+'
-+gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
-+i\
-+0
-+q
-+'
-+gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
-+i\
-+0
-+q
-+'
-+changequote([,])
-+
-+  if test "$HAVE_LIBUNISTRING" = yes; then
-+    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
-+    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
-+    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
-+  fi
-+])
-+
-+dnl gl_LIBUNISTRING_VERSION_CMP([VERSION])
-+dnl Expands to a shell statement that evaluates to true if LIBUNISTRING_VERSION
-+dnl is less than the VERSION argument.
-+AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP],
-+[ { test "$HAVE_LIBUNISTRING" != yes \
-+    || {
-+         dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least.
-+         AS_LITERAL_IF([$1],
-+           [dnl This is the optimized variant, that assumes the argument is a literal:
-+            m4_pushdef([requested_version_major],
-+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])])
-+            m4_pushdef([requested_version_minor],
-+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
-+            m4_pushdef([requested_version_subminor],
-+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
-+            test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \
-+            || { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \
-+                 && { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \
-+                      || { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \
-+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor
-+                         }
-+                    }
-+               }
-+            m4_popdef([requested_version_subminor])
-+            m4_popdef([requested_version_minor])
-+            m4_popdef([requested_version_major])
-+           ],
-+           [dnl This is the unoptimized variant:
-+            requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"`
-+            requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"`
-+            requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"`
-+            test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \
-+            || { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \
-+                 && { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \
-+                      || { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \
-+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor
-+                         }
-+                    }
-+               }
-+           ])
-+       }
-+  }])
-+
-+dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the
-+dnl same as ORIG, otherwise to 0.
-+m4_define([gl_LIBUNISTRING_ARG_OR_ZERO], [m4_if([$1], [$2], [0], [$1])])
-diff --git a/src/libs/gl/glm4/localcharset.m4 b/src/libs/gl/glm4/localcharset.m4
-new file mode 100644
-index 0000000..ee2e801
---- /dev/null
-+++ b/src/libs/gl/glm4/localcharset.m4
-@@ -0,0 +1,17 @@
-+# localcharset.m4 serial 7
-+dnl Copyright (C) 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([gl_LOCALCHARSET],
-+[
-+  dnl Prerequisites of lib/localcharset.c.
-+  AC_REQUIRE([AM_LANGINFO_CODESET])
-+  AC_REQUIRE([gl_FCNTL_O_FLAGS])
-+  AC_CHECK_DECLS_ONCE([getc_unlocked])
-+
-+  dnl Prerequisites of the lib/Makefile.am snippet.
-+  AC_REQUIRE([AC_CANONICAL_HOST])
-+  AC_REQUIRE([gl_GLIBC21])
-+])
-diff --git a/src/libs/gl/glm4/longlong.m4 b/src/libs/gl/glm4/longlong.m4
-new file mode 100644
-index 0000000..cca3c1a
---- /dev/null
-+++ b/src/libs/gl/glm4/longlong.m4
-@@ -0,0 +1,106 @@
-+# longlong.m4 serial 14
-+dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_LONG_LONG_INT if 'long long int' works.
-+# This fixes a bug in Autoconf 2.61, but can be removed once we
-+# assume 2.62 everywhere.
-+
-+# Note: If the type 'long long int' exists but is only 32 bits large
-+# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
-+# defined. In this case you can treat 'long long int' like 'long int'.
-+
-+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
-+[
-+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
-+    [AC_LINK_IFELSE(
-+       [_AC_TYPE_LONG_LONG_SNIPPET],
-+       [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
-+        dnl If cross compiling, assume the bug isn't important, since
-+        dnl nobody cross compiles for this platform as far as we know.
-+        AC_RUN_IFELSE(
-+          [AC_LANG_PROGRAM(
-+             [[@%:@include <limits.h>
-+               @%:@ifndef LLONG_MAX
-+               @%:@ define HALF \
-+                        (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-+               @%:@ define LLONG_MAX (HALF - 1 + HALF)
-+               @%:@endif]],
-+             [[long long int n = 1;
-+               int i;
-+               for (i = 0; ; i++)
-+                 {
-+                   long long int m = n << i;
-+                   if (m >> i != n)
-+                     return 1;
-+                   if (LLONG_MAX / 2 < m)
-+                     break;
-+                 }
-+               return 0;]])],
-+          [ac_cv_type_long_long_int=yes],
-+          [ac_cv_type_long_long_int=no],
-+          [ac_cv_type_long_long_int=yes])],
-+       [ac_cv_type_long_long_int=no])])
-+  if test $ac_cv_type_long_long_int = yes; then
-+    AC_DEFINE([HAVE_LONG_LONG_INT], [1],
-+      [Define to 1 if the system has the type `long long int'.])
-+  fi
-+])
-+
-+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-+# This fixes a bug in Autoconf 2.61, but can be removed once we
-+# assume 2.62 everywhere.
-+
-+# Note: If the type 'unsigned long long int' exists but is only 32 bits
-+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
-+# will not be defined. In this case you can treat 'unsigned long long int'
-+# like 'unsigned long int'.
-+
-+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
-+[
-+  AC_CACHE_CHECK([for unsigned long long int],
-+    [ac_cv_type_unsigned_long_long_int],
-+    [AC_LINK_IFELSE(
-+       [_AC_TYPE_LONG_LONG_SNIPPET],
-+       [ac_cv_type_unsigned_long_long_int=yes],
-+       [ac_cv_type_unsigned_long_long_int=no])])
-+  if test $ac_cv_type_unsigned_long_long_int = yes; then
-+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
-+      [Define to 1 if the system has the type `unsigned long long int'.])
-+  fi
-+])
-+
-+# Expands to a C program that can be used to test for simultaneous support
-+# of 'long long' and 'unsigned long long'. We don't want to say that
-+# 'long long' is available if 'unsigned long long' is not, or vice versa,
-+# because too many programs rely on the symmetry between signed and unsigned
-+# integer types (excluding 'bool').
-+AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
-+[
-+  AC_LANG_PROGRAM(
-+    [[/* For now, do not test the preprocessor; as of 2007 there are too many
-+         implementations with broken preprocessors.  Perhaps this can
-+         be revisited in 2012.  In the meantime, code should not expect
-+         #if to work with literals wider than 32 bits.  */
-+      /* Test literals.  */
-+      long long int ll = 9223372036854775807ll;
-+      long long int nll = -9223372036854775807LL;
-+      unsigned long long int ull = 18446744073709551615ULL;
-+      /* Test constant expressions.   */
-+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-+                     ? 1 : -1)];
-+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-+                     ? 1 : -1)];
-+      int i = 63;]],
-+    [[/* Test availability of runtime routines for shift and division.  */
-+      long long int llmax = 9223372036854775807ll;
-+      unsigned long long int ullmax = 18446744073709551615ull;
-+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-+              | (llmax / ll) | (llmax % ll)
-+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-+              | (ullmax / ull) | (ullmax % ull));]])
-+])
-diff --git a/src/libs/gl/glm4/multiarch.m4 b/src/libs/gl/glm4/multiarch.m4
-new file mode 100644
-index 0000000..389bd2b
---- /dev/null
-+++ b/src/libs/gl/glm4/multiarch.m4
-@@ -0,0 +1,65 @@
-+# multiarch.m4 serial 5
-+dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# Determine whether the compiler is or may be producing universal binaries.
-+#
-+# On MacOS X 10.5 and later systems, the user can create libraries and
-+# executables that work on multiple system types--known as "fat" or
-+# "universal" binaries--by specifying multiple '-arch' options to the
-+# compiler but only a single '-arch' option to the preprocessor.  Like
-+# this:
-+#
-+#     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+#                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+#                 CPP="gcc -E" CXXCPP="g++ -E"
-+#
-+# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the
-+# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly.
-+
-+AC_DEFUN_ONCE([gl_MULTIARCH],
-+[
-+  dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN.
-+  gl_cv_c_multiarch=no
-+  AC_COMPILE_IFELSE(
-+    [AC_LANG_SOURCE(
-+      [[#ifndef __APPLE_CC__
-+         not a universal capable compiler
-+        #endif
-+        typedef int dummy;
-+      ]])],
-+    [
-+     dnl Check for potential -arch flags.  It is not universal unless
-+     dnl there are at least two -arch flags with different values.
-+     arch=
-+     prev=
-+     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
-+       if test -n "$prev"; then
-+         case $word in
-+           i?86 | x86_64 | ppc | ppc64)
-+             if test -z "$arch" || test "$arch" = "$word"; then
-+               arch="$word"
-+             else
-+               gl_cv_c_multiarch=yes
-+             fi
-+             ;;
-+         esac
-+         prev=
-+       else
-+         if test "x$word" = "x-arch"; then
-+           prev=arch
-+         fi
-+       fi
-+     done
-+    ])
-+  if test $gl_cv_c_multiarch = yes; then
-+    AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1],
-+      [Define if the compiler is building for multiple architectures of Apple platforms at once.])
-+    APPLE_UNIVERSAL_BUILD=1
-+  else
-+    APPLE_UNIVERSAL_BUILD=0
-+  fi
-+  AC_SUBST([APPLE_UNIVERSAL_BUILD])
-+])
-diff --git a/src/libs/gl/glm4/stddef_h.m4 b/src/libs/gl/glm4/stddef_h.m4
-new file mode 100644
-index 0000000..c3ae569
---- /dev/null
-+++ b/src/libs/gl/glm4/stddef_h.m4
-@@ -0,0 +1,45 @@
-+dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
-+# stddef_h.m4 serial 2
-+dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([gl_STDDEF_H],
-+[
-+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
-+  AC_REQUIRE([gt_TYPE_WCHAR_T])
-+  if test $gt_cv_c_wchar_t = no; then
-+    HAVE_WCHAR_T=0
-+    STDDEF_H=stddef.h
-+  fi
-+  AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
-+    [gl_cv_decl_null_works],
-+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
-+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
-+]])],
-+      [gl_cv_decl_null_works=yes],
-+      [gl_cv_decl_null_works=no])])
-+  if test $gl_cv_decl_null_works = no; then
-+    REPLACE_NULL=1
-+    STDDEF_H=stddef.h
-+  fi
-+  if test -n "$STDDEF_H"; then
-+    gl_CHECK_NEXT_HEADERS([stddef.h])
-+  fi
-+])
-+
-+AC_DEFUN([gl_STDDEF_MODULE_INDICATOR],
-+[
-+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-+  AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
-+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-+])
-+
-+AC_DEFUN([gl_STDDEF_H_DEFAULTS],
-+[
-+  dnl Assume proper GNU behavior unless another module says otherwise.
-+  REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
-+  HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
-+  STDDEF_H='';                   AC_SUBST([STDDEF_H])
-+])
-diff --git a/src/libs/gl/glm4/stdint.m4 b/src/libs/gl/glm4/stdint.m4
-new file mode 100644
-index 0000000..c5e813a
---- /dev/null
-+++ b/src/libs/gl/glm4/stdint.m4
-@@ -0,0 +1,472 @@
-+# stdint.m4 serial 35
-+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Paul Eggert and Bruno Haible.
-+dnl Test whether <stdint.h> is supported or must be substituted.
-+
-+AC_DEFUN([gl_STDINT_H],
-+[
-+  AC_PREREQ([2.59])dnl
-+
-+  dnl Check for long long int and unsigned long long int.
-+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
-+  if test $ac_cv_type_long_long_int = yes; then
-+    HAVE_LONG_LONG_INT=1
-+  else
-+    HAVE_LONG_LONG_INT=0
-+  fi
-+  AC_SUBST([HAVE_LONG_LONG_INT])
-+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-+  if test $ac_cv_type_unsigned_long_long_int = yes; then
-+    HAVE_UNSIGNED_LONG_LONG_INT=1
-+  else
-+    HAVE_UNSIGNED_LONG_LONG_INT=0
-+  fi
-+  AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
-+
-+  dnl Check for <inttypes.h>.
-+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
-+  if test $ac_cv_header_inttypes_h = yes; then
-+    HAVE_INTTYPES_H=1
-+  else
-+    HAVE_INTTYPES_H=0
-+  fi
-+  AC_SUBST([HAVE_INTTYPES_H])
-+
-+  dnl Check for <sys/types.h>.
-+  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_sys_types_h.
-+  if test $ac_cv_header_sys_types_h = yes; then
-+    HAVE_SYS_TYPES_H=1
-+  else
-+    HAVE_SYS_TYPES_H=0
-+  fi
-+  AC_SUBST([HAVE_SYS_TYPES_H])
-+
-+  gl_CHECK_NEXT_HEADERS([stdint.h])
-+  if test $ac_cv_header_stdint_h = yes; then
-+    HAVE_STDINT_H=1
-+  else
-+    HAVE_STDINT_H=0
-+  fi
-+  AC_SUBST([HAVE_STDINT_H])
-+
-+  dnl Now see whether we need a substitute <stdint.h>.
-+  if test $ac_cv_header_stdint_h = yes; then
-+    AC_CACHE_CHECK([whether stdint.h conforms to C99],
-+      [gl_cv_header_working_stdint_h],
-+      [gl_cv_header_working_stdint_h=no
-+       AC_COMPILE_IFELSE([
-+         AC_LANG_PROGRAM([[
-+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
-+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-+#include <stdint.h>
-+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
-+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
-+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
-+#endif
-+]
-+gl_STDINT_INCLUDES
-+[
-+#ifdef INT8_MAX
-+int8_t a1 = INT8_MAX;
-+int8_t a1min = INT8_MIN;
-+#endif
-+#ifdef INT16_MAX
-+int16_t a2 = INT16_MAX;
-+int16_t a2min = INT16_MIN;
-+#endif
-+#ifdef INT32_MAX
-+int32_t a3 = INT32_MAX;
-+int32_t a3min = INT32_MIN;
-+#endif
-+#ifdef INT64_MAX
-+int64_t a4 = INT64_MAX;
-+int64_t a4min = INT64_MIN;
-+#endif
-+#ifdef UINT8_MAX
-+uint8_t b1 = UINT8_MAX;
-+#else
-+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
-+#endif
-+#ifdef UINT16_MAX
-+uint16_t b2 = UINT16_MAX;
-+#endif
-+#ifdef UINT32_MAX
-+uint32_t b3 = UINT32_MAX;
-+#endif
-+#ifdef UINT64_MAX
-+uint64_t b4 = UINT64_MAX;
-+#endif
-+int_least8_t c1 = INT8_C (0x7f);
-+int_least8_t c1max = INT_LEAST8_MAX;
-+int_least8_t c1min = INT_LEAST8_MIN;
-+int_least16_t c2 = INT16_C (0x7fff);
-+int_least16_t c2max = INT_LEAST16_MAX;
-+int_least16_t c2min = INT_LEAST16_MIN;
-+int_least32_t c3 = INT32_C (0x7fffffff);
-+int_least32_t c3max = INT_LEAST32_MAX;
-+int_least32_t c3min = INT_LEAST32_MIN;
-+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
-+int_least64_t c4max = INT_LEAST64_MAX;
-+int_least64_t c4min = INT_LEAST64_MIN;
-+uint_least8_t d1 = UINT8_C (0xff);
-+uint_least8_t d1max = UINT_LEAST8_MAX;
-+uint_least16_t d2 = UINT16_C (0xffff);
-+uint_least16_t d2max = UINT_LEAST16_MAX;
-+uint_least32_t d3 = UINT32_C (0xffffffff);
-+uint_least32_t d3max = UINT_LEAST32_MAX;
-+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
-+uint_least64_t d4max = UINT_LEAST64_MAX;
-+int_fast8_t e1 = INT_FAST8_MAX;
-+int_fast8_t e1min = INT_FAST8_MIN;
-+int_fast16_t e2 = INT_FAST16_MAX;
-+int_fast16_t e2min = INT_FAST16_MIN;
-+int_fast32_t e3 = INT_FAST32_MAX;
-+int_fast32_t e3min = INT_FAST32_MIN;
-+int_fast64_t e4 = INT_FAST64_MAX;
-+int_fast64_t e4min = INT_FAST64_MIN;
-+uint_fast8_t f1 = UINT_FAST8_MAX;
-+uint_fast16_t f2 = UINT_FAST16_MAX;
-+uint_fast32_t f3 = UINT_FAST32_MAX;
-+uint_fast64_t f4 = UINT_FAST64_MAX;
-+#ifdef INTPTR_MAX
-+intptr_t g = INTPTR_MAX;
-+intptr_t gmin = INTPTR_MIN;
-+#endif
-+#ifdef UINTPTR_MAX
-+uintptr_t h = UINTPTR_MAX;
-+#endif
-+intmax_t i = INTMAX_MAX;
-+uintmax_t j = UINTMAX_MAX;
-+
-+#include <limits.h> /* for CHAR_BIT */
-+#define TYPE_MINIMUM(t) \
-+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
-+#define TYPE_MAXIMUM(t) \
-+  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
-+struct s {
-+  int check_PTRDIFF:
-+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
-+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
-+      ? 1 : -1;
-+  /* Detect bug in FreeBSD 6.0 / ia64.  */
-+  int check_SIG_ATOMIC:
-+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
-+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
-+      ? 1 : -1;
-+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
-+  int check_WCHAR:
-+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
-+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
-+      ? 1 : -1;
-+  /* Detect bug in mingw.  */
-+  int check_WINT:
-+      WINT_MIN == TYPE_MINIMUM (wint_t)
-+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
-+      ? 1 : -1;
-+
-+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
-+  int check_UINT8_C:
-+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
-+  int check_UINT16_C:
-+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
-+
-+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
-+#ifdef UINT8_MAX
-+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
-+#endif
-+#ifdef UINT16_MAX
-+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
-+#endif
-+#ifdef UINT32_MAX
-+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
-+#endif
-+#ifdef UINT64_MAX
-+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
-+#endif
-+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
-+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
-+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
-+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
-+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
-+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
-+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
-+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
-+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
-+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
-+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
-+};
-+         ]])],
-+         [dnl Determine whether the various *_MIN, *_MAX macros are usable
-+          dnl in preprocessor expression. We could do it by compiling a test
-+          dnl program for each of these macros. It is faster to run a program
-+          dnl that inspects the macro expansion.
-+          dnl This detects a bug on HP-UX 11.23/ia64.
-+          AC_RUN_IFELSE([
-+            AC_LANG_PROGRAM([[
-+#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-+#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
-+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-+#include <stdint.h>
-+]
-+gl_STDINT_INCLUDES
-+[
-+#include <stdio.h>
-+#include <string.h>
-+#define MVAL(macro) MVAL1(macro)
-+#define MVAL1(expression) #expression
-+static const char *macro_values[] =
-+  {
-+#ifdef INT8_MAX
-+    MVAL (INT8_MAX),
-+#endif
-+#ifdef INT16_MAX
-+    MVAL (INT16_MAX),
-+#endif
-+#ifdef INT32_MAX
-+    MVAL (INT32_MAX),
-+#endif
-+#ifdef INT64_MAX
-+    MVAL (INT64_MAX),
-+#endif
-+#ifdef UINT8_MAX
-+    MVAL (UINT8_MAX),
-+#endif
-+#ifdef UINT16_MAX
-+    MVAL (UINT16_MAX),
-+#endif
-+#ifdef UINT32_MAX
-+    MVAL (UINT32_MAX),
-+#endif
-+#ifdef UINT64_MAX
-+    MVAL (UINT64_MAX),
-+#endif
-+    NULL
-+  };
-+]], [[
-+  const char **mv;
-+  for (mv = macro_values; *mv != NULL; mv++)
-+    {
-+      const char *value = *mv;
-+      /* Test whether it looks like a cast expression.  */
-+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
-+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
-+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
-+          || strncmp (value, "((int)"/*)*/, 6) == 0
-+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
-+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-+        return 1;
-+    }
-+  return 0;
-+]])],
-+              [gl_cv_header_working_stdint_h=yes],
-+              [],
-+              [dnl When cross-compiling, assume it works.
-+               gl_cv_header_working_stdint_h=yes
-+              ])
-+         ])
-+      ])
-+  fi
-+  if test "$gl_cv_header_working_stdint_h" = yes; then
-+    STDINT_H=
-+  else
-+    dnl Check for <sys/inttypes.h>, and for
-+    dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
-+    AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
-+    if test $ac_cv_header_sys_inttypes_h = yes; then
-+      HAVE_SYS_INTTYPES_H=1
-+    else
-+      HAVE_SYS_INTTYPES_H=0
-+    fi
-+    AC_SUBST([HAVE_SYS_INTTYPES_H])
-+    if test $ac_cv_header_sys_bitypes_h = yes; then
-+      HAVE_SYS_BITYPES_H=1
-+    else
-+      HAVE_SYS_BITYPES_H=0
-+    fi
-+    AC_SUBST([HAVE_SYS_BITYPES_H])
-+
-+    dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
-+    dnl character support).
-+    AC_CHECK_HEADERS_ONCE([wchar.h])
-+
-+    gl_STDINT_TYPE_PROPERTIES
-+    STDINT_H=stdint.h
-+  fi
-+  AC_SUBST([STDINT_H])
-+])
-+
-+dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
-+dnl Determine the size of each of the given types in bits.
-+AC_DEFUN([gl_STDINT_BITSIZEOF],
-+[
-+  dnl Use a shell loop, to avoid bloating configure, and
-+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
-+  dnl   config.h.in,
-+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
-+  m4_foreach_w([gltype], [$1],
-+    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
-+       [Define to the number of bits in type ']gltype['.])])
-+  for gltype in $1 ; do
-+    AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
-+      [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
-+         [$2
-+#include <limits.h>], [result=unknown])
-+       eval gl_cv_bitsizeof_${gltype}=\$result
-+      ])
-+    eval result=\$gl_cv_bitsizeof_${gltype}
-+    if test $result = unknown; then
-+      dnl Use a nonempty default, because some compilers, such as IRIX 5 cc,
-+      dnl do a syntax check even on unused #if conditions and give an error
-+      dnl on valid C code like this:
-+      dnl   #if 0
-+      dnl   # if  > 32
-+      dnl   # endif
-+      dnl   #endif
-+      result=0
-+    fi
-+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result])
-+    eval BITSIZEOF_${GLTYPE}=\$result
-+  done
-+  m4_foreach_w([gltype], [$1],
-+    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
-+])
-+
-+dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
-+dnl Determine the signedness of each of the given types.
-+dnl Define HAVE_SIGNED_TYPE if type is signed.
-+AC_DEFUN([gl_CHECK_TYPES_SIGNED],
-+[
-+  dnl Use a shell loop, to avoid bloating configure, and
-+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
-+  dnl   config.h.in,
-+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
-+  m4_foreach_w([gltype], [$1],
-+    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
-+       [Define to 1 if ']gltype[' is a signed integer type.])])
-+  for gltype in $1 ; do
-+    AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
-+      [AC_COMPILE_IFELSE(
-+         [AC_LANG_PROGRAM([$2[
-+            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
-+         result=yes, result=no)
-+       eval gl_cv_type_${gltype}_signed=\$result
-+      ])
-+    eval result=\$gl_cv_type_${gltype}_signed
-+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    if test "$result" = yes; then
-+      AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1])
-+      eval HAVE_SIGNED_${GLTYPE}=1
-+    else
-+      eval HAVE_SIGNED_${GLTYPE}=0
-+    fi
-+  done
-+  m4_foreach_w([gltype], [$1],
-+    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
-+])
-+
-+dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
-+dnl Determine the suffix to use for integer constants of the given types.
-+dnl Define t_SUFFIX for each such type.
-+AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
-+[
-+  dnl Use a shell loop, to avoid bloating configure, and
-+  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
-+  dnl   config.h.in,
-+  dnl - extra AC_SUBST calls, so that the right substitutions are made.
-+  m4_foreach_w([gltype], [$1],
-+    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
-+       [Define to l, ll, u, ul, ull, etc., as suitable for
-+        constants of type ']gltype['.])])
-+  for gltype in $1 ; do
-+    AC_CACHE_CHECK([for $gltype integer literal suffix],
-+      [gl_cv_type_${gltype}_suffix],
-+      [eval gl_cv_type_${gltype}_suffix=no
-+       eval result=\$gl_cv_type_${gltype}_signed
-+       if test "$result" = yes; then
-+         glsufu=
-+       else
-+         glsufu=u
-+       fi
-+       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
-+         case $glsuf in
-+           '')  gltype1='int';;
-+           l)   gltype1='long int';;
-+           ll)  gltype1='long long int';;
-+           i64) gltype1='__int64';;
-+           u)   gltype1='unsigned int';;
-+           ul)  gltype1='unsigned long int';;
-+           ull) gltype1='unsigned long long int';;
-+           ui64)gltype1='unsigned __int64';;
-+         esac
-+         AC_COMPILE_IFELSE(
-+           [AC_LANG_PROGRAM([$2[
-+              extern $gltype foo;
-+              extern $gltype1 foo;]])],
-+           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
-+         eval result=\$gl_cv_type_${gltype}_suffix
-+         test "$result" != no && break
-+       done])
-+    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-+    eval result=\$gl_cv_type_${gltype}_suffix
-+    test "$result" = no && result=
-+    eval ${GLTYPE}_SUFFIX=\$result
-+    AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
-+  done
-+  m4_foreach_w([gltype], [$1],
-+    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
-+])
-+
-+dnl gl_STDINT_INCLUDES
-+AC_DEFUN([gl_STDINT_INCLUDES],
-+[[
-+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-+     included before <wchar.h>.  */
-+  #include <stddef.h>
-+  #include <signal.h>
-+  #if HAVE_WCHAR_H
-+  # include <stdio.h>
-+  # include <time.h>
-+  # include <wchar.h>
-+  #endif
-+]])
-+
-+dnl gl_STDINT_TYPE_PROPERTIES
-+dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t
-+dnl of interest to stdint.in.h.
-+AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
-+[
-+  AC_REQUIRE([gl_MULTIARCH])
-+  if test $APPLE_UNIVERSAL_BUILD = 0; then
-+    gl_STDINT_BITSIZEOF([ptrdiff_t size_t],
-+      [gl_STDINT_INCLUDES])
-+  fi
-+  gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t],
-+    [gl_STDINT_INCLUDES])
-+  gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t],
-+    [gl_STDINT_INCLUDES])
-+  gl_cv_type_ptrdiff_t_signed=yes
-+  gl_cv_type_size_t_signed=no
-+  if test $APPLE_UNIVERSAL_BUILD = 0; then
-+    gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t],
-+      [gl_STDINT_INCLUDES])
-+  fi
-+  gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
-+    [gl_STDINT_INCLUDES])
-+])
-+
-+dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
-+dnl Remove this when we can assume autoconf >= 2.61.
-+m4_ifdef([AC_COMPUTE_INT], [], [
-+  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
-+])
-+
-+# Hey Emacs!
-+# Local Variables:
-+# indent-tabs-mode: nil
-+# End:
-diff --git a/src/libs/gl/glm4/warn-on-use.m4 b/src/libs/gl/glm4/warn-on-use.m4
-new file mode 100644
-index 0000000..42daae8
---- /dev/null
-+++ b/src/libs/gl/glm4/warn-on-use.m4
-@@ -0,0 +1,45 @@
-+# warn-on-use.m4 serial 2
-+dnl Copyright (C) 2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+# gl_WARN_ON_USE_PREPARE(INCLUDES, NAMES)
-+# ---------------------------------------
-+# For each whitespace-separated element in the list of NAMES, define
-+# HAVE_RAW_DECL_name if the function has a declaration among INCLUDES
-+# even after being undefined as a macro.
-+#
-+# See warn-on-use.h for some hints on how to poison function names, as
-+# well as ideas on poisoning global variables and macros.  NAMES may
-+# include global variables, but remember that only functions work with
-+# _GL_WARN_ON_USE.  Typically, INCLUDES only needs to list a single
-+# header, but if the replacement header pulls in other headers because
-+# some systems declare functions in the wrong header, then INCLUDES
-+# should do likewise.
-+#
-+# If you assume C89, then it is generally safe to assume declarations
-+# for functions declared in that standard (such as gets) without
-+# needing gl_WARN_ON_USE_PREPARE.
-+AC_DEFUN([gl_WARN_ON_USE_PREPARE],
-+[
-+  m4_foreach_w([gl_decl], [$2],
-+    [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])),
-+      [Define to 1 if ]m4_defn([gl_decl])[ is declared even after
-+       undefining macros.])])dnl
-+  for gl_func in m4_flatten([$2]); do
-+    AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl
-+    AC_CACHE_CHECK([whether $gl_func is declared without a macro],
-+      gl_Symbol,
-+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],
-+[@%:@undef $gl_func
-+  (void) $gl_func;])],
-+        [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])])
-+     AS_VAR_IF(gl_Symbol, [yes],
-+       [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
-+       dnl shortcut - if the raw declaration exists, then set a cache
-+       dnl variable to allow skipping any later AC_CHECK_DECL efforts
-+       eval ac_cv_have_decl_$gl_func=yes])
-+    AS_VAR_POPDEF([gl_Symbol])dnl
-+  done
-+])
-diff --git a/src/libs/gl/glm4/wchar_h.m4 b/src/libs/gl/glm4/wchar_h.m4
-new file mode 100644
-index 0000000..8cae82d
---- /dev/null
-+++ b/src/libs/gl/glm4/wchar_h.m4
-@@ -0,0 +1,152 @@
-+dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
-+
-+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl Written by Eric Blake.
-+
-+# wchar_h.m4 serial 33
-+
-+AC_DEFUN([gl_WCHAR_H],
-+[
-+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-+  AC_REQUIRE([gl_WCHAR_H_INLINE_OK])
-+  dnl Prepare for creating substitute <wchar.h>.
-+  dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
-+  dnl character support).
-+  dnl <wchar.h> is always overridden, because of GNULIB_POSIXCHECK.
-+  AC_CHECK_HEADERS_ONCE([wchar.h])
-+  gl_CHECK_NEXT_HEADERS([wchar.h])
-+  if test $ac_cv_header_wchar_h = yes; then
-+    HAVE_WCHAR_H=1
-+  else
-+    HAVE_WCHAR_H=0
-+  fi
-+  AC_SUBST([HAVE_WCHAR_H])
-+
-+  AC_REQUIRE([gt_TYPE_WINT_T])
-+  if test $gt_cv_c_wint_t = yes; then
-+    HAVE_WINT_T=1
-+  else
-+    HAVE_WINT_T=0
-+  fi
-+  AC_SUBST([HAVE_WINT_T])
-+
-+  dnl Check for declarations of anything we want to poison if the
-+  dnl corresponding gnulib module is not in use.
-+  gl_WARN_ON_USE_PREPARE([[
-+/* Some systems require additional headers.  */
-+#ifndef __GLIBC__
-+# include <stddef.h>
-+# include <stdio.h>
-+# include <time.h>
-+#endif
-+#include <wchar.h>
-+    ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
-+    wcsrtombs wcsnrtombs wcwidth])
-+])
-+
-+dnl Check whether <wchar.h> is usable at all.
-+AC_DEFUN([gl_WCHAR_H_INLINE_OK],
-+[
-+  dnl Test whether <wchar.h> suffers due to the transition from '__inline' to
-+  dnl 'gnu_inline'. See <http://sourceware.org/bugzilla/show_bug.cgi?id=4022>
-+  dnl and <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42440>. In summary,
-+  dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and
-+  dnl the option -std=c99 or -std=gnu99, leads to a broken <wchar.h>.
-+  AC_CACHE_CHECK([whether <wchar.h> uses 'inline' correctly],
-+    [gl_cv_header_wchar_h_correct_inline],
-+    [gl_cv_header_wchar_h_correct_inline=yes
-+     AC_LANG_CONFTEST([
-+       AC_LANG_SOURCE([[#define wcstod renamed_wcstod
-+#include <wchar.h>
-+extern int zero (void);
-+int main () { return zero(); }
-+]])])
-+     if AC_TRY_EVAL([ac_compile]); then
-+       mv conftest.$ac_objext conftest1.$ac_objext
-+       AC_LANG_CONFTEST([
-+         AC_LANG_SOURCE([[#define wcstod renamed_wcstod
-+#include <wchar.h>
-+int zero (void) { return 0; }
-+]])])
-+       if AC_TRY_EVAL([ac_compile]); then
-+         mv conftest.$ac_objext conftest2.$ac_objext
-+         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
-+           :
-+         else
-+           gl_cv_header_wchar_h_correct_inline=no
-+         fi
-+       fi
-+     fi
-+     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
-+    ])
-+  if test $gl_cv_header_wchar_h_correct_inline = no; then
-+    AC_MSG_ERROR([<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
-+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
-+C99 mode. You have four options:
-+  - Add the flag -fgnu89-inline to CC and reconfigure, or
-+  - Fix your include files, using parts of
-+    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
-+  - Use a gcc version older than 4.3, or
-+  - Don't use the flags -std=c99 or -std=gnu99.
-+Configuration aborted.])
-+  fi
-+])
-+
-+dnl Unconditionally enables the replacement of <wchar.h>.
-+AC_DEFUN([gl_REPLACE_WCHAR_H],
-+[
-+  dnl This is a no-op, because <wchar.h> is always overridden.
-+  :
-+])
-+
-+AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
-+[
-+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
-+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
-+  dnl Define it also as a C macro, for the benefit of the unit tests.
-+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
-+])
-+
-+AC_DEFUN([gl_WCHAR_H_DEFAULTS],
-+[
-+  GNULIB_BTOWC=0;      AC_SUBST([GNULIB_BTOWC])
-+  GNULIB_WCTOB=0;      AC_SUBST([GNULIB_WCTOB])
-+  GNULIB_MBSINIT=0;    AC_SUBST([GNULIB_MBSINIT])
-+  GNULIB_MBRTOWC=0;    AC_SUBST([GNULIB_MBRTOWC])
-+  GNULIB_MBRLEN=0;     AC_SUBST([GNULIB_MBRLEN])
-+  GNULIB_MBSRTOWCS=0;  AC_SUBST([GNULIB_MBSRTOWCS])
-+  GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS])
-+  GNULIB_WCRTOMB=0;    AC_SUBST([GNULIB_WCRTOMB])
-+  GNULIB_WCSRTOMBS=0;  AC_SUBST([GNULIB_WCSRTOMBS])
-+  GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS])
-+  GNULIB_WCWIDTH=0;    AC_SUBST([GNULIB_WCWIDTH])
-+  dnl Assume proper GNU behavior unless another module says otherwise.
-+  HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
-+  HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
-+  HAVE_MBRTOWC=1;       AC_SUBST([HAVE_MBRTOWC])
-+  HAVE_MBRLEN=1;        AC_SUBST([HAVE_MBRLEN])
-+  HAVE_MBSRTOWCS=1;     AC_SUBST([HAVE_MBSRTOWCS])
-+  HAVE_MBSNRTOWCS=1;    AC_SUBST([HAVE_MBSNRTOWCS])
-+  HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
-+  HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
-+  HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
-+  HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
-+  HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
-+  REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
-+  REPLACE_BTOWC=0;      AC_SUBST([REPLACE_BTOWC])
-+  REPLACE_WCTOB=0;      AC_SUBST([REPLACE_WCTOB])
-+  REPLACE_MBSINIT=0;    AC_SUBST([REPLACE_MBSINIT])
-+  REPLACE_MBRTOWC=0;    AC_SUBST([REPLACE_MBRTOWC])
-+  REPLACE_MBRLEN=0;     AC_SUBST([REPLACE_MBRLEN])
-+  REPLACE_MBSRTOWCS=0;  AC_SUBST([REPLACE_MBSRTOWCS])
-+  REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS])
-+  REPLACE_WCRTOMB=0;    AC_SUBST([REPLACE_WCRTOMB])
-+  REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
-+  REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
-+  REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
-+])
-diff --git a/src/libs/gl/glm4/wchar_t.m4 b/src/libs/gl/glm4/wchar_t.m4
-new file mode 100644
-index 0000000..ed804e6
---- /dev/null
-+++ b/src/libs/gl/glm4/wchar_t.m4
-@@ -0,0 +1,20 @@
-+# wchar_t.m4 serial 3 (gettext-0.18)
-+dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Bruno Haible.
-+dnl Test whether <stddef.h> has the 'wchar_t' type.
-+dnl Prerequisite: AC_PROG_CC
-+
-+AC_DEFUN([gt_TYPE_WCHAR_T],
-+[
-+  AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
-+    [AC_TRY_COMPILE([#include <stddef.h>
-+       wchar_t foo = (wchar_t)'\0';], ,
-+       [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
-+  if test $gt_cv_c_wchar_t = yes; then
-+    AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
-+  fi
-+])
-diff --git a/src/libs/gl/glm4/wctype_h.m4 b/src/libs/gl/glm4/wctype_h.m4
-new file mode 100644
-index 0000000..3292451
---- /dev/null
-+++ b/src/libs/gl/glm4/wctype_h.m4
-@@ -0,0 +1,76 @@
-+# wctype_h.m4 serial 6
-+
-+dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
-+
-+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl Written by Paul Eggert.
-+
-+AC_DEFUN([gl_WCTYPE_H],
-+[
-+  AC_REQUIRE([AC_PROG_CC])
-+  AC_REQUIRE([AC_CANONICAL_HOST])
-+  AC_CHECK_FUNCS_ONCE([iswcntrl])
-+  if test $ac_cv_func_iswcntrl = yes; then
-+    HAVE_ISWCNTRL=1
-+  else
-+    HAVE_ISWCNTRL=0
-+  fi
-+  AC_SUBST([HAVE_ISWCNTRL])
-+  AC_CHECK_FUNCS_ONCE([iswblank])
-+  if test $ac_cv_func_iswblank = yes; then
-+    HAVE_ISWBLANK=1
-+  else
-+    HAVE_ISWBLANK=0
-+  fi
-+  AC_SUBST([HAVE_ISWBLANK])
-+  AC_CHECK_HEADERS_ONCE([wctype.h])
-+  AC_REQUIRE([AC_C_INLINE])
-+
-+  AC_REQUIRE([gt_TYPE_WINT_T])
-+  if test $gt_cv_c_wint_t = yes; then
-+    HAVE_WINT_T=1
-+  else
-+    HAVE_WINT_T=0
-+  fi
-+  AC_SUBST([HAVE_WINT_T])
-+
-+  if test $ac_cv_header_wctype_h = yes; then
-+    if test $ac_cv_func_iswcntrl = yes; then
-+      dnl Linux libc5 has an iswprint function that returns 0 for all arguments.
-+      dnl The other functions are likely broken in the same way.
-+      AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works],
-+        [
-+          AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+                            #include <stddef.h>
-+                            #include <stdio.h>
-+                            #include <time.h>
-+                            #include <wchar.h>
-+                            #include <wctype.h>
-+                            int main () { return iswprint ('x') == 0; }]])],
-+            [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no],
-+            [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
-+                          #if __GNU_LIBRARY__ == 1
-+                          Linux libc5 i18n is broken.
-+                          #endif]], [])],
-+              [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no])
-+            ])
-+        ])
-+    fi
-+    gl_CHECK_NEXT_HEADERS([wctype.h])
-+    HAVE_WCTYPE_H=1
-+  else
-+    HAVE_WCTYPE_H=0
-+  fi
-+  AC_SUBST([HAVE_WCTYPE_H])
-+
-+  if test "$gl_cv_func_iswcntrl_works" = no; then
-+    REPLACE_ISWCNTRL=1
-+  else
-+    REPLACE_ISWCNTRL=0
-+  fi
-+  AC_SUBST([REPLACE_ISWCNTRL])
-+])
-diff --git a/src/libs/gl/glm4/wcwidth.m4 b/src/libs/gl/glm4/wcwidth.m4
-new file mode 100644
-index 0000000..ad5c6cc
---- /dev/null
-+++ b/src/libs/gl/glm4/wcwidth.m4
-@@ -0,0 +1,94 @@
-+# wcwidth.m4 serial 17
-+dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([gl_FUNC_WCWIDTH],
-+[
-+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+
-+  dnl Persuade glibc <wchar.h> to declare wcwidth().
-+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-+
-+  AC_REQUIRE([gt_TYPE_WCHAR_T])
-+  AC_REQUIRE([gt_TYPE_WINT_T])
-+
-+  AC_CHECK_HEADERS_ONCE([wchar.h])
-+  AC_CHECK_FUNCS_ONCE([wcwidth])
-+
-+  AC_CHECK_DECLS([wcwidth], [], [], [
-+/* AIX 3.2.5 declares wcwidth in <string.h>. */
-+#include <string.h>
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-+   before <wchar.h>.  */
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <time.h>
-+#include <wchar.h>
-+])
-+  if test $ac_cv_have_decl_wcwidth != yes; then
-+    HAVE_DECL_WCWIDTH=0
-+  fi
-+
-+  if test $ac_cv_func_wcwidth = yes; then
-+    dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
-+    dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
-+    dnl This leads to bugs in 'ls' (coreutils).
-+    AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
-+      [gl_cv_func_wcwidth_works],
-+      [
-+        AC_TRY_RUN([
-+#include <locale.h>
-+/* AIX 3.2.5 declares wcwidth in <string.h>. */
-+#include <string.h>
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-+   before <wchar.h>.  */
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <time.h>
-+#include <wchar.h>
-+#if !HAVE_DECL_WCWIDTH
-+extern
-+# ifdef __cplusplus
-+"C"
-+# endif
-+int wcwidth (int);
-+#endif
-+int main ()
-+{
-+  if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
-+      return 1;
-+  return 0;
-+}], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no],
-+          [
-+changequote(,)dnl
-+           case "$host_os" in
-+                     # Guess yes on glibc and AIX 7 systems.
-+             *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";;
-+             *)                  gl_cv_func_wcwidth_works="guessing no";;
-+           esac
-+changequote([,])dnl
-+          ])
-+      ])
-+    case "$gl_cv_func_wcwidth_works" in
-+      *yes) ;;
-+      *no) REPLACE_WCWIDTH=1 ;;
-+    esac
-+  fi
-+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
-+    AC_LIBOBJ([wcwidth])
-+  fi
-+  if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
-+     || test $HAVE_DECL_WCWIDTH = 0; then
-+    gl_REPLACE_WCHAR_H
-+  fi
-+  dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
-+  dnl have the wcwidth function, then it does not declare it.
-+])
-diff --git a/src/libs/gl/glm4/wint_t.m4 b/src/libs/gl/glm4/wint_t.m4
-new file mode 100644
-index 0000000..a6c7d15
---- /dev/null
-+++ b/src/libs/gl/glm4/wint_t.m4
-@@ -0,0 +1,28 @@
-+# wint_t.m4 serial 4 (gettext-0.18)
-+dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl From Bruno Haible.
-+dnl Test whether <wchar.h> has the 'wint_t' type.
-+dnl Prerequisite: AC_PROG_CC
-+
-+AC_DEFUN([gt_TYPE_WINT_T],
-+[
-+  AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t],
-+    [AC_TRY_COMPILE([
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included
-+   before <wchar.h>.  */
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <time.h>
-+#include <wchar.h>
-+       wint_t foo = (wchar_t)'\0';], ,
-+       [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])])
-+  if test $gt_cv_c_wint_t = yes; then
-+    AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
-+  fi
-+])
-diff --git a/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp
-index 18e0a07..35876db 100644
---- a/src/libs/libgroff/font.cpp
-+++ b/src/libs/libgroff/font.cpp
-@@ -391,6 +391,9 @@ int font::get_width(glyph *g, int point_size)
-     int width = 24;	// value found in the original font files
- 			// XXX: this must be eventually moved back to the
- 			//      font description file!
-+    int w = wcwidth(get_code(g));
-+    if (w > 0)
-+      width *= w;
-     if (real_size == unitwidth || font::unscaled_charwidths)
-       return width;
-     else
-@@ -1009,6 +1012,11 @@ int font::load(int *not_found, int head_only)
- 	      t.error("bad code `%1' for character `%2'", p, nm);
- 	      return 0;
- 	    }
-+	    // XXX: this could be moved to font files, as suggested in
-+	    // font/devutf8/NOTE.
-+	    int w = wcwidth(metric.code);
-+	    if (w > 0)
-+	      metric.width *= w;
- 	    p = strtok(0, WS);
- 	    if ((p == NULL) || (strcmp(p, "--") == 0)) {
- 	      metric.special_device_coding = NULL;
-diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
-index 82c727d..782ef43 100644
---- a/src/roff/troff/Makefile.sub
-+++ b/src/roff/troff/Makefile.sub
-@@ -1,6 +1,6 @@
- PROG=troff$(EXEEXT)
- MAN1=troff.n
--XLIBS=$(LIBGROFF)
-+XLIBS=$(LIBGROFF) $(LIBGNU)
- MLIB=$(LIBM)
- OBJS=\
-   dictionary.$(OBJEXT) \
-diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
-index 61d3b2e..e0339c5 100644
---- a/src/roff/troff/input.cpp
-+++ b/src/roff/troff/input.cpp
-@@ -7579,6 +7579,7 @@ int main(int argc, char **argv)
-     if (putenv(strsave(e.contents())))
-       fatal("putenv failed");
-   }
-+  setlocale(LC_CTYPE, "");
-   static const struct option long_options[] = {
-     { "help", no_argument, 0, CHAR_MAX + 1 },
-     { "version", no_argument, 0, 'v' },
--- 
-1.7.2
-
diff --git a/groff-makefile-typo.patch b/groff-makefile-typo.patch
new file mode 100644
index 0000000..be2dbb8
--- /dev/null
+++ b/groff-makefile-typo.patch
@@ -0,0 +1,17 @@
+Fixes a typo in Makefile.comm
+
+Upstream fix:
+http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00002.html
+
+diff -ur groff-1.21.old/Makefile.comm groff-1.21/Makefile.comm
+--- groff-1.21.old/Makefile.comm	2010-12-31 08:33:08.000000000 +0100
++++ groff-1.21/Makefile.comm	2011-01-21 16:19:59.762069900 +0100
+@@ -21,7 +21,7 @@
+ #
+ INCLUDES=-I. -I$(srcdir) \
+   -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \
+-  -I$(tob_builddir)/src/libs/gnulib/lib
++  -I$(top_builddir)/src/libs/gnulib/lib
+ ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
+ COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
+ ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
diff --git a/groff-manpages-typos.patch b/groff-manpages-typos.patch
new file mode 100644
index 0000000..c450db8
--- /dev/null
+++ b/groff-manpages-typos.patch
@@ -0,0 +1,56 @@
+Various manual page fixes. Selected from #668524 and #668461.
+
+Patch was sent upstream:
+http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00011.html
+
+diff -uNPrp a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man
+--- a/contrib/mm/groff_mm.man	2011-01-21 14:52:52.302854667 +0100
++++ b/contrib/mm/groff_mm.man	2011-01-21 15:51:53.138775191 +0100
+@@ -1158,7 +1158,7 @@ and also less than or equal to
+ .B Hb
+ or
+ .B Hs
+-are centerered.
++are centered.
+ .RE
+ .
+ .IP
+@@ -1229,7 +1229,7 @@ Fourteen number registers named
+ up to
+ .B H14
+ contain the counter for each heading level.
+-The values are printed using arabic numerals;
++The values are printed using Arabic numerals;
+ this can be changed with the macro
+ .B HM
+ (see below).
+@@ -1590,7 +1590,7 @@ is still controlled by
+ .IR text-indent .
+ .
+ .IP
+-The mark is left-justified whitin the mark area if
++The mark is left-justified within the mark area if
+ .I pad
+ is\~0.
+ If
+@@ -1664,7 +1664,7 @@ Default is\~0.
+ List-status clear.
+ Terminates all current active lists down to
+ .IR list-level ,
+-or\~0 if no argmuent is given.
++or\~0 if no argument is given.
+ This is used by\~\c
+ .B H
+ to clear any active list.
+diff -uNPrp groff-1.21.old/man/roff.man groff-1.21/man/roff.man
+--- groff-1.21.old/man/roff.man	2010-12-31 08:33:09.000000000 +0100
++++ groff-1.21/man/roff.man	2011-01-21 15:26:24.061849971 +0100
+@@ -252,7 +252,7 @@ Today, the name
+ .I roff
+ is used to refer to a
+ .I troff/\:nroff
+-sytem as a whole.
++system as a whole.
+ .
+ .P
+ Ossanna's first version was written in the PDP-11 assembly language and
diff --git a/groff.spec b/groff.spec
index 9024b55..4203c79 100644
--- a/groff.spec
+++ b/groff.spec
@@ -2,8 +2,8 @@
 
 Summary: A document formatting system
 Name: groff
-Version: 1.20.1
-Release: 3%{?dist}
+Version: 1.21
+Release: 1%{?dist}
 License: GPLv3+ and GFDL and BSD and MIT
 Group: Applications/Publishing
 URL: http://groff.ffii.org
@@ -11,8 +11,8 @@ URL: http://groff.ffii.org
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 
 Patch1: groff-info-missing-x11.patch
-Patch2: groff-japanese-charclass.patch
-Patch3: groff-japanese-wcwidth.patch
+Patch2: groff-makefile-typo.patch
+Patch3: groff-manpages-typos.patch
 
 Requires: mktemp
 Requires: /sbin/install-info
@@ -78,8 +78,8 @@ language and documentation for creating PDF files.
 %prep
 %setup -q
 %patch1 -p1 -b .info-missing-x11
-%patch2 -p1 -b .japanese-charclass
-%patch3 -p1 -b .japanese-wcwidth
+%patch2 -p1 -b .makefile-typo
+%patch3 -p1 -b .manpages-typos
 
 for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
 				contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom} ; do
@@ -202,6 +202,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/pdf/
 
 %changelog
+* Fri Jan 21 2011 Jan Vcelak <jvcelak@redhat.com> 1.21-1
+- package rebase to 1.21
+
 * Fri Nov 26 2010 Jan Vcelak <jvcelak@redhat.com> 1.20.1-3
 - experimental support of Japanese (charclass and wcwidth patches)
   thanks to Daiki Ueno (dueno@redhat.com)