Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
author: Patrick J Volkerding <volkerdi@slackware.com> 2018-05-28 19:12:29 +0000
committer: Eric Hameleers <alien@slackware.com> 2018-05-31 23:39:35 +0200
commit: 646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
tree: b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/l/gtk+
parent: d31c50870d0bee042ce660e445c9294a59a3a65b (diff)
download: current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
32 files changed, 6325 insertions, 29050 deletions
diff --git a/source/l/gtk+/gtk+-1.2.10-ahiguti.patch b/source/l/gtk+/gtk+-1.2.10-ahiguti.patch
new file mode 100644
index 00000000..68f091c5
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-ahiguti.patch
@@ -0,0 +1,557 @@
+Return-Path: a-higuti@math.sci.hokudai.ac.jp
+Delivery-Date: Thu Sep 23 14:52:43 1999
+Return-Path: <a-higuti@math.sci.hokudai.ac.jp>
+Received: from localhost (IDENT:otaylor@localhost [127.0.0.1])
+	by fresnel.labs.redhat.com (8.9.3/8.9.3) with ESMTP id OAA00891
+	for <otaylor@localhost>; Thu, 23 Sep 1999 14:52:41 -0400
+Received: from lacrosse.redhat.com
+	by localhost with POP3 (fetchmail-5.0.0)
+	for otaylor@localhost (single-drop); Thu, 23 Sep 1999 14:52:42 -0400 (EDT)
+Received: from mail.redhat.com (mail.redhat.com [199.183.24.239])
+	by lacrosse.corp.redhat.com (8.9.3/8.9.3) with ESMTP id OAA19205
+	for <otaylor@lacrosse.redhat.com>; Thu, 23 Sep 1999 14:01:27 -0400
+Received: from math.sci.hokudai.ac.jp (seki.math.sci.hokudai.ac.jp [133.50.152.8])
+	by mail.redhat.com (8.8.7/8.8.7) with ESMTP id OAA13383
+	for <otaylor@redhat.com>; Thu, 23 Sep 1999 14:01:49 -0400
+Received: from heathcliff (a-higuti@hilbert.math.sci.hokudai.ac.jp [133.50.152.11])
+	by math.sci.hokudai.ac.jp (8.8.8/3.6W01/06/98) with SMTP id DAA23889
+	for <otaylor@redhat.com>; Fri, 24 Sep 1999 03:01:10 +0900 (JST)
+Date: Fri, 24 Sep 1999 03:01:10 +0900 (JST)
+Message-Id: <199909231801.DAA23889@math.sci.hokudai.ac.jp>
+From: a-higuti@math.sci.hokudai.ac.jp (Akira Higuchi)
+To: otaylor@redhat.com
+Subject: Adding more gdk_isw* macros
+Mime-Version: 1.0
+Content-Type: text/plain; charset=US-ASCII
+Status:  O
+Lines: 528
+Xref: fresnel.labs.redhat.com prog-gtk:648
+
+Hello Owen,
+
+I'm working on adding CJK support to gnome apps, and I need your advice.
+
+As you know, gtk+-1.2 has some support for CJK. It's sufficient for most
+gnome apps to be internationalized, but some problems remain. The most
+problem is that there is no way of doing word wrapping for CJK strings.
+
+For example, gtk-xmhtml shows Japanese text very uglily, because Japanese
+sentences are recognized as very long words. (a Japanese sentence 
+contain any spaces in most cases.) The same problem is in gtk+ itself, too;
+Word wrapping in GtkLabel and GtkText doesn't work correctly for CJK text,
+because of the same reason as above.
+
+In order to fix it, we need more gdk_isw* functions than we already have
+in gdki18n.h. (I regret I didn't add them before gtk+-1.2 was released.)
+I attach herewith a patch which fixes it, but I think it's not acceptable
+to adding a new macro to a stable version of gtk+. (is it?)
+
+The question I want to ask you is: what's the best way of fixing the
+problem without adding these macros to gdki18n.h? A solution is to add
+these macros to each *.c files (in GtkLabel, GtkText, and gtkxmhtml etc.)
+rather than gtki18n.h, but it's very ugly I think. 
+
+Please don't say "wait until gscript is completed" ;-(  I don't want to
+wait for a long time. (Please let me know if I can help you with gscript
+BTW. I've not hacked gscript yet, because it seems to be too early to be
+hacked by other than you.)
+
+Thanks,
+Akira Higuchi
+---------------- x8 ---------------- x8 ---------------- x8 ----------------
+diff -up gtk+-1.2.10/gdk/gdki18n.h.ahiguti gtk+-1.2.10/gdk/gdki18n.h
+--- gtk+-1.2.10/gdk/gdki18n.h.ahiguti	2000-01-24 03:58:21.000000000 +0100
++++ gtk+-1.2.10/gdk/gdki18n.h	2008-10-02 10:43:26.000000000 +0200
+@@ -51,4 +51,32 @@
+ #  define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c))
+ #endif
+ 
++/* The following 9 macros are added in gtk+ 1.2.X. Don't use them without
++ * checking GTK_CHECK_VERSION. For example,
++ *	#if GTK_CHECK_VERSION (1,2,X)
++ *	    ... code which uses gdk_iswalpha(), gdk_iswcntrl(), etc. ...
++ *      #endif
++ */
++#if !defined(G_HAVE_BROKEN_WCTYPE) && (defined(G_HAVE_WCTYPE_H) || defined(G_HAVE_WCHAR_H)) && !defined(X_LOCALE)
++#  define gdk_iswalpha(c)  iswalpha(c)
++#  define gdk_iswcntrl(c)  iswcntrl(c)
++#  define gdk_iswdigit(c)  iswdigit(c)
++#  define gdk_iswlower(c)  iswlower(c)
++#  define gdk_iswgraph(c)  iswgraph(c)
++#  define gdk_iswprint(c)  iswprint(c)
++#  define gdk_iswpunct(c)  iswpunct(c)
++#  define gdk_iswupper(c)  iswupper(c)
++#  define gdk_iswxdigit(c) iswxdigit(c)
++#else
++#  define gdk_iswalpha(c)  ((wchar_t)(c) <= 0xFF && isalpha(c))
++#  define gdk_iswcntrl(c)  ((wchar_t)(c) <= 0xFF && iscntrl(c))
++#  define gdk_iswdigit(c)  ((wchar_t)(c) <= 0xFF && isdigit(c))
++#  define gdk_iswlower(c)  ((wchar_t)(c) <= 0xFF && islower(c))
++#  define gdk_iswgraph(c)  ((wchar_t)(c) >  0xFF || isgraph(c))
++#  define gdk_iswprint(c)  ((wchar_t)(c) >  0xFF || isprint(c))
++#  define gdk_iswpunct(c)  ((wchar_t)(c) <= 0xFF && ispunct(c))
++#  define gdk_iswupper(c)  ((wchar_t)(c) <= 0xFF && isupper(c))
++#  define gdk_iswxdigit(c) ((wchar_t)(c) <= 0xFF && isxdigit(c))
++#endif
++
+ #endif /* __GDK_I18N_H__ */
+diff -up gtk+-1.2.10/gtk/gtkentry.c.ahiguti gtk+-1.2.10/gtk/gtkentry.c
+--- gtk+-1.2.10/gtk/gtkentry.c.ahiguti	2001-04-02 04:14:54.000000000 +0200
++++ gtk+-1.2.10/gtk/gtkentry.c	2008-10-02 10:43:26.000000000 +0200
+@@ -2036,11 +2036,21 @@ gtk_entry_move_word (GtkEditable *editab
+     }
+ }
+ 
++static gboolean
++alnum_or_ideogram (GtkEntry *entry, guint index)
++{
++  GdkWChar ch;
++  ch = entry->text[index];
++  if (entry->use_wchar)
++    return !(gdk_iswpunct (ch) || gdk_iswcntrl (ch) || gdk_iswspace (ch));
++  else
++    return !(ispunct (ch) || iscntrl (ch) || isspace (ch));
++}
++
+ static void
+ gtk_move_forward_word (GtkEntry *entry)
+ {
+   GtkEditable *editable;
+-  GdkWChar *text;
+   gint i;
+ 
+   editable = GTK_EDITABLE (entry);
+@@ -2054,21 +2064,12 @@ gtk_move_forward_word (GtkEntry *entry)
+ 
+   if (entry->text && (editable->current_pos < entry->text_length))
+     {
+-      text = entry->text;
+-      i = editable->current_pos;
+-	  
+-      if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
+-	for (; i < entry->text_length; i++)
+-	  {
+-	    if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i]))
+-	      break;
+-	  }
+-
++      for (i = editable->current_pos; i < entry->text_length; i++)
++	if (alnum_or_ideogram (entry, i))
++	  break;
+       for (; i < entry->text_length; i++)
+-	{
+-	  if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
+-	    break;
+-	}
++	if (!alnum_or_ideogram (entry, i))
++	  break;
+ 
+       editable->current_pos = i;
+     }
+@@ -2078,7 +2079,6 @@ static void
+ gtk_move_backward_word (GtkEntry *entry)
+ {
+   GtkEditable *editable;
+-  GdkWChar *text;
+   gint i;
+ 
+   editable = GTK_EDITABLE (entry);
+@@ -2092,26 +2092,19 @@ gtk_move_backward_word (GtkEntry *entry)
+ 
+   if (entry->text && editable->current_pos > 0)
+     {
+-      text = entry->text;
+-      i = editable->current_pos - 1;
+-      if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
+-	for (; i >= 0; i--)
++      for (i = editable->current_pos - 1; i >= 0; i--)
++	if (alnum_or_ideogram (entry, i))
++	  break;
++      for (; i >= 0; i--)
++	if (!alnum_or_ideogram (entry, i))
+ 	  {
+-	    if ((entry->use_wchar) ? gdk_iswalnum (text[i]) : isalnum (text[i]))
+-	      break;
++	    i++;
++	    break;
+ 	  }
+-      for (; i >= 0; i--)
+-	{
+-	  if ((entry->use_wchar) ? (!gdk_iswalnum (text[i])) : (!isalnum (text[i])))
+-	    {
+-	      i++;
+-	      break;
+-	    }
+-	}
+-	  
++
+       if (i < 0)
+ 	i = 0;
+-	  
++  
+       editable->current_pos = i;
+     }
+ }
+diff -up gtk+-1.2.10/gtk/gtklabel.c.ahiguti gtk+-1.2.10/gtk/gtklabel.c
+--- gtk+-1.2.10/gtk/gtklabel.c.ahiguti	2001-04-02 05:12:38.000000000 +0200
++++ gtk+-1.2.10/gtk/gtklabel.c	2008-10-02 10:43:26.000000000 +0200
+@@ -56,6 +56,7 @@ struct _GtkLabelWord
+   GtkLabelWord *next;
+   gint uline_y;
+   GtkLabelULine *uline;
++  gboolean paragraph_break;
+ };
+ 
+ struct _GtkLabelULine
+@@ -396,6 +397,7 @@ gtk_label_word_alloc (void)
+   word->beginning = NULL;
+   word->next = NULL;
+   word->uline = NULL;
++  word->paragraph_break = FALSE;
+ 
+   return word;
+ }
+@@ -441,6 +443,7 @@ gtk_label_split_text (GtkLabel *label)
+       if (str == label->label_wc || str[-1] == '\n')
+ 	{
+ 	  /* Paragraph break */
++	  word->paragraph_break = TRUE;
+ 	  word->space = 0;
+ 	  
+ 	  max_line_width = MAX (line_width, max_line_width);
+@@ -488,6 +491,7 @@ gtk_label_split_text (GtkLabel *label)
+     {
+       word = gtk_label_word_alloc ();
+       
++      word->paragraph_break = TRUE;
+       word->space = 0;
+       word->beginning = str;
+       word->length = 0;
+@@ -500,6 +504,13 @@ gtk_label_split_text (GtkLabel *label)
+   return MAX (line_width, max_line_width);
+ }
+ 
++static gboolean
++is_ideogram (GdkWChar wc)
++{
++  return !(gdk_iswalnum (wc) || gdk_iswspace (wc) ||
++	   gdk_iswpunct (wc) || gdk_iswcntrl (wc));
++}
++
+ /* this needs to handle white space better. */
+ static gint
+ gtk_label_split_text_wrapped (GtkLabel *label)
+@@ -526,6 +537,7 @@ gtk_label_split_text_wrapped (GtkLabel *
+       if (str == label->label_wc || str[-1] == '\n')
+ 	{
+ 	  /* Paragraph break */
++	  word->paragraph_break = TRUE;
+ 	  word->space = 0;
+ 	  
+ 	  max_line_width = MAX (line_width, max_line_width);
+@@ -546,24 +558,30 @@ gtk_label_split_text_wrapped (GtkLabel *
+ 	  else
+ 	    word->space = space_width * nspaces;
+ 	}
+-      else
++      else if (gdk_iswspace (str[-1]))
+ 	{
+ 	  /* Regular inter-word space */
+ 	  word->space = space_width;
+ 	}
++      else
++	{
++	  word->space = 0;
++	}
+       
+       word->beginning = str;
+       word->length = 0;
+       p = word->beginning;
+       while (*p && !gdk_iswspace (*p))
+ 	{
++	  if (word->length > 0 && (is_ideogram (p[-1]) || is_ideogram (*p)))
++	    break;
+ 	  word->length++;
+ 	  p++;
+ 	}
+       word->width = gdk_text_width_wc (GTK_WIDGET (label)->style->font, str, word->length);
+       
+       str += word->length;
+-      if (*str)
++      if (*str && gdk_iswspace (*str))
+ 	str++;
+       
+       line_width += word->space + word->width;
+@@ -600,7 +618,7 @@ gtk_label_pick_width (GtkLabel *label,
+   width = 0;
+   for (word = label->words; word; word = word->next)
+     {
+-      if (word->space == 0
++      if (word->paragraph_break
+ 	  || (line_width
+ 	      && (line_width >= min_width
+ 		  || line_width + word->width + word->space > max_width)))
+@@ -716,7 +734,8 @@ gtk_label_finalize_lines_wrap (GtkLabel 
+   GtkLabelWord *word, *line, *next_line;
+   GtkWidget *widget;
+   gchar *ptrn;
+-  gint x, y, space, extra_width, add_space, baseline_skip;
++  gint x, y, space, num_words, extra_width, add_space, baseline_skip;
++  gboolean deliver_equivalently;
+   
+   g_return_if_fail (label->wrap);
+   
+@@ -724,20 +743,24 @@ gtk_label_finalize_lines_wrap (GtkLabel 
+   y = 0;
+   baseline_skip = (GTK_WIDGET (label)->style->font->ascent +
+ 		   GTK_WIDGET (label)->style->font->descent + 1);
++  deliver_equivalently = FALSE;
+   
+   for (line = label->words; line != 0; line = next_line)
+     {
+-      space = 0;
++      space = num_words = 0;
+       extra_width = max_line_width - line->width;
+       
+       for (next_line = line->next; next_line; next_line = next_line->next)
+ 	{
+-	  if (next_line->space == 0)
++	  if (next_line->paragraph_break)
+ 	    break;		/* New paragraph */
+ 	  if (next_line->space + next_line->width > extra_width)
+ 	    break;
++	  if (next_line->space == 0)
++	    deliver_equivalently = TRUE; /* An ideogram is found. */
+ 	  extra_width -= next_line->space + next_line->width;
+ 	  space += next_line->space;
++	  num_words++;
+ 	}
+       
+       line->x = 0;
+@@ -747,14 +770,18 @@ gtk_label_finalize_lines_wrap (GtkLabel 
+       
+       for (word = line->next; word != next_line; word = word->next)
+ 	{
+-	  if (next_line && next_line->space)
++	  if (next_line && !next_line->paragraph_break &&
++	      label->jtype == GTK_JUSTIFY_FILL &&
++	      (deliver_equivalently ? num_words : space) > 0)
+ 	    {
+-	      /* Not last line of paragraph --- fill line if needed */
+-	      if (label->jtype == GTK_JUSTIFY_FILL) {
++	      /* Not last line of paragraph --- fill line */
++	      if (deliver_equivalently)
++		add_space = (extra_width + num_words / 2) / num_words;
++	      else
+ 		add_space = (extra_width * word->space + space / 2) / space;
+-		extra_width -= add_space;
+-		space -= word->space;
+-	      }
++	      extra_width -= add_space;
++	      space -= word->space;
++	      num_words--;
+ 	    }
+ 	  
+ 	  word->x = x + word->space + add_space;
+@@ -925,7 +952,7 @@ gtk_label_expose (GtkWidget      *widget
+ 
+       for (word = label->words; word; word = word->next)
+ 	{
+-	  gchar save = word->beginning[word->length];
++	  GdkWChar save = word->beginning[word->length];
+ 	  word->beginning[word->length] = '\0';
+ 	  gtk_label_paint_word (label, x, y, word, &event->area);
+ 	  word->beginning[word->length] = save;
+diff -up gtk+-1.2.10/gtk/gtktext.c.ahiguti gtk+-1.2.10/gtk/gtktext.c
+--- gtk+-1.2.10/gtk/gtktext.c.ahiguti	2001-03-15 21:15:12.000000000 +0100
++++ gtk+-1.2.10/gtk/gtktext.c	2008-10-02 10:43:27.000000000 +0200
+@@ -101,6 +101,13 @@ enum {
+   ARG_WORD_WRAP
+ };
+ 
++typedef enum {
++  CHAR_CLASS_SPACE,
++  CHAR_CLASS_ALNUM,
++  CHAR_CLASS_IDEOGRAM,
++  CHAR_CLASS_OTHERS     /* punct, cntrl */
++} CharClass;
++
+ typedef struct _TextProperty          TextProperty;
+ typedef struct _TabStopMark           TabStopMark;
+ typedef struct _PrevTabCont           PrevTabCont;
+@@ -300,6 +307,8 @@ static LineParams find_line_params (GtkT
+ 				    const GtkPropertyMark *mark,
+ 				    const PrevTabCont *tab_cont,
+ 				    PrevTabCont *next_cont);
++static void find_word_wrap_position (GtkText* text, LineParams *lp);
++static CharClass char_class (GtkText* text, guint index);
+ static void recompute_geometry (GtkText* text);
+ static void insert_expose (GtkText* text, guint old_pixels, gint nchars, guint new_line_count);
+ static void delete_expose (GtkText* text,
+@@ -4111,27 +4120,21 @@ gtk_text_move_forward_word (GtkText *tex
+   
+   undraw_cursor (text, FALSE);
+   
+-  if (text->use_wchar)
++  while (!LAST_INDEX (text, text->cursor_mark))
+     {
+-      while (!LAST_INDEX (text, text->cursor_mark) && 
+-	     !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
+-	advance_mark (&text->cursor_mark);
+-      
+-      while (!LAST_INDEX (text, text->cursor_mark) && 
+-	     gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
+-	advance_mark (&text->cursor_mark);
++      CharClass cc = char_class (text, text->cursor_mark.index);
++      if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM)
++	break;
++      advance_mark (&text->cursor_mark);
+     }
+-  else
++  while (!LAST_INDEX (text, text->cursor_mark))
+     {
+-      while (!LAST_INDEX (text, text->cursor_mark) && 
+-	     !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
+-	advance_mark (&text->cursor_mark);
+-      
+-      while (!LAST_INDEX (text, text->cursor_mark) && 
+-	     isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index)))
+-	advance_mark (&text->cursor_mark);
++      CharClass cc = char_class (text, text->cursor_mark.index);
++      if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM)
++	break;
++      advance_mark (&text->cursor_mark);
+     }
+-  
++
+   find_cursor (text, TRUE);
+   draw_cursor (text, FALSE);
+ }
+@@ -4143,25 +4146,19 @@ gtk_text_move_backward_word (GtkText *te
+   
+   undraw_cursor (text, FALSE);
+   
+-  if (text->use_wchar)
++  while (text->cursor_mark.index > 0)
+     {
+-      while ((text->cursor_mark.index > 0) &&
+-	     !gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
+-	decrement_mark (&text->cursor_mark);
+-      
+-      while ((text->cursor_mark.index > 0) &&
+-	     gdk_iswalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
+-	decrement_mark (&text->cursor_mark);
++      CharClass cc = char_class (text, text->cursor_mark.index - 1);
++      if (cc == CHAR_CLASS_ALNUM || cc == CHAR_CLASS_IDEOGRAM)
++	break;
++      decrement_mark (&text->cursor_mark);
+     }
+-  else
++  while (text->cursor_mark.index > 0)
+     {
+-      while ((text->cursor_mark.index > 0) &&
+-	     !isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
+-	decrement_mark (&text->cursor_mark);
+-      
+-      while ((text->cursor_mark.index > 0) &&
+-	     isalnum (GTK_TEXT_INDEX(text, text->cursor_mark.index-1)))
+-	decrement_mark (&text->cursor_mark);
++      CharClass cc = char_class (text, text->cursor_mark.index - 1);
++      if (cc != CHAR_CLASS_ALNUM && cc != CHAR_CLASS_IDEOGRAM)
++	break;
++      decrement_mark (&text->cursor_mark);
+     }
+   
+   find_cursor (text, TRUE);
+@@ -4782,27 +4779,8 @@ find_line_params (GtkText* text,
+ 		      GtkPropertyMark saved_mark = lp.end;
+ 		      guint saved_characters = lp.displayable_chars;
+ 		      
+-		      lp.displayable_chars += 1;
+-		      
+-		      if (text->use_wchar)
+-			{
+-			  while (!gdk_iswspace (GTK_TEXT_INDEX (text, lp.end.index)) &&
+-				 (lp.end.index > lp.start.index))
+-			    {
+-			      decrement_mark (&lp.end);
+-			      lp.displayable_chars -= 1;
+-			    }
+-			}
+-		      else
+-			{
+-			  while (!isspace(GTK_TEXT_INDEX (text, lp.end.index)) &&
+-				 (lp.end.index > lp.start.index))
+-			    {
+-			      decrement_mark (&lp.end);
+-			      lp.displayable_chars -= 1;
+-			    }
+-			}
+-		      
++		      find_word_wrap_position (text, &lp);
++
+ 		      /* If whole line is one word, revert to char wrapping */
+ 		      if (lp.end.index == lp.start.index)
+ 			{
+@@ -4850,6 +4828,54 @@ find_line_params (GtkText* text,
+   return lp;
+ }
+ 
++static CharClass
++char_class (GtkText* text, guint index)
++{
++  GdkWChar wc;
++  wc = GTK_TEXT_INDEX (text, index);
++  if (text->use_wchar)
++    {
++      if (gdk_iswspace (wc))
++	return CHAR_CLASS_SPACE;
++      else if (gdk_iswalnum (wc))
++	return CHAR_CLASS_ALNUM;
++      else if (gdk_iswpunct (wc) || gdk_iswcntrl (wc))
++	return CHAR_CLASS_OTHERS;
++      else
++	return CHAR_CLASS_IDEOGRAM;
++    }
++  else
++    {
++      if (isspace (wc))
++	return CHAR_CLASS_SPACE;
++      else if (isalnum (wc))
++	return CHAR_CLASS_ALNUM;
++      else if (ispunct (wc) || iscntrl (wc))
++	return CHAR_CLASS_OTHERS;
++      else
++	return CHAR_CLASS_IDEOGRAM;
++    }
++}
++
++static void
++find_word_wrap_position (GtkText* text, LineParams *lp)
++{
++  while (lp->end.index > lp->start.index &&
++	 char_class (text, lp->end.index) != CHAR_CLASS_SPACE &&
++	 char_class (text, lp->end.index) != CHAR_CLASS_IDEOGRAM &&
++	 char_class (text, lp->end.index - 1) != CHAR_CLASS_IDEOGRAM)
++    {
++      decrement_mark (&lp->end);
++      lp->displayable_chars -= 1;
++    }
++
++  /* lp->end.index points the position to be cut just now. If it's not a
++   * space, move it to the next display line. */
++  if (lp->end.index > lp->start.index &&
++      char_class (text, lp->end.index) != CHAR_CLASS_SPACE)
++    decrement_mark (&lp->end);
++}
++
+ static void
+ expand_scratch_buffer (GtkText* text, guint len)
+ {
+---------------- x8 ---------------- x8 ---------------- x8 ----------------
+
+--------------------------------------
+Akira Higuchi
+Dept. of Mathematics, Hokkaido Univ.
+Hokkaido, Japan
+Email: a-higuti@math.sci.hokudai.ac.jp
diff --git a/source/l/gtk+/gtk+-1.2.10-alignment.patch b/source/l/gtk+/gtk+-1.2.10-alignment.patch
new file mode 100644
index 00000000..7d90898a
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-alignment.patch
@@ -0,0 +1,29 @@
+--- gtk+-1.2.10/gtk/gtktypeutils.h.alignment	Fri Aug 18 17:36:34 2000
++++ gtk+-1.2.10/gtk/gtktypeutils.h	Tue Jul  3 21:07:40 2001
+@@ -191,6 +191,13 @@
+   GtkTypeClass	*klass;
+ };
+ 
++#ifdef __GNUC__
++struct _GtkTypeClassDummyAlign
++{
++  GtkType type;
++  guint *signals;
++};
++#endif /* __GNUC__ */
+ 
+ /* A GtkTypeClass defines the minimum structure requirements for
+  * a types class. Classes returned from gtk_type_class () and
+@@ -203,7 +210,11 @@
+    *  one unique identifier per class.
+    */
+   GtkType type;
+-};
++}
++#ifdef __GNUC__
++__attribute__ ((aligned (__alignof (struct _GtkTypeClassDummyAlign))))
++#endif /* __GNUC__ */
++;
+ 
+ 
+ struct _GtkArg
diff --git a/source/l/gtk+/gtk+-1.2.10-autotools.patch b/source/l/gtk+/gtk+-1.2.10-autotools.patch
new file mode 100644
index 00000000..fefc5cbf
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-autotools.patch
@@ -0,0 +1,4374 @@
+--- Makefile.in
++++ Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 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.
+@@ -133,7 +133,98 @@ bin_SCRIPTS = gtk-config
+ # require automake 1.4
+ AUTOMAKE_OPTIONS = 1.4
+ 
+-EXTRA_DIST =  	HACKING			gtk+.spec.in	        gtk.m4          	makecopyright		TODO			NEWS.pre-1-0		ChangeLog.pre-1-0		README.cvs-commits		intl/libgettext.h		intl/po2tbl.sed.in		examples/aspectframe/Makefile  	examples/aspectframe/aspectframe.c  	examples/Makefile  	examples/README.1ST  	examples/extract.awk  	examples/extract.sh  	examples/base/Makefile  	examples/base/base.c  	examples/buttons/Makefile  	examples/buttons/buttons.c  	examples/buttons/info.xpm  	examples/calendar/Makefile  	examples/calendar/calendar.c  	examples/clist/Makefile  	examples/clist/clist.c  	examples/entry/Makefile  	examples/entry/entry.c  	examples/eventbox/Makefile  	examples/eventbox/eventbox.c  	examples/filesel/Makefile  	examples/filesel/filesel.c  	examples/gtkdial/Makefile  	examples/gtkdial/dial_test.c  	examples/gtkdial/gtkdial.c  	examples/gtkdial/gtkdial.h  	examples/helloworld/Makefile  	examples/helloworld/helloworld.c  	examples/helloworld2/Makefile  	examples/helloworld2/helloworld2.c  	examples/list/Makefile  	examples/list/list.c  	examples/menu/Makefile  	examples/menu/menu.c  	examples/menu/itemfactory.c  	examples/notebook/Makefile  	examples/notebook/notebook.c  	examples/packbox/Makefile  	examples/packbox/packbox.c  	examples/packer/Makefile  	examples/packer/pack.c  	examples/paned/Makefile  	examples/paned/paned.c  	examples/pixmap/Makefile  	examples/pixmap/pixmap.c  	examples/progressbar/Makefile  	examples/progressbar/progressbar.c  	examples/radiobuttons/Makefile  	examples/radiobuttons/radiobuttons.c  	examples/rangewidgets/Makefile  	examples/rangewidgets/rangewidgets.c  	examples/rulers/Makefile  	examples/rulers/rulers.c  	examples/scribble-simple/Makefile  	examples/scribble-simple/scribble-simple.c  	examples/scrolledwin/Makefile  	examples/scrolledwin/scrolledwin.c  	examples/selection/Makefile  	examples/selection/gettargets.c  	examples/selection/setselection.c  	examples/statusbar/Makefile  	examples/statusbar/statusbar.c  	examples/table/Makefile  	examples/table/table.c  	examples/text/Makefile  	examples/text/text.c  	examples/tictactoe/Makefile  	examples/tictactoe/tictactoe.c  	examples/tictactoe/tictactoe.h  	examples/tictactoe/ttt_test.c  	examples/tree/Makefile  	examples/tree/tree.c  	examples/wheelbarrow/Makefile  	examples/wheelbarrow/wheelbarrow.c  	examples/fixed/fixed.c  	examples/fixed/Makefile  	examples/frame/frame.c  	examples/frame/Makefile  	examples/spinbutton/spinbutton.c  	examples/spinbutton/Makefile  	examples/find-examples.sh 	gdk.pc.in gtk+.pc.in
++EXTRA_DIST = \
++	HACKING		\
++	gtk+.spec.in	\
++        gtk.m4          \
++	makecopyright	\
++	TODO		\
++	NEWS.pre-1-0	\
++	ChangeLog.pre-1-0	\
++	README.cvs-commits	\
++	intl/libgettext.h	\
++	intl/po2tbl.sed.in	\
++	examples/aspectframe/Makefile  \
++	examples/aspectframe/aspectframe.c  \
++	examples/Makefile  \
++	examples/README.1ST  \
++	examples/extract.awk  \
++	examples/extract.sh  \
++	examples/base/Makefile  \
++	examples/base/base.c  \
++	examples/buttons/Makefile  \
++	examples/buttons/buttons.c  \
++	examples/buttons/info.xpm  \
++	examples/calendar/Makefile  \
++	examples/calendar/calendar.c  \
++	examples/clist/Makefile  \
++	examples/clist/clist.c  \
++	examples/entry/Makefile  \
++	examples/entry/entry.c  \
++	examples/eventbox/Makefile  \
++	examples/eventbox/eventbox.c  \
++	examples/filesel/Makefile  \
++	examples/filesel/filesel.c  \
++	examples/gtkdial/Makefile  \
++	examples/gtkdial/dial_test.c  \
++	examples/gtkdial/gtkdial.c  \
++	examples/gtkdial/gtkdial.h  \
++	examples/helloworld/Makefile  \
++	examples/helloworld/helloworld.c  \
++	examples/helloworld2/Makefile  \
++	examples/helloworld2/helloworld2.c  \
++	examples/list/Makefile  \
++	examples/list/list.c  \
++	examples/menu/Makefile  \
++	examples/menu/menu.c  \
++	examples/menu/itemfactory.c  \
++	examples/notebook/Makefile  \
++	examples/notebook/notebook.c  \
++	examples/packbox/Makefile  \
++	examples/packbox/packbox.c  \
++	examples/packer/Makefile  \
++	examples/packer/pack.c  \
++	examples/paned/Makefile  \
++	examples/paned/paned.c  \
++	examples/pixmap/Makefile  \
++	examples/pixmap/pixmap.c  \
++	examples/progressbar/Makefile  \
++	examples/progressbar/progressbar.c  \
++	examples/radiobuttons/Makefile  \
++	examples/radiobuttons/radiobuttons.c  \
++	examples/rangewidgets/Makefile  \
++	examples/rangewidgets/rangewidgets.c  \
++	examples/rulers/Makefile  \
++	examples/rulers/rulers.c  \
++	examples/scribble-simple/Makefile  \
++	examples/scribble-simple/scribble-simple.c  \
++	examples/scrolledwin/Makefile  \
++	examples/scrolledwin/scrolledwin.c  \
++	examples/selection/Makefile  \
++	examples/selection/gettargets.c  \
++	examples/selection/setselection.c  \
++	examples/statusbar/Makefile  \
++	examples/statusbar/statusbar.c  \
++	examples/table/Makefile  \
++	examples/table/table.c  \
++	examples/text/Makefile  \
++	examples/text/text.c  \
++	examples/tictactoe/Makefile  \
++	examples/tictactoe/tictactoe.c  \
++	examples/tictactoe/tictactoe.h  \
++	examples/tictactoe/ttt_test.c  \
++	examples/tree/Makefile  \
++	examples/tree/tree.c  \
++	examples/wheelbarrow/Makefile  \
++	examples/wheelbarrow/wheelbarrow.c  \
++	examples/fixed/fixed.c  \
++	examples/fixed/Makefile  \
++	examples/frame/frame.c  \
++	examples/frame/Makefile  \
++	examples/spinbutton/spinbutton.c  \
++	examples/spinbutton/Makefile  \
++	examples/find-examples.sh \
++	gdk.pc.in gtk+.pc.in
+ 
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -163,9 +254,9 @@ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -282,7 +373,7 @@ uninstall-pkgconfigDATA:
+ all-recursive install-data-recursive install-exec-recursive \
+ installdirs-recursive install-recursive uninstall-recursive  \
+ check-recursive installcheck-recursive info-recursive dvi-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -302,11 +393,11 @@ check-recursive installcheck-recursive i
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+ 	done; \
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+@@ -396,7 +487,12 @@ dist-all: distdir
+ distdir: $(DISTFILES)
+ 	-rm -rf $(distdir)
+ 	mkdir $(distdir)
+-	-chmod 777 $(distdir)
++	-chmod 755 $(distdir)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+ 	$(mkinstalldirs) $(distdir)/examples $(distdir)/examples/aspectframe \
+ 	   $(distdir)/examples/base $(distdir)/examples/buttons \
+ 	   $(distdir)/examples/calendar $(distdir)/examples/clist \
+@@ -433,7 +529,7 @@ distdir: $(DISTFILES)
+ 	    test -d $(distdir)/$$subdir \
+ 	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+-	    chmod 777 $(distdir)/$$subdir; \
++	    chmod 755 $(distdir)/$$subdir; \
+ 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+--- docs/Makefile.in
++++ docs/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 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.
+@@ -129,19 +129,135 @@ info_TEXINFOS = gdk.texi gtk.texi
+ 
+ man_MANS = gtk-config.1
+ 
+-TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html   	html/gtk_tut_fr-2.html   	html/gtk_tut_fr-3.html   	html/gtk_tut_fr-4.html   	html/gtk_tut_fr-5.html   	html/gtk_tut_fr-6.html   	html/gtk_tut_fr-7.html   	html/gtk_tut_fr-8.html   	html/gtk_tut_fr-9.html   	html/gtk_tut_fr-10.html  	html/gtk_tut_fr-11.html  	html/gtk_tut_fr-12.html  	html/gtk_tut_fr-13.html  	html/gtk_tut_fr-14.html  	html/gtk_tut_fr-15.html  	html/gtk_tut_fr-16.html  	html/gtk_tut_fr-17.html  	html/gtk_tut_fr-18.html  	html/gtk_tut_fr-19.html  	html/gtk_tut_fr-20.html  	html/gtk_tut_fr-21.html  	html/gtk_tut_fr-22.html  	html/gtk_tut_fr-23.html  	html/gtk_tut_fr-24.html  	html/gtk_tut_fr.html text/gtk_tut_fr.txt
+-
+-
+-TUTORIAL_FILES = text/gtk_tut.txt html/gtk_tut.html html/gtk_tut.html        	html/gtk_tut-1.html      	html/gtk_tut-2.html      	html/gtk_tut-3.html      	html/gtk_tut-4.html      	html/gtk_tut-5.html      	html/gtk_tut-6.html      	html/gtk_tut-7.html      	html/gtk_tut-8.html      	html/gtk_tut-9.html      	html/gtk_tut-10.html     	html/gtk_tut-11.html     	html/gtk_tut-12.html     	html/gtk_tut-13.html     	html/gtk_tut-14.html     	html/gtk_tut-15.html     	html/gtk_tut-16.html     	html/gtk_tut-17.html     	html/gtk_tut-18.html     	html/gtk_tut-19.html     	html/gtk_tut-20.html     	html/gtk_tut-21.html     	html/gtk_tut-22.html     	html/gtk_tut-23.html     	html/gtk_tut-24.html     	html/gtk_tut-25.html     	html/gtk_tut-26.html     	html/gtk_tut-27.html     	html/gtk_tut-28.html     	html/gtk_tut-29.html     	html/gtk_tut-30.html     	html/gtk_tut-31.html
+-
+-
+-TUTORIAL_IT_FILES = html/gtk_tut_it.html     		html/gtk_tut_it-1.html   		html/gtk_tut_it-2.html   		html/gtk_tut_it-3.html   		html/gtk_tut_it-4.html   		html/gtk_tut_it-5.html   		html/gtk_tut_it-6.html   		html/gtk_tut_it-7.html   		html/gtk_tut_it-8.html   		html/gtk_tut_it-9.html   		html/gtk_tut_it-10.html  		html/gtk_tut_it-11.html  		html/gtk_tut_it-12.html  		html/gtk_tut_it-13.html  		html/gtk_tut_it-14.html  		html/gtk_tut_it-15.html  		html/gtk_tut_it-16.html  		html/gtk_tut_it-17.html  		html/gtk_tut_it-18.html  		html/gtk_tut_it-19.html  		html/gtk_tut_it-20.html  		html/gtk_tut_it-21.html  		html/gtk_tut_it-22.html  		html/gtk_tut_it-23.html  		html/gtk_tut_it-24.html			text/gtk_tut_it.txt
+-
+-
+-FAQ_FILES = html/gtkfaq.html			html/gtkfaq-1.html       		html/gtkfaq-2.html       		html/gtkfaq-3.html       		html/gtkfaq-4.html       		html/gtkfaq-5.html       		html/gtkfaq-6.html       		html/gtkfaq-7.html			text/gtkfaq.txt
+-
+-
+-EXTRA_DIST =  	Changes-1.2.txt				debugging.txt				developers.txt				refcounting.txt				styles.txt				text_widget.txt 			widget_system.txt 			generation.txt			        gtk-config.txt  	        	gtk-config.1.in				texinfo.tex 				macros.texi				gtkdocs_fix				gtkfaq.sgml				gtk_tut.sgml				gtk_tut_it.sgml				gtk_tut_fr.sgml				gtk_tut_packbox1.gif 			gtk_tut_packbox2.gif 			html/gtk_tut_table.gif			html/gtk_tut_packbox1.gif 		html/gtk_tut_packbox2.gif 		gtk_tut_table.gif			$(TUTORIAL_FILES)			$(TUTORIAL_FR_FILES)			$(TUTORIAL_IT_FILES)			$(FAQ_FILES)
++TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html   	\
++html/gtk_tut_fr-2.html   	\
++html/gtk_tut_fr-3.html   	\
++html/gtk_tut_fr-4.html   	\
++html/gtk_tut_fr-5.html   	\
++html/gtk_tut_fr-6.html   	\
++html/gtk_tut_fr-7.html   	\
++html/gtk_tut_fr-8.html   	\
++html/gtk_tut_fr-9.html   	\
++html/gtk_tut_fr-10.html  	\
++html/gtk_tut_fr-11.html  	\
++html/gtk_tut_fr-12.html  	\
++html/gtk_tut_fr-13.html  	\
++html/gtk_tut_fr-14.html  	\
++html/gtk_tut_fr-15.html  	\
++html/gtk_tut_fr-16.html  	\
++html/gtk_tut_fr-17.html  	\
++html/gtk_tut_fr-18.html  	\
++html/gtk_tut_fr-19.html  	\
++html/gtk_tut_fr-20.html  	\
++html/gtk_tut_fr-21.html  	\
++html/gtk_tut_fr-22.html  	\
++html/gtk_tut_fr-23.html  	\
++html/gtk_tut_fr-24.html  	\
++html/gtk_tut_fr.html text/gtk_tut_fr.txt
++
++
++TUTORIAL_FILES = text/gtk_tut.txt html/gtk_tut.html \
++html/gtk_tut.html        	\
++html/gtk_tut-1.html      	\
++html/gtk_tut-2.html      	\
++html/gtk_tut-3.html      	\
++html/gtk_tut-4.html      	\
++html/gtk_tut-5.html      	\
++html/gtk_tut-6.html      	\
++html/gtk_tut-7.html      	\
++html/gtk_tut-8.html      	\
++html/gtk_tut-9.html      	\
++html/gtk_tut-10.html     	\
++html/gtk_tut-11.html     	\
++html/gtk_tut-12.html     	\
++html/gtk_tut-13.html     	\
++html/gtk_tut-14.html     	\
++html/gtk_tut-15.html     	\
++html/gtk_tut-16.html     	\
++html/gtk_tut-17.html     	\
++html/gtk_tut-18.html     	\
++html/gtk_tut-19.html     	\
++html/gtk_tut-20.html     	\
++html/gtk_tut-21.html     	\
++html/gtk_tut-22.html     	\
++html/gtk_tut-23.html     	\
++html/gtk_tut-24.html     	\
++html/gtk_tut-25.html     	\
++html/gtk_tut-26.html     	\
++html/gtk_tut-27.html     	\
++html/gtk_tut-28.html     	\
++html/gtk_tut-29.html     	\
++html/gtk_tut-30.html     	\
++html/gtk_tut-31.html
++
++
++TUTORIAL_IT_FILES = html/gtk_tut_it.html     	\
++	html/gtk_tut_it-1.html   	\
++	html/gtk_tut_it-2.html   	\
++	html/gtk_tut_it-3.html   	\
++	html/gtk_tut_it-4.html   	\
++	html/gtk_tut_it-5.html   	\
++	html/gtk_tut_it-6.html   	\
++	html/gtk_tut_it-7.html   	\
++	html/gtk_tut_it-8.html   	\
++	html/gtk_tut_it-9.html   	\
++	html/gtk_tut_it-10.html  	\
++	html/gtk_tut_it-11.html  	\
++	html/gtk_tut_it-12.html  	\
++	html/gtk_tut_it-13.html  	\
++	html/gtk_tut_it-14.html  	\
++	html/gtk_tut_it-15.html  	\
++	html/gtk_tut_it-16.html  	\
++	html/gtk_tut_it-17.html  	\
++	html/gtk_tut_it-18.html  	\
++	html/gtk_tut_it-19.html  	\
++	html/gtk_tut_it-20.html  	\
++	html/gtk_tut_it-21.html  	\
++	html/gtk_tut_it-22.html  	\
++	html/gtk_tut_it-23.html  	\
++	html/gtk_tut_it-24.html		\
++	text/gtk_tut_it.txt
++
++
++FAQ_FILES = html/gtkfaq.html		\
++	html/gtkfaq-1.html       	\
++	html/gtkfaq-2.html       	\
++	html/gtkfaq-3.html       	\
++	html/gtkfaq-4.html       	\
++	html/gtkfaq-5.html       	\
++	html/gtkfaq-6.html       	\
++	html/gtkfaq-7.html		\
++	text/gtkfaq.txt
++
++
++EXTRA_DIST =  \
++	Changes-1.2.txt			\
++	debugging.txt			\
++	developers.txt			\
++	refcounting.txt			\
++	styles.txt			\
++	text_widget.txt 		\
++	widget_system.txt 		\
++	generation.txt			\
++        gtk-config.txt  	        \
++	gtk-config.1.in			\
++	texinfo.tex 			\
++	macros.texi			\
++	gtkdocs_fix			\
++	gtkfaq.sgml			\
++	gtk_tut.sgml			\
++	gtk_tut_it.sgml			\
++	gtk_tut_fr.sgml			\
++	gtk_tut_packbox1.gif 		\
++	gtk_tut_packbox2.gif 		\
++	html/gtk_tut_table.gif		\
++	html/gtk_tut_packbox1.gif 	\
++	html/gtk_tut_packbox2.gif 	\
++	gtk_tut_table.gif		\
++	$(TUTORIAL_FILES)		\
++	$(TUTORIAL_FR_FILES)		\
++	$(TUTORIAL_IT_FILES)		\
++	$(FAQ_FILES)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -165,9 +281,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -257,7 +373,7 @@ uninstall-info:
+ 	else ii=; fi; \
+ 	list='$(INFO_DEPS)'; \
+ 	for file in $$list; do \
+-	  test -z "$ii" \
++	  test -z "$$ii" \
+ 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
+ 	done
+ 	@$(NORMAL_UNINSTALL)
+@@ -343,6 +459,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+ subdir = docs
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile
+ 	$(mkinstalldirs) $(distdir)/html $(distdir)/text
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+--- gdk/Makefile.in
++++ gdk/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 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.
+@@ -125,7 +125,15 @@ x_ldflags = @x_ldflags@
+ x_libs = @x_libs@
+ xinput_progs = @xinput_progs@
+ 
+-INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gdk\"		-I$(top_srcdir)			@GTK_DEBUG_FLAGS@ 		@GTK_XIM_FLAGS@			@GTK_LOCALE_FLAGS@		@GLIB_CFLAGS@			@x_cflags@ 		@STRIP_END@
++INCLUDES = @STRIP_BEGIN@ \
++	-DG_LOG_DOMAIN=\"Gdk\"	\
++	-I$(top_srcdir)		\
++	@GTK_DEBUG_FLAGS@ 	\
++	@GTK_XIM_FLAGS@		\
++	@GTK_LOCALE_FLAGS@	\
++	@GLIB_CFLAGS@		\
++	@x_cflags@ 		\
++@STRIP_END@
+ 
+ 
+ #
+@@ -135,16 +143,65 @@ lib_LTLIBRARIES = libgdk.la
+ 
+ # libtool stuff: set version and export symbols for resolving
+ libgdkincludedir = $(includedir)/gtk-1.2/gdk
+-libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
++libgdk_la_LDFLAGS = @STRIP_BEGIN@ \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++	-release $(LT_RELEASE) \
++	-export-dynamic \
++	-no-undefined -Wl,--no-undefined \
++	$(filter-out -lgmodule -ldl, @GLIB_DEPLIBS@) \
++	@x_ldflags@	\
++	@x_libs@	\
++@STRIP_END@
+ 
+ 
+ #
+ # setup source file variables
+ #
+ # GDK header files for public installation (non-generated)
+-gdk_public_h_sources = @STRIP_BEGIN@ 	gdk.h			gdkcursors.h		gdkrgb.h		gdki18n.h		gdkkeysyms.h		gdkprivate.h		gdktypes.h		gdkx.h		@STRIP_END@
+-
+-gdk_c_sources = @STRIP_BEGIN@ 	gdk.c			gdkcc.c			gdkcolor.c		gdkcursor.c		gdkdnd.c		gdkdraw.c		gdkevents.c     	gdkfont.c		gdkgc.c			gdkglobals.c		gdkim.c			gdkimage.c		gdkinput.c		gdkinput.h		gdkinputnone.h  	gdkinputcommon.h 	gdkinputgxi.h		gdkinputxfree.h		gdkpixmap.c		gdkproperty.c		gdkrgb.c		gdkrectangle.c		gdkregion.c		gdkselection.c		gdkvisual.c		gdkwindow.c		gdkxid.c 		MwmUtil.h       	gxid_lib.h		gxid_proto.h	        gxid_lib.c	@STRIP_END@
++gdk_public_h_sources = @STRIP_BEGIN@ \
++	gdk.h		\
++	gdkcursors.h	\
++	gdkrgb.h	\
++	gdki18n.h	\
++	gdkkeysyms.h	\
++	gdkprivate.h	\
++	gdktypes.h	\
++	gdkx.h		\
++@STRIP_END@
++
++gdk_c_sources = @STRIP_BEGIN@ \
++	gdk.c		\
++	gdkcc.c		\
++	gdkcolor.c	\
++	gdkcursor.c	\
++	gdkdnd.c	\
++	gdkdraw.c	\
++	gdkevents.c     \
++	gdkfont.c	\
++	gdkgc.c		\
++	gdkglobals.c	\
++	gdkim.c		\
++	gdkimage.c	\
++	gdkinput.c	\
++	gdkinput.h	\
++	gdkinputnone.h  \
++	gdkinputcommon.h\
++	gdkinputgxi.h	\
++	gdkinputxfree.h	\
++	gdkpixmap.c	\
++	gdkproperty.c	\
++	gdkrgb.c	\
++	gdkrectangle.c	\
++	gdkregion.c	\
++	gdkselection.c	\
++	gdkvisual.c	\
++	gdkwindow.c	\
++	gdkxid.c 	\
++	MwmUtil.h       \
++	gxid_lib.h	\
++	gxid_proto.h	\
++        gxid_lib.c	\
++@STRIP_END@
+ 
+ 
+ #
+@@ -161,7 +218,12 @@ EXTRA_DIST =
+ #
+ EXTRA_PROGRAMS = gxid
+ bin_PROGRAMS = @xinput_progs@
+-LDADDS = @STRIP_BEGIN@ 	@x_ldflags@		@x_libs@		@GLIB_LIBS@		-lm		@STRIP_END@
++LDADDS = @STRIP_BEGIN@ \
++	@x_ldflags@	\
++	@x_libs@	\
++	@GLIB_LIBS@	\
++	-lm		\
++@STRIP_END@
+ 
+ gxid_SOURCES = gxid.c
+ gxid_LDADD = $(LDADDS)
+@@ -204,6 +266,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
+ 
+ TAR = gtar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/gdk.P .deps/gdkcc.P .deps/gdkcolor.P \
++.deps/gdkcursor.P .deps/gdkdnd.P .deps/gdkdraw.P .deps/gdkevents.P \
++.deps/gdkfont.P .deps/gdkgc.P .deps/gdkglobals.P .deps/gdkim.P \
++.deps/gdkimage.P .deps/gdkinput.P .deps/gdkpixmap.P .deps/gdkproperty.P \
++.deps/gdkrectangle.P .deps/gdkregion.P .deps/gdkrgb.P \
++.deps/gdkselection.P .deps/gdkvisual.P .deps/gdkwindow.P .deps/gdkxid.P \
++.deps/gxid.P .deps/gxid_lib.P
+ SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
+ OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
+ 
+@@ -211,9 +280,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gdk/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -243,9 +312,6 @@ uninstall-libLTLIBRARIES:
+ 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -262,9 +328,6 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -362,6 +425,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+ subdir = gdk
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gdk/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -372,55 +440,38 @@ distdir: $(DISTFILES)
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-gdk.lo gdk.o : gdk.c ../config.h gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
+-	gdkprivate.h gdkinput.h gdkx.h gdkprivate.h gdki18n.h \
+-	gdkkeysyms.h
+-gdkcc.lo gdkcc.o : gdkcc.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
+-	gdkprivate.h gdkx.h gdkprivate.h
+-gdkcolor.lo gdkcolor.o : gdkcolor.c gdk.h gdktypes.h gdkcursors.h \
+-	gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
+-gdkcursor.lo gdkcursor.o : gdkcursor.c gdk.h gdktypes.h gdkcursors.h \
+-	gdkrgb.h gdkprivate.h
+-gdkdnd.lo gdkdnd.o : gdkdnd.c gdkx.h gdkprivate.h gdktypes.h \
+-	gdkcursors.h gdk.h gdkrgb.h
+-gdkdraw.lo gdkdraw.o : gdkdraw.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
+-	gdkprivate.h
+-gdkevents.lo gdkevents.o : gdkevents.c gdk.h gdktypes.h gdkcursors.h \
+-	gdkrgb.h gdkx.h gdkprivate.h gdkprivate.h gdkkeysyms.h \
+-	../config.h gdkinput.h
+-gdkfont.lo gdkfont.o : gdkfont.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
+-	gdkprivate.h ../config.h
+-gdkgc.lo gdkgc.o : gdkgc.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
+-	gdkprivate.h
+-gdkglobals.lo gdkglobals.o : gdkglobals.c gdktypes.h gdkcursors.h \
+-	gdkprivate.h gdktypes.h ../config.h
+-gdkim.lo gdkim.o : gdkim.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
+-	gdkprivate.h gdki18n.h gdkx.h gdkprivate.h ../config.h
+-gdkimage.lo gdkimage.o : gdkimage.c ../config.h gdk.h gdktypes.h \
+-	gdkcursors.h gdkrgb.h gdkprivate.h
+-gdkinput.lo gdkinput.o : gdkinput.c ../config.h gdk.h gdktypes.h \
+-	gdkcursors.h gdkrgb.h gdkx.h gdkprivate.h gdkprivate.h \
+-	gdkinput.h gdkinputnone.h gdkinputcommon.h gdkinputxfree.h \
+-	gdkinputgxi.h
+-gdkpixmap.lo gdkpixmap.o : gdkpixmap.c ../config.h gdk.h gdktypes.h \
+-	gdkcursors.h gdkrgb.h gdkprivate.h
+-gdkproperty.lo gdkproperty.o : gdkproperty.c gdk.h gdktypes.h \
+-	gdkcursors.h gdkrgb.h gdkprivate.h
+-gdkrectangle.lo gdkrectangle.o : gdkrectangle.c gdk.h gdktypes.h \
+-	gdkcursors.h gdkrgb.h
+-gdkregion.lo gdkregion.o : gdkregion.c gdk.h gdktypes.h gdkcursors.h \
+-	gdkrgb.h gdkprivate.h
+-gdkrgb.lo gdkrgb.o : gdkrgb.c ../config.h gdk.h gdktypes.h gdkcursors.h \
+-	gdkrgb.h gdkprivate.h gdkrgb.h
+-gdkselection.lo gdkselection.o : gdkselection.c gdk.h gdktypes.h \
+-	gdkcursors.h gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
+-gdkvisual.lo gdkvisual.o : gdkvisual.c gdk.h gdktypes.h gdkcursors.h \
+-	gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
+-gdkwindow.lo gdkwindow.o : gdkwindow.c gdk.h gdktypes.h gdkcursors.h \
+-	gdkrgb.h ../config.h gdkinput.h gdkprivate.h MwmUtil.h
+-gdkxid.lo gdkxid.o : gdkxid.c gdkprivate.h gdktypes.h gdkcursors.h
+-gxid_lib.lo gxid_lib.o : gxid_lib.c ../config.h gxid_lib.h gxid_proto.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -462,19 +513,19 @@ maintainer-clean-generic:
+ 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-binPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
+-		clean-binPROGRAMS clean-tags clean-generic \
++		clean-binPROGRAMS clean-tags clean-depend clean-generic \
+ 		mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-binPROGRAMS distclean-tags \
+-		distclean-generic clean-am
++		distclean-depend distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -482,7 +533,8 @@ distclean: distclean-am
+ maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-binPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -497,12 +549,13 @@ maintainer-clean-libtool mostlyclean-bin
+ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
+ install-binPROGRAMS uninstall-libgdkincludeHEADERS \
+ install-libgdkincludeHEADERS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ #
+--- gtk/Makefile.in
++++ gtk/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 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.
+@@ -125,7 +125,20 @@ x_ldflags = @x_ldflags@
+ x_libs = @x_libs@
+ xinput_progs = @xinput_progs@
+ 
+-INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"	     	        	-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_cflags@					@STRIP_END@
++INCLUDES = @STRIP_BEGIN@ \
++	-DG_LOG_DOMAIN=\"Gtk\"				\
++	-DGTK_DISABLE_COMPAT_H				\
++	-DGTK_LIBDIR=\"$(libdir)\"	     	        \
++	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
++	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
++	-I$(top_srcdir)					\
++	@GTK_DEBUG_FLAGS@				\
++	@GTK_XIM_FLAGS@					\
++	@GTK_LOCALE_FLAGS@				\
++	@GLIB_CFLAGS@					\
++	@x_cflags@					\
++@STRIP_END@
+ 
+ 
+ #
+@@ -135,7 +148,20 @@ lib_LTLIBRARIES = libgtk.la
+ 
+ # libtool stuff: set version and export symbols for resolving
+ libgtkincludedir = $(includedir)/gtk-1.2/gtk
+-libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
++
++libgtk_la_DEPENDENCIES = $(top_builddir)/gdk/libgdk.la
++libgtk_la_LIBADD = $(top_builddir)/gdk/libgdk.la
++
++libgtk_la_LDFLAGS = @STRIP_BEGIN@ \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
++	-release $(LT_RELEASE) 					\
++	-export-dynamic						\
++	-no-undefined -Wl,--no-undefined			\
++	$(filter-out -ldl, @GLIB_DEPLIBS@)			\
++	@x_ldflags@						\
++	$(filter-out -lXi -lXext, @x_libs@)			\
++	-lm							\
++@STRIP_END@
+ 
+ #	$(top_builddir)/gdk/libgdk.la
+ 
+@@ -143,13 +169,233 @@ libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-vers
+ # setup source file variables
+ #
+ # GTK+ header files for public installation (non-generated)
+-gtk_public_h_sources = @STRIP_BEGIN@ 	gtk.h				gtkaccelgroup.h			gtkaccellabel.h			gtkadjustment.h			gtkalignment.h			gtkarg.h			gtkarrow.h			gtkaspectframe.h		gtkbin.h			gtkbindings.h			gtkbbox.h			gtkbox.h			gtkbutton.h			gtkcalendar.h			gtkcheckbutton.h		gtkcheckmenuitem.h		gtkclist.h			gtkcolorsel.h			gtkcombo.h			gtkcompat.h			gtkcontainer.h			gtkctree.h			gtkcurve.h			gtkdata.h			gtkdebug.h              	gtkdialog.h			gtkdnd.h			gtkdrawingarea.h		gtkeditable.h           	gtkentry.h			gtkenums.h			gtkeventbox.h			gtkfilesel.h			gtkfixed.h			gtkfontsel.h			gtkframe.h			gtkgamma.h			gtkgc.h				gtkhandlebox.h			gtkhbbox.h			gtkhbox.h			gtkhpaned.h			gtkhruler.h			gtkhscale.h			gtkhscrollbar.h			gtkhseparator.h			gtkimage.h			gtkinputdialog.h		gtkinvisible.h			gtkitem.h			gtkitemfactory.h		gtklabel.h			gtklayout.h             	gtklist.h			gtklistitem.h			gtkmain.h			gtkmenu.h			gtkmenubar.h			gtkmenufactory.h		gtkmenuitem.h			gtkmenushell.h			gtkmisc.h			gtknotebook.h			gtkobject.h			gtkoptionmenu.h			gtkpacker.h			gtkpaned.h			gtkpixmap.h			gtkplug.h			gtkpreview.h			gtkprivate.h			gtkprogress.h			gtkprogressbar.h		gtkradiobutton.h		gtkradiomenuitem.h		gtkrange.h			gtkrc.h				gtkruler.h			gtkscale.h			gtkscrollbar.h			gtkscrolledwindow.h		gtkselection.h			gtkseparator.h			gtksignal.h			gtksocket.h			gtkspinbutton.h			gtkstyle.h			gtkstatusbar.h			gtktable.h			gtktearoffmenuitem.h    	gtktext.h			gtkthemes.h			gtktipsquery.h			gtktogglebutton.h		gtktoolbar.h			gtktooltips.h			gtktree.h			gtktreeitem.h			gtktypeutils.h			gtkvbbox.h			gtkvbox.h			gtkviewport.h			gtkvpaned.h			gtkvruler.h			gtkvscale.h			gtkvscrollbar.h			gtkvseparator.h			gtkwidget.h			gtkwindow.h		@STRIP_END@
++gtk_public_h_sources = @STRIP_BEGIN@ \
++	gtk.h			\
++	gtkaccelgroup.h		\
++	gtkaccellabel.h		\
++	gtkadjustment.h		\
++	gtkalignment.h		\
++	gtkarg.h		\
++	gtkarrow.h		\
++	gtkaspectframe.h	\
++	gtkbin.h		\
++	gtkbindings.h		\
++	gtkbbox.h		\
++	gtkbox.h		\
++	gtkbutton.h		\
++	gtkcalendar.h		\
++	gtkcheckbutton.h	\
++	gtkcheckmenuitem.h	\
++	gtkclist.h		\
++	gtkcolorsel.h		\
++	gtkcombo.h		\
++	gtkcompat.h		\
++	gtkcontainer.h		\
++	gtkctree.h		\
++	gtkcurve.h		\
++	gtkdata.h		\
++	gtkdebug.h              \
++	gtkdialog.h		\
++	gtkdnd.h		\
++	gtkdrawingarea.h	\
++	gtkeditable.h           \
++	gtkentry.h		\
++	gtkenums.h		\
++	gtkeventbox.h		\
++	gtkfilesel.h		\
++	gtkfixed.h		\
++	gtkfontsel.h		\
++	gtkframe.h		\
++	gtkgamma.h		\
++	gtkgc.h			\
++	gtkhandlebox.h		\
++	gtkhbbox.h		\
++	gtkhbox.h		\
++	gtkhpaned.h		\
++	gtkhruler.h		\
++	gtkhscale.h		\
++	gtkhscrollbar.h		\
++	gtkhseparator.h		\
++	gtkimage.h		\
++	gtkinputdialog.h	\
++	gtkinvisible.h		\
++	gtkitem.h		\
++	gtkitemfactory.h	\
++	gtklabel.h		\
++	gtklayout.h             \
++	gtklist.h		\
++	gtklistitem.h		\
++	gtkmain.h		\
++	gtkmenu.h		\
++	gtkmenubar.h		\
++	gtkmenufactory.h	\
++	gtkmenuitem.h		\
++	gtkmenushell.h		\
++	gtkmisc.h		\
++	gtknotebook.h		\
++	gtkobject.h		\
++	gtkoptionmenu.h		\
++	gtkpacker.h		\
++	gtkpaned.h		\
++	gtkpixmap.h		\
++	gtkplug.h		\
++	gtkpreview.h		\
++	gtkprivate.h		\
++	gtkprogress.h		\
++	gtkprogressbar.h	\
++	gtkradiobutton.h	\
++	gtkradiomenuitem.h	\
++	gtkrange.h		\
++	gtkrc.h			\
++	gtkruler.h		\
++	gtkscale.h		\
++	gtkscrollbar.h		\
++	gtkscrolledwindow.h	\
++	gtkselection.h		\
++	gtkseparator.h		\
++	gtksignal.h		\
++	gtksocket.h		\
++	gtkspinbutton.h		\
++	gtkstyle.h		\
++	gtkstatusbar.h		\
++	gtktable.h		\
++	gtktearoffmenuitem.h    \
++	gtktext.h		\
++	gtkthemes.h		\
++	gtktipsquery.h		\
++	gtktogglebutton.h	\
++	gtktoolbar.h		\
++	gtktooltips.h		\
++	gtktree.h		\
++	gtktreeitem.h		\
++	gtktypeutils.h		\
++	gtkvbbox.h		\
++	gtkvbox.h		\
++	gtkviewport.h		\
++	gtkvpaned.h		\
++	gtkvruler.h		\
++	gtkvscale.h		\
++	gtkvscrollbar.h		\
++	gtkvseparator.h		\
++	gtkwidget.h		\
++	gtkwindow.h		\
++@STRIP_END@
+ 
+ # GTK+ header files that don't get installed
+-gtk_private_h_sources = @STRIP_BEGIN@ @STRIP_END@
++gtk_private_h_sources = @STRIP_BEGIN@ \
++@STRIP_END@
+ 
+ # GTK+ C sources to build the library from
+-gtk_c_sources = @STRIP_BEGIN@ 	gtkaccelgroup.c			gtkaccellabel.c			gtkadjustment.c			gtkalignment.c			gtkarg.c			gtkarrow.c			gtkaspectframe.c		gtkbin.c			gtkbindings.c			gtkbbox.c			gtkbox.c			gtkbutton.c			gtkcalendar.c			gtkcheckbutton.c		gtkcheckmenuitem.c		gtkclist.c			gtkcolorsel.c			gtkcombo.c			gtkcontainer.c			gtkctree.c			gtkcurve.c			gtkdata.c			gtkdialog.c			gtkdnd.c			gtkdrawingarea.c		gtkeditable.c           	gtkentry.c			gtkeventbox.c			gtkfilesel.c			gtkfixed.c			gtkfontsel.c            	gtkframe.c			gtkgamma.c			gtkgc.c				gtkhandlebox.c			gtkhbbox.c			gtkhbox.c			gtkhpaned.c			gtkhruler.c			gtkhscale.c			gtkhscrollbar.c			gtkhseparator.c			gtkimage.c			gtkinputdialog.c		gtkintl.h			gtkinvisible.c			gtkitem.c			gtkitemfactory.c		gtklabel.c			gtklayout.c			gtklist.c			gtklistitem.c			gtkmain.c			gtkmarshal.c			gtkmenu.c			gtkmenubar.c			gtkmenufactory.c		gtkmenuitem.c			gtkmenushell.c			gtkmisc.c			gtknotebook.c			gtkobject.c			gtkoptionmenu.c			gtkpacker.c			gtkpaned.c			gtkpixmap.c			gtkplug.c               	gtkpreview.c			gtkprogress.c			gtkprogressbar.c		gtkradiobutton.c		gtkradiomenuitem.c		gtkrange.c			gtkrc.c				gtkruler.c			gtkscale.c			gtkscrollbar.c			gtkscrolledwindow.c		gtkselection.c			gtkseparator.c			gtksignal.c			gtksocket.c             	gtkspinbutton.c			gtkstyle.c			gtkstatusbar.c			gtktable.c			gtktearoffmenuitem.c    	gtktext.c			gtkthemes.c			gtktipsquery.c			gtktogglebutton.c		gtktoolbar.c			gtktooltips.c			gtktree.c			gtktreeitem.c			gtktypeutils.c			gtkvbbox.c			gtkvbox.c			gtkviewport.c			gtkvpaned.c			gtkvruler.c			gtkvscale.c			gtkvscrollbar.c			gtkvseparator.c			gtkwidget.c			gtkwindow.c			fnmatch.c			fnmatch.h		@STRIP_END@
++gtk_c_sources = @STRIP_BEGIN@ \
++	gtkaccelgroup.c		\
++	gtkaccellabel.c		\
++	gtkadjustment.c		\
++	gtkalignment.c		\
++	gtkarg.c		\
++	gtkarrow.c		\
++	gtkaspectframe.c	\
++	gtkbin.c		\
++	gtkbindings.c		\
++	gtkbbox.c		\
++	gtkbox.c		\
++	gtkbutton.c		\
++	gtkcalendar.c		\
++	gtkcheckbutton.c	\
++	gtkcheckmenuitem.c	\
++	gtkclist.c		\
++	gtkcolorsel.c		\
++	gtkcombo.c		\
++	gtkcontainer.c		\
++	gtkctree.c		\
++	gtkcurve.c		\
++	gtkdata.c		\
++	gtkdialog.c		\
++	gtkdnd.c		\
++	gtkdrawingarea.c	\
++	gtkeditable.c           \
++	gtkentry.c		\
++	gtkeventbox.c		\
++	gtkfilesel.c		\
++	gtkfixed.c		\
++	gtkfontsel.c            \
++	gtkframe.c		\
++	gtkgamma.c		\
++	gtkgc.c			\
++	gtkhandlebox.c		\
++	gtkhbbox.c		\
++	gtkhbox.c		\
++	gtkhpaned.c		\
++	gtkhruler.c		\
++	gtkhscale.c		\
++	gtkhscrollbar.c		\
++	gtkhseparator.c		\
++	gtkimage.c		\
++	gtkinputdialog.c	\
++	gtkintl.h		\
++	gtkinvisible.c		\
++	gtkitem.c		\
++	gtkitemfactory.c	\
++	gtklabel.c		\
++	gtklayout.c		\
++	gtklist.c		\
++	gtklistitem.c		\
++	gtkmain.c		\
++	gtkmarshal.c		\
++	gtkmenu.c		\
++	gtkmenubar.c		\
++	gtkmenufactory.c	\
++	gtkmenuitem.c		\
++	gtkmenushell.c		\
++	gtkmisc.c		\
++	gtknotebook.c		\
++	gtkobject.c		\
++	gtkoptionmenu.c		\
++	gtkpacker.c		\
++	gtkpaned.c		\
++	gtkpixmap.c		\
++	gtkplug.c               \
++	gtkpreview.c		\
++	gtkprogress.c		\
++	gtkprogressbar.c	\
++	gtkradiobutton.c	\
++	gtkradiomenuitem.c	\
++	gtkrange.c		\
++	gtkrc.c			\
++	gtkruler.c		\
++	gtkscale.c		\
++	gtkscrollbar.c		\
++	gtkscrolledwindow.c	\
++	gtkselection.c		\
++	gtkseparator.c		\
++	gtksignal.c		\
++	gtksocket.c             \
++	gtkspinbutton.c		\
++	gtkstyle.c		\
++	gtkstatusbar.c		\
++	gtktable.c		\
++	gtktearoffmenuitem.c    \
++	gtktext.c		\
++	gtkthemes.c		\
++	gtktipsquery.c		\
++	gtktogglebutton.c	\
++	gtktoolbar.c		\
++	gtktooltips.c		\
++	gtktree.c		\
++	gtktreeitem.c		\
++	gtktypeutils.c		\
++	gtkvbbox.c		\
++	gtkvbox.c		\
++	gtkviewport.c		\
++	gtkvpaned.c		\
++	gtkvruler.c		\
++	gtkvscale.c		\
++	gtkvscrollbar.c		\
++	gtkvseparator.c		\
++	gtkwidget.c		\
++	gtkwindow.c		\
++	fnmatch.c		\
++	fnmatch.h		\
++@STRIP_END@
+ 
+ # we use our own built_sources variable rules to avoid automake's
+ # BUILT_SOURCES oddities
+@@ -158,18 +404,43 @@ gtk_c_sources = @STRIP_BEGIN@ 	gtkaccelg
+ # content
+ #
+ # built sources that don't get installed
+-gtk_built_sources = @STRIP_BEGIN@ 	stamp-gtk.defs			stamp-gtktypebuiltins.h		stamp-gtkmarshal.h		gtktypebuiltins_vars.c		gtktypebuiltins_ids.c		gtktypebuiltins_evals.c		gtkmarshal.c			gtk.defs		@STRIP_END@
++gtk_built_sources = @STRIP_BEGIN@ \
++	stamp-gtk.defs		\
++	stamp-gtktypebuiltins.h	\
++	stamp-gtkmarshal.h	\
++	gtktypebuiltins_vars.c	\
++	gtktypebuiltins_ids.c	\
++	gtktypebuiltins_evals.c	\
++	gtkmarshal.c		\
++	gtk.defs		\
++@STRIP_END@
+ 
+ # built sources that get installed with the header files
+-gtk_built_public_sources = @STRIP_BEGIN@ 	gtkmarshal.h			gtktypebuiltins.h	@STRIP_END@
++gtk_built_public_sources = @STRIP_BEGIN@ \
++	gtkmarshal.h		\
++	gtktypebuiltins.h	\
++@STRIP_END@
+ 
+ # non-header sources (headers should be specified in the above variables)
+ # that don't serve as direct make target sources, i.e. they don't have
+ # their own .lo rules and don't get publically installed
+-gtk_extra_sources = @STRIP_BEGIN@ 	gtkfeatures.h.in		makeenums.pl			makeenums.awk			maketypes.awk			makeenums.h			gtkargcollector.c		gtk-boxed.defs			genmarshal.pl			gtkmarshal.list		@STRIP_END@
++gtk_extra_sources = @STRIP_BEGIN@ \
++	gtkfeatures.h.in	\
++	makeenums.pl		\
++	makeenums.awk		\
++	maketypes.awk		\
++	makeenums.h		\
++	gtkargcollector.c	\
++	gtk-boxed.defs		\
++	genmarshal.pl		\
++	gtkmarshal.list		\
++@STRIP_END@
+ 
+ # Extra headers that are used for enum type array/id generation
+-gdk_headers = @STRIP_BEGIN@ 	../gdk/gdktypes.h		../gdk/gdkrgb.h		@STRIP_END@
++gdk_headers = @STRIP_BEGIN@ \
++	../gdk/gdktypes.h	\
++	../gdk/gdkrgb.h		\
++@STRIP_END@
+ 
+ 
+ #
+@@ -180,7 +451,29 @@ libgtk_la_SOURCES = $(gtk_c_sources)
+ MAINTAINERCLEANFILES =  $(gtk_built_public_sources) $(gtk_built_sources)
+ EXTRA_HEADERS =  
+ 
+-EXTRA_DIST =  $(gtk_private_h_sources) $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) @STRIP_BEGIN@ 	testgtk.1 			testgtkrc 			testgtkrc2 			circles.xbm			line-arrow.xbm 			line-wrap.xbm 			tree_plus.xbm			tree_minus.xbm          	3DRings.xpm			FilesQueue.xpm			Modeller.xpm			check-y.xpm			check-n.xpm			marble.xpm			tree_minus.xpm			tree_plus.xpm			test.xpm			check-y.xpm			check-n.xpm			test.xpm			$(gtkconf_DATA)		@STRIP_END@
++EXTRA_DIST =  $(gtk_private_h_sources) $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) @STRIP_BEGIN@ \
++	testgtk.1 		\
++	testgtkrc 		\
++	testgtkrc2 		\
++	circles.xbm		\
++	line-arrow.xbm 		\
++	line-wrap.xbm 		\
++	tree_plus.xbm		\
++	tree_minus.xbm          \
++	3DRings.xpm		\
++	FilesQueue.xpm		\
++	Modeller.xpm		\
++	check-y.xpm		\
++	check-n.xpm		\
++	marble.xpm		\
++	tree_minus.xpm		\
++	tree_plus.xpm		\
++	test.xpm		\
++	check-y.xpm		\
++	check-n.xpm		\
++	test.xpm		\
++	$(gtkconf_DATA)		\
++@STRIP_END@
+ 
+ 
+ #
+@@ -191,7 +484,14 @@ gen_sources = xgen-gdef xgen-gtbh xgen-g
+ CLEANFILES =  $(gen_sources)
+ 
+ gtkconfdir = $(sysconfdir)/gtk
+-gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
++gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
++	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
++	gtkrc.utf8 gtkrc.iso88592 \
++	gtkrc.iso88593 gtkrc.iso88595 gtkrc.iso88597 \
++	gtkrc.iso88599 gtkrc.iso885913 gtkrc.iso885914 \
++	gtkrc.iso885915 gtkrc.zh_CN gtkrc.zh_TW.big5 \
++	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
++	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
+ 
+ 
+ #
+@@ -199,7 +499,15 @@ gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.e
+ #
+ noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads
+ DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
+-LDADDS = @STRIP_BEGIN@ 	libgtk.la				$(top_builddir)/gdk/libgdk.la		@x_ldflags@				@x_libs@				@GDK_WLIBS@				@GLIB_LIBS@				-lm				@STRIP_END@
++LDADDS = @STRIP_BEGIN@ \
++	libgtk.la			\
++	$(top_builddir)/gdk/libgdk.la	\
++	@x_ldflags@			\
++	@x_libs@			\
++	@GDK_WLIBS@			\
++	@GLIB_LIBS@			\
++	-lm				\
++@STRIP_END@
+ 
+ testgtk_DEPENDENCIES = $(DEPS)
+ testinput_DEPENDENCIES = $(DEPS)
+@@ -228,7 +536,6 @@ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libgtk_la_LIBADD = 
+ libgtk_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
+ gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
+ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \
+@@ -288,6 +595,40 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
+ 
+ TAR = gtar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/fnmatch.P .deps/gtkaccelgroup.P .deps/gtkaccellabel.P \
++.deps/gtkadjustment.P .deps/gtkalignment.P .deps/gtkarg.P \
++.deps/gtkarrow.P .deps/gtkaspectframe.P .deps/gtkbbox.P .deps/gtkbin.P \
++.deps/gtkbindings.P .deps/gtkbox.P .deps/gtkbutton.P \
++.deps/gtkcalendar.P .deps/gtkcheckbutton.P .deps/gtkcheckmenuitem.P \
++.deps/gtkclist.P .deps/gtkcolorsel.P .deps/gtkcombo.P \
++.deps/gtkcontainer.P .deps/gtkctree.P .deps/gtkcurve.P .deps/gtkdata.P \
++.deps/gtkdialog.P .deps/gtkdnd.P .deps/gtkdrawingarea.P \
++.deps/gtkeditable.P .deps/gtkentry.P .deps/gtkeventbox.P \
++.deps/gtkfilesel.P .deps/gtkfixed.P .deps/gtkfontsel.P .deps/gtkframe.P \
++.deps/gtkgamma.P .deps/gtkgc.P .deps/gtkhandlebox.P .deps/gtkhbbox.P \
++.deps/gtkhbox.P .deps/gtkhpaned.P .deps/gtkhruler.P .deps/gtkhscale.P \
++.deps/gtkhscrollbar.P .deps/gtkhseparator.P .deps/gtkimage.P \
++.deps/gtkinputdialog.P .deps/gtkinvisible.P .deps/gtkitem.P \
++.deps/gtkitemfactory.P .deps/gtklabel.P .deps/gtklayout.P \
++.deps/gtklist.P .deps/gtklistitem.P .deps/gtkmain.P .deps/gtkmarshal.P \
++.deps/gtkmenu.P .deps/gtkmenubar.P .deps/gtkmenufactory.P \
++.deps/gtkmenuitem.P .deps/gtkmenushell.P .deps/gtkmisc.P \
++.deps/gtknotebook.P .deps/gtkobject.P .deps/gtkoptionmenu.P \
++.deps/gtkpacker.P .deps/gtkpaned.P .deps/gtkpixmap.P .deps/gtkplug.P \
++.deps/gtkpreview.P .deps/gtkprogress.P .deps/gtkprogressbar.P \
++.deps/gtkradiobutton.P .deps/gtkradiomenuitem.P .deps/gtkrange.P \
++.deps/gtkrc.P .deps/gtkruler.P .deps/gtkscale.P .deps/gtkscrollbar.P \
++.deps/gtkscrolledwindow.P .deps/gtkselection.P .deps/gtkseparator.P \
++.deps/gtksignal.P .deps/gtksocket.P .deps/gtkspinbutton.P \
++.deps/gtkstatusbar.P .deps/gtkstyle.P .deps/gtktable.P \
++.deps/gtktearoffmenuitem.P .deps/gtktext.P .deps/gtkthemes.P \
++.deps/gtktipsquery.P .deps/gtktogglebutton.P .deps/gtktoolbar.P \
++.deps/gtktooltips.P .deps/gtktree.P .deps/gtktreeitem.P \
++.deps/gtktypeutils.P .deps/gtkvbbox.P .deps/gtkvbox.P \
++.deps/gtkviewport.P .deps/gtkvpaned.P .deps/gtkvruler.P \
++.deps/gtkvscale.P .deps/gtkvscrollbar.P .deps/gtkvseparator.P \
++.deps/gtkwidget.P .deps/gtkwindow.P .deps/simple.P .deps/testdnd.P \
++.deps/testgtk.P .deps/testinput.P .deps/testrgb.P .deps/testselection.P
+ SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c
+ OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o
+ 
+@@ -295,9 +636,9 @@ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gtk/Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -329,9 +670,6 @@ uninstall-libLTLIBRARIES:
+ 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -348,9 +686,6 @@ distclean-compile:
+ 
+ maintainer-clean-compile:
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+-
+ .s.lo:
+ 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ 
+@@ -471,6 +806,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+ subdir = gtk
+ 
+ distdir: $(DISTFILES)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(top_distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gtk/Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -481,866 +821,38 @@ distdir: $(DISTFILES)
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-fnmatch.lo fnmatch.o : fnmatch.c ../config.h fnmatch.h
+-gtkaccelgroup.lo gtkaccelgroup.o : gtkaccelgroup.c gtkaccelgroup.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h ../gdk/gdkkeysyms.h \
+-	gtksignal.h gtkmarshal.h gtkwidget.h gtkaccelgroup.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkaccellabel.lo gtkaccellabel.o : gtkaccellabel.c gtkmain.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
+-	gtkaccellabel.h gtklabel.h gtkmisc.h
+-gtkadjustment.lo gtkadjustment.o : gtkadjustment.c gtkadjustment.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtksignal.h \
+-	gtkmarshal.h
+-gtkalignment.lo gtkalignment.o : gtkalignment.c gtkalignment.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h
+-gtkarg.lo gtkarg.o : gtkarg.c gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkargcollector.c
+-gtkarrow.lo gtkarrow.o : gtkarrow.c gtkarrow.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h
+-gtkaspectframe.lo gtkaspectframe.o : gtkaspectframe.c gtkaspectframe.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkframe.h
+-gtkbbox.lo gtkbbox.o : gtkbbox.c gtkbbox.h gtkbox.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkbin.lo gtkbin.o : gtkbin.c gtkbin.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkcontainer.h gtkenums.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h
+-gtkbindings.lo gtkbindings.o : gtkbindings.c gtkbindings.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtksignal.h gtkmarshal.h gtkwidget.h \
+-	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h gtkrc.h \
+-	gtkwidget.h
+-gtkbox.lo gtkbox.o : gtkbox.c gtkbox.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkcontainer.h gtkenums.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h
+-gtkbutton.lo gtkbutton.o : gtkbutton.c gtkbutton.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
+-	gtkmisc.h gtkmain.h gtksignal.h gtkmarshal.h
+-gtkcalendar.lo gtkcalendar.o : gtkcalendar.c gtkcalendar.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtksignal.h gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkwidget.h \
+-	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	../gdk/gdkkeysyms.h
+-gtkcheckbutton.lo gtkcheckbutton.o : gtkcheckbutton.c gtkcheckbutton.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtktogglebutton.h gtkbutton.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
+-	gtkmisc.h
+-gtkcheckmenuitem.lo gtkcheckmenuitem.o : gtkcheckmenuitem.c \
+-	gtkcheckmenuitem.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmenuitem.h gtkitem.h \
+-	gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkaccellabel.h \
+-	gtklabel.h gtkmisc.h gtksignal.h gtkmarshal.h
+-gtkclist.lo gtkclist.o : gtkclist.c ../config.h gtkmain.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkclist.h gtksignal.h gtkmarshal.h \
+-	gtkalignment.h gtkbin.h gtkcontainer.h gtklabel.h gtkmisc.h \
+-	gtkbutton.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
+-	gtkvscrollbar.h gtkbindings.h gtkdnd.h gtkselection.h \
+-	gtkwindow.h ../gdk/gdkx.h ../gdk/gdkprivate.h \
+-	../gdk/gdkkeysyms.h
+-gtkcolorsel.lo gtkcolorsel.o : gtkcolorsel.c ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcolorsel.h gtkwindow.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h gtkbin.h \
+-	gtkcontainer.h gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtkvbox.h gtkbox.h gtkframe.h gtkpreview.h gtkbutton.h \
+-	gtkentry.h gtkeditable.h gtkhbox.h gtklabel.h gtkmisc.h \
+-	gtkmain.h gtksignal.h gtkmarshal.h gtkrange.h gtkscale.h \
+-	gtkhscale.h gtktable.h gtkeventbox.h gtkwindow.h gtkhbbox.h \
+-	gtkbbox.h gtkintl.h ../config.h gtkdnd.h gtkselection.h \
+-	gtkselection.h
+-gtkcombo.lo gtkcombo.o : gtkcombo.c gtkarrow.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtklabel.h gtklist.h gtkcontainer.h \
+-	gtklistitem.h gtkitem.h gtkbin.h gtkentry.h gtkeditable.h \
+-	gtkeventbox.h gtkbutton.h gtklistitem.h gtkscrolledwindow.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkviewport.h gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h \
+-	../gdk/gdkkeysyms.h gtkcombo.h gtkhbox.h gtkbox.h gtkframe.h
+-gtkcontainer.lo gtkcontainer.o : gtkcontainer.c gtkcontainer.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkprivate.h \
+-	gtksignal.h gtkmarshal.h gtkmain.h
+-gtkctree.lo gtkctree.o : gtkctree.c gtkctree.h gtkclist.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtksignal.h gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkalignment.h \
+-	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h gtkmisc.h \
+-	gtkbutton.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
+-	gtkvscrollbar.h gtkbindings.h gtkmain.h gtkdnd.h gtkselection.h \
+-	../gdk/gdkx.h ../gdk/gdkprivate.h ../gdk/gdkkeysyms.h
+-gtkcurve.lo gtkcurve.o : gtkcurve.c gtkcurve.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkdrawingarea.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkdrawingarea.h gtkmain.h \
+-	gtkradiobutton.h gtkcheckbutton.h gtktogglebutton.h gtkbutton.h \
+-	gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h gtktable.h
+-gtkdata.lo gtkdata.o : gtkdata.c gtkdata.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtksignal.h gtkmarshal.h
+-gtkdialog.lo gtkdialog.o : gtkdialog.c gtkbutton.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkdialog.h \
+-	gtkwindow.h gtkhbox.h gtkbox.h gtkhseparator.h gtkseparator.h \
+-	gtkvbox.h
+-gtkdnd.lo gtkdnd.o : gtkdnd.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
+-	gtkdnd.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkselection.h gtkinvisible.h gtkbin.h \
+-	gtkcontainer.h gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h
+-gtkdrawingarea.lo gtkdrawingarea.o : gtkdrawingarea.c gtkdrawingarea.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkeditable.lo gtkeditable.o : gtkeditable.c ../gdk/gdkx.h \
+-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkkeysyms.h ../gdk/gdki18n.h gtkeditable.h ../gdk/gdk.h \
+-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkmain.h gtkselection.h \
+-	gtksignal.h gtkmarshal.h
+-gtkentry.lo gtkentry.o : gtkentry.c ../gdk/gdkkeysyms.h ../gdk/gdki18n.h \
+-	gtkentry.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkeditable.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtkmain.h gtkselection.h gtksignal.h gtkmarshal.h gtkstyle.h
+-gtkeventbox.lo gtkeventbox.o : gtkeventbox.c gtksignal.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkeventbox.h \
+-	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkfilesel.lo gtkfilesel.o : gtkfilesel.c fnmatch.h ../gdk/gdkkeysyms.h \
+-	gtkbutton.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkentry.h gtkeditable.h gtkfilesel.h gtkwindow.h \
+-	gtkhbox.h gtkbox.h gtkhbbox.h gtkbbox.h gtklabel.h gtkmisc.h \
+-	gtklist.h gtklistitem.h gtkitem.h gtklistitem.h gtkmain.h \
+-	gtkscrolledwindow.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
+-	gtkvscrollbar.h gtkviewport.h gtksignal.h gtkmarshal.h \
+-	gtkvbox.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
+-	gtkoptionmenu.h gtkbutton.h gtkclist.h gtksignal.h \
+-	gtkalignment.h gtklabel.h gtkdialog.h gtkintl.h ../config.h
+-gtkfixed.lo gtkfixed.o : gtkfixed.c gtkfixed.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkfontsel.lo gtkfontsel.o : gtkfontsel.c ../gdk/gdkx.h \
+-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkkeysyms.h gtkbutton.h ../gdk/gdk.h ../gdk/gdkrgb.h \
+-	gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtkcheckbutton.h gtktogglebutton.h gtkbutton.h gtkclist.h \
+-	gtksignal.h gtkmarshal.h gtkalignment.h gtklabel.h gtkmisc.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkentry.h gtkeditable.h gtkfontsel.h gtkwindow.h gtknotebook.h \
+-	gtkframe.h gtkhbbox.h gtkbbox.h gtkbox.h gtkhbox.h gtklabel.h \
+-	gtknotebook.h gtkradiobutton.h gtkcheckbutton.h gtksignal.h \
+-	gtktable.h gtkvbox.h gtkscrolledwindow.h gtkviewport.h \
+-	gtkintl.h ../config.h
+-gtkframe.lo gtkframe.o : gtkframe.c gtkframe.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkgamma.lo gtkgamma.o : gtkgamma.c gtkgamma.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkvbox.h \
+-	gtkbox.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkcurve.h \
+-	gtkdrawingarea.h gtkdialog.h gtkwindow.h gtkbin.h \
+-	gtkdrawingarea.h gtkentry.h gtkeditable.h gtkhbox.h gtklabel.h \
+-	gtkmisc.h gtkmain.h gtkpixmap.h gtkradiobutton.h \
+-	gtkcheckbutton.h gtktogglebutton.h gtkbutton.h gtksignal.h \
+-	gtkmarshal.h gtktable.h gtkvbox.h gtkwindow.h gtkintl.h \
+-	../config.h
+-gtkgc.lo gtkgc.o : gtkgc.c gtkgc.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h
+-gtkhandlebox.lo gtkhandlebox.o : gtkhandlebox.c ../gdk/gdkx.h \
+-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	gtkhandlebox.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkinvisible.h \
+-	gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h
+-gtkhbbox.lo gtkhbbox.o : gtkhbbox.c gtkhbbox.h gtkbbox.h gtkbox.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkcontainer.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h
+-gtkhbox.lo gtkhbox.o : gtkhbox.c gtkhbox.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbox.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkhpaned.lo gtkhpaned.o : gtkhpaned.c gtkhpaned.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkpaned.h gtkcontainer.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
+-gtkhruler.lo gtkhruler.o : gtkhruler.c gtkhruler.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkruler.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkhscale.lo gtkhscale.o : gtkhscale.c gtkhscale.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkscale.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtksignal.h gtkmarshal.h \
+-	../gdk/gdkkeysyms.h
+-gtkhscrollbar.lo gtkhscrollbar.o : gtkhscrollbar.c gtkhscrollbar.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkscrollbar.h gtkrange.h gtkadjustment.h \
+-	gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h \
+-	gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
+-gtkhseparator.lo gtkhseparator.o : gtkhseparator.c gtkhseparator.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkseparator.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkimage.lo gtkimage.o : gtkimage.c gtkcontainer.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkimage.h gtkmisc.h
+-gtkinputdialog.lo gtkinputdialog.o : gtkinputdialog.c \
+-	../gdk/gdkkeysyms.h gtkbutton.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h gtkcontainer.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkentry.h gtkeditable.h gtkhbox.h \
+-	gtkbox.h gtkhseparator.h gtkseparator.h gtkinputdialog.h \
+-	gtkdialog.h gtkwindow.h gtklabel.h gtkmisc.h gtklistitem.h \
+-	gtkitem.h gtkmain.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
+-	gtknotebook.h gtkoptionmenu.h gtkbutton.h gtkscrolledwindow.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkviewport.h gtksignal.h gtkmarshal.h gtktable.h gtkvbox.h \
+-	gtkintl.h ../config.h
+-gtkinvisible.lo gtkinvisible.o : gtkinvisible.c gtksignal.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkinvisible.h \
+-	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkitem.lo gtkitem.o : gtkitem.c gtkitem.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
+-	gtkmarshal.h
+-gtkitemfactory.lo gtkitemfactory.o : gtkitemfactory.c gtkitemfactory.h \
+-	gtkwidget.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkmenufactory.h \
+-	gtkbindings.h gtksignal.h gtkmarshal.h gtkoptionmenu.h \
+-	gtkbutton.h gtkbin.h gtkcontainer.h gtkmenubar.h gtkmenushell.h \
+-	gtkmenu.h gtkmenuitem.h gtkitem.h gtkradiomenuitem.h \
+-	gtkcheckmenuitem.h gtktearoffmenuitem.h gtkaccellabel.h \
+-	gtklabel.h gtkmisc.h ../gdk/gdkkeysyms.h
+-gtklabel.lo gtklabel.o : gtklabel.c gtklabel.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h ../gdk/gdkkeysyms.h ../gdk/gdki18n.h
+-gtklayout.lo gtklayout.o : gtklayout.c gtklayout.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
+-	gtkmarshal.h gtkprivate.h ../gdk/gdkx.h ../gdk/gdkprivate.h
+-gtklist.lo gtklist.o : gtklist.c gtklist.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklistitem.h \
+-	gtkitem.h gtkbin.h gtklistitem.h gtkmain.h gtksignal.h \
+-	gtkmarshal.h gtklabel.h gtkmisc.h
+-gtklistitem.lo gtklistitem.o : gtklistitem.c gtkbindings.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtklabel.h gtkmisc.h gtkwidget.h \
+-	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtklistitem.h gtkitem.h gtkbin.h gtkcontainer.h gtklist.h \
+-	gtklistitem.h gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
+-gtkmain.lo gtkmain.o : gtkmain.c gtkbutton.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkdnd.h \
+-	gtkselection.h gtkfeatures.h gtkhscrollbar.h gtkscrollbar.h \
+-	gtkrange.h gtkhseparator.h gtkseparator.h gtkmain.h \
+-	gtkpreview.h gtkrc.h gtkscrolledwindow.h gtkhscrollbar.h \
+-	gtkvscrollbar.h gtkviewport.h gtkselection.h gtksignal.h \
+-	gtkmarshal.h gtktable.h gtktext.h gtkeditable.h gtkvbox.h \
+-	gtkbox.h gtkvscrollbar.h gtkwidget.h gtkwindow.h gtkprivate.h \
+-	../gdk/gdki18n.h ../config.h gtkdebug.h gtkintl.h
+-gtkmarshal.lo gtkmarshal.o : gtkmarshal.c gtkmarshal.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkobject.h gtkarg.h gtkenums.h gtkdebug.h
+-gtkmenu.lo gtkmenu.o : gtkmenu.c ../gdk/gdkkeysyms.h gtkbindings.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtklabel.h gtkmisc.h \
+-	gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkmain.h gtkmenu.h gtkmenushell.h gtkcontainer.h \
+-	gtkmenuitem.h gtkitem.h gtkbin.h gtksignal.h gtkmarshal.h \
+-	gtkwindow.h
+-gtkmenubar.lo gtkmenubar.o : gtkmenubar.c ../gdk/gdkkeysyms.h \
+-	gtkbindings.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkmain.h gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkmenubar.h gtkmenushell.h gtkcontainer.h \
+-	gtkmenuitem.h gtkitem.h gtkbin.h
+-gtkmenufactory.lo gtkmenufactory.o : gtkmenufactory.c gtkcheckmenuitem.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkmenu.h gtkmenushell.h gtkmenubar.h \
+-	gtkmenufactory.h gtkmenuitem.h gtksignal.h gtkmarshal.h
+-gtkmenuitem.lo gtkmenuitem.o : gtkmenuitem.c gtkaccellabel.h gtklabel.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtkmain.h gtkmenu.h gtkmenushell.h gtkcontainer.h gtkmenubar.h \
+-	gtkmenuitem.h gtkitem.h gtkbin.h gtksignal.h gtkmarshal.h
+-gtkmenushell.lo gtkmenushell.o : gtkmenushell.c ../gdk/gdkkeysyms.h \
+-	gtkbindings.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkmain.h gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h \
+-	gtktearoffmenuitem.h gtkmenuitem.h gtkmenushell.h gtksignal.h \
+-	gtkmarshal.h
+-gtkmisc.lo gtkmisc.o : gtkmisc.c gtkcontainer.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkmisc.h
+-gtknotebook.lo gtknotebook.o : gtknotebook.c gtknotebook.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
+-	gtkmarshal.h gtkmain.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
+-	gtkitem.h gtkbin.h gtklabel.h gtkmisc.h ../gdk/gdkkeysyms.h \
+-	gtkintl.h ../config.h
+-gtkobject.lo gtkobject.o : gtkobject.c gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtksignal.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkobject.h gtkmarshal.h
+-gtkoptionmenu.lo gtkoptionmenu.o : gtkoptionmenu.c gtkmenu.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkmenushell.h gtkcontainer.h gtkwidget.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkmenuitem.h gtkitem.h gtkbin.h \
+-	gtkoptionmenu.h gtkbutton.h gtksignal.h gtkmarshal.h \
+-	../gdk/gdkkeysyms.h
+-gtkpacker.lo gtkpacker.o : gtkpacker.c gtkpacker.h gtkcontainer.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkpaned.lo gtkpaned.o : gtkpaned.c gtkpaned.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkhpaned.h \
+-	gtkpaned.h
+-gtkpixmap.lo gtkpixmap.o : gtkpixmap.c gtkcontainer.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkpixmap.h gtkmisc.h
+-gtkplug.lo gtkplug.o : gtkplug.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
+-	gtkplug.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkwindow.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkbin.h gtkcontainer.h \
+-	gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkpreview.lo gtkpreview.o : gtkpreview.c ../gdk/gdkx.h \
+-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkpreview.h gtkwidget.h ../gdk/gdk.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
+-gtkprogress.lo gtkprogress.o : gtkprogress.c gtkprogress.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
+-gtkprogressbar.lo gtkprogressbar.o : gtkprogressbar.c ../config.h \
+-	gtkprogressbar.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkprogress.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
+-gtkradiobutton.lo gtkradiobutton.o : gtkradiobutton.c gtklabel.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtkradiobutton.h gtkcheckbutton.h gtktogglebutton.h gtkbutton.h \
+-	gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h
+-gtkradiomenuitem.lo gtkradiomenuitem.o : gtkradiomenuitem.c \
+-	gtkaccellabel.h gtklabel.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkradiomenuitem.h gtkcheckmenuitem.h \
+-	gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h
+-gtkrange.lo gtkrange.o : gtkrange.c gtkmain.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkrange.h gtksignal.h gtkmarshal.h
+-gtkrc.lo gtkrc.o : gtkrc.c gtkrc.h gtkstyle.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkbindings.h gtkthemes.h gtkintl.h ../config.h
+-gtkruler.lo gtkruler.o : gtkruler.c gtkruler.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h
+-gtkscale.lo gtkscale.o : gtkscale.c gtkcontainer.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkscale.h gtkrange.h
+-gtkscrollbar.lo gtkscrollbar.o : gtkscrollbar.c gtkscrollbar.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkrange.h gtkadjustment.h gtkdata.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h
+-gtkscrolledwindow.lo gtkscrolledwindow.o : gtkscrolledwindow.c \
+-	gtkscrolledwindow.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkhscrollbar.h \
+-	gtkscrollbar.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtkvscrollbar.h \
+-	gtkviewport.h gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h
+-gtkselection.lo gtkselection.o : gtkselection.c ../gdk/gdkx.h \
+-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	gtkmain.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkselection.h gtksignal.h gtkmarshal.h
+-gtkseparator.lo gtkseparator.o : gtkseparator.c gtkseparator.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h
+-gtksignal.lo gtksignal.o : gtksignal.c gtksignal.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkargcollector.c
+-gtksocket.lo gtksocket.o : gtksocket.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
+-	gtkwindow.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkbin.h gtkcontainer.h gtkwidget.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
+-	gtksocket.h gtkdnd.h gtkselection.h
+-gtkspinbutton.lo gtkspinbutton.o : gtkspinbutton.c ../gdk/gdkkeysyms.h \
+-	gtkspinbutton.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkentry.h gtkeditable.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
+-gtkstatusbar.lo gtkstatusbar.o : gtkstatusbar.c gtkframe.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
+-	gtkmisc.h gtksignal.h gtkmarshal.h gtkstatusbar.h gtkhbox.h \
+-	gtkbox.h
+-gtkstyle.lo gtkstyle.o : gtkstyle.c gtkgc.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkrc.h \
+-	gtkstyle.h gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkwidget.h gtkthemes.h \
+-	../gdk/gdkprivate.h
+-gtktable.lo gtktable.o : gtktable.c gtktable.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtktearoffmenuitem.lo gtktearoffmenuitem.o : gtktearoffmenuitem.c \
+-	gtkmenu.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkmenushell.h gtkcontainer.h gtkwidget.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
+-	gtktearoffmenuitem.h gtkmenuitem.h gtkitem.h gtkbin.h
+-gtktext.lo gtktext.o : gtktext.c ../gdk/gdkkeysyms.h ../gdk/gdki18n.h \
+-	gtkmain.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkselection.h gtksignal.h \
+-	gtkmarshal.h gtktext.h gtkeditable.h line-wrap.xbm \
+-	line-arrow.xbm
+-gtkthemes.lo gtkthemes.o : gtkthemes.c gtkthemes.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkstyle.h gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkmain.h gtkrc.h gtkselection.h \
+-	gtksignal.h gtkmarshal.h gtkwidget.h ../config.h gtkintl.h
+-gtktipsquery.lo gtktipsquery.o : gtktipsquery.c gtktipsquery.h \
+-	gtklabel.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtksignal.h gtkmarshal.h gtktooltips.h gtkmain.h gtkintl.h \
+-	../config.h
+-gtktogglebutton.lo gtktogglebutton.o : gtktogglebutton.c gtklabel.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtkmain.h gtksignal.h gtkmarshal.h gtktogglebutton.h \
+-	gtkbutton.h gtkbin.h gtkcontainer.h
+-gtktoolbar.lo gtktoolbar.o : gtktoolbar.c gtkbutton.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtktogglebutton.h gtkbutton.h gtkradiobutton.h gtkcheckbutton.h \
+-	gtktogglebutton.h gtklabel.h gtkmisc.h gtkvbox.h gtkbox.h \
+-	gtktoolbar.h gtkpixmap.h gtksignal.h gtkmarshal.h gtktooltips.h
+-gtktooltips.lo gtktooltips.o : gtktooltips.c gtkmain.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkwidget.h gtkwindow.h gtkbin.h \
+-	gtkcontainer.h gtksignal.h gtkmarshal.h gtkstyle.h \
+-	gtktooltips.h
+-gtktree.lo gtktree.o : gtktree.c gtktree.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtktreeitem.h \
+-	gtkitem.h gtkbin.h gtkmain.h gtksignal.h gtkmarshal.h gtklist.h \
+-	gtklistitem.h
+-gtktreeitem.lo gtktreeitem.o : gtktreeitem.c gtklabel.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
+-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtktree.h gtkcontainer.h gtktreeitem.h \
+-	gtkitem.h gtkbin.h gtkeventbox.h gtkpixmap.h gtkmain.h \
+-	gtksignal.h gtkmarshal.h tree_plus.xpm tree_minus.xpm
+-gtktypeutils.lo gtktypeutils.o : gtktypeutils.c gtktypeutils.h \
+-	gtktypebuiltins.h makeenums.h ../gdk/gdkprivate.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdk.h \
+-	../gdk/gdkrgb.h gtk.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtkenums.h gtkdebug.h gtkaccellabel.h gtklabel.h \
+-	gtkmisc.h gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h \
+-	gtkalignment.h gtkbin.h gtkcontainer.h gtkaspectframe.h \
+-	gtkframe.h gtkarrow.h gtkbindings.h gtkbox.h gtkbbox.h \
+-	gtkbutton.h gtkcalendar.h gtksignal.h gtkmarshal.h \
+-	gtkcheckbutton.h gtktogglebutton.h gtkcheckmenuitem.h \
+-	gtkmenuitem.h gtkitem.h gtkclist.h gtkhscrollbar.h \
+-	gtkscrollbar.h gtkrange.h gtkvscrollbar.h gtkcolorsel.h \
+-	gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h gtkeditable.h \
+-	gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h gtktable.h \
+-	gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h gtkcurve.h \
+-	gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
+-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
+-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
+-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
+-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
+-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
+-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
+-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
+-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
+-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
+-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
+-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
+-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
+-	gtkprivate.h gtktypebuiltins_vars.c gtktypebuiltins_evals.c \
+-	gtktypebuiltins_ids.c
+-gtkvbbox.lo gtkvbbox.o : gtkvbbox.c gtkvbbox.h gtkbbox.h gtkbox.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkcontainer.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h
+-gtkvbox.lo gtkvbox.o : gtkvbox.c gtkvbox.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbox.h \
+-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkviewport.lo gtkviewport.o : gtkviewport.c gtksignal.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkviewport.h \
+-	gtkadjustment.h gtkdata.h gtkbin.h gtkcontainer.h gtkwidget.h \
+-	gtkaccelgroup.h gtkstyle.h
+-gtkvpaned.lo gtkvpaned.o : gtkvpaned.c gtkvpaned.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkpaned.h gtkcontainer.h gtkenums.h gtkwidget.h \
+-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
+-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
+-gtkvruler.lo gtkvruler.o : gtkvruler.c gtkvruler.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkruler.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkvscale.lo gtkvscale.o : gtkvscale.c gtkvscale.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkscale.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtksignal.h gtkmarshal.h \
+-	../gdk/gdkkeysyms.h
+-gtkvscrollbar.lo gtkvscrollbar.o : gtkvscrollbar.c gtkvscrollbar.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkscrollbar.h gtkrange.h gtkadjustment.h \
+-	gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h \
+-	gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
+-gtkvseparator.lo gtkvseparator.o : gtkvseparator.c gtkvseparator.h \
+-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
+-	../gdk/gdkrgb.h gtkseparator.h gtkwidget.h gtkaccelgroup.h \
+-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
+-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
+-gtkwidget.lo gtkwidget.o : gtkwidget.c gtkcontainer.h ../gdk/gdk.h \
+-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
+-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
+-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
+-	gtkdata.h gtkstyle.h gtkmain.h gtkrc.h gtkselection.h \
+-	gtksignal.h gtkmarshal.h gtkwidget.h gtkwindow.h gtkbin.h \
+-	gtkcontainer.h gtkbindings.h gtkprivate.h ../gdk/gdkx.h \
+-	../gdk/gdkprivate.h
+-gtkwindow.lo gtkwindow.o : gtkwindow.c ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h ../gdk/gdkkeysyms.h \
+-	../gdk/gdkx.h ../gdk/gdkprivate.h gtkprivate.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
+-	gtkstyle.h gtkrc.h gtksignal.h gtkmarshal.h gtkwindow.h \
+-	gtkbin.h gtkcontainer.h gtkbindings.h gtkmain.h
+-simple.o: simple.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
+-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
+-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
+-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
+-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
+-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
+-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
+-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
+-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
+-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
+-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
+-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
+-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
+-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
+-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
+-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
+-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
+-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
+-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
+-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
+-	../gdk/gdkprivate.h
+-testdnd.o: testdnd.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
+-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
+-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
+-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
+-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
+-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
+-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
+-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
+-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
+-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
+-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
+-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
+-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
+-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
+-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
+-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
+-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
+-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
+-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
+-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
+-testgtk.o: testgtk.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
+-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
+-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
+-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
+-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
+-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
+-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
+-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
+-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
+-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
+-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
+-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
+-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
+-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
+-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
+-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
+-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
+-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
+-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
+-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
+-	../gdk/gdkx.h ../gdk/gdkprivate.h ../gdk/gdkkeysyms.h \
+-	circles.xbm
+-testinput.o: testinput.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
+-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
+-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
+-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
+-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
+-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
+-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
+-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
+-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
+-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
+-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
+-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
+-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
+-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
+-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
+-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
+-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
+-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
+-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
+-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
+-testrgb.o: testrgb.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
+-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
+-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
+-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
+-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
+-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
+-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
+-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
+-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
+-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
+-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
+-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
+-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
+-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
+-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
+-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
+-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
+-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
+-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
+-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
+-testselection.o: testselection.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
+-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
+-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
+-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
+-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
+-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
+-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
+-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
+-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
+-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
+-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
+-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
+-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
+-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
+-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
+-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
+-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
+-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
+-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
+-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
+-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
+-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
+-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
+-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
+-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
+-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -1384,19 +896,20 @@ maintainer-clean-generic:
+ 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+ 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+-		mostlyclean-tags mostlyclean-generic
++		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
+-		clean-noinstPROGRAMS clean-tags clean-generic \
+-		mostlyclean-am
++		clean-noinstPROGRAMS clean-tags clean-depend \
++		clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-noinstPROGRAMS \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+@@ -1404,7 +917,8 @@ distclean: distclean-am
+ maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -1420,10 +934,11 @@ distclean-noinstPROGRAMS clean-noinstPRO
+ maintainer-clean-noinstPROGRAMS uninstall-gtkconfDATA \
+ install-gtkconfDATA uninstall-libgtkincludeHEADERS \
+ install-libgtkincludeHEADERS tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-local install-data-am install-data install-am install \
+-uninstall-local uninstall-am uninstall all-redirect all-am all \
++clean-tags maintainer-clean-tags distdir mostlyclean-depend \
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-local install-data-am install-data install-am \
++install uninstall-local uninstall-am uninstall all-redirect all-am all \
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+@@ -1486,11 +1001,11 @@ install-data-local:
+ 	cd $(DESTDIR)$(gtkconfdir) && \
+ 	  for i in cs hr hu pl ro sk sl sq sr ; do \
+ 	    rm -f gtkrc.$$i ; \
+-	    ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
++	    ln -s gtkrc.iso88592 gtkrc.$$i ; \
+ 	  done ; \
+ 	  for i in bg_BG.iso88595 mk sp ru_RU.iso88595 ; do \
+ 	    rm -f gtkrc.$$i ; \
+-	    ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
++	    ln -s gtkrc.iso88595 gtkrc.$$i ; \
+ 	  done ; \
+ 	  for i in he_IL.cp1255 he_IL.microsoftcp1255 yi ; do \
+ 	    rm -f gtkrc.$$i ; \
+@@ -1499,12 +1014,12 @@ install-data-local:
+ 	rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
+ 	     gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \
+ 	     gtkrc.be gtkrc.bg gtkrc.mi ; \
+-	ln -s gtkrc.iso-8859-13 gtkrc.mi ; \
+-	ln -s gtkrc.iso-8859-13 gtkrc.lt ; \
+-	ln -s gtkrc.iso-8859-13 gtkrc.lv ; \
+-	ln -s gtkrc.iso-8859-14 gtkrc.cy ; \
+-	ln -s gtkrc.iso-8859-14 gtkrc.ga ; \
+-	ln -s gtkrc.iso-8859-15 gtkrc.et ; \
++	ln -s gtkrc.iso885913 gtkrc.mi ; \
++	ln -s gtkrc.iso885913 gtkrc.lt ; \
++	ln -s gtkrc.iso885913 gtkrc.lv ; \
++	ln -s gtkrc.iso885914 gtkrc.cy ; \
++	ln -s gtkrc.iso885914 gtkrc.ga ; \
++	ln -s gtkrc.iso885915 gtkrc.et ; \
+ 	ln -s gtkrc.ka_GE.georgianps gtkrc.ka ; \
+ 	ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \
+ 	ln -s gtkrc.vi_VN.tcvn gtkrc.vi ; \
+--- config.h.in
++++ config.h.in
+@@ -146,12 +146,21 @@
+ /* Define if you have the <nl_types.h> header file.  */
+ #undef HAVE_NL_TYPES_H
+ 
++/* Define if you have the <stdlib.h> header file.  */
++#undef HAVE_STDLIB_H
++
+ /* Define if you have the <string.h> header file.  */
+ #undef HAVE_STRING_H
+ 
+ /* Define if you have the <sys/param.h> header file.  */
+ #undef HAVE_SYS_PARAM_H
+ 
++/* Define if you have the <sys/stat.h> header file.  */
++#undef HAVE_SYS_STAT_H
++
++/* Define if you have the <sys/types.h> header file.  */
++#undef HAVE_SYS_TYPES_H
++
+ /* Define if you have the <unistd.h> header file.  */
+ #undef HAVE_UNISTD_H
+ 
+--- configure
++++ configure
+@@ -1389,6 +1389,7 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++
+ lt_target="$host"
+ 
+ # Check for any special flags to pass to ltconfig.
+@@ -1414,8 +1415,8 @@ test x"$silent" = xyes && libtool_flags=
+ case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 1422 "configure"' > conftest.$ac_ext
+-  if { (eval echo configure:1423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  echo '#line 1419 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:1420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+       LD="${LD-ld} -32"
+@@ -1436,19 +1437,19 @@ case "$lt_target" in
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
+-echo "configure:1444: checking whether the C compiler needs -belf" >&5
++echo "configure:1441: checking whether the C compiler needs -belf" >&5
+ if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1449 "configure"
++#line 1446 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   lt_cv_cc_needs_belf=yes
+ else
+@@ -1551,7 +1552,7 @@ exec 5>>./config.log
+ 
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+-echo "configure:1559: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo "configure:1556: checking whether to enable maintainer-specific portions of Makefiles" >&5
+     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+ if test "${enable_maintainer_mode+set}" = set; then
+   enableval="$enable_maintainer_mode"
+@@ -1581,7 +1582,7 @@ else { echo "configure: error: can not r
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:1589: checking host system type" >&5
++echo "configure:1586: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -1697,7 +1698,7 @@ EOF
+ 
+ # Build time sanity check...
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+-echo "configure:1705: checking whether build environment is sane" >&5
++echo "configure:1702: checking whether build environment is sane" >&5
+ # Just in case
+ sleep 1
+ echo timestamp > conftestfile
+@@ -1739,7 +1740,7 @@ echo "$ac_t""yes" 1>&6
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1747: checking for $ac_word" >&5
++echo "configure:1744: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1769,7 +1770,7 @@ 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
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1777: checking for $ac_word" >&5
++echo "configure:1774: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1820,7 +1821,7 @@ fi
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1828: checking for $ac_word" >&5
++echo "configure:1825: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1852,7 +1853,7 @@ fi
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1857: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1863,12 +1864,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1871 "configure"
++#line 1868 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1894,12 +1895,12 @@ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1902: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1907: checking whether we are using GNU C" >&5
++echo "configure:1904: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1908,7 +1909,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1927,7 +1928,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1935: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1932: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1959,7 +1960,7 @@ else
+ fi
+ 
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:1967: checking for POSIXized ISC" >&5
++echo "configure:1964: checking for POSIXized ISC" >&5
+ if test -d /etc/conf/kconfig.d &&
+   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+ then
+@@ -1983,7 +1984,7 @@ fi
+ 
+ 
+ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+-echo "configure:1991: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "configure:1988: checking for ${CC-cc} option to accept ANSI C" >&5
+ if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1999,7 +2000,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-
+ do
+   CC="$ac_save_CC $ac_arg"
+   cat > conftest.$ac_ext <<EOF
+-#line 2007 "configure"
++#line 2004 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2036,7 +2037,7 @@ return f (e, argv, 0) != argv[0]  ||  f
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_prog_cc_stdc="$ac_arg"; break
+ else
+@@ -2071,7 +2072,7 @@ esac
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:2079: checking for a BSD compatible install" >&5
++echo "configure:2076: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2124,7 +2125,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:2132: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:2129: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2181,7 +2182,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2189: checking for $ac_word" >&5
++echo "configure:2186: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2215,7 +2216,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2223: checking for $ac_word" >&5
++echo "configure:2220: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2249,7 +2250,7 @@ done
+ # Extract the first word of "indent", so it can be a program name with args.
+ set dummy indent; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2257: checking for $ac_word" >&5
++echo "configure:2254: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_INDENT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2286,7 +2287,7 @@ fi
+ 
+ 
+ echo $ac_n "checking whether make is GNU Make""... $ac_c" 1>&6
+-echo "configure:2294: checking whether make is GNU Make" >&5
++echo "configure:2291: checking whether make is GNU Make" >&5
+ STRIP_BEGIN=
+ STRIP_END=
+ if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+@@ -2304,7 +2305,7 @@ STRIP_DUMMY=
+ # i18n stuff
+ ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5"
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:2312: checking how to run the C preprocessor" >&5
++echo "configure:2309: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -2319,13 +2320,13 @@ else
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 2327 "configure"
++#line 2324 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2336,13 +2337,13 @@ else
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 2344 "configure"
++#line 2341 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2353,13 +2354,13 @@ else
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 2361 "configure"
++#line 2358 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2384,12 +2385,12 @@ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:2392: checking for ANSI C header files" >&5
++echo "configure:2389: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2397 "configure"
++#line 2394 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -2397,7 +2398,7 @@ else
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2414,7 +2415,7 @@ rm -f conftest*
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 2422 "configure"
++#line 2419 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -2432,7 +2433,7 @@ fi
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 2440 "configure"
++#line 2437 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -2453,7 +2454,7 @@ if test "$cross_compiling" = yes; then
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2461 "configure"
++#line 2458 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -2464,7 +2465,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -2488,12 +2489,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:2496: checking for working const" >&5
++echo "configure:2493: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2501 "configure"
++#line 2498 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2542,7 +2543,7 @@ ccp = (char const *const *) p;
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -2563,21 +2564,21 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:2571: checking for inline" >&5
++echo "configure:2568: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 2578 "configure"
++#line 2575 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2603,12 +2604,12 @@ EOF
+ esac
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:2611: checking for off_t" >&5
++echo "configure:2608: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2616 "configure"
++#line 2613 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2636,12 +2637,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:2644: checking for size_t" >&5
++echo "configure:2641: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2649 "configure"
++#line 2646 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2671,19 +2672,19 @@ fi
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:2679: checking for working alloca.h" >&5
++echo "configure:2676: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2684 "configure"
++#line 2681 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+@@ -2704,12 +2705,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:2712: checking for alloca" >&5
++echo "configure:2709: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2717 "configure"
++#line 2714 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -2737,7 +2738,7 @@ int main() {
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -2769,12 +2770,12 @@ EOF
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:2777: checking whether alloca needs Cray hooks" >&5
++echo "configure:2774: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2782 "configure"
++#line 2779 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -2799,12 +2800,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2807: checking for $ac_func" >&5
++echo "configure:2804: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2812 "configure"
++#line 2809 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2827,7 +2828,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2854,7 +2855,7 @@ done
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:2862: checking stack direction for C alloca" >&5
++echo "configure:2859: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2862,7 +2863,7 @@ else
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2870 "configure"
++#line 2867 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -2881,7 +2882,7 @@ main ()
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+@@ -2902,21 +2903,21 @@ EOF
+ 
+ fi
+ 
+-for ac_hdr in unistd.h
++for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2914: checking for $ac_hdr" >&5
++echo "configure:2911: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2919 "configure"
++#line 2916 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2945,12 +2946,12 @@ done
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2953: checking for $ac_func" >&5
++echo "configure:2950: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2958 "configure"
++#line 2955 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2973,7 +2974,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2998,7 +2999,7 @@ fi
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:3006: checking for working mmap" >&5
++echo "configure:3003: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3006,7 +3007,7 @@ else
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3014 "configure"
++#line 3011 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -3034,11 +3035,24 @@ else
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++
++#if HAVE_STDLIB_H
++# include <stdlib.h>
++#endif
++
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++
++#if HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ /* This mess was copied from the GNU getpagesize.h.  */
+ #ifndef HAVE_GETPAGESIZE
+-# ifdef HAVE_UNISTD_H
+-#  include <unistd.h>
+-# endif
+ 
+ /* Assume that all systems that can run configure have sys/param.h.  */
+ # ifndef HAVE_SYS_PARAM_H
+@@ -3146,7 +3160,7 @@ main()
+ }
+ 
+ EOF
+-if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -3174,17 +3188,17 @@ unistd.h sys/param.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3182: checking for $ac_hdr" >&5
++echo "configure:3192: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3187 "configure"
++#line 3197 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3214,12 +3228,12 @@ done
+ strdup __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3222: checking for $ac_func" >&5
++echo "configure:3232: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3227 "configure"
++#line 3237 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3242,7 +3256,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3271,12 +3285,12 @@ done
+      for ac_func in stpcpy
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3279: checking for $ac_func" >&5
++echo "configure:3289: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3284 "configure"
++#line 3294 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3299,7 +3313,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3333,19 +3347,19 @@ EOF
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:3341: checking for LC_MESSAGES" >&5
++echo "configure:3351: checking for LC_MESSAGES" >&5
+ if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3346 "configure"
++#line 3356 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_val_LC_MESSAGES=yes
+ else
+@@ -3366,7 +3380,7 @@ EOF
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:3374: checking whether NLS is requested" >&5
++echo "configure:3384: checking whether NLS is requested" >&5
+         # Check whether --enable-nls or --disable-nls was given.
+ if test "${enable_nls+set}" = set; then
+   enableval="$enable_nls"
+@@ -3398,17 +3412,17 @@ fi
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:3406: checking for libintl.h" >&5
++echo "configure:3416: checking for libintl.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3411 "configure"
++#line 3421 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3425,19 +3439,19 @@ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for dgettext in libc""... $ac_c" 1>&6
+-echo "configure:3433: checking for dgettext in libc" >&5
++echo "configure:3443: checking for dgettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_dgettext_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3438 "configure"
++#line 3448 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ int main() {
+ return (int) dgettext ("","")
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_dgettext_libc=yes
+ else
+@@ -3453,7 +3467,7 @@ echo "$ac_t""$gt_cv_func_dgettext_libc"
+ 
+ 	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
+ 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+-echo "configure:3461: checking for bindtextdomain in -lintl" >&5
++echo "configure:3471: checking for bindtextdomain in -lintl" >&5
+ ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3461,7 +3475,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3469 "configure"
++#line 3479 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3472,7 +3486,7 @@ int main() {
+ bindtextdomain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3488,12 +3502,12 @@ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for dgettext in libintl""... $ac_c" 1>&6
+-echo "configure:3496: checking for dgettext in libintl" >&5
++echo "configure:3506: checking for dgettext in libintl" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_dgettext_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
+-echo "configure:3501: checking for dgettext in -lintl" >&5
++echo "configure:3511: checking for dgettext in -lintl" >&5
+ ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3501,7 +3515,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3509 "configure"
++#line 3519 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3512,7 +3526,7 @@ int main() {
+ dgettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3555,7 +3569,7 @@ EOF
+ 	      # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3563: checking for $ac_word" >&5
++echo "configure:3573: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3589,12 +3603,12 @@ fi
+ 		for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3597: checking for $ac_func" >&5
++echo "configure:3607: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3602 "configure"
++#line 3612 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3617,7 +3631,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3644,7 +3658,7 @@ done
+ 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3652: checking for $ac_word" >&5
++echo "configure:3662: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3680,7 +3694,7 @@ fi
+ 		# Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3688: checking for $ac_word" >&5
++echo "configure:3698: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3712,7 +3726,7 @@ else
+ fi
+ 
+ 		cat > conftest.$ac_ext <<EOF
+-#line 3720 "configure"
++#line 3730 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3720,7 +3734,7 @@ extern int _nl_msg_cat_cntr;
+ 			       return _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   CATOBJEXT=.gmo
+ 		   DATADIRNAME=share
+@@ -3750,7 +3764,7 @@ fi
+ 
+         if test "$CATOBJEXT" = "NONE"; then
+ 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
+-echo "configure:3758: checking whether catgets can be used" >&5
++echo "configure:3768: checking whether catgets can be used" >&5
+ 	  # Check whether --with-catgets or --without-catgets was given.
+ if test "${with_catgets+set}" = set; then
+   withval="$with_catgets"
+@@ -3763,7 +3777,7 @@ fi
+ 
+ 	  if test "$nls_cv_use_catgets" = "yes"; then
+ 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
+-echo "configure:3771: checking for main in -li" >&5
++echo "configure:3781: checking for main in -li" >&5
+ ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3771,14 +3785,14 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-li  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3779 "configure"
++#line 3789 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3806,12 +3820,12 @@ else
+ fi
+ 
+ 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
+-echo "configure:3814: checking for catgets" >&5
++echo "configure:3824: checking for catgets" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3819 "configure"
++#line 3829 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char catgets(); below.  */
+@@ -3834,7 +3848,7 @@ catgets();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_catgets=yes"
+ else
+@@ -3856,7 +3870,7 @@ EOF
+ 	       # Extract the first word of "gencat", so it can be a program name with args.
+ set dummy gencat; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3864: checking for $ac_word" >&5
++echo "configure:3874: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3996,7 +4010,7 @@ EOF
+        LINGUAS=
+      else
+        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:4004: checking for catalogs to be installed" >&5
++echo "configure:4014: checking for catalogs to be installed" >&5
+        NEW_LINGUAS=
+        for lang in ${LINGUAS=$ALL_LINGUAS}; do
+          case "$ALL_LINGUAS" in
+@@ -4024,17 +4038,17 @@ echo "configure:4004: checking for catal
+    if test "$CATOBJEXT" = ".cat"; then
+      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
+-echo "configure:4032: checking for linux/version.h" >&5
++echo "configure:4042: checking for linux/version.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4037 "configure"
++#line 4047 "configure"
+ #include "confdefs.h"
+ #include <linux/version.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4106,7 +4120,7 @@ gtklocaledir='${prefix}/${DATADIRNAME}/l
+ 
+ 
+ echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
+-echo "configure:4114: checking for extra flags to get ANSI library prototypes" >&5
++echo "configure:4124: checking for extra flags to get ANSI library prototypes" >&5
+ 
+ gtk_save_LIBS=$LIBS
+ LIBS="$LIBS -lm"
+@@ -4115,12 +4129,12 @@ if test "$cross_compiling" = yes; then
+ 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4123 "configure"
++#line 4133 "configure"
+ #include "confdefs.h"
+ #include <math.h>
+              int main (void) { return (log(1) != log(1.)); }
+ EOF
+-if { (eval echo configure:4128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   echo "$ac_t""none needed" 1>&6
+ else
+@@ -4134,12 +4148,12 @@ else
+      
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4142 "configure"
++#line 4152 "configure"
+ #include "confdefs.h"
+ #include <math.h>
+ 	         int main (void) { return (log(1) != log(1.)); }
+ EOF
+-if { (eval echo configure:4147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   echo "$ac_t""-std1" 1>&6
+ else
+@@ -4160,16 +4174,16 @@ fi
+ LIBS=$gtk_save_LIBS
+ 
+ echo $ac_n "checking for extra flags for POSIX compliance""... $ac_c" 1>&6
+-echo "configure:4168: checking for extra flags for POSIX compliance" >&5
++echo "configure:4178: checking for extra flags for POSIX compliance" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 4170 "configure"
++#line 4180 "configure"
+ #include "confdefs.h"
+ #include <dirent.h>
+ int main() {
+ DIR *dir;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""none needed" 1>&6
+ else
+@@ -4179,14 +4193,14 @@ else
+   gtk_save_CFLAGS=$CFLAGS
+   CFLAGS="$CFLAGS -posix"
+   cat > conftest.$ac_ext <<EOF
+-#line 4187 "configure"
++#line 4197 "configure"
+ #include "confdefs.h"
+ #include <dirent.h>
+ int main() {
+ DIR *dir;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""-posix" 1>&6
+ else
+@@ -4262,7 +4276,7 @@ fi
+   # Extract the first word of "glib-config", so it can be a program name with args.
+ set dummy glib-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4270: checking for $ac_word" >&5
++echo "configure:4280: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4297,7 +4311,7 @@ fi
+ 
+   min_glib_version=1.2.8
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:4305: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:4315: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+@@ -4320,7 +4334,7 @@ echo "configure:4305: checking for GLIB
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4328 "configure"
++#line 4338 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+@@ -4396,7 +4410,7 @@ main ()
+ }
+ 
+ EOF
+-if { (eval echo configure:4404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -4430,7 +4444,7 @@ fi
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 4438 "configure"
++#line 4448 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+@@ -4440,7 +4454,7 @@ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+@@ -4536,7 +4550,7 @@ fi
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:4544: checking for X" >&5
++echo "configure:4554: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -4598,12 +4612,12 @@ if test "$ac_x_includes" = NO; then
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 4606 "configure"
++#line 4616 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4672,14 +4686,14 @@ if test "$ac_x_libraries" = NO; then
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4680 "configure"
++#line 4690 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -4785,17 +4799,17 @@ else
+     case "`(uname -sr) 2>/dev/null`" in
+     "SunOS 5"*)
+       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+-echo "configure:4793: checking whether -R must be followed by a space" >&5
++echo "configure:4803: checking whether -R must be followed by a space" >&5
+       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+       cat > conftest.$ac_ext <<EOF
+-#line 4796 "configure"
++#line 4806 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_nospace=yes
+ else
+@@ -4811,14 +4825,14 @@ rm -f conftest*
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 4819 "configure"
++#line 4829 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_space=yes
+ else
+@@ -4850,7 +4864,7 @@ rm -f conftest*
+     # libraries were built with DECnet support.  And karl@cs.umb.edu says
+     # the Alpha needs dnet_stub (dnet does not exist).
+     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:4858: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:4868: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4858,7 +4872,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4866 "configure"
++#line 4876 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4869,7 +4883,7 @@ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4891,7 +4905,7 @@ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:4899: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:4909: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4899,7 +4913,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4907 "configure"
++#line 4917 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4910,7 +4924,7 @@ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4939,12 +4953,12 @@ fi
+     # The nsl library prevents programs from opening the X display
+     # on Irix 5.2, according to dickey@clark.net.
+     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:4947: checking for gethostbyname" >&5
++echo "configure:4957: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4952 "configure"
++#line 4962 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname(); below.  */
+@@ -4967,7 +4981,7 @@ gethostbyname();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=yes"
+ else
+@@ -4988,7 +5002,7 @@ fi
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:4996: checking for gethostbyname in -lnsl" >&5
++echo "configure:5006: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4996,7 +5010,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5004 "configure"
++#line 5014 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5007,7 +5021,7 @@ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5037,12 +5051,12 @@ fi
+     # -lsocket must be given before -lnsl if both are needed.
+     # We assume that if connect needs -lnsl, so does gethostbyname.
+     echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:5045: checking for connect" >&5
++echo "configure:5055: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5050 "configure"
++#line 5060 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect(); below.  */
+@@ -5065,7 +5079,7 @@ connect();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_connect=yes"
+ else
+@@ -5086,7 +5100,7 @@ fi
+ 
+     if test $ac_cv_func_connect = no; then
+       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:5094: checking for connect in -lsocket" >&5
++echo "configure:5104: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5094,7 +5108,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5102 "configure"
++#line 5112 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5105,7 +5119,7 @@ int main() {
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5129,12 +5143,12 @@ fi
+ 
+     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+     echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:5137: checking for remove" >&5
++echo "configure:5147: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5142 "configure"
++#line 5152 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove(); below.  */
+@@ -5157,7 +5171,7 @@ remove();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_remove=yes"
+ else
+@@ -5178,7 +5192,7 @@ fi
+ 
+     if test $ac_cv_func_remove = no; then
+       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:5186: checking for remove in -lposix" >&5
++echo "configure:5196: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5186,7 +5200,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5194 "configure"
++#line 5204 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5197,7 +5211,7 @@ int main() {
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5221,12 +5235,12 @@ fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+     echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:5229: checking for shmat" >&5
++echo "configure:5239: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5234 "configure"
++#line 5244 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat(); below.  */
+@@ -5249,7 +5263,7 @@ shmat();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_shmat=yes"
+ else
+@@ -5270,7 +5284,7 @@ fi
+ 
+     if test $ac_cv_func_shmat = no; then
+       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:5278: checking for shmat in -lipc" >&5
++echo "configure:5288: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5278,7 +5292,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lipc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5286 "configure"
++#line 5296 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5289,7 +5303,7 @@ int main() {
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5322,7 +5336,7 @@ fi
+   # libraries we check for below, so use a different variable.
+   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:5330: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:5340: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5330,7 +5344,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5338 "configure"
++#line 5348 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5341,7 +5355,7 @@ int main() {
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5385,7 +5399,7 @@ fi
+ # Checks for libraries.
+ # Check for the X11 library
+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
+-echo "configure:5393: checking for XOpenDisplay in -lX11" >&5
++echo "configure:5403: checking for XOpenDisplay in -lX11" >&5
+ ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5393,7 +5407,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5401 "configure"
++#line 5411 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5404,7 +5418,7 @@ int main() {
+ XOpenDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5429,7 +5443,7 @@ fi
+ if test "x$enable_shm" = "xyes"; then
+   # Check for the Xext library (needed for XShm extention)
+   echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
+-echo "configure:5437: checking for XShmAttach in -lXext" >&5
++echo "configure:5447: checking for XShmAttach in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5437,7 +5451,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $x_libs $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5445 "configure"
++#line 5455 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5448,7 +5462,7 @@ int main() {
+ XShmAttach()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5468,7 +5482,7 @@ else
+   echo "$ac_t""no" 1>&6
+ # On AIX, it is in XextSam instead, but we still need -lXext
+       echo $ac_n "checking for XShmAttach in -lXextSam""... $ac_c" 1>&6
+-echo "configure:5476: checking for XShmAttach in -lXextSam" >&5
++echo "configure:5486: checking for XShmAttach in -lXextSam" >&5
+ ac_lib_var=`echo XextSam'_'XShmAttach | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5476,7 +5490,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXextSam $x_libs $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5484 "configure"
++#line 5494 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5487,7 +5501,7 @@ int main() {
+ XShmAttach()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5515,7 +5529,7 @@ fi
+ # Check for shaped window extension
+ 
+ echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
+-echo "configure:5523: checking for XShapeCombineMask in -lXext" >&5
++echo "configure:5533: checking for XShapeCombineMask in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5523,7 +5537,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $x_libs $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5531 "configure"
++#line 5541 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5534,7 +5548,7 @@ int main() {
+ XShapeCombineMask()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5564,7 +5578,7 @@ fi
+ # Check for XConvertCase (X11R6 specific)
+ 
+ echo $ac_n "checking for XConvertCase in -lX11""... $ac_c" 1>&6
+-echo "configure:5572: checking for XConvertCase in -lX11" >&5
++echo "configure:5582: checking for XConvertCase in -lX11" >&5
+ ac_lib_var=`echo X11'_'XConvertCase | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5572,7 +5586,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $x_libs $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5580 "configure"
++#line 5590 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5583,7 +5597,7 @@ int main() {
+ XConvertCase()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5610,7 +5624,7 @@ fi
+ # Check for XIM support.
+ 
+ echo $ac_n "checking for XUnregisterIMInstantiateCallback in -lX11""... $ac_c" 1>&6
+-echo "configure:5618: checking for XUnregisterIMInstantiateCallback in -lX11" >&5
++echo "configure:5628: checking for XUnregisterIMInstantiateCallback in -lX11" >&5
+ ac_lib_var=`echo X11'_'XUnregisterIMInstantiateCallback | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5618,7 +5632,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $x_libs $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5626 "configure"
++#line 5636 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5629,7 +5643,7 @@ int main() {
+ XUnregisterIMInstantiateCallback()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5717,17 +5731,17 @@ if test "x$enable_shm" = "xyes"; then
+   # Check for shared memory
+   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
+-echo "configure:5725: checking for sys/ipc.h" >&5
++echo "configure:5735: checking for sys/ipc.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5730 "configure"
++#line 5740 "configure"
+ #include "confdefs.h"
+ #include <sys/ipc.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -5754,17 +5768,17 @@ fi
+ 
+   ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6
+-echo "configure:5762: checking for sys/shm.h" >&5
++echo "configure:5772: checking for sys/shm.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5767 "configure"
++#line 5777 "configure"
+ #include "confdefs.h"
+ #include <sys/shm.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -5792,7 +5806,7 @@ fi
+ 
+   # Check for the X shared memory extension header file
+   echo $ac_n "checking X11/extensions/XShm.h""... $ac_c" 1>&6
+-echo "configure:5800: checking X11/extensions/XShm.h" >&5
++echo "configure:5810: checking X11/extensions/XShm.h" >&5
+   if test "x$no_xext_lib" = "xyes"; then
+     echo "$ac_t""no" 1>&6
+     no_xshm=yes
+@@ -5813,13 +5827,13 @@ fi
+ # Check if X_LOCALE definition is necessary
+ 
+ echo $ac_n "checking need -DX_LOCALE""... $ac_c" 1>&6
+-echo "configure:5821: checking need -DX_LOCALE" >&5
++echo "configure:5831: checking need -DX_LOCALE" >&5
+ 
+ if test "$cross_compiling" = yes; then
+   need_x_locale=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5827 "configure"
++#line 5837 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5831,7 +5845,7 @@ main ()
+   return setlocale (LC_ALL, "${with_locale}") == NULL;
+ }
+ EOF
+-if { (eval echo configure:5839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   need_x_locale=no
+ else
+@@ -5851,10 +5865,10 @@ if test $need_x_locale = yes; then
+ else
+   if test x$with_native_locale = xyes ; then
+     echo $ac_n "checking functioning locale support""... $ac_c" 1>&6
+-echo "configure:5859: checking functioning locale support" >&5
++echo "configure:5869: checking functioning locale support" >&5
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 5862 "configure"
++#line 5872 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int main() {
+@@ -5866,7 +5880,7 @@ int main() {
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   use_native_locale=yes
+ else
+@@ -5881,13 +5895,13 @@ fi
+ 
+ if test x$use_native_locale = xyes ; then
+   echo $ac_n "checking if sizeof(wchar_t) == 4""... $ac_c" 1>&6
+-echo "configure:5889: checking if sizeof(wchar_t) == 4" >&5
++echo "configure:5899: checking if sizeof(wchar_t) == 4" >&5
+ 
+   if test "$cross_compiling" = yes; then
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5895 "configure"
++#line 5905 "configure"
+ #include "confdefs.h"
+ 
+   #include <stdlib.h>
+@@ -5898,7 +5912,7 @@ else
+     return (sizeof(wchar_t) == 4) ? 0 : 1;
+   }
+ EOF
+-if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -5922,12 +5936,12 @@ fi
+ 
+ # Checks for header files.
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:5930: checking for ANSI C header files" >&5
++echo "configure:5940: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5935 "configure"
++#line 5945 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -5935,7 +5949,7 @@ else
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -5952,7 +5966,7 @@ rm -f conftest*
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 5960 "configure"
++#line 5970 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -5970,7 +5984,7 @@ fi
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 5978 "configure"
++#line 5988 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -5991,7 +6005,7 @@ if test "$cross_compiling" = yes; then
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5999 "configure"
++#line 6009 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -6002,7 +6016,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -6028,12 +6042,12 @@ fi
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:6036: checking for working const" >&5
++echo "configure:6046: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6041 "configure"
++#line 6051 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -6082,7 +6096,7 @@ ccp = (char const *const *) p;
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -6105,12 +6119,12 @@ fi
+ 
+ # Checks for library functions.
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:6113: checking return type of signal handlers" >&5
++echo "configure:6123: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6118 "configure"
++#line 6128 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -6127,7 +6141,7 @@ int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -6145,21 +6159,21 @@ cat >> confdefs.h <<EOF
+ EOF
+ 
+ 
+-for ac_hdr in unistd.h
++for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:6157: checking for $ac_hdr" >&5
++echo "configure:6167: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6162 "configure"
++#line 6172 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -6188,12 +6202,12 @@ done
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6196: checking for $ac_func" >&5
++echo "configure:6206: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6201 "configure"
++#line 6211 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6216,7 +6230,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6241,7 +6255,7 @@ fi
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:6249: checking for working mmap" >&5
++echo "configure:6259: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6249,7 +6263,7 @@ else
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6257 "configure"
++#line 6267 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -6277,11 +6291,24 @@ else
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++
++#if HAVE_STDLIB_H
++# include <stdlib.h>
++#endif
++
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++
++#if HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ /* This mess was copied from the GNU getpagesize.h.  */
+ #ifndef HAVE_GETPAGESIZE
+-# ifdef HAVE_UNISTD_H
+-#  include <unistd.h>
+-# endif
+ 
+ /* Assume that all systems that can run configure have sys/param.h.  */
+ # ifndef HAVE_SYS_PARAM_H
+@@ -6389,7 +6416,7 @@ main()
+ }
+ 
+ EOF
+-if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -6415,12 +6442,12 @@ fi
+ for ac_func in getresuid
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6423: checking for $ac_func" >&5
++echo "configure:6446: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6428 "configure"
++#line 6451 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6443,7 +6470,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6468,12 +6495,12 @@ fi
+ done
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:6476: checking for uid_t in sys/types.h" >&5
++echo "configure:6499: checking for uid_t in sys/types.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6481 "configure"
++#line 6504 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -6504,16 +6531,16 @@ fi
+ 
+ # Check if <sys/select.h> needs to be included for fd_set
+ echo $ac_n "checking for fd_set""... $ac_c" 1>&6
+-echo "configure:6512: checking for fd_set" >&5
++echo "configure:6535: checking for fd_set" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 6514 "configure"
++#line 6537 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ int main() {
+ fd_set readMask, writeMask;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gtk_ok=yes
+ else
+@@ -6527,7 +6554,7 @@ if test $gtk_ok = yes; then
+     echo "$ac_t""yes, found in sys/types.h" 1>&6
+ else
+     cat > conftest.$ac_ext <<EOF
+-#line 6535 "configure"
++#line 6558 "configure"
+ #include "confdefs.h"
+ #include <sys/select.h>
+ EOF
+@@ -6556,14 +6583,14 @@ fi
+ # Duplicate `widechar' tests from `glib'.
+ # Check for wchar.h
+ echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
+-echo "configure:6564: checking for wchar.h" >&5
++echo "configure:6587: checking for wchar.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 6566 "configure"
++#line 6589 "configure"
+ #include "confdefs.h"
+ #include <wchar.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -6586,14 +6613,14 @@ echo "$ac_t""$gtk_ok" 1>&6
+ 
+ # Check for wctype.h (for iswalnum)
+ echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
+-echo "configure:6594: checking for wctype.h" >&5
++echo "configure:6617: checking for wctype.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 6596 "configure"
++#line 6619 "configure"
+ #include "confdefs.h"
+ #include <wctype.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -6617,12 +6644,12 @@ echo "$ac_t""$gtk_ok" 1>&6
+ # in Solaris 2.5, `iswalnum' is in -lw
+ GDK_WLIBS=
+ echo $ac_n "checking for iswalnum""... $ac_c" 1>&6
+-echo "configure:6625: checking for iswalnum" >&5
++echo "configure:6648: checking for iswalnum" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_iswalnum'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6630 "configure"
++#line 6653 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char iswalnum(); below.  */
+@@ -6645,7 +6672,7 @@ iswalnum();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_iswalnum=yes"
+ else
+@@ -6663,7 +6690,7 @@ if eval "test \"`echo '$ac_cv_func_'iswa
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6
+-echo "configure:6671: checking for iswalnum in -lw" >&5
++echo "configure:6694: checking for iswalnum in -lw" >&5
+ ac_lib_var=`echo w'_'iswalnum | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6671,7 +6698,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lw  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6679 "configure"
++#line 6702 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6682,7 +6709,7 @@ int main() {
+ iswalnum()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6709,9 +6736,9 @@ fi
+ oLIBS="$LIBS"
+ LIBS="$LIBS $GDK_WLIBS"
+ echo $ac_n "checking if iswalnum() and friends are properly defined""... $ac_c" 1>&6
+-echo "configure:6717: checking if iswalnum() and friends are properly defined" >&5
++echo "configure:6740: checking if iswalnum() and friends are properly defined" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 6719 "configure"
++#line 6742 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int main() {
+@@ -6731,7 +6758,7 @@ iswalnum((wchar_t) 0);
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gtk_ok=yes
+ else
diff --git a/source/l/gtk+/gtk+-1.2.10-bellvolume.patch b/source/l/gtk+/gtk+-1.2.10-bellvolume.patch
new file mode 100644
index 00000000..c64293c2
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-bellvolume.patch
@@ -0,0 +1,11 @@
+--- gtk+-1.2.10/gdk/gdk.c.bellvolume	Wed Jan 15 12:32:25 2003
++++ gtk+-1.2.10/gdk/gdk.c	Wed Jan 15 12:32:28 2003
+@@ -989,7 +989,7 @@
+ void
+ gdk_beep (void)
+ {
+-  XBell(gdk_display, 100);
++  XBell(gdk_display, 0);
+ }
+ 
+ /*
diff --git a/source/l/gtk+/gtk+-1.2.10-clistfocusrow.patch b/source/l/gtk+/gtk+-1.2.10-clistfocusrow.patch
new file mode 100644
index 00000000..afae023a
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-clistfocusrow.patch
@@ -0,0 +1,30 @@
+Index: gtk/gtkclist.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkclist.c,v
+retrieving revision 1.156.2.25
+retrieving revision 1.156.2.26
+diff -u -p -r1.156.2.25 -r1.156.2.26
+--- gtk/gtkclist.c	1 Mar 2001 00:18:20 -0000	1.156.2.25
++++ gtk/gtkclist.c	14 Dec 2002 04:17:03 -0000	1.156.2.26
+@@ -2800,10 +2800,6 @@ real_remove_row (GtkCList *clist,
+     clist->row_list_end = g_list_previous (list);
+   g_list_remove (list, clist_row);
+ 
+-  /*if (clist->focus_row >=0 &&
+-      (row <= clist->focus_row || clist->focus_row >= clist->rows))
+-      clist->focus_row--;*/
+-
+   if (row < ROW_FROM_YPIXEL (clist, 0))
+     clist->voffset += clist->row_height + CELL_SPACING;
+ 
+@@ -4331,7 +4327,9 @@ sync_selection (GtkCList *clist,
+ 	clist->focus_row += d;
+       if (clist->focus_row == -1 && clist->rows >= 1)
+ 	clist->focus_row = 0;
+-      else if (clist->focus_row >= clist->rows)
++      else if (d < 0 && clist->focus_row >= clist->rows - 1)
++	clist->focus_row = clist->rows - 2;
++      else if (clist->focus_row >= clist->rows)	/* Paranoia */
+ 	clist->focus_row = clist->rows - 1;
+     }
+ 
diff --git a/source/l/gtk+/gtk+-1.2.10-ctext.patch b/source/l/gtk+/gtk+-1.2.10-ctext.patch
new file mode 100644
index 00000000..28fca0cd
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-ctext.patch
@@ -0,0 +1,140 @@
+--- gtk+-1.2.10/gdk/gdkselection.c.ctext	Thu Jul  5 12:41:42 2001
++++ gtk+-1.2.10/gdk/gdkselection.c	Thu Jul  5 12:45:25 2001
+@@ -191,73 +191,6 @@
+   gdk_send_xevent (requestor, False, NoEventMask, (XEvent*) &xevent);
+ }
+ 
+-
+-/* The output of XmbTextPropertyToTextList may include stuff not valid
+- * for COMPOUND_TEXT. This routine tries to correct this by:
+- *
+- * a) Canonicalizing CR LF and CR to LF
+- * b) Stripping out all other non-allowed control characters
+- *
+- * See the COMPOUND_TEXT spec distributed with X for explanations
+- * what is allowed.
+- */
+-static gchar *
+-sanitize_ctext (const char *str,
+-		gint       *length)
+-{
+-  gchar *result = g_malloc (*length + 1);
+-  gint out_length = 0;
+-  gint i;
+-  const guchar *ustr = (const guchar *)str;
+-
+-  for (i=0; i < *length; i++)
+-    {
+-      guchar c = ustr[i];
+-      
+-      if (c == '\r')
+-	{
+-	  result[out_length++] = '\n';
+-	  if (i + 1 < *length && ustr[i + 1] == '\n')
+-	    i++;
+-	}
+-      else if (c == 27 /* ESC */)
+-	{
+-	  /* Check for "extended segments, which can contain arbitrary
+-	   * octets. See CTEXT spec, section 6.
+-	   */
+-
+-	  if (i + 5 < *length &&
+-	      ustr[i + 1] == '%' &&
+-	      ustr[i + 2] == '/' &&
+-	      (ustr[i + 3] >= 48 && ustr[i + 3] <= 52) &&
+-	      ustr[i + 4] >= 128 &&
+-	      ustr[i + 5] >= 128)
+-	    {
+-	      int extra_len = 6 + (ustr[i + 4] - 128) * 128 + ustr[i + 5] - 128;
+-	      extra_len = MAX (extra_len, *length - i);
+-
+-	      memcpy (result + out_length, ustr + i, extra_len);
+-	      out_length += extra_len;
+-	      i += extra_len - 1;
+-	    }
+-	  else
+-	    result[out_length++] = c;	    
+-	}
+-      else if (c == '\n' || c == '\t' || c == 27 /* ESC */ ||
+-	       (c >= 32 && c <= 127) ||	/* GL */
+-	       c == 155 /* CONTROL SEQUENCE INTRODUCER */ ||	
+-	       (c >= 160 && c <= 255)) /* GR */
+-	{
+-	  result[out_length++] = c;
+-	}
+-    }
+-
+-  result[out_length] = '\0';
+-  *length = out_length;
+-  
+-  return result;
+-}
+-
+ gint
+ gdk_text_property_to_text_list (GdkAtom encoding, gint format, 
+ 				guchar *text, gint length,
+@@ -266,32 +199,16 @@
+   XTextProperty property;
+   gint count = 0;
+   gint res;
+-  gchar *sanitized_text = NULL;
+ 
+   if (!list) 
+     return 0;
+ 
+   property.encoding = encoding;
+   property.format = format;
+-
+-  if (encoding == gdk_atom_intern ("COMPOUND_TEXT", FALSE) && format == 8)
+-    {
+-      gint sanitized_text_length = length;
+-      
+-      property.value = sanitized_text = sanitize_ctext (text, &sanitized_text_length);
+-      property.nitems = sanitized_text_length;
+-    }
+-  else
+-    {
+-      property.value = text;
+-      property.nitems = length;
+-    }
+-  
++  property.value = text;
++  property.nitems = length;
+   res = XmbTextPropertyToTextList (GDK_DISPLAY(), &property, list, &count);
+ 
+-  if (sanitized_text)
+-    g_free (sanitized_text);
+-
+   if (res == XNoMemory || res == XLocaleNotSupported || 
+       res == XConverterNotFound)
+     return 0;
+@@ -314,8 +231,6 @@
+ {
+   gint res;
+   XTextProperty property;
+-  gint sanitized_text_length;
+-  gchar *sanitized_text;
+ 
+   res = XmbTextListToTextProperty (GDK_DISPLAY(), 
+ 				   (char **)&str, 1, XCompoundTextStyle,
+@@ -334,17 +249,10 @@
+     *encoding = property.encoding;
+   if (format)
+     *format = property.format;
+-
+-  sanitized_text_length = property.nitems;
+-  sanitized_text = sanitize_ctext (property.value, &sanitized_text_length);
+-
+   if (ctext)
+-    *ctext = sanitized_text;
+-  else
+-    g_free (sanitized_text);
+-  
++    *ctext = g_strdup (property.value);
+   if (length)
+-    *length = sanitized_text_length;
++    *length = property.nitems;
+ 
+   if (property.value)
+     XFree (property.value);
diff --git a/source/l/gtk+/gtk+-1.2.10-deletedir.patch b/source/l/gtk+/gtk+-1.2.10-deletedir.patch
new file mode 100644
index 00000000..7a1151c9
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-deletedir.patch
@@ -0,0 +1,188 @@
+--- gtk+-1.2.10/gtk/gtkfilesel.c.deletedir	Thu Feb 15 23:36:19 2001
++++ gtk+-1.2.10/gtk/gtkfilesel.c	Wed Apr 17 20:36:25 2002
+@@ -325,7 +325,8 @@
+ 
+ static void gtk_file_selection_populate      (GtkFileSelection      *fs,
+ 					      gchar                 *rel_path,
+-					      gint                   try_complete);
++					      gboolean               try_complete,
++					      gboolean               reset_entry);
+ static void gtk_file_selection_abort         (GtkFileSelection      *fs);
+ 
+ static void gtk_file_selection_update_history_menu (GtkFileSelection       *fs,
+@@ -522,7 +523,7 @@
+     }
+   else
+     {
+-      gtk_file_selection_populate (filesel, "", FALSE);
++      gtk_file_selection_populate (filesel, "", FALSE, TRUE);
+     }
+ 
+   gtk_widget_grab_focus (filesel->selection_entry);
+@@ -637,7 +638,7 @@
+       name = last_slash + 1;
+     }
+ 
+-  gtk_file_selection_populate (filesel, buf, FALSE);
++  gtk_file_selection_populate (filesel, buf, FALSE, TRUE);
+ 
+   if (filesel->selection_entry)
+     gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), name);
+@@ -673,7 +674,7 @@
+ 
+   if (filesel->selection_entry)
+     gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), pattern);
+-  gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE);
++  gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE, TRUE);
+ }
+ 
+ static void
+@@ -806,7 +807,7 @@
+   g_free (full_path);
+   
+   gtk_widget_destroy (fs->fileop_dialog);
+-  gtk_file_selection_populate (fs, "", FALSE);
++  gtk_file_selection_populate (fs, "", FALSE, FALSE);
+ }
+   
+ static void
+@@ -903,7 +904,7 @@
+   g_free (full_path);
+   
+   gtk_widget_destroy (fs->fileop_dialog);
+-  gtk_file_selection_populate (fs, "", FALSE);
++  gtk_file_selection_populate (fs, "", FALSE, TRUE);
+ }
+ 
+ static void
+@@ -1009,8 +1010,9 @@
+   g_free (new_filename);
+   g_free (old_filename);
+   
++  gtk_file_selection_populate (fs, "", FALSE, FALSE);
++  gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), file);
+   gtk_widget_destroy (fs->fileop_dialog);
+-  gtk_file_selection_populate (fs, "", FALSE);
+ }
+   
+ static void
+@@ -1112,7 +1114,7 @@
+ 
+       text = g_strdup (text);
+ 
+-      gtk_file_selection_populate (fs, text, TRUE);
++      gtk_file_selection_populate (fs, text, TRUE, TRUE);
+ 
+       g_free (text);
+ 
+@@ -1124,7 +1126,6 @@
+   return FALSE;
+ }
+ 
+-
+ static void
+ gtk_file_selection_history_callback (GtkWidget *widget, gpointer data)
+ {
+@@ -1142,7 +1143,7 @@
+     
+     if (callback_arg->menu_item == widget)
+       {
+-	gtk_file_selection_populate (fs, callback_arg->directory, FALSE);
++	gtk_file_selection_populate (fs, callback_arg->directory, FALSE, FALSE);
+ 	break;
+       }
+     
+@@ -1272,7 +1273,7 @@
+ 			       gpointer user_data)
+ {
+   GtkFileSelection *fs = NULL;
+-  gchar *filename, *temp = NULL;
++  gchar *filename = NULL;
+ 
+   g_return_if_fail (GTK_IS_CLIST (widget));
+ 
+@@ -1280,39 +1281,23 @@
+   g_return_if_fail (fs != NULL);
+   g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
+ 
+-  gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &temp);
+-  filename = g_strdup (temp);
+-
+-  if (filename)
+-    {
+-      if (bevent)
+-	switch (bevent->type)
+-	  {
+-	  case GDK_2BUTTON_PRESS:
+-	    gtk_file_selection_populate (fs, filename, FALSE);
+-	    break;
+-	  
+-	  default:
+-	    gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
+-	    break;
+-	  }
+-      else
+-	gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
+-
+-      g_free (filename);
+-    }
++  gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &filename);
++  
++  if (filename && bevent && bevent->type == GDK_2BUTTON_PRESS)
++    gtk_file_selection_populate (fs, filename, FALSE, FALSE);
+ }
+ 
+ static void
+ gtk_file_selection_populate (GtkFileSelection *fs,
+ 			     gchar            *rel_path,
+-			     gint              try_complete)
++			     gboolean          try_complete,
++			     gboolean          reset_entry)
+ {
+   CompletionState *cmpl_state;
+   PossibleCompletion* poss;
+   gchar* filename;
+   gint row;
+-  gchar* rem_path = rel_path;
++  gchar* rem_path;
+   gchar* sel_text;
+   gchar* text[2];
+   gint did_recurse = FALSE;
+@@ -1323,6 +1308,8 @@
+   
+   g_return_if_fail (fs != NULL);
+   g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
++
++  rem_path = rel_path = g_strdup (rel_path);
+   
+   cmpl_state = (CompletionState*) fs->cmpl_state;
+   poss = cmpl_completion_matches (rel_path, &rem_path, cmpl_state);
+@@ -1422,7 +1409,7 @@
+ 
+               did_recurse = TRUE;
+ 
+-              gtk_file_selection_populate (fs, dir_name, TRUE);
++              gtk_file_selection_populate (fs, dir_name, TRUE, TRUE);
+ 
+               g_free (dir_name);
+             }
+@@ -1441,7 +1428,7 @@
+ 	    gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), rem_path);
+         }
+     }
+-  else
++  else if (reset_entry)
+     {
+       if (fs->selection_entry)
+ 	gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), "");
+@@ -1466,8 +1453,9 @@
+ 	{
+ 	  gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state));
+ 	}
+-      
+     }
++
++  g_free (rel_path);
+ }
+ 
+ static void
diff --git a/source/l/gtk+/gtk+-1.2.10-dndorder.patch b/source/l/gtk+/gtk+-1.2.10-dndorder.patch
new file mode 100644
index 00000000..58a9c921
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-dndorder.patch
@@ -0,0 +1,30 @@
+Index: gdk/gdkdnd.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gdk/gdkdnd.c,v
+retrieving revision 1.25.2.7
+retrieving revision 1.25.2.9
+diff -u -p -r1.25.2.7 -r1.25.2.9
+--- gdk/gdkdnd.c	13 Mar 2000 23:41:53 -0000	1.25.2.7
++++ gdk/gdkdnd.c	14 May 2002 22:14:15 -0000	1.25.2.9
+@@ -275,12 +275,16 @@ gdk_window_cache_filter (GdkXEvent *xev,
+ 							 GUINT_TO_POINTER (xce->above));
+ 		if (above_node && node->prev != above_node)
+ 		  {
++		    /* Put the window above (before in the list) above_node
++		     */
+ 		    cache->children = g_list_remove_link (cache->children, node);
+-		    node->next = above_node->next;
+-		    if (node->next)
+-		      node->next->prev = node;
+-		    node->prev = above_node;
+-		    above_node->next = node;
++		    node->prev = above_node->prev;
++		    if (node->prev)
++		      node->prev->next = node;
++		    else
++		      cache->children = node;
++		    node->next = above_node;
++		    above_node->prev = node;
+ 		  }
+ 	      }
+ 	  }
diff --git a/source/l/gtk+/gtk+-1.2.10-encoding.patch b/source/l/gtk+/gtk+-1.2.10-encoding.patch
new file mode 100644
index 00000000..5b784a8d
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-encoding.patch
@@ -0,0 +1,298 @@
+--- gtk+-1.2.10/gtk/gtkrc.iso88593.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso88593	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,8 @@
++style "gtk-default-iso-8859-3" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-3,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-3,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-3"
++
+--- gtk+-1.2.10/gtk/Makefile.am.encoding	Fri Feb  2 12:09:02 2001
++++ gtk+-1.2.10/gtk/Makefile.am	Fri Jul 26 16:47:04 2002
+@@ -374,10 +374,12 @@
+ 
+ 
+ gtkconfdir = $(sysconfdir)/gtk
+-gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
+-	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \
+-	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
+-	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
++gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
++	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
++	gtkrc.utf8 gtkrc.iso88592 \
++	gtkrc.iso88593 gtkrc.iso88595 gtkrc.iso88597 \
++	gtkrc.iso88599 gtkrc.iso885913 gtkrc.iso885914 \
++	gtkrc.iso885915 gtkrc.zh_CN gtkrc.zh_TW.big5 \
+ 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
+ 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
+ 
+@@ -390,11 +392,11 @@
+ 	cd $(DESTDIR)$(gtkconfdir) && \
+ 	  for i in cs hr hu pl ro sk sl sq sr ; do \
+ 	    rm -f gtkrc.$$i ; \
+-	    ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
++	    ln -s gtkrc.iso88592 gtkrc.$$i ; \
+ 	  done ; \
+ 	  for i in bg_BG.iso88595 mk sp ru_RU.iso88595 ; do \
+ 	    rm -f gtkrc.$$i ; \
+-	    ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
++	    ln -s gtkrc.iso88595 gtkrc.$$i ; \
+ 	  done ; \
+ 	  for i in he_IL.cp1255 he_IL.microsoftcp1255 yi ; do \
+ 	    rm -f gtkrc.$$i ; \
+@@ -403,12 +405,12 @@
+ 	rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
+ 	     gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \
+ 	     gtkrc.be gtkrc.bg gtkrc.mi ; \
+-	ln -s gtkrc.iso-8859-13 gtkrc.mi ; \
+-	ln -s gtkrc.iso-8859-13 gtkrc.lt ; \
+-	ln -s gtkrc.iso-8859-13 gtkrc.lv ; \
+-	ln -s gtkrc.iso-8859-14 gtkrc.cy ; \
+-	ln -s gtkrc.iso-8859-14 gtkrc.ga ; \
+-	ln -s gtkrc.iso-8859-15 gtkrc.et ; \
++	ln -s gtkrc.iso885913 gtkrc.mi ; \
++	ln -s gtkrc.iso885913 gtkrc.lt ; \
++	ln -s gtkrc.iso885913 gtkrc.lv ; \
++	ln -s gtkrc.iso885914 gtkrc.cy ; \
++	ln -s gtkrc.iso885914 gtkrc.ga ; \
++	ln -s gtkrc.iso885915 gtkrc.et ; \
+ 	ln -s gtkrc.ka_GE.georgianps gtkrc.ka ; \
+ 	ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \
+ 	ln -s gtkrc.vi_VN.tcvn gtkrc.vi ; \
+--- gtk+-1.2.10/gtk/gtkrc.c.encoding	Thu Mar 15 13:41:40 2001
++++ gtk+-1.2.10/gtk/gtkrc.c	Fri Jul 26 16:49:24 2002
+@@ -33,6 +33,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <langinfo.h>
+ 
+ #include "gtkrc.h"
+ #include "gtkbindings.h"
+@@ -440,7 +441,7 @@
+ void
+ gtk_rc_init (void)
+ {
+-  static gchar *locale_suffixes[3];
++  static gchar *locale_suffixes[8];
+   static gint n_locale_suffixes = 0;
+ 
+   gint i, j;
+@@ -449,9 +450,7 @@
+ 
+   if (!initted)
+     {
+-      gint length;
+-      
+-      char *locale = setlocale (LC_CTYPE, NULL);
++      char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
+       char *p;
+       
+       initted = TRUE;
+@@ -470,39 +469,88 @@
+ 	   * We normalize the charset into a standard form,
+ 	   * which has all '-' and '_' characters removed,
+ 	   * and is lowercase.
++	   *
++	   * the search is done in that order:
++	   * gtkrc.ll_cc.lowercasecodeset
++	   * gtkrc.ll_cc.normalizedcodeset
++	   * gtkrc.ll.lowercasecodeset
++	   * gtkrc.ll.normalizedcodeset
++	   * gtkrc.lowercasecodeset
++	   * gtkrc.normalizedcodeset
++	   * gtkrc.ll_cc
++	   * gtkrc.ll
++	   * 
+ 	   */
+-	  gchar *normalized_locale;
++	  char *codeset = NULL;
++	  char *normalized_codeset = NULL;
++	  char *cc = NULL;
++	  char *ll;
+ 
+ 	  p = strchr (locale, '@');
+-	  length = p ? (p -locale) : strlen (locale);
++	  if (p)
++	    *p = '\0';
+ 
++	  codeset = nl_langinfo (CODESET);
++	  
+ 	  p = strchr (locale, '.');
++	  if (!codeset && p)
++	    codeset = p + 1;
+ 	  if (p)
++	    *p = '\0';
++	  
++	  if (codeset)
+ 	    {
+-	      gchar *tmp1 = g_strndup (locale, p - locale + 1);
+-	      gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1));
++	      codeset = g_strdup (codeset);
+ 	      
+-	      normalized_locale = g_strconcat (tmp1, tmp2, NULL);
+-	      g_free (tmp1);
+-	      g_free (tmp2);
+-						 
+-	      locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale);
+-	      length = p - locale;
++	      p = codeset;
++	      while (*p)
++		{
++		  /* tolower not used, because some locales are not
++		   * compatible with C locale in lowercasing ascii
++		   */
++		  if (*p >= 'A' && *p <= 'Z')
++		    *p = (*p) - 'A' + 'a';
++		  p++;
++		}
++	      
++	      normalized_codeset = _gtk_normalize_codeset(codeset, strlen (codeset));
++	      if (strcmp (normalized_codeset, codeset) == 0)
++		{
++		  g_free (normalized_codeset);
++		  normalized_codeset = NULL;
++		}
+ 	    }
+-	  else
+-	    normalized_locale = g_strndup (locale, length);
+ 	  
+-	  p = strchr (normalized_locale, '_');
++	  p = strchr (locale, '_');
+ 	  if (p)
+ 	    {
+-	      locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
+-	      length = p - normalized_locale;
++	      cc = p + 1;
++	      *p = '\0';
+ 	    }
+-	  
+-	  locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
+ 
+-	  g_free (normalized_locale);
++	  ll = locale;	
++	
++	  if (cc && codeset)
++	    locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, ".", codeset, NULL);
++          if (cc && normalized_codeset)
++	    locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, ".", normalized_codeset, NULL);
++	  if (codeset)
++            locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, ".", codeset, NULL);
++          if (normalized_codeset)
++	    locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, ".", normalized_codeset, NULL);
++	  if (codeset)
++	    locale_suffixes[n_locale_suffixes++] = g_strdup (codeset);
++	  if (normalized_codeset)
++	    locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_codeset);
++	  if (cc)
++            locale_suffixes[n_locale_suffixes++] = g_strconcat (ll, "_", cc, NULL);
++	  locale_suffixes[n_locale_suffixes++] = g_strdup (ll);
++
++	  g_free (normalized_codeset);
++	  g_free (codeset);
+ 	}
++
++      g_free (locale);
+     }
+   
+   i = 0;
+--- gtk+-1.2.10/gtk/gtkrc.iso88599.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso88599	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,8 @@
++style "gtk-default-iso-8859-9" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-9,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-9,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-9"
++
+--- gtk+-1.2.10/gtk/gtkrc.utf8.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.utf8	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,7 @@
++style "default-text" {
++       fontset = "-*-helvetica-medium-r-normal--*-120-*-*-p-*-*-*"
++
++}
++
++class "GtkWidget" style "default-text"
++
+--- gtk+-1.2.10/gtk/gtkrc.iso885913.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso885913	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,7 @@
++style "gtk-default-iso-8859-13" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-13,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-13,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-13"
+--- gtk+-1.2.10/gtk/gtkrc.iso885914.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso885914	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,8 @@
++style "gtk-default-iso-8859-14" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-14,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-14,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-14"
++
+--- gtk+-1.2.10/gtk/gtkrc.iso885915.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso885915	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,8 @@
++style "gtk-default-iso-8859-15" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-15,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-15,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-15"
++
+--- gtk+-1.2.10/gtk/gtkrc.iso88592.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso88592	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,14 @@
++#$(gtkconfigdir)/gtkrc.iso-8859-2
++#
++# This file defines the fontsets for iso-8859-2 encoding
++# make symliks or hardlinks to gtkrc.$LANG if your language uses iso-8859-2
++# and a gtkrc.$LANG doesn't exist yet.
++
++style  "gtk-default-iso-8859-2" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-2,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-2,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-2"
++
+--- gtk+-1.2.10/gtk/gtkrc.iso88595.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso88595	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,14 @@
++#$(gtkconfigdir)/gtkrc.iso-8859-5
++#
++# This file defines the fontsets for iso-8859-5 encoding
++# make symliks or hardlinks to gtkrc.$LANG if your language uses iso-8859-5
++# and a gtkrc.$LANG doesn't exist yet.
++
++style "gtk-default-iso-8859-5" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-5,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-5,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-5"
++
+--- gtk+-1.2.10/gtk/gtkrc.iso88597.encoding	Fri Jul 26 16:47:04 2002
++++ gtk+-1.2.10/gtk/gtkrc.iso88597	Fri Jul 26 16:47:04 2002
+@@ -0,0 +1,8 @@
++style "gtk-default-iso-8859-7" {
++       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-7,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-7,*-r-*"
++}
++class "GtkWidget" style "gtk-default-iso-8859-7"
++
diff --git a/source/l/gtk+/gtk+-1.2.10-expose.patch b/source/l/gtk+/gtk+-1.2.10-expose.patch
new file mode 100644
index 00000000..f8fe8cdb
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-expose.patch
@@ -0,0 +1,42 @@
+--- gtk+-1.2.10/gdk/gdkevents.c.expose	Sun Dec  3 11:02:49 2000
++++ gtk+-1.2.10/gdk/gdkevents.c	Wed Jul 11 15:54:18 2001
+@@ -383,6 +383,7 @@
+ struct _GdkExposeInfo
+ {
+   Window window;
++  GdkWindowPrivate *toplevel_window;
+   gboolean seen_nonmatching;
+ };
+ 
+@@ -400,10 +401,21 @@
+    * we'll get a whole bunch of them interspersed with
+    * expose events.
+    */
+-  if (xevent->xany.type != Expose && 
+-      xevent->xany.type != GravityNotify)
++  switch (xevent->xany.type)
+     {
++    case Expose:
++    case GravityNotify:
++      break;
++    case ConfigureNotify:
++      if (xevent->xconfigure.window != info->toplevel_window->xwindow)
++	break;
++      if (xevent->xconfigure.width == info->toplevel_window->width &&
++	  xevent->xconfigure.height == info->toplevel_window->height)
++	break;
++      /* Fall through */
++    default:
+       info->seen_nonmatching = TRUE;
++      break;
+     }
+ 
+   if (info->seen_nonmatching ||
+@@ -429,6 +441,7 @@
+   GdkEvent event;
+ 
+   info.window = xevent->xany.window;
++  info.toplevel_window = (GdkWindowPrivate *) gdk_window_get_toplevel (window);
+   info.seen_nonmatching = FALSE;
+   
+   rect1.x = xevent->xexpose.x;
diff --git a/source/l/gtk+/gtk+-1.2.10-focus.patch b/source/l/gtk+/gtk+-1.2.10-focus.patch
new file mode 100644
index 00000000..f7fad1de
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-focus.patch
@@ -0,0 +1,17 @@
+--- gtk+-1.2.10/gtk/gtkwindow.c.focus	Fri Mar  9 18:39:16 2001
++++ gtk+-1.2.10/gtk/gtkwindow.c	Thu Jul  5 10:34:00 2001
+@@ -985,7 +985,13 @@
+       break;
+     case EnterNotify:
+     case LeaveNotify:
+-      if (xev->xcrossing.detail != NotifyInferior &&
++      /* We only track the actual destination of keyboard events for real
++       * toplevels, not for embedded toplevels such as GtkPlug. The reason for
++       * this is that GtkPlug redirects events so the widget may effectively not
++       * have the focus even if it actually has the focus.
++       */
++      if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () &&
++	  xev->xcrossing.detail != NotifyInferior &&
+ 	  xev->xcrossing.focus && !window->window_has_focus)
+ 	{
+ 	  window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE;
diff --git a/source/l/gtk+/gtk+-1.2.10-fontwarning.patch b/source/l/gtk+/gtk+-1.2.10-fontwarning.patch
new file mode 100644
index 00000000..bf540bb0
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-fontwarning.patch
@@ -0,0 +1,24 @@
+--- gtk+-1.2.10/gdk/gdkfont.c.fontwarning	Fri Apr 12 17:33:55 2002
++++ gtk+-1.2.10/gdk/gdkfont.c	Fri Apr 12 17:36:52 2002
+@@ -27,6 +27,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xos.h>
+ #include <langinfo.h>
++#include <locale.h>
+ #include "gdk.h"
+ #include "gdkprivate.h"
+ 
+@@ -187,9 +188,11 @@
+       if (g_strcasecmp (codeset, "utf-8") != 0 &&
+ 	  g_strcasecmp (codeset, "utf8") != 0)
+ 	{
+-	  g_warning ("Missing charsets in FontSet creation\n");
++	  g_printerr ("The font \"%s\" does not support all the required character sets for the current locale \"%s\"\n",
++		      fontset_name, setlocale (LC_ALL, NULL));
+ 	  for (i=0;i<missing_charset_count;i++)
+-	    g_warning ("    %s\n", missing_charset_list[i]);
++	    g_printerr ("  (Missing character set \"%s\")\n",
++			missing_charset_list[i]);
+ 	}
+       
+       XFreeStringList (missing_charset_list);
diff --git a/source/l/gtk+/gtk+-1.2.10-format.patch b/source/l/gtk+/gtk+-1.2.10-format.patch
new file mode 100644
index 00000000..0fdf513a
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-format.patch
@@ -0,0 +1,20 @@
+--- gtk/gtkthemes.c
++++ gtk/gtkthemes.c
+@@ -90,7 +90,7 @@ gtk_theme_engine_get (const gchar *name)
+        g_free(engine_path);
+        if (!library)
+ 	 {
+-	   g_warning (g_module_error());
++	   g_warning ("%s", g_module_error());
+ 	   return NULL;
+ 	 }
+        else
+@@ -107,7 +107,7 @@ gtk_theme_engine_get (const gchar *name)
+ 		!g_module_symbol (library, "theme_exit", 
+ 				  (gpointer *)&result->exit))
+ 	      {
+-		g_warning (g_module_error());
++		g_warning ("%s", g_module_error());
+ 		g_free (result);
+ 		return NULL;
+ 	      }
diff --git a/source/l/gtk+/gtk+-1.2.10-gtkgdkdep.patch b/source/l/gtk+/gtk+-1.2.10-gtkgdkdep.patch
new file mode 100644
index 00000000..acee05a7
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-gtkgdkdep.patch
@@ -0,0 +1,13 @@
+--- gtk+-1.2.10/gtk/Makefile.am.gtkgdkdep	2003-10-15 15:20:27.000000000 -0400
++++ gtk+-1.2.10/gtk/Makefile.am	2003-10-15 15:22:50.000000000 -0400
+@@ -23,6 +23,10 @@
+ 
+ # libtool stuff: set version and export symbols for resolving
+ libgtkincludedir = $(includedir)/gtk-1.2/gtk
++
++libgtk_la_DEPENDENCIES = $(top_builddir)/gdk/libgdk.la
++libgtk_la_LIBADD = $(top_builddir)/gdk/libgdk.la
++
+ libgtk_la_LDFLAGS = @STRIP_BEGIN@ \
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
+ 	-release $(LT_RELEASE) 					\
diff --git a/source/l/gtk+/gtk+-1.2.10-kpenter.patch b/source/l/gtk+/gtk+-1.2.10-kpenter.patch
new file mode 100644
index 00000000..a72fcb28
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-kpenter.patch
@@ -0,0 +1,52 @@
+--- gtk+-1.2.10/gtk/gtkentry.c.kpenter	Sat Jul 21 20:27:08 2001
++++ gtk+-1.2.10/gtk/gtkentry.c	Sat Jul 21 20:27:16 2001
+@@ -1184,6 +1184,7 @@
+ 	}
+       break;
+     case GDK_Return:
++    case GDK_KP_Enter:
+       return_val = TRUE;
+       gtk_widget_activate (widget);
+       break;
+--- gtk+-1.2.10/gtk/gtktext.c.kpenter	Sat Jul 21 20:28:56 2001
++++ gtk+-1.2.10/gtk/gtktext.c	Sat Jul 21 20:29:17 2001
+@@ -2055,6 +2055,7 @@
+ 	case GDK_Up:        scroll_int (text, -KEY_SCROLL_PIXELS); break;
+ 	case GDK_Down:      scroll_int (text, +KEY_SCROLL_PIXELS); break;
+ 	case GDK_Return:
++	case GDK_KP_Enter:
+ 	  if (event->state & GDK_CONTROL_MASK)
+ 	    gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
+ 	  else
+@@ -2161,6 +2162,7 @@
+ 	  gtk_editable_insert_text (editable, "\t", 1, &position);
+ 	  break;
+ 	case GDK_Return:
++	case GDK_KP_Enter:
+ 	  if (event->state & GDK_CONTROL_MASK)
+ 	    gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
+ 	  else
+--- gtk+-1.2.10/gtk/gtkmenushell.c.kpenter	Sat Jul 21 20:27:59 2001
++++ gtk+-1.2.10/gtk/gtkmenushell.c	Sat Jul 21 20:28:05 2001
+@@ -258,6 +258,11 @@
+ 				GTK_TYPE_BOOL,
+ 				TRUE);
+   gtk_binding_entry_add_signal (binding_set,
++				GDK_KP_Enter, 0,
++				"activate_current", 1,
++				GTK_TYPE_BOOL,
++				TRUE);
++  gtk_binding_entry_add_signal (binding_set,
+ 				GDK_space, 0,
+ 				"activate_current", 1,
+ 				GTK_TYPE_BOOL,
+--- gtk+-1.2.10/gtk/gtknotebook.c.kpenter	Sat Jul 21 20:28:30 2001
++++ gtk+-1.2.10/gtk/gtknotebook.c	Sat Jul 21 20:28:38 2001
+@@ -1369,6 +1369,7 @@
+ 	gtk_notebook_switch_focus_tab (notebook, list);
+       return TRUE;
+     case GDK_Return:
++    case GDK_KP_Enter:
+     case GDK_space:
+       gtk_notebook_page_select (GTK_NOTEBOOK (widget));
+       return TRUE;
diff --git a/source/l/gtk+/gtk+-1.2.10-libtool.patch b/source/l/gtk+/gtk+-1.2.10-libtool.patch
new file mode 100644
index 00000000..92a15528
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-libtool.patch
@@ -0,0 +1,52 @@
+--- gtk+-1.2.10/configure.libtool	Wed Jan 15 12:44:35 2003
++++ gtk+-1.2.10/configure	Wed Jan 15 12:45:29 2003
+@@ -1389,11 +1389,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-
+-case "$target" in
+-NONE) lt_target="$host" ;;
+-*) lt_target="$target" ;;
+-esac
++lt_target="$host"
+ 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+--- gtk+-1.2.10/aclocal.m4.libtool	Wed Jan 15 12:44:47 2003
++++ gtk+-1.2.10/aclocal.m4	Wed Jan 15 12:45:42 2003
+@@ -56,10 +56,7 @@
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+ dnl
+ 
+-case "$target" in
+-NONE) lt_target="$host" ;;
+-*) lt_target="$target" ;;
+-esac
++lt_target="$host"
+ 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+--- gtk+-1.2.10/ltconfig.libtool	Wed Jan 15 12:44:58 2003
++++ gtk+-1.2.10/ltconfig	Wed Jan 15 12:46:15 2003
+@@ -447,16 +447,16 @@
+   host_alias=$host
+ fi
+ 
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case "$host_os" in
+ linux-gnu*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+ case "$host_os" in
+ aix3*)
+   # AIX sometimes has problems with the GCC collect2 program.  For some
diff --git a/source/l/gtk+/gtk+-1.2.10-localecrash.patch b/source/l/gtk+/gtk+-1.2.10-localecrash.patch
new file mode 100644
index 00000000..368380b2
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-localecrash.patch
@@ -0,0 +1,20 @@
+--- gtk+-1.2.10/gdk/gdkselection.c.localecrash	Thu Aug 22 16:50:01 2002
++++ gtk+-1.2.10/gdk/gdkselection.c	Thu Aug 22 17:50:46 2002
+@@ -238,12 +238,14 @@
+   if (res != Success)
+     {
+       property.encoding = None;
+-      property.format = None;
++      property.format = 8;
+       property.value = NULL;
+       property.nitems = 0;
+-    }
+ 
+-  g_assert (property.encoding == gdk_atom_intern ("COMPOUND_TEXT", FALSE) && property.format == 8);
++      g_warning ("Error converting string to compound text.\n"
++		 "This might mean that your locale setting is supported\n"
++		 "by the C library but not by Xlib.");
++    }
+ 
+   if (encoding)
+     *encoding = property.encoding;
diff --git a/source/l/gtk+/gtk+-1.2.10-missingchar.patch b/source/l/gtk+/gtk+-1.2.10-missingchar.patch
new file mode 100644
index 00000000..0d76f93a
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-missingchar.patch
@@ -0,0 +1,33 @@
+--- gtk+-1.2.10/gdk/gdkfont.c.missingchar	Mon Aug 13 13:37:52 2001
++++ gtk+-1.2.10/gdk/gdkfont.c	Mon Aug 13 13:39:30 2001
+@@ -461,7 +461,6 @@
+   GdkFontPrivate *private;
+   XCharStruct *chars;
+   gint width;
+-  guint ch = character & 0xff;  /* get rid of sign-extension */
+   XFontStruct *xfont;
+   XFontSet fontset;
+ 
+@@ -474,21 +473,7 @@
+     case GDK_FONT_FONT:
+       /* only 8 bits characters are considered here */
+       xfont = (XFontStruct *) private->xfont;
+-      if ((xfont->min_byte1 == 0) &&
+-	  (xfont->max_byte1 == 0) &&
+-	  (ch >= xfont->min_char_or_byte2) &&
+-	  (ch <= xfont->max_char_or_byte2))
+-	{
+-	  chars = xfont->per_char;
+-	  if (chars)
+-	    width = chars[ch - xfont->min_char_or_byte2].width;
+-	  else
+-	    width = xfont->min_bounds.width;
+-	}
+-      else
+-	{
+-	  width = XTextWidth (xfont, &character, 1);
+-	}
++      width = XTextWidth (xfont, &character, 1);
+       break;
+     case GDK_FONT_FONTSET:
+       fontset = (XFontSet) private->xfont;
diff --git a/source/l/gtk+/gtk+-1.2.10-multilib.patch b/source/l/gtk+/gtk+-1.2.10-multilib.patch
new file mode 100644
index 00000000..d0c3ad5d
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-multilib.patch
@@ -0,0 +1,52 @@
+diff -up gtk+-1.2.10/gtk-config.in.multilib gtk+-1.2.10/gtk-config.in
+--- gtk+-1.2.10/gtk-config.in.multilib	2000-10-21 20:20:40.000000000 +0200
++++ gtk+-1.2.10/gtk-config.in	2008-10-02 09:52:59.000000000 +0200
+@@ -1,12 +1,16 @@
+ #!/bin/sh
+ 
+-glib_libs="@glib_libs@"
+-glib_cflags="@glib_cflags@"
+-glib_thread_libs="@glib_thread_libs@"
+-glib_thread_cflags="@glib_thread_cflags@"
++[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++glib_libs=`${PKG_CONFIG} --libs glib gmodule`
++glib_cflags=`${PKG_CONFIG} --cflags glib gmodule`
++glib_thread_libs=`${PKG_CONFIG} --libs gthread`
++glib_thread_cflags=`${PKG_CONFIG} --cflags gthread`
++
++prefix=`${PKG_CONFIG} --variable prefix gtk+`
++exec_prefix=`${PKG_CONFIG} --variable exec_prefix gtk+`
++libdir=`${PKG_CONFIG} --variable libdir gtk+`
++includedir=`${PKG_CONFIG} --variable includedir gtk+`
+ exec_prefix_set=no
+ 
+ usage()
+@@ -91,14 +95,14 @@ if test "$lib_gthread" = "yes"; then
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I@includedir@/gtk-1.2 $glib_cflags @x_cflags@ 
++      echo -I${includedir}/gtk-1.2 $glib_cflags @x_cflags@ 
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+       my_glib_libs=
+-      libdirs=-L@libdir@
++      libdirs=-L${libdir}
+       for i in $glib_libs ; do
+-        if test $i != -L@libdir@ ; then
++        if test $i != -L${libdir} ; then
+           if test -z "$my_glib_libs" ; then
+             my_glib_libs="$i"
+           else
+@@ -107,6 +111,6 @@ if test "$echo_libs" = "yes"; then
+         fi
+       done
+ 
+-      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
+ fi      
+ 
diff --git a/source/l/gtk+/gtk+-1.2.10-no_undefined.patch b/source/l/gtk+/gtk+-1.2.10-no_undefined.patch
new file mode 100644
index 00000000..34e9d497
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-no_undefined.patch
@@ -0,0 +1,20 @@
+--- gtk+-1.2.10/gtk/Makefile.am.no_undefined	2006-04-08 20:58:18.000000000 -0500
++++ gtk+-1.2.10/gtk/Makefile.am	2006-04-08 20:58:59.000000000 -0500
+@@ -31,6 +31,7 @@
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
+ 	-release $(LT_RELEASE) 					\
+ 	-export-dynamic						\
++	-no-undefined -Wl,--no-undefined			\
+ 	@GLIB_DEPLIBS@ 						\
+ 	@x_ldflags@						\
+ 	@x_libs@ 						\
+--- gtk+-1.2.10/gdk/Makefile.am.no_undefined	2000-10-21 13:20:40.000000000 -0500
++++ gtk+-1.2.10/gdk/Makefile.am	2006-04-08 20:58:18.000000000 -0500
+@@ -21,6 +21,7 @@
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ 	-release $(LT_RELEASE) \
+ 	-export-dynamic \
++	-no-undefined -Wl,--no-undefined \
+ 	@GLIB_DEPLIBS@	\
+ 	@x_ldflags@	\
+ 	@x_libs@	\
diff --git a/source/l/gtk+/gtk+-1.2.10-pixmapref.patch b/source/l/gtk+/gtk+-1.2.10-pixmapref.patch
new file mode 100644
index 00000000..0a6c3b2b
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-pixmapref.patch
@@ -0,0 +1,14 @@
+--- gtk+-1.2.10/gtk/gtkstyle.c.pixmapref	Tue Feb 20 11:46:58 2001
++++ gtk+-1.2.10/gtk/gtkstyle.c	Sun Aug 12 15:42:06 2001
+@@ -348,8 +348,9 @@
+       new_style->bg[i] = style->bg[i];
+       new_style->text[i] = style->text[i];
+       new_style->base[i] = style->base[i];
+-      
+-      new_style->bg_pixmap[i] = style->bg_pixmap[i];
++
++      if (style->bg_pixmap[i] && !(style->rc_style && style->rc_style->bg_pixmap_name[i]))
++	new_style->bg_pixmap[i] = gdk_pixmap_ref (style->bg_pixmap[i]);
+     }
+   
+   gdk_font_unref (new_style->font);
diff --git a/source/l/gtk+/gtk+-1.2.10-ppc64.patch b/source/l/gtk+/gtk+-1.2.10-ppc64.patch
new file mode 100644
index 00000000..dcfe2915
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-ppc64.patch
@@ -0,0 +1,11 @@
+--- gtk+-1.2.10/ltconfig.ppc64	2005-11-01 11:11:27.000000000 -0500
++++ gtk+-1.2.10/ltconfig	2005-11-01 11:12:42.000000000 -0500
+@@ -1968,7 +1968,7 @@
+   shlibpath_overrides_runpath=no
+   deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+   file_magic_cmd=/usr/bin/file
+-  file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  file_magic_test_file=`echo /lib{,64}/libc.so* /lib{,64}/libc-*.so`
+ 
+   if test -f /lib/ld.so.1; then
+     dynamic_linker='GNU ld.so'
diff --git a/source/l/gtk+/gtk+-1.2.10-themeswitch.patch b/source/l/gtk+/gtk+-1.2.10-themeswitch.patch
new file mode 100644
index 00000000..5bf84903
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-themeswitch.patch
@@ -0,0 +1,88 @@
+--- gtk+-1.2.10/gtk/gtkwindow.c.themeswitch	Mon Aug 13 13:42:05 2001
++++ gtk+-1.2.10/gtk/gtkwindow.c	Mon Aug 13 13:42:05 2001
+@@ -859,13 +859,60 @@
+   GTK_OBJECT_CLASS(parent_class)->finalize (object);
+ }
+ 
++
++static void
++reread_rc_files ()
++{
++  if (gtk_rc_reparse_all ())
++    {
++      /* If the above returned true, some of our RC files are out
++       * of date, so we need to reset all our widgets. Our other
++       * toplevel windows will also get the message, but by
++       * then, the RC file will up to date, so we have to tell
++       * them now.
++       */
++      GList *toplevels;
++      
++      toplevels = gtk_container_get_toplevels();
++      while (toplevels)
++	{
++	  gtk_widget_reset_rc_styles (toplevels->data);
++	  toplevels = toplevels->next;
++	}
++    }
++}
++
+ static void
+ gtk_window_show (GtkWidget *widget)
+ {
+   GtkWindow *window = GTK_WINDOW (widget);
+   GtkContainer *container = GTK_CONTAINER (window);
+   gboolean need_resize;
++  GList *toplevels;
++  gboolean had_visible = FALSE;
+ 
++  /* If we have no windows shown at this point, then check for
++   * theme changes before showing the window. We really should
++   * be checking realized, not shown, but shown => realized,
++   * and checking in realize might cause reentrancy problems.
++   *
++   * Plus, this allows us to get the new size right before
++   * realizing.
++   */
++  toplevels = gtk_container_get_toplevels ();
++  while (toplevels)
++    {
++      if (GTK_WIDGET_VISIBLE (toplevels->data))
++	{
++	  had_visible = TRUE;
++	  break;
++	}
++      toplevels = toplevels->next;
++    }
++
++  if (!had_visible)
++    reread_rc_files ();
++  
+   GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
+ 
+   need_resize = container->need_resize || !GTK_WIDGET_REALIZED (widget);
+@@ -1480,23 +1527,7 @@
+ 	}
+     }
+ 
+-  if (gtk_rc_reparse_all ())
+-    {
+-      /* If the above returned true, some of our RC files are out
+-       * of date, so we need to reset all our widgets. Our other
+-       * toplevel windows will also get the message, but by
+-       * then, the RC file will up to date, so we have to tell
+-       * them now.
+-       */
+-      GList *toplevels;
+-      
+-      toplevels = gtk_container_get_toplevels();
+-      while (toplevels)
+-	{
+-	  gtk_widget_reset_rc_styles (toplevels->data);
+-	  toplevels = toplevels->next;
+-	}
+-    }
++  reread_rc_files ();
+ }
+ 
+ static gint
diff --git a/source/l/gtk+/gtk+-1.2.10-troughpaint.patch b/source/l/gtk+/gtk+-1.2.10-troughpaint.patch
new file mode 100644
index 00000000..28c902e1
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-troughpaint.patch
@@ -0,0 +1,19 @@
+Index: gtk/gtkrange.c
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkrange.c,v
+retrieving revision 1.26.2.3
+diff -u -p -r1.26.2.3 gtkrange.c
+--- gtk/gtkrange.c	22 Feb 2001 20:38:14 -0000	1.26.2.3
++++ gtk/gtkrange.c	19 Jul 2002 15:41:58 -0000
+@@ -829,7 +828,10 @@ gtk_range_expose (GtkWidget      *widget
+ 	    (event->area.x + event->area.width <= 
+ 	     widget->allocation.width - trough_border) &&
+ 	    (event->area.y + event->area.height <= 
+-	     widget->allocation.height - trough_border)))
++	     widget->allocation.height - trough_border)) ||
++	  gtk_style_get_prop_experimental (widget->style,
++					   "GtkRange::always_draw_trough",
++					   0))
+ 	gtk_range_draw_trough (range);
+     }
+   else if (event->window == widget->window)
diff --git a/source/l/gtk+/gtk+-1.2.10-ukfont.patch b/source/l/gtk+/gtk+-1.2.10-ukfont.patch
new file mode 100644
index 00000000..369be503
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-ukfont.patch
@@ -0,0 +1,27 @@
+--- gtk+-1.2.10/gtk/gtkrc.uk.ukfont	Wed Apr 10 19:20:40 2002
++++ gtk+-1.2.10/gtk/gtkrc.uk	Wed Apr 10 19:20:56 2002
+@@ -7,10 +7,10 @@
+ #
+ 
+ style "gtk-default-uk" {
+-       fontset = "-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-*,\
++       fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
+                   -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+-		  -*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-u,\
+-		  -*-arial-medium-r-normal--14-*-*-*-*-*-koi8-u,*-r-*"
++		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-u,\
++		  -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-u,*-r-*"
+ }
+ class "GtkWidget" style "gtk-default-uk"
+ 
+--- gtk+-1.2.10/gtk/gtkrc.ru.ukfont	Thu Apr 11 10:22:15 2002
++++ gtk+-1.2.10/gtk/gtkrc.ru	Mon May  8 14:49:18 2000
+@@ -1,7 +1,7 @@
+ style "gtk-default-ru" {
+        fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
+                   -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+-                  -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
++                  -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
+                   -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r,*-r-*"
+ }
+ class "GtkWidget" style "gtk-default-ru"
diff --git a/source/l/gtk+/gtk+-1.2.10-unused-deps.patch b/source/l/gtk+/gtk+-1.2.10-unused-deps.patch
new file mode 100644
index 00000000..3d90f2a2
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-unused-deps.patch
@@ -0,0 +1,28 @@
+--- gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:02:02.000000000 +0100
++++ gtk+-1.2.10/gdk/Makefile.am	2009-04-17 17:05:49.000000000 +0100
+@@ -22,10 +22,9 @@
+ 	-release $(LT_RELEASE) \
+ 	-export-dynamic \
+ 	-no-undefined -Wl,--no-undefined \
+-	@GLIB_DEPLIBS@	\
++	$(filter-out -lgmodule -ldl, @GLIB_DEPLIBS@) \
+ 	@x_ldflags@	\
+ 	@x_libs@	\
+-	-lm		\
+ @STRIP_END@
+ 
+ #
+--- gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:46:56.000000000 +0100
++++ gtk+-1.2.10/gtk/Makefile.am	2009-04-17 20:52:24.000000000 +0100
+@@ -32,9 +32,9 @@
+ 	-release $(LT_RELEASE) 					\
+ 	-export-dynamic						\
+ 	-no-undefined -Wl,--no-undefined			\
+-	@GLIB_DEPLIBS@ 						\
++	$(filter-out -ldl, @GLIB_DEPLIBS@)			\
+ 	@x_ldflags@						\
+-	@x_libs@ 						\
++	$(filter-out -lXi -lXext, @x_libs@)			\
+ 	-lm							\
+ @STRIP_END@
+ #	$(top_builddir)/gdk/libgdk.la
diff --git a/source/l/gtk+/gtk+-1.2.10-utf8fontset.patch b/source/l/gtk+/gtk+-1.2.10-utf8fontset.patch
new file mode 100644
index 00000000..fbf829aa
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.10-utf8fontset.patch
@@ -0,0 +1,38 @@
+--- gtk+-1.2.10/gdk/gdkfont.c.utf8fontset	Sun Apr  1 22:31:25 2001
++++ gtk+-1.2.10/gdk/gdkfont.c	Tue Jul 10 11:31:54 2001
+@@ -26,6 +26,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xos.h>
++#include <langinfo.h>
+ #include "gdk.h"
+ #include "gdkprivate.h"
+ 
+@@ -173,9 +174,24 @@
+   if (missing_charset_count)
+     {
+       gint i;
+-      g_warning ("Missing charsets in FontSet creation\n");
+-      for (i=0;i<missing_charset_count;i++)
+-	g_warning ("    %s\n", missing_charset_list[i]);
++      const char *codeset;
++
++      codeset = nl_langinfo (CODESET);
++
++      /* Hack - UTF-8 is likely to be rendered with a list of
++       * possible legacy fallback charsets, so a failure here
++       * shouldn't be warned about. But we don't want to suppress
++       * this warning in general, since for other character sets
++       * it gives a useful indication of what went wrong.
++       */
++      if (g_strcasecmp (codeset, "utf-8") != 0 &&
++	  g_strcasecmp (codeset, "utf8") != 0)
++	{
++	  g_warning ("Missing charsets in FontSet creation\n");
++	  for (i=0;i<missing_charset_count;i++)
++	    g_warning ("    %s\n", missing_charset_list[i]);
++	}
++      
+       XFreeStringList (missing_charset_list);
+     }
+ 
diff --git a/source/l/gtk+/gtk+-1.2.8-wrap-alnum.patch b/source/l/gtk+/gtk+-1.2.8-wrap-alnum.patch
new file mode 100644
index 00000000..ddbd29bb
--- /dev/null
+++ b/source/l/gtk+/gtk+-1.2.8-wrap-alnum.patch
@@ -0,0 +1,16 @@
+--- gtk+-1.2.8/gtk/gtklabel.c.alnum	Wed Jan 24 05:56:00 2001
++++ gtk+-1.2.8/gtk/gtklabel.c	Wed Jan 24 07:44:22 2001
+@@ -507,8 +507,11 @@
+ static gboolean
+ is_ideogram (GdkWChar wc)
+ {
+-  return !(gdk_iswalnum (wc) || gdk_iswspace (wc) ||
+-	   gdk_iswpunct (wc) || gdk_iswcntrl (wc));
++    if (gdk_iswalpha (wc) && (!gdk_iswupper (wc) && !gdk_iswlower (wc)))
++	return TRUE;
++    
++    return !(gdk_iswspace (wc) || gdk_iswalnum (wc) ||
++	     gdk_iswpunct (wc) || gdk_iswcntrl (wc));
+ }
+ 
+ /* this needs to handle white space better. */
diff --git a/source/l/gtk+/gtk+-underquoted.patch b/source/l/gtk+/gtk+-underquoted.patch
new file mode 100644
index 00000000..3e7ae155
--- /dev/null
+++ b/source/l/gtk+/gtk+-underquoted.patch
@@ -0,0 +1,11 @@
+--- gtk+-1.2.10/gtk.m4.underquoted	2004-08-15 22:20:34.253447389 +0100
++++ gtk+-1.2.10/gtk.m4	2004-08-15 22:20:47.874844660 +0100
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_GTK,
++AC_DEFUN([AM_PATH_GTK],
+ [dnl 
+ dnl Get the cflags and libraries from the gtk-config script
+ dnl
diff --git a/source/l/gtk+/gtk+.SlackBuild b/source/l/gtk+/gtk+.SlackBuild
index 8ac39412..25a7ad8d 100755
--- a/source/l/gtk+/gtk+.SlackBuild
+++ b/source/l/gtk+/gtk+.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,31 +20,39 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gtk+
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -60,9 +68,40 @@ fi
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
-cd ${PKGNAM}-$VERSION
-
-bzcat $CWD/gtk+1.2_1.2.10-18.diff.bz2 | patch -p1 --verbose || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
+
+zcat $CWD/gtk+-1.2.10-ahiguti.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.8-wrap-alnum.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-alignment.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-expose.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-focus.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-encoding.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-ctext.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-utf8fontset.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-kpenter.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-themeswitch.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-pixmapref.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-missingchar.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-ukfont.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-deletedir.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-fontwarning.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-troughpaint.patch.gz | patch -p0 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-localecrash.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-dndorder.patch.gz | patch -p0 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-clistfocusrow.patch.gz | patch -p0 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-bellvolume.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-libtool.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-gtkgdkdep.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-underquoted.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-ppc64.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-no_undefined.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-multilib.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-unused-deps.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-autotools.patch.gz | patch -p0 --verbose || exit 1
+zcat $CWD/gtk+-1.2.10-format.patch.gz | patch -p0 --verbose || exit 1
+
+# The original config.{guess,sub} do not work on x86_64 and some other $ARCH:
+cp -p /usr/share/libtool/build-aux/config.{guess,sub} .
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -72,11 +111,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# The original config.{guess,sub} do not work on x86_64
-#cp /usr/share/libtool/config.{guess,sub} .             # libtool-1.x
-cp /usr/share/libtool/config/config.{guess,sub} .       # libtool-2.x
-
 # Configure:
+LIBTOOL=/usr/bin/libtool \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -84,19 +120,35 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --with-glib-prefix=/usr \
+  --with-xinput=xfree \
+  --with-native-locale \
+  --disable-static \
   --mandir=/usr/man \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
-make $NUMJOBS || make || exit 1
+make $NUMJOBS LIBTOOL=/usr/bin/libtool || make LIBTOOL=/usr/bin/libtool || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# Throw away the static libraries that shouldn't have been built:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a
+
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Remove rpaths:
+for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
+  if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
+    patchelf --remove-rpath $file
+  fi
+done
+
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
diff --git a/source/l/gtk+/gtk+1.2_1.2.10-18.diff b/source/l/gtk+/gtk+1.2_1.2.10-18.diff
deleted file mode 100644
index e3e71deb..00000000
--- a/source/l/gtk+/gtk+1.2_1.2.10-18.diff
+++ /dev/null
@@ -1,29031 +0,0 @@
---- gtk+1.2-1.2.10.orig/Makefile.in
-+++ gtk+1.2-1.2.10/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-@@ -66,6 +66,8 @@
- CC = @CC@
- DATADIRNAME = @DATADIRNAME@
- DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
- GDK_WLIBS = @GDK_WLIBS@
- GENCAT = @GENCAT@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -101,12 +103,14 @@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- POFILES = @POFILES@
- POSUB = @POSUB@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
-+STRIP = @STRIP@
- STRIP_BEGIN = @STRIP_BEGIN@
- STRIP_DUMMY = @STRIP_DUMMY@
- STRIP_END = @STRIP_END@
-@@ -125,6 +129,8 @@
- x_libs = @x_libs@
- xinput_progs = @xinput_progs@
- 
-+CONFIGURE_DEPENDENCIES = acgtk.m4
-+
- SRC_SUBDIRS = gdk gtk
- SUBDIRS = po $(SRC_SUBDIRS) docs
- 
-@@ -133,7 +139,7 @@
- # require automake 1.4
- AUTOMAKE_OPTIONS = 1.4
- 
--EXTRA_DIST =  	HACKING			gtk+.spec.in	        gtk.m4          	makecopyright		TODO			NEWS.pre-1-0		ChangeLog.pre-1-0		README.cvs-commits		intl/libgettext.h		intl/po2tbl.sed.in		examples/aspectframe/Makefile  	examples/aspectframe/aspectframe.c  	examples/Makefile  	examples/README.1ST  	examples/extract.awk  	examples/extract.sh  	examples/base/Makefile  	examples/base/base.c  	examples/buttons/Makefile  	examples/buttons/buttons.c  	examples/buttons/info.xpm  	examples/calendar/Makefile  	examples/calendar/calendar.c  	examples/clist/Makefile  	examples/clist/clist.c  	examples/entry/Makefile  	examples/entry/entry.c  	examples/eventbox/Makefile  	examples/eventbox/eventbox.c  	examples/filesel/Makefile  	examples/filesel/filesel.c  	examples/gtkdial/Makefile  	examples/gtkdial/dial_test.c  	examples/gtkdial/gtkdial.c  	examples/gtkdial/gtkdial.h  	examples/helloworld/Makefile  	examples/helloworld/helloworld.c  	examples/helloworld2/Makefile  	examples/helloworld2/helloworld2.c  	examples/list/Makefile  	examples/list/list.c  	examples/menu/Makefile  	examples/menu/menu.c  	examples/menu/itemfactory.c  	examples/notebook/Makefile  	examples/notebook/notebook.c  	examples/packbox/Makefile  	examples/packbox/packbox.c  	examples/packer/Makefile  	examples/packer/pack.c  	examples/paned/Makefile  	examples/paned/paned.c  	examples/pixmap/Makefile  	examples/pixmap/pixmap.c  	examples/progressbar/Makefile  	examples/progressbar/progressbar.c  	examples/radiobuttons/Makefile  	examples/radiobuttons/radiobuttons.c  	examples/rangewidgets/Makefile  	examples/rangewidgets/rangewidgets.c  	examples/rulers/Makefile  	examples/rulers/rulers.c  	examples/scribble-simple/Makefile  	examples/scribble-simple/scribble-simple.c  	examples/scrolledwin/Makefile  	examples/scrolledwin/scrolledwin.c  	examples/selection/Makefile  	examples/selection/gettargets.c  	examples/selection/setselection.c  	examples/statusbar/Makefile  	examples/statusbar/statusbar.c  	examples/table/Makefile  	examples/table/table.c  	examples/text/Makefile  	examples/text/text.c  	examples/tictactoe/Makefile  	examples/tictactoe/tictactoe.c  	examples/tictactoe/tictactoe.h  	examples/tictactoe/ttt_test.c  	examples/tree/Makefile  	examples/tree/tree.c  	examples/wheelbarrow/Makefile  	examples/wheelbarrow/wheelbarrow.c  	examples/fixed/fixed.c  	examples/fixed/Makefile  	examples/frame/frame.c  	examples/frame/Makefile  	examples/spinbutton/spinbutton.c  	examples/spinbutton/Makefile  	examples/find-examples.sh 	gdk.pc.in gtk+.pc.in
-+EXTRA_DIST =  	HACKING			gtk+.spec.in		acgtk.m4	        gtk.m4          	makecopyright		TODO			NEWS.pre-1-0		ChangeLog.pre-1-0		README.cvs-commits		intl/libgettext.h		intl/po2tbl.sed.in		examples/aspectframe/Makefile  	examples/aspectframe/aspectframe.c  	examples/Makefile  	examples/README.1ST  	examples/extract.awk  	examples/extract.sh  	examples/base/Makefile  	examples/base/base.c  	examples/buttons/Makefile  	examples/buttons/buttons.c  	examples/buttons/info.xpm  	examples/calendar/Makefile  	examples/calendar/calendar.c  	examples/clist/Makefile  	examples/clist/clist.c  	examples/entry/Makefile  	examples/entry/entry.c  	examples/eventbox/Makefile  	examples/eventbox/eventbox.c  	examples/filesel/Makefile  	examples/filesel/filesel.c  	examples/gtkdial/Makefile  	examples/gtkdial/dial_test.c  	examples/gtkdial/gtkdial.c  	examples/gtkdial/gtkdial.h  	examples/helloworld/Makefile  	examples/helloworld/helloworld.c  	examples/helloworld2/Makefile  	examples/helloworld2/helloworld2.c  	examples/list/Makefile  	examples/list/list.c  	examples/menu/Makefile  	examples/menu/menu.c  	examples/menu/itemfactory.c  	examples/notebook/Makefile  	examples/notebook/notebook.c  	examples/packbox/Makefile  	examples/packbox/packbox.c  	examples/packer/Makefile  	examples/packer/pack.c  	examples/paned/Makefile  	examples/paned/paned.c  	examples/pixmap/Makefile  	examples/pixmap/pixmap.c  	examples/progressbar/Makefile  	examples/progressbar/progressbar.c  	examples/radiobuttons/Makefile  	examples/radiobuttons/radiobuttons.c  	examples/rangewidgets/Makefile  	examples/rangewidgets/rangewidgets.c  	examples/rulers/Makefile  	examples/rulers/rulers.c  	examples/scribble-simple/Makefile  	examples/scribble-simple/scribble-simple.c  	examples/scrolledwin/Makefile  	examples/scrolledwin/scrolledwin.c  	examples/selection/Makefile  	examples/selection/gettargets.c  	examples/selection/setselection.c  	examples/statusbar/Makefile  	examples/statusbar/statusbar.c  	examples/table/Makefile  	examples/table/table.c  	examples/text/Makefile  	examples/text/text.c  	examples/tictactoe/Makefile  	examples/tictactoe/tictactoe.c  	examples/tictactoe/tictactoe.h  	examples/tictactoe/ttt_test.c  	examples/tree/Makefile  	examples/tree/tree.c  	examples/wheelbarrow/Makefile  	examples/wheelbarrow/wheelbarrow.c  	examples/fixed/fixed.c  	examples/fixed/Makefile  	examples/frame/frame.c  	examples/frame/Makefile  	examples/spinbutton/spinbutton.c  	examples/spinbutton/Makefile  	examples/find-examples.sh 	gdk.pc.in gtk+.pc.in
- 
- 
- pkgconfigdir = $(libdir)/pkgconfig
-@@ -150,26 +156,26 @@
- DATA =  $(m4data_DATA) $(pkgconfig_DATA)
- 
- DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
--INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \
--aclocal.m4 config.guess config.h.in config.sub configure configure.in \
--gdk.pc.in gtk+.pc.in gtk+.spec.in gtk-config.in install-sh ltconfig \
--ltmain.sh missing mkinstalldirs
-+INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 \
-+config.guess config.h.in config.sub configure configure.in gdk.pc.in \
-+gtk+.pc.in gtk+.spec.in gtk-config.in install-sh ltmain.sh missing \
-+mkinstalldirs
- 
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
--$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
- 	cd $(srcdir) && $(ACLOCAL)
- 
- config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-@@ -306,7 +312,7 @@
- 	dot_seen=no; \
- 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  rev="$$subdir $$rev"; \
--	  test "$$subdir" = "." && dot_seen=yes; \
-+	  test "$$subdir" != "." || dot_seen=yes; \
- 	done; \
- 	test "$$dot_seen" = "no" && rev=". $$rev"; \
- 	target=`echo $@ | sed s/-recursive//`; \
-@@ -348,7 +354,7 @@
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
- 
- mostlyclean-tags:
- 
-@@ -397,6 +403,11 @@
- 	-rm -rf $(distdir)
- 	mkdir $(distdir)
- 	-chmod 777 $(distdir)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
- 	$(mkinstalldirs) $(distdir)/examples $(distdir)/examples/aspectframe \
- 	   $(distdir)/examples/base $(distdir)/examples/buttons \
- 	   $(distdir)/examples/calendar $(distdir)/examples/clist \
---- gtk+1.2-1.2.10.orig/intl/po2tbl.sed
-+++ gtk+1.2-1.2.10/intl/po2tbl.sed
-@@ -0,0 +1,60 @@
-+1 {
-+  i\
-+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-+\
-+#if HAVE_CONFIG_H\
-+# include <config.h>\
-+#endif\
-+\
-+#include "libgettext.h"\
-+\
-+const struct _msg_ent _msg_tbl[] = {
-+  h
-+  s/.*/0/
-+  x
-+}
-+/^msgid/ {
-+  s/msgid[ 	]*\(".*"\)/  {\1/
-+  tb
-+  :b
-+  N
-+  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-+  ta
-+  s/\(.*\)\n.*/\1/
-+  bc
-+  :a
-+  s/\(.*\)\(\n.*\)/\1\\\2/
-+  P
-+  s/.*\n\(.*\)/\1/
-+  tb
-+  :c
-+  x
-+  td
-+  :d
-+  s/9\(_*\)$/_\1/
-+  td
-+  s/^\(_*\)$/0\1/
-+  s/8\(_*\)$/9\1/
-+  s/7\(_*\)$/8\1/
-+  s/6\(_*\)$/7\1/
-+  s/5\(_*\)$/6\1/
-+  s/4\(_*\)$/5\1/
-+  s/3\(_*\)$/4\1/
-+  s/2\(_*\)$/3\1/
-+  s/1\(_*\)$/2\1/
-+  s/0\(_*\)$/1\1/
-+  s/_/0/g
-+  x
-+  G
-+  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-+  s/\(.*\)"$/\1/
-+  p
-+}
-+$ {
-+  i\
-+};\
-+
-+  g
-+  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-+}
-+d
---- gtk+1.2-1.2.10.orig/Makefile.am
-+++ gtk+1.2-1.2.10/Makefile.am
-@@ -1,5 +1,7 @@
- ## Makefile.am for GTK+
- 
-+CONFIGURE_DEPENDENCIES = acgtk.m4
-+
- SRC_SUBDIRS = gdk gtk
- SUBDIRS = po $(SRC_SUBDIRS) docs
- 
-@@ -11,6 +13,7 @@
- EXTRA_DIST =	\
- 	HACKING		\
- 	gtk+.spec.in	\
-+	acgtk.m4	\
-         gtk.m4          \
- 	makecopyright	\
- 	TODO		\
---- gtk+1.2-1.2.10.orig/acconfig.h
-+++ gtk+1.2-1.2.10/acconfig.h
-@@ -28,6 +28,7 @@
- #undef HAVE_SHAPE_EXT
- #undef HAVE_SYS_SELECT_H
- #undef HAVE_XCONVERTCASE
-+#undef HAVE_CODESET
- 
- #undef NO_FD_SET
- 
---- gtk+1.2-1.2.10.orig/aclocal.m4
-+++ gtk+1.2-1.2.10/aclocal.m4
-@@ -1,6 +1,6 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
- 
--dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 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.
-@@ -10,81 +10,217 @@
- dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- dnl PARTICULAR PURPOSE.
- 
-+# Do all the work for Automake.  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.
- 
--# serial 40 AC_PROG_LIBTOOL
--AC_DEFUN(AC_PROG_LIBTOOL,
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+# serial 1
-+
-+dnl Usage:
-+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-+
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
-+PACKAGE=[$1]
-+AC_SUBST(PACKAGE)
-+VERSION=[$2]
-+AC_SUBST(VERSION)
-+dnl test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+ifelse([$3],,
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-+AC_REQUIRE([AM_SANITY_CHECK])
-+AC_REQUIRE([AC_ARG_PROGRAM])
-+dnl FIXME This is truly gross.
-+missing_dir=`cd $ac_aux_dir && pwd`
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-+AC_REQUIRE([AC_PROG_MAKE_SET])])
-+
-+# Copyright 2002  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., 59 Temple Place - Suite 330, Boston, MA
-+
-+# 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.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-+
-+#
-+# Check to make sure that the build environment is sane.
-+#
-+
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# 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 conftestfile 2> /dev/null`
-+   if test "[$]*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "[$]*" != "X $srcdir/configure conftestfile" \
-+      && test "[$]*" != "X conftestfile $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" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+rm -f conftest*
-+AC_MSG_RESULT(yes)])
-+
-+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-+dnl The program must properly implement --version.
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_MSG_CHECKING(for working $2)
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if ($2 --version) < /dev/null > /dev/null 2>&1; then
-+   $1=$2
-+   AC_MSG_RESULT(found)
-+else
-+   $1="$3/missing $2"
-+   AC_MSG_RESULT(missing)
-+fi
-+AC_SUBST($1)])
-+
-+# Like AC_CONFIG_HEADER, but automatically create stamp file.
-+
-+AC_DEFUN([AM_CONFIG_HEADER],
-+[AC_PREREQ([2.12])
-+AC_CONFIG_HEADER([$1])
-+dnl When config.status generates a header, we must update the stamp-h file.
-+dnl This file resides in the same directory as the config header
-+dnl that is generated.  We must strip everything past the first ":",
-+dnl and everything past the last "/".
-+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-+<<am_indx=1
-+for am_file in <<$1>>; do
-+  case " <<$>>CONFIG_HEADERS " in
-+  *" <<$>>am_file "*<<)>>
-+    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-+    ;;
-+  esac
-+  am_indx=`expr "<<$>>am_indx" + 1`
-+done<<>>dnl>>)
-+changequote([,]))])
- 
--# Save cache, so that ltconfig can load it
--AC_CACHE_SAVE
-+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
- 
--# Actually configure libtool.  ac_aux_dir is where install-sh is found.
--CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
--LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
--DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
--|| AC_MSG_ERROR([libtool configure failed])
-+# serial 46 AC_PROG_LIBTOOL
- 
--# Reload cache, that may have been modified by ltconfig
--AC_CACHE_LOAD
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- AC_SUBST(LIBTOOL)dnl
- 
--# Redirect the config.log output again, so that the ltconfig log is not
--# clobbered by the next message.
--exec 5>>./config.log
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
- ])
- 
--AC_DEFUN(AC_LIBTOOL_SETUP,
-+AC_DEFUN([AC_LIBTOOL_SETUP],
- [AC_PREREQ(2.13)dnl
- AC_REQUIRE([AC_ENABLE_SHARED])dnl
- AC_REQUIRE([AC_ENABLE_STATIC])dnl
- AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
- AC_REQUIRE([AC_PROG_NM])dnl
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+
- AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
- dnl
- 
--case "$target" in
--NONE) lt_target="$host" ;;
--*) lt_target="$target" ;;
-+_LT_AC_PROG_ECHO_BACKSLASH
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    AC_PATH_MAGIC
-+  fi
-+  ;;
- esac
- 
--# Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
--test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
--test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
--test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
--test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
--test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
--ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
--[libtool_flags="$libtool_flags --enable-dlopen"])
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-+
-+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
- ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--[libtool_flags="$libtool_flags --enable-win32-dll"])
-+enable_win32_dll=yes, enable_win32_dll=no)
-+
- AC_ARG_ENABLE(libtool-lock,
-   [  --disable-libtool-lock  avoid locking (might break parallel builds)])
--test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
--test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- # Some flags need to be propagated to the compiler or linker for good
- # libtool support.
--case "$lt_target" in
-+case $host in
- *-*-irix6*)
-   # Find out which ABI we are using.
-   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-   if AC_TRY_EVAL(ac_compile); then
--    case "`/usr/bin/file conftest.o`" in
-+    case `/usr/bin/file conftest.$ac_objext` in
-     *32-bit*)
-       LD="${LD-ld} -32"
-       ;;
-@@ -99,46 +235,2889 @@
-   rm -rf conftest*
-   ;;
- 
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
--    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_SAVE
-+     AC_LANG_C
-+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_RESTORE])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+
-+  # recent cygwin and mingw systems supply a stub DllMain which the user
-+  # can override, but on older systems we have to supply one
-+  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-+    [AC_TRY_LINK([],
-+      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-+      DllMain (0, 0, 0);],
-+      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-+
-+  case $host/$CC in
-+  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-+    # old mingw systems require "-dll" to link a DLL, while more recent ones
-+    # require "-mdll"
-+    SAVE_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS -mdll"
-+    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-+      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-+    CFLAGS="$SAVE_CFLAGS" ;;
-+  *-*-cygwin* | *-*-pw32*)
-+    # cygwin systems need to pass --dll to the linker, and not link
-+    # crt.o which will require a WinMain@16 definition.
-+    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-+  esac
-+  ;;
-+  ])
-+esac
-+
-+_LT_AC_LTCONFIG_HACK
-+
-+])
-+
-+# AC_LIBTOOL_HEADER_ASSERT
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
-+[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
-+    [lt_cv_func_assert_works],
-+    [case $host in
-+    *-*-solaris*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
-+        case `$CC --version 2>/dev/null` in
-+        [[12]].*) lt_cv_func_assert_works=no ;;
-+        *)        lt_cv_func_assert_works=yes ;;
-+        esac
-+      fi
-+      ;;
-+    esac])
-+
-+if test "x$lt_cv_func_assert_works" = xyes; then
-+  AC_CHECK_HEADERS(assert.h)
-+fi
-+])# AC_LIBTOOL_HEADER_ASSERT
-+
-+# _LT_AC_CHECK_DLFCN
-+# --------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)
-+])# _LT_AC_CHECK_DLFCN
-+
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris* | sysv5*)
-+  symcode='[[BDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $host_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[[ABCDGISTW]]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$save_LIBS"
-+	  CFLAGS="$save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AC_FD_CC
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+  global_symbol_to_c_name_address=
-+else
-+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
-+fi
-+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-+then
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+
-+# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
-+[# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+			      [AC_DIVERT_PUSH(NOTICE)])
-+_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
-+
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "[$]0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-+
-+AC_SUBST(ECHO)
-+AC_DIVERT_POP
-+])# _LT_AC_PROG_ECHO_BACKSLASH
-+
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}]
-+EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_unknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-+
-+# AC_LIBTOOL_DLOPEN_SELF
-+# -------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+          [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      LDFLAGS="$LDFLAGS $link_static_flag"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+    	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_AC_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+])# AC_LIBTOOL_DLOPEN_SELF
-+
-+AC_DEFUN([_LT_AC_LTCONFIG_HACK],
-+[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+need_locks="$enable_libtool_lock"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+if test x"$host" != x"$build"; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case $host_os in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="[$]2"
-+
-+AC_MSG_CHECKING([for objdir])
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+AC_MSG_RESULT($objdir)
-+
-+
-+AC_ARG_WITH(pic,
-+[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-+pic_mode="$withval", pic_mode=default)
-+test -z "$pic_mode" && pic_mode=default
-+
-+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-+# in isolation, and that seeing it set (from the cache) indicates that
-+# the associated values are set (in the cache) correctly too.
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+AC_CACHE_VAL(lt_cv_prog_cc_pic,
-+[ lt_cv_prog_cc_pic=
-+  lt_cv_prog_cc_shlib=
-+  lt_cv_prog_cc_wl=
-+  lt_cv_prog_cc_static=
-+  lt_cv_prog_cc_no_builtin=
-+  lt_cv_prog_cc_can_build_shared=$can_build_shared
-+
-+  if test "$GCC" = yes; then
-+    lt_cv_prog_cc_wl='-Wl,'
-+    lt_cv_prog_cc_static='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # Below there is a dirty hack to force normal static linking with -ldl
-+      # The problem is because libdl dynamically linked with both libc and
-+      # libC (AIX C++ library), which obviously doesn't included in libraries
-+      # list by gcc. This cause undefined symbols with -static flags.
-+      # This hack allows C programs to be linked with "-static -ldl", but
-+      # not sure about C++ programs.
-+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_cv_prog_cc_pic='-fno-common'
-+      ;;
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	 lt_cv_prog_cc_pic=-Kconform_pic
-+      fi
-+      ;;
-+    *)
-+      lt_cv_prog_cc_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for PIC flags for the system compiler.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_cv_prog_cc_static='-Bstatic'
-+      else
-+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-+      lt_cv_prog_cc_pic='+Z'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      # PIC (with -KPIC) is the default.
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    newsos6)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      # All OSF/1 code is PIC.
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      ;;
-+
-+    sco3.2v5*)
-+      lt_cv_prog_cc_pic='-Kpic'
-+      lt_cv_prog_cc_static='-dn'
-+      lt_cv_prog_cc_shlib='-belf'
-+      ;;
-+
-+    solaris*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    sunos4*)
-+      lt_cv_prog_cc_pic='-PIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Qoption ld '
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    uts4*)
-+      lt_cv_prog_cc_pic='-pic'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_cv_prog_cc_pic='-Kconform_pic'
-+	lt_cv_prog_cc_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    *)
-+      lt_cv_prog_cc_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+])
-+if test -z "$lt_cv_prog_cc_pic"; then
-+  AC_MSG_RESULT([none])
-+else
-+  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
-+
-+  # Check to make sure the pic_flag actually works.
-+  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
-+  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
-+    save_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-+    AC_TRY_COMPILE([], [], [dnl
-+      case $host_os in
-+      hpux9* | hpux10* | hpux11*)
-+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-+	# they create non-PIC objects.  So, if there were any warnings, we
-+	# assume that PIC is not supported.
-+	if test -s conftest.err; then
-+	  lt_cv_prog_cc_pic_works=no
-+	else
-+	  lt_cv_prog_cc_pic_works=yes
-+	fi
-+	;;
-+      *)
-+	lt_cv_prog_cc_pic_works=yes
-+	;;
-+      esac
-+    ], [dnl
-+      lt_cv_prog_cc_pic_works=no
-+    ])
-+    CFLAGS="$save_CFLAGS"
-+  ])
-+
-+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-+    lt_cv_prog_cc_pic=
-+    lt_cv_prog_cc_can_build_shared=no
-+  else
-+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-+  fi
-+
-+  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$lt_cv_prog_cc_shlib"; then
-+  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
-+  else
-+   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
-+    lt_cv_prog_cc_can_build_shared=no
-+  fi
-+fi
-+
-+AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
-+AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
-+  lt_cv_prog_cc_static_works=no
-+  save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-+  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
-+  LDFLAGS="$save_LDFLAGS"
-+])
-+
-+# Belt *and* braces to stop my trousers falling down:
-+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-+AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
-+
-+pic_flag="$lt_cv_prog_cc_pic"
-+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-+wl="$lt_cv_prog_cc_wl"
-+link_static_flag="$lt_cv_prog_cc_static"
-+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-+can_build_shared="$lt_cv_prog_cc_can_build_shared"
-+
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
-+AC_CACHE_VAL([lt_cv_compiler_c_o], [
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+echo "int some_variable = 0;" > conftest.$ac_ext
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-+compiler_c_o=no
-+if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+  if test -s out/conftest.err; then
-+    lt_cv_compiler_c_o=no
-+  else
-+    lt_cv_compiler_c_o=yes
-+  fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&AC_FD_CC
-+  lt_cv_compiler_c_o=no
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+])
-+compiler_c_o=$lt_cv_compiler_c_o
-+AC_MSG_RESULT([$compiler_c_o])
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
-+  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
-+  lt_cv_compiler_o_lo=no
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  save_objext="$ac_objext"
-+  ac_objext=lo
-+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      lt_cv_compiler_o_lo=no
-+    else
-+      lt_cv_compiler_o_lo=yes
-+    fi
-+  ])
-+  ac_objext="$save_objext"
-+  CFLAGS="$save_CFLAGS"
-+  ])
-+  compiler_o_lo=$lt_cv_compiler_o_lo
-+  AC_MSG_RESULT([$compiler_o_lo])
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$GCC" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-+  compiler_rtti_exceptions=no
-+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
-+    # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      compiler_rtti_exceptions=no
-+    else
-+      compiler_rtti_exceptions=yes
-+    fi
-+  ])
-+  CFLAGS="$save_CFLAGS"
-+  AC_MSG_RESULT([$compiler_rtti_exceptions])
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+fi
-+
-+# See if the linker supports building shared libraries.
-+AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+old_archive_from_expsyms_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_into_libs=no
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+link_all_deplibs=unknown
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+extract_expsyms_cmds=
-+
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$GCC" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case $host_os in
-+  aix3* | aix4* | aix5*)
-+    # On AIX, the GNU linker is very broken
-+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-+      else $CC -o impgen impgen.c ; fi)~
-+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-+
-+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-+
-+    # cygwin and mingw dlls have different entry points and sets of symbols
-+    # to exclude.
-+    # FIXME: what about values for MSVC?
-+    dll_entry=__cygwin_dll_entry@12
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-+    case $host_os in
-+    mingw*)
-+      # mingw values
-+      dll_entry=_DllMainCRTStartup@12
-+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-+      ;;
-+    esac
-+
-+    # mingw and cygwin differ, and it's simplest to just exclude the union
-+    # of the two symbol sets.
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-+
-+    # recent cygwin and mingw systems supply a stub DllMain which the user
-+    # can override, but on older systems we have to supply one (in ltdll.c)
-+    if test "x$lt_cv_need_dllmain" = "xyes"; then
-+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-+    else
-+      ltdll_obj=
-+      ltdll_cmds=
-+    fi
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left be newer dlltools.
-+    export_symbols_cmds="$ltdll_cmds"'
-+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-+
-+    # If the export-symbols file already is a .def file (1st line
-+    # is EXPORTS), use it as is.
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname-def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname-def;
-+	_lt_hint=1;
-+	cat $export_symbols | while read symbol; do
-+	 set dummy \$symbol;
-+	 case \[$]# in
-+	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-+	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-+	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
-+	 esac;
-+	 _lt_hint=`expr 1 + \$_lt_hint`;
-+	done;
-+      fi~
-+      '"$ltdll_cmds"'
-+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+      wlarc=
-+    else
-+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw* | pw32*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+	whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case $host_os in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  ;;
-+	  esac
-+	done
-+      esac
-+
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    hardcode_direct=yes
-+    archive_cmds=''
-+    hardcode_libdir_separator=':'
-+    if test "$GCC" = yes; then
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	fi
-+      esac
-+
-+      shared_flag='-shared'
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	shared_flag='${wl}-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
-+    # It seems that -bexpall can do strange things, so it is better to
-+    # generate a list of symbols to export.
-+    always_export_symbols=yes
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      allow_undefined_flag='-berok'
-+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+    else
-+      if test "$host_cpu" = ia64; then
-+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag="-z nodefs"
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='${wl}-berok'
-+	# This is a bit strange, but is similar to how AIX traditionally builds
-+	# it's shared libraries.
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+    fix_srcfile_path='`cygpath -w "$srcfile"`'
-+    ;;
-+
-+  darwin* | rhapsody*)
-+    case "$host_os" in
-+    rhapsody* | darwin1.[[012]])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+    esac
-+    # FIXME: Relying on posixy $() will cause problems for
-+    #        cross-compilation, but unfortunately the echo tests do not
-+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+    #	     `"' quotes if we put them in here... so don't!
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+    # We need to add '_' to the symbols in $export_symbols first
-+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    whole_archive_flag_spec='-all_load $convenience'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_os in
-+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6* | nonstopux*)
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    link_all_deplibs=yes
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  newsos6)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+    else
-+      case "$host_os" in
-+      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+        ;;
-+      *)
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        ;;
-+      esac
-+    fi
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+      #Both c and cxx compiler support -rpath directly
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    export_dynamic_flag_spec='${wl}-Bexport'
-+    ;;
-+
-+  solaris*)
-+    # gcc --version < 3.0 without binutils cannot create self contained
-+    # shared libraries reliably, requiring libgcc.a to resolve some of
-+    # the object symbols generated in some cases.  Libraries that use
-+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-+    # a copy of libgcc.a into every shared library to guarantee resolving
-+    # such symbols causes other problems:  According to Tim Van Holder
-+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-+    # (to the application) exception stack for one thing.
-+    no_undefined_flag=' -z defs'
-+    if test "$GCC" = yes; then
-+      case `$CC --version 2>/dev/null` in
-+      [[12]].*)
-+	cat <<EOF 1>&2
-+
-+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-+*** create self contained shared libraries on Solaris systems, without
-+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-+*** -no-undefined support, which will at least allow you to build shared
-+*** libraries.  However, you may find that when you link such libraries
-+*** into an application without using GCC, you have to manually add
-+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-+*** upgrade to a newer version of GCC.  Another option is to rebuild your
-+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-+
-+EOF
-+        no_undefined_flag=
-+	;;
-+      esac
-+    fi
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case $host_os in
-+    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    link_all_deplibs=yes
-+    ;;
-+
-+  sunos4*)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+    fi
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    case $host_vendor in
-+      sni)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=yes # is this really true???
-+        ;;
-+      siemens)
-+        ## LD is ld it makes a PLAMLIB
-+        ## CC just makes a GrossModule.
-+        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+        reload_cmds='$CC -r -o $output$reload_objs'
-+        hardcode_direct=no
-+        ;;
-+      motorola)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+        ;;
-+    esac
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  sysv5uw7* | unixware7*)
-+    no_undefined_flag='${wl}-z ${wl}text'
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+AC_MSG_RESULT([$ld_shlibs])
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+# Check hardcoding attributes.
-+AC_MSG_CHECKING([how to hardcode library paths into programs])
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+AC_MSG_RESULT([$hardcode_action])
-+
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+  AC_MSG_RESULT([no])
-+fi
-+
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+# PORTME Fill in your ld.so characteristics
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	     echo ' yes '
-+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	  :
-+	else
-+	  can_build_shared=no
-+	fi
-+	;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can
-+    # not hardcode correct soname into executable. Probably we can
-+    # add versioning support to collect2, so additional links can
-+    # be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}.so$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  hardcode_into_libs=yes
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  case $GCC,$host_os in
-+  yes,cygwin*)
-+    library_names_spec='$libname.dll.a'
-+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog .libs/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    ;;
-+  yes,mingw*)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
-+    ;;
-+  yes,pw32*)
-+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    ;;
-+  *)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  # FIXME: Relying on posixy $() will cause problems for
-+  #        cross-compilation, but unfortunately the echo tests do not
-+  #        yet detect zsh echo's removal of \ escapes.
-+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd*-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU/FreeBSD ld.so'
-+  ;;
-+
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)          version_type=irix ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case "$host_os" in
-+    openbsd2.[[89]] | openbsd2.[[89]].*)
-+      shlibpath_overrides_runpath=no
-+      ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+      ;;
-+    esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  need_lib_prefix=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+  ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+AC_LIBTOOL_DLOPEN_SELF
-+
-+if test "$enable_shared" = yes && test "$GCC" = yes; then
-+  case $archive_cmds in
-+  *'~'*)
-+    # FIXME: we may have to deal with multi-command sequences.
-+    ;;
-+  '$CC '*)
-+    # Test whether the compiler implicitly links with -lc since on some
-+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+    # to ld, don't add -lc before -lgcc.
-+    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
-+    [$rm conftest*
-+    echo 'static int dummy;' > conftest.$ac_ext
-+
-+    if AC_TRY_EVAL(ac_compile); then
-+      soname=conftest
-+      lib=conftest
-+      libobjs=conftest.$ac_objext
-+      deplibs=
-+      wl=$lt_cv_prog_cc_wl
-+      compiler_flags=-v
-+      linker_flags=-v
-+      verstring=
-+      output_objdir=.
-+      libname=conftest
-+      save_allow_undefined_flag=$allow_undefined_flag
-+      allow_undefined_flag=
-+      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+      then
-+	lt_cv_archive_cmds_need_lc=no
-+      else
-+	lt_cv_archive_cmds_need_lc=yes
-+      fi
-+      allow_undefined_flag=$save_allow_undefined_flag
-+    else
-+      cat conftest.err 1>&5
-+    fi])
-+    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
-+    ;;
-+  esac
-+fi
-+need_lc=${lt_cv_archive_cmds_need_lc-yes}
-+
-+# The second clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  :
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  test -f Makefile && make "$ltmain"
-+fi
-+
-+if test -f "$ltmain"; then
-+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-+  $rm -f "${ofile}T"
-+
-+  echo creating $ofile
-+
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS SED \
-+    AR AR_FLAGS CC LD LN_S NM SHELL \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd export_symbols_cmds \
-+    deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    global_symbol_to_c_name_address \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case $var in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  cat <<__EOF__ > "${ofile}T"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="${SED} -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$need_lc
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# The default C compiler.
-+CC=$lt_CC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_pic_flag
-+pic_mode=$pic_mode
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$lt_compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "${ofile}T"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | os2*)
-+    cat <<'EOF' >> "${ofile}T"
-+      # This is a source program that is used to create dlls on Windows
-+      # Don't remove nor modify the starting and closing comments
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+	# This is a source program that is used to create import libraries
-+	# on Windows for dlls which lack them. Don't remove nor modify the
-+	# starting and closing comments
-+# /* impgen.c starts here */
-+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-+#
-+#  This file is part of GNU libtool.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#  */
-+#
-+# #include <stdio.h>		/* for printf() */
-+# #include <unistd.h>		/* for open(), lseek(), read() */
-+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-+# #include <string.h>		/* for strdup() */
-+#
-+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-+# #ifndef O_BINARY
-+# #define O_BINARY 0
-+# #endif
-+#
-+# static unsigned int
-+# pe_get16 (fd, offset)
-+#      int fd;
-+#      int offset;
-+# {
-+#   unsigned char b[2];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 2);
-+#   return b[0] + (b[1]<<8);
-+# }
-+#
-+# static unsigned int
-+# pe_get32 (fd, offset)
-+#     int fd;
-+#     int offset;
-+# {
-+#   unsigned char b[4];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 4);
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# static unsigned int
-+# pe_as32 (ptr)
-+#      void *ptr;
-+# {
-+#   unsigned char *b = ptr;
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# int
-+# main (argc, argv)
-+#     int argc;
-+#     char *argv[];
-+# {
-+#     int dll;
-+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-+#     unsigned long name_rvas, nexp;
-+#     unsigned char *expdata, *erva;
-+#     char *filename, *dll_name;
-+#
-+#     filename = argv[1];
-+#
-+#     dll = open(filename, O_RDONLY|O_BINARY);
-+#     if (dll < 1)
-+# 	return 1;
-+#
-+#     dll_name = filename;
-+#
-+#     for (i=0; filename[i]; i++)
-+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-+# 	    dll_name = filename + i +1;
-+#
-+#     pe_header_offset = pe_get32 (dll, 0x3c);
-+#     opthdr_ofs = pe_header_offset + 4 + 20;
-+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-+#
-+#     if (num_entries < 1) /* no exports */
-+# 	return 1;
-+#
-+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-+#     secptr = (pe_header_offset + 4 + 20 +
-+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-+#
-+#     expptr = 0;
-+#     for (i = 0; i < nsections; i++)
-+#     {
-+# 	char sname[8];
-+# 	unsigned long secptr1 = secptr + 40 * i;
-+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-+# 	lseek(dll, secptr1, SEEK_SET);
-+# 	read(dll, sname, 8);
-+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-+# 	{
-+# 	    expptr = fptr + (export_rva - vaddr);
-+# 	    if (export_rva + export_size > vaddr + vsize)
-+# 		export_size = vsize - (export_rva - vaddr);
-+# 	    break;
-+# 	}
-+#     }
-+#
-+#     expdata = (unsigned char*)malloc(export_size);
-+#     lseek (dll, expptr, SEEK_SET);
-+#     read (dll, expdata, export_size);
-+#     erva = expdata - export_rva;
-+#
-+#     nexp = pe_as32 (expdata+24);
-+#     name_rvas = pe_as32 (expdata+32);
-+#
-+#     printf ("EXPORTS\n");
-+#     for (i = 0; i<nexp; i++)
-+#     {
-+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-+#     }
-+#
-+#     return 0;
-+# }
-+# /* impgen.c ends here */
-+
-+EOF
-+    ;;
-+  esac
- 
--ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw*)
--  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
--  AC_CHECK_TOOL(AS, as, false)
--  AC_CHECK_TOOL(OBJDUMP, objdump, false)
--  ;;
--])
--esac
--])
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-+
-+  mv -f "${ofile}T" "$ofile" || \
-+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-+  chmod +x "$ofile"
-+fi
-+
-+])# _LT_AC_LTCONFIG_HACK
- 
- # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
--AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
- 
- # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
--AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
- 
- # AC_ENABLE_SHARED - implement the --enable-shared flag
- # Usage: AC_ENABLE_SHARED[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
--AC_DEFUN(AC_ENABLE_SHARED, [dnl
--define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(shared,
- changequote(<<, >>)dnl
- <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
- changequote([, ])dnl
- [p=${PACKAGE-default}
--case "$enableval" in
-+case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
-@@ -157,21 +3136,22 @@
- ])
- 
- # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
--AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_SHARED(no)])
- 
- # AC_ENABLE_STATIC - implement the --enable-static flag
- # Usage: AC_ENABLE_STATIC[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
--AC_DEFUN(AC_ENABLE_STATIC, [dnl
--define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(static,
- changequote(<<, >>)dnl
- <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
- changequote([, ])dnl
- [p=${PACKAGE-default}
--case "$enableval" in
-+case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
-@@ -190,7 +3170,8 @@
- ])
- 
- # AC_DISABLE_STATIC - set the default static flag to --disable-static
--AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_STATIC(no)])
- 
- 
-@@ -198,14 +3179,14 @@
- # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
- #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
- #   `yes'.
--AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
--define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
- AC_ARG_ENABLE(fast-install,
- changequote(<<, >>)dnl
- <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
- changequote([, ])dnl
- [p=${PACKAGE-default}
--case "$enableval" in
-+case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
-@@ -223,29 +3204,120 @@
- enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
- ])
- 
--# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
--AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
- AC_ENABLE_FAST_INSTALL(no)])
- 
-+# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-+# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-+#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-+#   `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)])
-+
-+
-+# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="ifelse([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+])
-+
-+
-+# AC_PATH_MAGIC - find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-+AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])
-+
-+
- # AC_PROG_LD - find the path to the GNU or non-GNU linker
--AC_DEFUN(AC_PROG_LD,
-+AC_DEFUN([AC_PROG_LD],
- [AC_ARG_WITH(gnu-ld,
- [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
- test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
- ac_prog=ld
--if test "$ac_cv_prog_gcc" = yes; then
-+if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
-   AC_MSG_CHECKING([for ld used by GCC])
--  ac_prog=`($CC -print-prog-name=ld) 2>&5`
--  case "$ac_prog" in
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-     # Accept absolute paths.
--changequote(,)dnl
--    [\\/]* | [A-Za-z]:[\\/]*)
--      re_direlt='/[^/][^/]*/\.\./'
--changequote([,])dnl
-+    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-       # Canonicalize the path of ld
-       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-@@ -267,17 +3339,17 @@
- else
-   AC_MSG_CHECKING([for non-GNU ld])
- fi
--AC_CACHE_VAL(ac_cv_path_LD,
-+AC_CACHE_VAL(lt_cv_path_LD,
- [if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-   for ac_dir in $PATH; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      ac_cv_path_LD="$ac_dir/$ac_prog"
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
-       # but apparently some GNU ld's only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
--      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
- 	test "$with_gnu_ld" != no && break
-       else
- 	test "$with_gnu_ld" != yes && break
-@@ -286,9 +3358,9 @@
-   done
-   IFS="$ac_save_ifs"
- else
--  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
- fi])
--LD="$ac_cv_path_LD"
-+LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-   AC_MSG_RESULT($LD)
- else
-@@ -298,56 +3370,255 @@
- AC_PROG_LD_GNU
- ])
- 
--AC_DEFUN(AC_PROG_LD_GNU,
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-+# AC_PROG_LD_GNU -
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
- [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
--  ac_cv_prog_gnu_ld=yes
-+  lt_cv_prog_gnu_ld=yes
- else
--  ac_cv_prog_gnu_ld=no
-+  lt_cv_prog_gnu_ld=no
- fi])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])
-+
-+# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-+[lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
-+])
-+
-+# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi4*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  case "$host_os" in
-+  rhapsody* | darwin1.[[012]])
-+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+    ;;
-+  *) # Darwin 1.3 on
-+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    ;;
-+  esac
-+  ;;
-+
-+freebsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20*|hpux11*)
-+  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case $LD in
-+    *-32|*"-32 ") libmagic=32-bit;;
-+    *-n32|*"-n32 ") libmagic=N32;;
-+    *-64|*"-64 ") libmagic=64-bit;;
-+    *) libmagic=never-match;;
-+    esac
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
-+    ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  case $host_cpu in
-+  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k)
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  *)
-+    # glibc up to 2.1.1 does not perform some relocations on ARM
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sysv5uw[[78]]* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
- ])
- 
-+
- # AC_PROG_NM - find the path to a BSD-compatible name lister
--AC_DEFUN(AC_PROG_NM,
--[AC_MSG_CHECKING([for BSD-compatible nm])
--AC_CACHE_VAL(ac_cv_path_NM,
-+AC_DEFUN([AC_PROG_NM],
-+[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
-+AC_MSG_CHECKING([for BSD-compatible nm])
-+AC_CACHE_VAL(lt_cv_path_NM,
- [if test -n "$NM"; then
-   # Let the user override the test.
--  ac_cv_path_NM="$NM"
-+  lt_cv_path_NM="$NM"
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-     test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-+    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-+    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-       # Check to see if the nm accepts a BSD-compat flag.
-       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-       #   nm: unknown option "B" ignored
--      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
--	ac_cv_path_NM="$ac_dir/nm -B"
-+      # Tru64's nm complains that /dev/null is an invalid object file
-+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -B"
- 	break
--      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
--	ac_cv_path_NM="$ac_dir/nm -p"
-+      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -p"
- 	break
-       else
--	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- 	continue # so that we can try to find one that supports BSD flags
-       fi
-     fi
-   done
-   IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi])
--NM="$ac_cv_path_NM"
-+NM="$lt_cv_path_NM"
- AC_MSG_RESULT([$NM])
- ])
- 
- # AC_CHECK_LIBM - check for math library
--AC_DEFUN(AC_CHECK_LIBM,
-+AC_DEFUN([AC_CHECK_LIBM],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
--case "$lt_target" in
--*-*-beos* | *-*-cygwin*)
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32*)
-   # These system don't have libm
-   ;;
- *-ncr-sysv4.3*)
-@@ -361,33 +3632,41 @@
- ])
- 
- # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
--# the libltdl convenience library, adds --enable-ltdl-convenience to
--# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
--# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
--# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
--# '${top_builddir}/' (note the single quotes!) if your package is not
--# flat, and, if you're not using automake, define top_builddir as
--# appropriate in the Makefiles.
--AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  case "$enable_ltdl_convenience" in
-+# the libltdl convenience library and LTDLINCL to the include flags for
-+# the libltdl header and adds --enable-ltdl-convenience to the
-+# configure arguments.  Note that LIBLTDL and LTDLINCL are not
-+# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-+# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-+# with '${top_builddir}/' and LTDLINCL will be prefixed with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  case $enable_ltdl_convenience in
-   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-   "") enable_ltdl_convenience=yes
-       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-   esac
--  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
--  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
- ])
- 
- # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
--# the libltdl installable library, and adds --enable-ltdl-install to
--# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
--# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
--# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
--# '${top_builddir}/' (note the single quotes!) if your package is not
--# flat, and, if you're not using automake, define top_builddir as
--# appropriate in the Makefiles.
-+# the libltdl installable library and LTDLINCL to the include flags for
-+# the libltdl header and adds --enable-ltdl-install to the configure
-+# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
-+# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-+# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
-+# with '${top_srcdir}/' (note the single quotes!).  If your package is
-+# not flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
- # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
--AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-   AC_CHECK_LIB(ltdl, main,
-   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-   [if test x"$enable_ltdl_install" = xno; then
-@@ -398,27 +3677,266 @@
-   ])
-   if test x"$enable_ltdl_install" = x"yes"; then
-     ac_configure_args="$ac_configure_args --enable-ltdl-install"
--    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
--    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-   else
-     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-     LIBLTDL="-lltdl"
--    INCLTDL=
-+    LTDLINCL=
-   fi
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])
-+
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-+
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-+
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_executable_p="test -f"
-+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_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+
-+  # Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+: ${TMPDIR=/tmp}
-+{
-+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=$TMPDIR/sed$$-$RANDOM
-+  (umask 077 && mkdir $tmp)
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+   { (exit 1); exit 1; }
-+}
-+  _max=0
-+  _count=0
-+  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+  # along with /bin/sed that truncates output.
-+  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-+    test ! -f ${_sed} && break
-+    cat /dev/null > "$tmp/sed.in"
-+    _count=0
-+    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-+    # Check for GNU sed and select it if it is found.
-+    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-+      lt_cv_path_SED=${_sed}
-+      break
-+    fi
-+    while true; do
-+      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-+      mv "$tmp/sed.tmp" "$tmp/sed.in"
-+      cp "$tmp/sed.in" "$tmp/sed.nl"
-+      echo >>"$tmp/sed.nl"
-+      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-+      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-+      # 40000 chars as input seems more than enough
-+      test $_count -gt 10 && break
-+      _count=`expr $_count + 1`
-+      if test $_count -gt $_max; then
-+        _max=$_count
-+        lt_cv_path_SED=$_sed
-+      fi
-+    done
-+  done
-+  rm -rf "$tmp"
-+])
-+if test "X$SED" != "X"; then
-+  lt_cv_path_SED=$SED
-+else
-+  SED=$lt_cv_path_SED
-+fi
-+AC_MSG_RESULT([$SED])
-+])
-+
-+# Add --enable-maintainer-mode option to configure.
-+# From Jim Meyering
-+
-+# serial 1
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode enable make rules and dependencies not useful
-+                          (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+# Define a conditional.
-+
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_SUBST($1_TRUE)
-+AC_SUBST($1_FALSE)
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi])
-+
-+# isc-posix.m4 serial 2 (gettext-0.11.2)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-+
-+# This test replaces the one in autoconf.
-+# Currently this macro should have the same name as the autoconf macro
-+# because gettext's gettext.m4 (distributed in the automake package)
-+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-+# give these diagnostics:
-+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-+
-+undefine([AC_ISC_POSIX])
-+
-+AC_DEFUN([AC_ISC_POSIX],
-+  [
-+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-+  ]
-+)
-+
-+
-+# serial 1
-+
-+# @defmac AC_PROG_CC_STDC
-+# @maindex PROG_CC_STDC
-+# @ovindex CC
-+# If the C compiler in not in ANSI C mode by default, try to add an option
-+# to output variable @code{CC} to make it so.  This macro tries various
-+# options that select ANSI C on some system or another.  It considers the
-+# compiler to be in ANSI C mode if it handles function prototypes correctly.
-+#
-+# If you use this macro, you should check after calling it whether the C
-+# compiler has been set to accept ANSI C; if not, the shell variable
-+# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-+# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-+# program @code{ansi2knr}, which comes with Ghostscript.
-+# @end defmac
-+
-+AC_DEFUN([AM_PROG_CC_STDC],
-+[AC_REQUIRE([AC_PROG_CC])
-+AC_BEFORE([$0], [AC_C_INLINE])
-+AC_BEFORE([$0], [AC_C_CONST])
-+dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
-+dnl a magic option to avoid problems with ANSI preprocessor commands
-+dnl like #elif.
-+dnl FIXME: can't do this because then AC_AIX won't work due to a
-+dnl circular dependency.
-+dnl AC_BEFORE([$0], [AC_PROG_CPP])
-+AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
-+AC_CACHE_VAL(am_cv_prog_cc_stdc,
-+[am_cv_prog_cc_stdc=no
-+ac_save_CC="$CC"
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX			-qlanglvl=ansi
-+# Ultrix and OSF/1	-std1
-+# HP-UX			-Aa -D_HPUX_SOURCE
-+# SVR4			-Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  AC_TRY_COMPILE(
-+[#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;
-+}
-+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;
-+], [
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+],
-+[am_cv_prog_cc_stdc="$ac_arg"; break])
-+done
-+CC="$ac_save_CC"
-+])
-+if test -z "$am_cv_prog_cc_stdc"; then
-+  AC_MSG_RESULT([none needed])
-+else
-+  AC_MSG_RESULT($am_cv_prog_cc_stdc)
-+fi
-+case "x$am_cv_prog_cc_stdc" in
-+  x|xno) ;;
-+  *) CC="$CC $am_cv_prog_cc_stdc" ;;
-+esac
- ])
- 
--dnl old names
--AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
--AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
--AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
--AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
--AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
--AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
--AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
--
--dnl This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])dnl
--
- # Macro to add for using GNU gettext.
- # Ulrich Drepper <drepper@cygnus.com>, 1995.
- #
-@@ -756,20 +4274,31 @@
- 	< $srcdir/po/POTFILES.in > po/POTFILES
-   ])
- 
-+# progtest.m4 serial 2 (gettext-0.10.40)
-+dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
- 
--# Search path for a program which passes the given test.
--# Ulrich Drepper <drepper@cygnus.com>, 1996.
--#
--# This file can be copied and used freely without restrictions.  It can
--# be used in projects which are not available under the GNU Public License
--# but which still want to provide support for the GNU gettext functionality.
--# Please note that the actual code is *not* freely available.
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
- 
--# serial 1
-+# Search path for a program which passes the given test.
- 
- dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
- dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
--AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
- [# Extract the first word of "$2", so it can be a program name with args.
- set dummy $2; ac_word=[$]2
- AC_MSG_CHECKING([for $ac_word])
-@@ -797,7 +4326,7 @@
-   ;;
- esac])dnl
- $1="$ac_cv_path_$1"
--if test -n "[$]$1"; then
-+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-   AC_MSG_RESULT([$]$1)
- else
-   AC_MSG_RESULT(no)
-@@ -805,260 +4334,37 @@
- AC_SUBST($1)dnl
- ])
- 
--# Check whether LC_MESSAGES is available in <locale.h>.
--# Ulrich Drepper <drepper@cygnus.com>, 1995.
--#
--# This file can be copied and used freely without restrictions.  It can
--# be used in projects which are not available under the GNU Public License
--# but which still want to provide support for the GNU gettext functionality.
--# Please note that the actual code is *not* freely available.
--
--# serial 1
--
--AC_DEFUN(AM_LC_MESSAGES,
--  [if test $ac_cv_header_locale_h = yes; then
--    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
--      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
--       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
--    if test $am_cv_val_LC_MESSAGES = yes; then
--      AC_DEFINE(HAVE_LC_MESSAGES)
--    fi
--  fi])
--
--# Do all the work for Automake.  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.
--
--# serial 1
--
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN(AM_INIT_AUTOMAKE,
--[AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN(AM_SANITY_CHECK,
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# 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 conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $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" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
--
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN(AM_MISSING_PROG,
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--AC_DEFUN(AM_CONFIG_HEADER,
--[AC_PREREQ([2.12])
--AC_CONFIG_HEADER([$1])
--dnl When config.status generates a header, we must update the stamp-h file.
--dnl This file resides in the same directory as the config header
--dnl that is generated.  We must strip everything past the first ":",
--dnl and everything past the last "/".
--AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
--ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
--<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
--<<am_indx=1
--for am_file in <<$1>>; do
--  case " <<$>>CONFIG_HEADERS " in
--  *" <<$>>am_file "*<<)>>
--    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
--    ;;
--  esac
--  am_indx=`expr "<<$>>am_indx" + 1`
--done<<>>dnl>>)
--changequote([,]))])
--
--# Add --enable-maintainer-mode option to configure.
--# From Jim Meyering
--
--# serial 1
--
--AC_DEFUN(AM_MAINTAINER_MODE,
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode enable make rules and dependencies not useful
--                          (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
--  AC_MSG_RESULT($USE_MAINTAINER_MODE)
--  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
--]
--)
--
--# Define a conditional.
--
--AC_DEFUN(AM_CONDITIONAL,
--[AC_SUBST($1_TRUE)
--AC_SUBST($1_FALSE)
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi])
--
-+# lcmessage.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License.  As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
- 
--# serial 1
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
- 
--# @defmac AC_PROG_CC_STDC
--# @maindex PROG_CC_STDC
--# @ovindex CC
--# If the C compiler in not in ANSI C mode by default, try to add an option
--# to output variable @code{CC} to make it so.  This macro tries various
--# options that select ANSI C on some system or another.  It considers the
--# compiler to be in ANSI C mode if it handles function prototypes correctly.
--#
--# If you use this macro, you should check after calling it whether the C
--# compiler has been set to accept ANSI C; if not, the shell variable
--# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
--# code in ANSI C, you can make an un-ANSIfied copy of it by using the
--# program @code{ansi2knr}, which comes with Ghostscript.
--# @end defmac
-+# Check whether LC_MESSAGES is available in <locale.h>.
- 
--AC_DEFUN(AM_PROG_CC_STDC,
--[AC_REQUIRE([AC_PROG_CC])
--AC_BEFORE([$0], [AC_C_INLINE])
--AC_BEFORE([$0], [AC_C_CONST])
--dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
--dnl a magic option to avoid problems with ANSI preprocessor commands
--dnl like #elif.
--dnl FIXME: can't do this because then AC_AIX won't work due to a
--dnl circular dependency.
--dnl AC_BEFORE([$0], [AC_PROG_CPP])
--AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
--AC_CACHE_VAL(am_cv_prog_cc_stdc,
--[am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX			-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  AC_TRY_COMPILE(
--[#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;
--}
--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;
--], [
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
--],
--[am_cv_prog_cc_stdc="$ac_arg"; break])
--done
--CC="$ac_save_CC"
--])
--if test -z "$am_cv_prog_cc_stdc"; then
--  AC_MSG_RESULT([none needed])
--else
--  AC_MSG_RESULT($am_cv_prog_cc_stdc)
--fi
--case "x$am_cv_prog_cc_stdc" in
--  x|xno) ;;
--  *) CC="$CC $am_cv_prog_cc_stdc" ;;
--esac
-+AC_DEFUN([AM_LC_MESSAGES],
-+[
-+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+  if test $am_cv_val_LC_MESSAGES = yes; then
-+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+      [Define if your <locale.h> file defines LC_MESSAGES.])
-+  fi
- ])
- 
- # Configure paths for GLIB
---- gtk+1.2-1.2.10.orig/config.guess
-+++ gtk+1.2-1.2.10/config.guess
-@@ -1,8 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
--#   Free Software Foundation, Inc.
--#
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+timestamp='2005-08-03'
-+
- # 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
-@@ -15,159 +17,290 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# 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.
- 
--# Written by Per Bothner <bothner@cygnus.com>.
--# The master version of this file is at the FSF in /home/gd/gnu/lib.
--# Please send patches to <autoconf-patches@gnu.org>.
-+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted 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.
- #
- # The plan is that this can be called by configure scripts if you
--# don't specify an explicit system type (host/target name).
--#
--# Only a few systems have been added to this list; please add others
--# (but try to keep the structure clean).
--#
-+# don't specify an explicit build system type.
- 
--# Use $HOST_CC if defined. $CC may point to a cross-compiler
--if test x"$CC_FOR_BUILD" = x; then
--  if test x"$HOST_CC" != x; then
--    CC_FOR_BUILD="$HOST_CC"
--  else
--    if test x"$CC" != x; then
--      CC_FOR_BUILD="$CC"
--    else
--      CC_FOR_BUILD=cc
--    fi
--  fi
-+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
-+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 -q "$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 8/24/94.)
-+# (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_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
--dummy=dummy-$$
--trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
--
- # 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 ;;
-+	    *) 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 __ELF__ >/dev/null
-+		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 ;;
-+    macppc:MirBSD:*:*)
-+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*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.
--	cat <<EOF >$dummy.s
--	.globl main
--	.ent main
--main:
--	.frame \$30,0,\$26,0
--	.prologue 0
--	.long 0x47e03d80 # implver $0
--	lda \$2,259
--	.long 0x47e20c21 # amask $2,$1
--	srl \$1,8,\$2
--	sll \$2,2,\$2
--	sll \$0,3,\$0
--	addl \$1,\$0,\$0
--	addl \$2,\$0,\$0
--	ret \$31,(\$26),1
--	.end main
--EOF
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		./$dummy
--		case "$?" in
--			7)
--				UNAME_MACHINE="alpha"
--				;;
--			15)
--				UNAME_MACHINE="alphaev5"
--				;;
--			14)
--				UNAME_MACHINE="alphaev56"
--				;;
--			10)
--				UNAME_MACHINE="alphapca56"
--				;;
--			16)
--				UNAME_MACHINE="alphaev6"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
-+	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 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
--	echo m68k-cbm-sysv4
--	exit 0;;
--    amiga:NetBSD:*:*)
--      echo m68k-cbm-netbsd${UNAME_RELEASE}
--      exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	echo m68k-unknown-sysv4
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
--    arc64:OpenBSD:*:*)
--	echo mips64el-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hkmips:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	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 0;;
--    arm32:NetBSD:*:*)
--	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--	exit 0 ;;
--    SR2?01:HI-UX/MPP:*:*)
-+	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 0;;
-+	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
-@@ -175,25 +308,32 @@
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	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 ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	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 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -202,12 +342,12 @@
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
--	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	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)
-@@ -217,19 +357,13 @@
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
--    atari*:NetBSD:*:*)
--	echo m68k-atari-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    atari*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	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 
-+    # "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
-@@ -237,61 +371,45 @@
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
--    sun3*:NetBSD:*:*)
--	echo m68k-sun-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:NetBSD:*:*)
--	echo m68k-apple-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:NetBSD:*:*)
--        echo powerpc-apple-netbsd${UNAME_RELEASE}
--        exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	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[]; {
-@@ -310,28 +428,37 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy \
--	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$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 0 ;;
-+	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 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
--	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- 	then
- 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-@@ -343,31 +470,40 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	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 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
--    i?86: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 0 ;;
-+	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>
- 
-@@ -379,18 +515,21 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
--		rm -f $dummy.c $dummy
--		echo rs6000-ibm-aix3.2.5
-+		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 0 ;;
--    *:AIX:*:4)
--	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
--	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
-+	exit ;;
-+    *:AIX:*:[45])
-+	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
-@@ -398,37 +537,56 @@
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
- 	else
--		IBM_REV=4.${UNAME_RELEASE}
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
--    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
-+	exit ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	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])
--              sed 's/^              //' << EOF >$dummy.c
-+		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>
- 
-@@ -459,13 +617,39 @@
-                   exit (0);
-               }
- EOF
--	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
--	rm -f $dummy.c $dummy
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
- 	esac
--	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	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 __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	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
-@@ -491,434 +675,447 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
--    *9??*:MPE/iX:*:*)
-+	exit ;;
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
--    i?86:OSF1:*:*)
-+	exit ;;
-+    i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
--    hppa*:OpenBSD:*:*)
--	echo hppa-unknown-openbsd
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
--    CRAY*X-MP:*:*:*)
--	echo xmp-cray-unicos
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
--	echo ymp-cray-unicos${UNAME_RELEASE}
--	exit 0 ;;
-+	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/
--	exit 0 ;;
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     CRAY*TS:*:*:*)
--	echo t90-cray-unicos${UNAME_RELEASE}
--	exit 0 ;;
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     CRAY*T3E:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE}
--	exit 0 ;;
--    CRAY-2:*:*:*)
--	echo cray2-cray-unicos
--        exit 0 ;;
--    F300:UNIX_System_V:*:*)
-+	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 "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
--    F301:UNIX_System_V:*:*)
--       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
--       exit 0 ;;
--    hp3[0-9][05]:NetBSD:*:*)
--	echo m68k-hp-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
-+        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 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:FreeBSD:*:*)
--	if test -x /usr/bin/objformat; then
--	    if test "elf" = "`/usr/bin/objformat`"; then
--		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
--		exit 0
--	    fi
--	fi
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
--    *:NetBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
--	exit 0 ;;
--    *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--	exit 0 ;;
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
-+	exit ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-+    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
-+	exit ;;
-+    x86:Interix*:[34]*)
-+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+	exit ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-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 i386-pc-interix
--	exit 0 ;;
-+	echo i586-pc-interix
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
--    *:Linux:*:*)
--
-+	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 ;;
-+    arm*: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 ;;
-+    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:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips
-+	#undef mipsel
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mipsel
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips
-+	#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; }
-+	;;
-+    mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips64
-+	#undef mips64el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mips64el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips64
-+	#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 ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	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 ld.so.1 >/dev/null
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	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 ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-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 ;;
-+    x86_64:Linux:*:*)
-+	echo x86_64-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
- 	# problems with other programs or directories called `ld' in the path.
--	ld_help_string=`cd /; ld --help 2>&1`
--	ld_supported_emulations=`echo $ld_help_string \
--			 | sed -ne '/supported emulations:/!d
-+	# Set LC_ALL=C to ensure ld outputs messages in English.
-+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+			 | sed -ne '/supported targets:/!d
- 				    s/[ 	][ 	]*/ /g
--				    s/.*supported emulations: *//
-+				    s/.*supported targets: *//
- 				    s/ .*//
- 				    p'`
--        case "$ld_supported_emulations" in
--	  *ia64)
--		echo "${UNAME_MACHINE}-unknown-linux"
--		exit 0
-+        case "$ld_supported_targets" in
-+	  elf32-i386)
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
--	  i?86linux)
-+	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0
--		;;
--	  i?86coff)
-+		exit ;;
-+	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0
--		;;
--	  sparclinux)
--		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
--		exit 0
--		;;
--	  armlinux)
--		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
--		exit 0
--		;;
--	  elf32arm*)
--		echo "${UNAME_MACHINE}-unknown-linux-gnu"
--		exit 0
--		;;
--	  armelf_linux*)
--		echo "${UNAME_MACHINE}-unknown-linux-gnu"
--		exit 0
--		;;
--	  m68klinux)
--		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
--		exit 0
--		;;
--	  elf32ppc)
--		# Determine Lib Version
--		cat >$dummy.c <<EOF
--#include <features.h>
--#if defined(__GLIBC__)
--extern char __libc_version[];
--extern char __libc_release[];
--#endif
--main(argc, argv)
--     int argc;
--     char *argv[];
--{
--#if defined(__GLIBC__)
--  printf("%s %s\n", __libc_version, __libc_release);
--#else
--  printf("unkown\n");
--#endif
--  return 0;
--}
--EOF
--		LIBC=""
--		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
--		if test "$?" = 0 ; then
--			./$dummy | grep 1\.99 > /dev/null
--			if test "$?" = 0 ; then
--				LIBC="libc1"
--			fi
--		fi	
--		rm -f $dummy.c $dummy
--		echo powerpc-unknown-linux-gnu${LIBC}
--		exit 0
--		;;
-+		exit ;;
-+	  "")
-+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-+		# one that does not give us useful --help.
-+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		exit ;;
- 	esac
--
--	if test "${UNAME_MACHINE}" = "alpha" ; then
--		sed 's/^	//'  <<EOF >$dummy.s
--		.globl main
--		.ent main
--	main:
--		.frame \$30,0,\$26,0
--		.prologue 0
--		.long 0x47e03d80 # implver $0
--		lda \$2,259
--		.long 0x47e20c21 # amask $2,$1
--		srl \$1,8,\$2
--		sll \$2,2,\$2
--		sll \$0,3,\$0
--		addl \$1,\$0,\$0
--		addl \$2,\$0,\$0
--		ret \$31,(\$26),1
--		.end main
--EOF
--		LIBC=""
--		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--		if test "$?" = 0 ; then
--			./$dummy
--			case "$?" in
--			7)
--				UNAME_MACHINE="alpha"
--				;;
--			15)
--				UNAME_MACHINE="alphaev5"
--				;;
--			14)
--				UNAME_MACHINE="alphaev56"
--				;;
--			10)
--				UNAME_MACHINE="alphapca56"
--				;;
--			16)
--				UNAME_MACHINE="alphaev6"
--				;;
--			esac
--
--			objdump --private-headers $dummy | \
--			  grep ld.so.1 > /dev/null
--			if test "$?" = 0 ; then
--				LIBC="libc1"
--			fi
--		fi
--		rm -f $dummy.s $dummy
--		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
--	elif test "${UNAME_MACHINE}" = "mips" ; then
--	  cat >$dummy.c <<EOF
--#ifdef __cplusplus
--	int main (int argc, char *argv[]) {
--#else
--	int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __MIPSEB__
--  printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
--  printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
--  return 0;
--}
--EOF
--	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
--	  rm -f $dummy.c $dummy
--	else
--	  # Either a pre-BFD a.out linker (linux-gnuoldld)
--	  # or one that does not give us useful --help.
--	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
--	  # If ld does not provide *any* "supported emulations:"
--	  # that means it is gnuoldld.
--	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
--	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
--
--	  case "${UNAME_MACHINE}" in
--	  i?86)
--	    VENDOR=pc;
--	    ;;
--	  *)
--	    VENDOR=unknown;
--	    ;;
--	  esac
--	  # Determine whether the default compiler is a.out or elf
--	  cat >$dummy.c <<EOF
--#include <features.h>
--#ifdef __cplusplus
--	int main (int argc, char *argv[]) {
--#else
--	int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __ELF__
--# ifdef __GLIBC__
--#  if __GLIBC__ >= 2
--    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
--#  else
--    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--#  endif
--# else
--   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--#else
--  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
--#endif
--  return 0;
--}
-+	# Determine whether the default compiler is a.out or elf
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <features.h>
-+	#ifdef __ELF__
-+	# ifdef __GLIBC__
-+	#  if __GLIBC__ >= 2
-+	LIBC=gnu
-+	#  else
-+	LIBC=gnulibc1
-+	#  endif
-+	# else
-+	LIBC=gnulibc1
-+	# endif
-+	#else
-+	#ifdef __INTEL_COMPILER
-+	LIBC=gnu
-+	#else
-+	LIBC=gnuaout
-+	#endif
-+	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
- EOF
--	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
--	  rm -f $dummy.c $dummy
--	fi ;;
--# 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.
--    i?86:DYNIX/ptx:4*:*)
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; 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 0 ;;
--    i?86:UNIX_SV:4.2MP:2.*)
-+	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 0 ;;
--    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-+	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.0*:*)
-+	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 0 ;;
--    i?86:*:5:7*)
--        # Fixed at (any) Pentium or better
--        UNAME_MACHINE=i586
--        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
--	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
--	else
--	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
--	fi
--	exit 0 ;;
--    i?86:*:3.2:*)
-+	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|egrep Release|sed -e 's/.*= //')`
--		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
--		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+		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|egrep '^Machine.*Pent ?II' >/dev/null) \
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- 			&& UNAME_MACHINE=i686
--		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-+		(/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 0 ;;
-+	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 i386.
- 	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	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 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
--    M68*:*:R3V[567]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-+	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 0
-+	  && { 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 0 ;;
-+	  && { 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 0 ;;
--    m68*:LynxOS:2.*:*)
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
--    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
--    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-+	exit ;;
-+    rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -926,62 +1123,153 @@
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
--    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-+	exit ;;
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        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 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	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 0 ;;
--    news*:NEWS-OS:*:6*)
-+	exit ;;
-+    news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	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 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:Darwin:*:*)
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    *86) UNAME_PROCESSOR=i686 ;;
-+	    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-qnx-qnx${UNAME_VERSION}
--	exit 0 ;;
-+	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 ;;
- 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>
-@@ -1007,7 +1295,7 @@
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1068,11 +1356,24 @@
- #endif
- 
- #if defined (vax)
--#if !defined (ultrix)
--  printf ("vax-dec-bsd\n"); exit (0);
--#else
--  printf ("vax-dec-ultrix\n"); exit (0);
--#endif
-+# 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)
-@@ -1083,12 +1384,12 @@
- }
- EOF
- 
--$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
--rm -f $dummy.c $dummy
-+$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 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1097,25 +1398,69 @@
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
--#echo '(Unable to guess system type)' 1>&2
-+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://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+and
-+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+
-+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:
---- gtk+1.2-1.2.10.orig/config.h.in
-+++ gtk+1.2-1.2.10/config.h.in
-@@ -1,4 +1,4 @@
--/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-+/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
- 
- /* Define if using alloca.c.  */
- #undef C_ALLOCA
-@@ -28,9 +28,6 @@
- /* Define to `long' if <sys/types.h> doesn't define.  */
- #undef off_t
- 
--/* Define if you need to in order for stat and other things to work.  */
--#undef _POSIX_SOURCE
--
- /* Define as the return type of signal handlers (int or void).  */
- #undef RETSIGTYPE
- 
-@@ -69,6 +66,7 @@
- #undef HAVE_SHAPE_EXT
- #undef HAVE_SYS_SELECT_H
- #undef HAVE_XCONVERTCASE
-+#undef HAVE_CODESET
- 
- #undef NO_FD_SET
- 
-@@ -134,6 +132,9 @@
- /* Define if you have the <argz.h> header file.  */
- #undef HAVE_ARGZ_H
- 
-+/* Define if you have the <dlfcn.h> header file.  */
-+#undef HAVE_DLFCN_H
-+
- /* Define if you have the <limits.h> header file.  */
- #undef HAVE_LIMITS_H
- 
-@@ -158,6 +159,12 @@
- /* Define if you have the i library (-li).  */
- #undef HAVE_LIBI
- 
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+#undef HAVE_LC_MESSAGES
-+
-+/* Have nl_langinfo (CODESET) */
-+#undef HAVE_CODESET
-+
- /* Define if wchar.h exists */
- #undef HAVE_WCHAR_H
- 
---- gtk+1.2-1.2.10.orig/config.sub
-+++ gtk+1.2-1.2.10/config.sub
-@@ -1,6 +1,10 @@
- #! /bin/sh
--# Configuration validation subroutine script, version 1.1.
--#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+timestamp='2005-07-08'
-+
- # 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.
-@@ -17,14 +21,18 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# 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 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.
-@@ -45,30 +53,74 @@
- #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # It is wrong to echo any other type of specification.
- 
--if [ x$1 = x ]
--then
--	echo Configuration name missing. 1>&2
--	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
--	echo "or     $0 ALIAS" 1>&2
--	echo where ALIAS is a recognized configuration type. 1>&2
--	exit 1
--fi
-+me=`echo "$0" | sed -e 's,.*/,,'`
- 
--# First pass through any local machine types.
--case $1 in
--	*local*)
--		echo $1
--		exit 0
--		;;
--	*)
--	;;
-+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
-+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
--  linux-gnu*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -94,7 +146,7 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple)
-+	-apple | -axis | -knuth | -cray)
- 		os=
- 		basic_machine=$1
- 		;;
-@@ -108,6 +160,14 @@
- 		os=-vxworks
- 		basic_machine=$1
- 		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-@@ -166,27 +226,71 @@
- case $basic_machine in
- 	# Recognize the basic CPU types without company name.
- 	# Some are omitted here because they have special meanings below.
--	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
--		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
--		| 580 | i960 | h8300 \
--		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
--		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
--		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
--		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
--		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
--		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
--		| mips64vr5000 | miprs64vr5000el | mcore \
--		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
--		| thumb | d10v | fr30)
-+	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 \
-+	| bfin \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64vr | mips64vrel \
-+	| mips64orion | mips64orionel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| ms1 \
-+	| msp430 \
-+	| ns16k | ns32k \
-+	| or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b \
-+	| strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
-+	m32c)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12)
-+		# Motorola 68HC11/12.
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- 		;;
- 
- 	# 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[34567]86)
-+	i*86 | x86_64)
- 	  basic_machine=$basic_machine-pc
- 	  ;;
- 	# Object if more than one company name word.
-@@ -195,24 +299,67 @@
- 		exit 1
- 		;;
- 	# Recognize the basic CPU types with company name.
--	# FIXME: clean up the formatting here.
--	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
--	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
--	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
--	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
--	      | xmp-* | ymp-* \
--	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
--	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
--	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
--	      | clipper-* | orion-* \
--	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
--	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
--	      | mips64el-* | mips64orion-* | mips64orionel-* \
--	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
--	      | mipstx39-* | mipstx39el-* | mcore-* \
--	      | f301-* | armv*-* | t3e-* \
--	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
--	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
-+	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-* \
-+	| bfin-* | bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| ms1-* \
-+	| msp430-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa-* \
-+	| ymp-* \
-+	| z8k-*)
-+		;;
-+	m32c-*)
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -230,6 +377,9 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
- 	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
-@@ -244,19 +394,25 @@
- 		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-cbm
-+		basic_machine=m68k-unknown
- 		;;
- 	amigaos | amigados)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		os=-amigaos
- 		;;
- 	amigaunix | amix)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		os=-sysv4
- 		;;
- 	apollo68)
-@@ -275,6 +431,10 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -295,27 +455,45 @@
- 		basic_machine=c38-convex
- 		os=-bsd
- 		;;
--	cray | ymp)
--		basic_machine=ymp-cray
-+	cray | j90)
-+		basic_machine=j90-cray
- 		os=-unicos
- 		;;
--	cray2)
--		basic_machine=cray2-cray
--		os=-unicos
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
- 		;;
--	[ctj]90-cray)
--		basic_machine=c90-cray
--		os=-unicos
-+	cr16c)
-+		basic_machine=cr16c-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
-@@ -324,6 +502,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -357,6 +539,10 @@
- 		basic_machine=tron-gmicro
- 		os=-sysv
- 		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
- 	h3050r* | hiux*)
- 		basic_machine=hppa1.1-hitachi
- 		os=-hiuxwe2
-@@ -432,19 +618,19 @@
- 		basic_machine=i370-ibm
- 		;;
- # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
--	i[34567]86v32)
-+	i*86v32)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
- 		;;
--	i[34567]86v4*)
-+	i*86v4*)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv4
- 		;;
--	i[34567]86v)
-+	i*86v)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv
- 		;;
--	i[34567]86sol2)
-+	i*86sol2)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-solaris2
- 		;;
-@@ -456,17 +642,6 @@
- 		basic_machine=i386-unknown
- 		os=-vsta
- 		;;
--	i386-go32 | go32)
--		basic_machine=i386-unknown
--		os=-go32
--		;;
--	i386-mingw32 | mingw32)
--		basic_machine=i386-unknown
--		os=-mingw32
--		;;
--	i386-qnx | qnx)
--		basic_machine=i386-qnx
--		;;
- 	iris | iris4d)
- 		basic_machine=mips-sgi
- 		case $os in
-@@ -492,6 +667,10 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -499,14 +678,6 @@
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
--	mipsel*-linux*)
--		basic_machine=mipsel-unknown
--		os=-linux-gnu
--		;;
--	mips*-linux*)
--		basic_machine=mips-unknown
--		os=-linux-gnu
--		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
-@@ -517,8 +688,12 @@
- 		basic_machine=m68k-rom68k
- 		os=-coff
- 		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
- 	msdos)
--		basic_machine=i386-unknown
-+		basic_machine=i386-pc
- 		os=-msdos
- 		;;
- 	mvs)
-@@ -582,13 +757,27 @@
- 		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
-@@ -611,45 +800,65 @@
- 	pbb)
- 		basic_machine=m68k-tti
- 		;;
--        pc532 | pc532-*)
-+	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
--	pentium | p5 | k5 | k6 | nexen)
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
--	pentiumpro | p6 | 6x86)
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
- 		basic_machine=i686-pc
- 		;;
--	pentiumii | pentium2)
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
-+		;;
-+	pentium4)
- 		basic_machine=i786-pc
- 		;;
--	pentium-* | p5-* | k5-* | k6-* | nexen-*)
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumpro-* | p6-* | 6x86-*)
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumii-* | pentium2-*)
-+	pentium4-*)
- 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
--	power)	basic_machine=rs6000-ibm
-+	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
-+		;;
- 	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -660,10 +869,26 @@
- 	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
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -671,7 +896,10 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
--	sparclite-wrs)
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
- 		;;
-@@ -729,23 +957,51 @@
- 	sun386 | sun386i | roadrunner)
- 		basic_machine=i386-sun
- 		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
- 	symmetry)
- 		basic_machine=i386-sequent
- 		os=-dynix
- 		;;
- 	t3e)
--		basic_machine=t3e-cray
-+		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
-+		;;
- 	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
-@@ -767,8 +1023,8 @@
- 		os=-vms
- 		;;
- 	vpp*|vx|vx-*)
--               basic_machine=f301-fujitsu
--               ;;
-+		basic_machine=f301-fujitsu
-+		;;
- 	vxworks960)
- 		basic_machine=i960-wrs
- 		os=-vxworks
-@@ -789,13 +1045,17 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
--	xmp)
--		basic_machine=xmp-cray
--		os=-unicos
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
- 		;;
--        xps | xps100)
-+	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
- 	z8k-*-coff)
- 		basic_machine=z8k-unknown
- 		os=-sim
-@@ -816,32 +1076,35 @@
- 	op60c)
- 		basic_machine=hppa1.1-oki
- 		;;
--	mips)
--		if [ x$os = x-linux-gnu ]; then
--			basic_machine=mips-unknown
--		else
--			basic_machine=mips-mips
--		fi
--		;;
- 	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
- 		;;
--	sparc | sparcv9)
-+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
--        cydra)
-+	cydra)
- 		basic_machine=cydra-cydrome
- 		;;
- 	orion)
-@@ -856,9 +1119,8 @@
- 	pmac | pmac-mpw)
- 		basic_machine=powerpc-apple
- 		;;
--	c4x*)
--		basic_machine=c4x-none
--		os=-coff
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
- 		;;
- 	*)
- 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-@@ -912,22 +1174,47 @@
- 	      | -aos* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+	      | -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* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
-+	      | -mingw32* | -linux-gnu* | -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*)
- 	# 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* \
--	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
-+	      | -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|'`
- 		;;
-@@ -940,6 +1227,12 @@
- 	-opened*)
- 		os=-openedition
- 		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
- 	-osfrose*)
- 		os=-osfrose
- 		;;
-@@ -955,14 +1248,26 @@
- 	-acis*)
- 		os=-aos
- 		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
- 	-386bsd)
- 		os=-bsd
- 		;;
- 	-ctix* | -uts*)
- 		os=-sysv
- 		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
- 	-ns2 )
--	        os=-nextstep2
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
- 		;;
- 	# Preserve the version number of sinix5.
- 	-sinix5.*)
-@@ -971,15 +1276,15 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
- 	-oss*)
- 		os=-sysv3
- 		;;
--        -qnx)
--		os=-qnx4
--		;;
- 	-svr4)
- 		os=-sysv4
- 		;;
-@@ -1001,8 +1306,17 @@
- 	-xenix)
- 		os=-xenix
- 		;;
--        -*mint | -*MiNT)
--	        os=-mint
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
- 		;;
- 	-none)
- 		;;
-@@ -1035,7 +1349,14 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--        pdp11-*)
-+    c4x-* | tic4x-*)
-+        os=-coff
-+        ;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
- 		os=-none
- 		;;
- 	*-dec | vax-*)
-@@ -1062,6 +1383,9 @@
- 	mips*-*)
- 		os=-elf
- 		;;
-+	or32-*)
-+		os=-coff
-+		;;
- 	*-tti)	# must be before sparc entry or we get the wrong os.
- 		os=-sysv3
- 		;;
-@@ -1071,9 +1395,15 @@
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
- 	*-wec)
- 		os=-proelf
- 		;;
-@@ -1125,25 +1455,25 @@
- 	*-next)
- 		os=-nextstep3
- 		;;
--        *-gould)
-+	*-gould)
- 		os=-sysv
- 		;;
--        *-highlevel)
-+	*-highlevel)
- 		os=-bsd
- 		;;
- 	*-encore)
- 		os=-bsd
- 		;;
--        *-sgi)
-+	*-sgi)
- 		os=-irix
- 		;;
--        *-siemens)
-+	*-siemens)
- 		os=-sysv4
- 		;;
- 	*-masscomp)
- 		os=-rtu
- 		;;
--	f301-fujitsu)
-+	f30[01]-fujitsu | f700-fujitsu)
- 		os=-uxpv
- 		;;
- 	*-rom68k)
-@@ -1206,10 +1536,16 @@
- 			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
--			-vxsim* | -vxworks*)
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
- 			-aux*)
-@@ -1221,12 +1557,23 @@
- 			-mpw* | -macos*)
- 				vendor=apple
- 				;;
--			-*mint | -*MiNT)
-+			-*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:
---- gtk+1.2-1.2.10.orig/configure
-+++ gtk+1.2-1.2.10/configure
-@@ -34,9 +34,170 @@
-   --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
- ac_help="$ac_help
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-+
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+  ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+
-+EOF
-+  exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+       echo_test_string="`eval $cmd`" &&
-+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+    then
-+      break
-+    fi
-+  done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+   test "X$echo_testing_string" = "X$echo_test_string"; then
-+  :
-+else
-+  # The Solaris, AIX, and Digital Unix default echo programs unquote
-+  # backslashes.  This makes it impossible to quote backslashes using
-+  #   echo "$something" | sed 's/\\/\\\\/g'
-+  #
-+  # So, first we look for a working echo in the user's PATH.
-+
-+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for dir in $PATH /usr/ucb; do
-+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      echo="$dir/echo"
-+      break
-+    fi
-+  done
-+  IFS="$save_ifs"
-+
-+  if test "X$echo" = Xecho; then
-+    # We didn't find a better echo, so look for alternatives.
-+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+       test "X$echo_testing_string" = "X$echo_test_string"; then
-+      # This shell has a builtin print -r that does the trick.
-+      echo='print -r'
-+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-+      # If we have ksh, try running configure again with it.
-+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+      export ORIGINAL_CONFIG_SHELL
-+      CONFIG_SHELL=/bin/ksh
-+      export CONFIG_SHELL
-+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+    else
-+      # Try using printf.
-+      echo='printf %s\n'
-+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+	 test "X$echo_testing_string" = "X$echo_test_string"; then
-+	# Cool, printf works
-+	:
-+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	export CONFIG_SHELL
-+	SHELL="$CONFIG_SHELL"
-+	export SHELL
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+	   test "X$echo_testing_string" = 'X\t' &&
-+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	echo="$CONFIG_SHELL $0 --fallback-echo"
-+      else
-+	# maybe with a smaller string...
-+	prev=:
-+
-+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+	  then
-+	    break
-+	  fi
-+	  prev="$cmd"
-+	done
-+
-+	if test "$prev" != 'sed 50q "$0"'; then
-+	  echo_test_string=`eval $prev`
-+	  export echo_test_string
-+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	else
-+	  # Oops.  We lost completely, so just stick with echo.
-+	  echo=echo
-+	fi
-+      fi
-+    fi
-+  fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+fi
-+
-+
- ac_help="$ac_help
-   --disable-libtool-lock  avoid locking (might break parallel builds)"
- ac_help="$ac_help
-+  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-+ac_help="$ac_help
-   --enable-maintainer-mode enable make rules and dependencies not useful
-                           (and sometimes confusing) to the casual installer"
- if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
-@@ -587,6 +748,7 @@
- 
- 
- 
-+
- # In the following, there are a the following variants
- # of GLib cflags and libs variables
- #
-@@ -645,6 +807,7 @@
- ac_config_sub=$ac_aux_dir/config.sub
- ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
- 
-+am__api_version="1.4"
- # 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:
-@@ -657,7 +820,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:661: checking for a BSD compatible install" >&5
-+echo "configure:824: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -710,7 +873,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:714: checking whether build environment is sane" >&5
-+echo "configure:877: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -767,7 +930,7 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:771: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -805,21 +968,21 @@
- 
- 
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:810: checking for working aclocal" >&5
-+echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:973: checking for working aclocal-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   ACLOCAL=aclocal-${am__api_version}
-    echo "$ac_t""found" 1>&6
- else
--   ACLOCAL="$missing_dir/missing aclocal"
-+   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-    echo "$ac_t""missing" 1>&6
- fi
- 
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:823: checking for working autoconf" >&5
-+echo "configure:986: checking for working autoconf" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -831,21 +994,21 @@
-    echo "$ac_t""missing" 1>&6
- fi
- 
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:836: checking for working automake" >&5
-+echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:999: checking for working automake-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-${am__api_version}
-    echo "$ac_t""found" 1>&6
- else
--   AUTOMAKE="$missing_dir/missing automake"
-+   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-    echo "$ac_t""missing" 1>&6
- fi
- 
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:849: checking for working autoheader" >&5
-+echo "configure:1012: checking for working autoheader" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -858,7 +1021,7 @@
- fi
- 
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:862: checking for working makeinfo" >&5
-+echo "configure:1025: checking for working makeinfo" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
-@@ -877,11 +1040,164 @@
- 
- 
- 
-+# Find the correct PATH separator.  Usually this is `:', but
-+# DJGPP uses `;' like DOS.
-+if test "X${PATH_SEPARATOR+set}" != Xset; then
-+  UNAME=${UNAME-`uname 2>/dev/null`}
-+  case X$UNAME in
-+    *-DOS) lt_cv_sys_path_separator=';' ;;
-+    *)     lt_cv_sys_path_separator=':' ;;
-+  esac
-+  PATH_SEPARATOR=$lt_cv_sys_path_separator
-+fi
-+
-+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-+echo "configure:1056: checking for Cygwin environment" >&5
-+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1061 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+#ifndef __CYGWIN__
-+#define __CYGWIN__ __CYGWIN32__
-+#endif
-+return __CYGWIN__;
-+; return 0; }
-+EOF
-+if { (eval echo configure:1072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_cygwin=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_cygwin=no
-+fi
-+rm -f conftest*
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_cygwin" 1>&6
-+CYGWIN=
-+test "$ac_cv_cygwin" = yes && CYGWIN=yes
-+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-+echo "configure:1089: checking for mingw32 environment" >&5
-+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1094 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+return __MINGW32__;
-+; return 0; }
-+EOF
-+if { (eval echo configure:1101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_mingw32=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_mingw32=no
-+fi
-+rm -f conftest*
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_mingw32" 1>&6
-+MINGW32=
-+test "$ac_cv_mingw32" = yes && MINGW32=yes
-+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:1118: checking how to run the C preprocessor" >&5
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    # This must be in double quotes, not single quotes, because CPP may get
-+  # substituted into the Makefile and "${CC-cc}" will confuse make.
-+  CPP="${CC-cc} -E"
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp.
-+  cat > conftest.$ac_ext <<EOF
-+#line 1133 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -E -traditional-cpp"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1150 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1167 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP=/lib/cpp
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+  CPP="$ac_cv_prog_CPP"
-+else
-+  ac_cv_prog_CPP="$CPP"
-+fi
-+echo "$ac_t""$CPP" 1>&6
-+
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
-   enableval="$enable_shared"
-   p=${PACKAGE-default}
--case "$enableval" in
-+case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
-@@ -904,7 +1220,7 @@
- if test "${enable_static+set}" = set; then
-   enableval="$enable_static"
-   p=${PACKAGE-default}
--case "$enableval" in
-+case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
-@@ -927,7 +1243,7 @@
- if test "${enable_fast_install+set}" = set; then
-   enableval="$enable_fast_install"
-   p=${PACKAGE-default}
--case "$enableval" in
-+case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
-@@ -953,7 +1269,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:957: checking host system type" >&5
-+echo "configure:1273: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -974,7 +1290,7 @@
- echo "$ac_t""$host" 1>&6
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:978: checking build system type" >&5
-+echo "configure:1294: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -991,40 +1307,10 @@
- build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$build" 1>&6
- 
--# Extract the first word of "ranlib", so it can be a program name with args.
--set dummy ranlib; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:998: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$RANLIB"; then
--  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_RANLIB="ranlib"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
--fi
--fi
--RANLIB="$ac_cv_prog_RANLIB"
--if test -n "$RANLIB"; then
--  echo "$ac_t""$RANLIB" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
--
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1028: checking for $ac_word" >&5
-+echo "configure:1314: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1054,7 +1340,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1058: checking for $ac_word" >&5
-+echo "configure:1344: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1105,7 +1391,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1109: checking for $ac_word" >&5
-+echo "configure:1395: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1137,7 +1423,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1141: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1427: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1148,12 +1434,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 1152 "configure"
-+#line 1438 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:1157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -1179,12 +1465,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1183: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1469: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1188: checking whether we are using GNU C" >&5
-+echo "configure:1474: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1193,7 +1479,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -1212,7 +1498,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1216: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1502: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1252,12 +1538,18 @@
- fi
- 
- ac_prog=ld
--if test "$ac_cv_prog_gcc" = yes; then
-+if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
-   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
--echo "configure:1259: checking for ld used by GCC" >&5
--  ac_prog=`($CC -print-prog-name=ld) 2>&5`
--  case "$ac_prog" in
-+echo "configure:1545: checking for ld used by GCC" >&5
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-     # Accept absolute paths.
-     [\\/]* | [A-Za-z]:[\\/]*)
-       re_direlt='/[^/][^/]*/\.\./'
-@@ -1279,24 +1571,24 @@
-   esac
- elif test "$with_gnu_ld" = yes; then
-   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:1283: checking for GNU ld" >&5
-+echo "configure:1575: checking for GNU ld" >&5
- else
-   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:1286: checking for non-GNU ld" >&5
-+echo "configure:1578: checking for non-GNU ld" >&5
- fi
--if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-   for ac_dir in $PATH; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      ac_cv_path_LD="$ac_dir/$ac_prog"
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-       # Check to see if the program is GNU ld.  I'd rather use --version,
-       # but apparently some GNU ld's only accept -v.
-       # Break only if it was the GNU/non-GNU ld that we prefer.
--      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
- 	test "$with_gnu_ld" != no && break
-       else
- 	test "$with_gnu_ld" != yes && break
-@@ -1305,11 +1597,11 @@
-   done
-   IFS="$ac_save_ifs"
- else
--  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
- fi
- fi
- 
--LD="$ac_cv_path_LD"
-+LD="$lt_cv_path_LD"
- if test -n "$LD"; then
-   echo "$ac_t""$LD" 1>&6
- else
-@@ -1317,59 +1609,158 @@
- fi
- test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
- echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
--echo "configure:1321: checking if the linker ($LD) is GNU ld" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-+echo "configure:1613: checking if the linker ($LD) is GNU ld" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
- if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
--  ac_cv_prog_gnu_ld=yes
-+  lt_cv_prog_gnu_ld=yes
- else
--  ac_cv_prog_gnu_ld=no
-+  lt_cv_prog_gnu_ld=no
- fi
- fi
- 
--echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-+echo "configure:1630: checking for $LD option to reload object files" >&5
-+if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
- 
-+echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-+reload_flag=$lt_cv_ld_reload_flag
-+test -n "$reload_flag" && reload_flag=" $reload_flag"
- 
- echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
--echo "configure:1337: checking for BSD-compatible nm" >&5
--if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-+echo "configure:1642: checking for BSD-compatible nm" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$NM"; then
-   # Let the user override the test.
--  ac_cv_path_NM="$NM"
-+  lt_cv_path_NM="$NM"
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-     test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-+    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-+    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-       # Check to see if the nm accepts a BSD-compat flag.
-       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-       #   nm: unknown option "B" ignored
--      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
--	ac_cv_path_NM="$ac_dir/nm -B"
-+      # Tru64's nm complains that /dev/null is an invalid object file
-+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -B"
- 	break
--      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
--	ac_cv_path_NM="$ac_dir/nm -p"
-+      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	lt_cv_path_NM="$tmp_nm -p"
- 	break
-       else
--	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- 	continue # so that we can try to find one that supports BSD flags
-       fi
-     fi
-   done
-   IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
- 
--NM="$ac_cv_path_NM"
-+NM="$lt_cv_path_NM"
- echo "$ac_t""$NM" 1>&6
- 
-+echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
-+echo "configure:1680: checking for a sed that does not truncate output" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  # Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_executable_p="test -f"
-+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_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+
-+  # Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+: ${TMPDIR=/tmp}
-+{
-+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=$TMPDIR/sed$$-$RANDOM
-+  (umask 077 && mkdir $tmp)
-+} ||
-+{
-+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-+   { (exit 1); exit 1; }
-+}
-+  _max=0
-+  _count=0
-+  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+  # along with /bin/sed that truncates output.
-+  for _sed in $_sed_list /usr/xpg4/bin/sed; do
-+    test ! -f ${_sed} && break
-+    cat /dev/null > "$tmp/sed.in"
-+    _count=0
-+    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
-+    # Check for GNU sed and select it if it is found.
-+    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
-+      lt_cv_path_SED=${_sed}
-+      break
-+    fi
-+    while true; do
-+      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
-+      mv "$tmp/sed.tmp" "$tmp/sed.in"
-+      cp "$tmp/sed.in" "$tmp/sed.nl"
-+      echo >>"$tmp/sed.nl"
-+      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
-+      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
-+      # 40000 chars as input seems more than enough
-+      test $_count -gt 10 && break
-+      _count=`expr $_count + 1`
-+      if test $_count -gt $_max; then
-+        _max=$_count
-+        lt_cv_path_SED=$_sed
-+      fi
-+    done
-+  done
-+  rm -rf "$tmp"
-+
-+fi
-+
-+if test "X$SED" != "X"; then
-+  lt_cv_path_SED=$SED
-+else
-+  SED=$lt_cv_path_SED
-+fi
-+echo "$ac_t""$SED" 1>&6
-+
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:1373: checking whether ln -s works" >&5
-+echo "configure:1764: checking whether ln -s works" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1389,173 +1780,3709 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
-+echo "configure:1785: checking how to recognise dependent libraries" >&5
-+if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given egrep regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--case "$target" in
--NONE) lt_target="$host" ;;
--*) lt_target="$target" ;;
--esac
--
--# Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
--test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
--test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
--test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
--test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
--test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
-+bsdi4*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
- 
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
--  :
--fi
-+cygwin* | mingw* | pw32*)
-+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
- 
--test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
--test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  case "$host_os" in
-+  rhapsody* | darwin1.[012])
-+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
-+    ;;
-+  *) # Darwin 1.3 on
-+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-+    ;;
-+  esac
-+  ;;
- 
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case "$lt_target" in
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '#line 1422 "configure"' > conftest.$ac_ext
--  if { (eval echo configure:1423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--    case "`/usr/bin/file conftest.o`" in
--    *32-bit*)
--      LD="${LD-ld} -32"
--      ;;
--    *N32*)
--      LD="${LD-ld} -n32"
--      ;;
--    *64-bit*)
--      LD="${LD-ld} -64"
-+freebsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-     esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-   fi
--  rm -rf conftest*
-   ;;
- 
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
--echo "configure:1444: checking whether the C compiler needs -belf" >&5
--if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 1449 "configure"
--#include "confdefs.h"
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20*|hpux11*)
-+  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-+    ;;
-+  *)
-+    case $LD in
-+    *-32|*"-32 ") libmagic=32-bit;;
-+    *-n32|*"-n32 ") libmagic=N32;;
-+    *-64|*"-64 ") libmagic=64-bit;;
-+    *) libmagic=never-match;;
-+    esac
-+    # this will be overridden with pass_all, but let us keep it just in case
-+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-+    ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  case $host_cpu in
-+  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k)
-+    lt_cv_deplibs_check_method=pass_all ;;
-+  *)
-+    # glibc up to 2.1.1 does not perform some relocations on ARM
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-+  esac
-+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+openbsd*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+  else
-+    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  # this will be overridden with pass_all, but let us keep it just in case
-+  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sco3.2v5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=/lib/libc.so
-+  ;;
-+
-+sysv5uw[78]* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+esac
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+
-+echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-+echo "configure:1971: checking for object suffix" >&5
-+if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  rm -f conftest*
-+echo 'int i = 1;' > conftest.$ac_ext
-+if { (eval echo configure:1977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  for ac_file in conftest.*; do
-+    case $ac_file in
-+    *.c) ;;
-+    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-+    esac
-+  done
-+else
-+  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_objext" 1>&6
-+OBJEXT=$ac_cv_objext
-+ac_objext=$ac_cv_objext
-+
-+
-+
-+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-+echo "configure:1997: checking for executable suffix" >&5
-+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-+  ac_cv_exeext=.exe
-+else
-+  rm -f conftest*
-+  echo 'int main () { return 0; }' > conftest.$ac_ext
-+  ac_cv_exeext=
-+  if { (eval echo configure:2007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+    for file in conftest.*; do
-+      case $file in
-+      *.$ac_ext | *.c | *.o | *.obj) ;;
-+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-+      esac
-+    done
-+  else
-+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-+  fi
-+  rm -f conftest*
-+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-+fi
-+fi
-+
-+EXEEXT=""
-+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-+echo "$ac_t""${ac_cv_exeext}" 1>&6
-+ac_exeext=$EXEEXT
-+
-+if test $host != $build; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-+echo "configure:2038: checking command to parse $NM output" >&5
-+if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform the above into a raw symbol and a C symbol.
-+symxfrm='\1 \2\3 \3'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
-+  ;;
-+solaris* | sysv5*)
-+  symcode='[BDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $host_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-+  symcode='[ABCDGISTW]'
-+fi
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Write the raw and C identifiers.
-+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+  if { (eval echo configure:2121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { (eval echo configure:2124: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
-+
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
-+#else
-+# define lt_ptr char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
-+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  save_LIBS="$LIBS"
-+	  save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$no_builtin_flag"
-+	  if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$save_LIBS"
-+	  CFLAGS="$save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+
-+fi
-+
-+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  global_symbol_to_cdecl=
-+  global_symbol_to_c_name_address=
-+else
-+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
-+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
-+fi
-+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
-+then
-+  echo "$ac_t""failed" 1>&6
-+else
-+  echo "$ac_t""ok" 1>&6
-+fi
-+
-+for ac_hdr in dlfcn.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:2224: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2229 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+
-+
-+
-+
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-+echo "configure:2270: checking for ${ac_tool_prefix}file" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="/usr/bin:$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  echo "$ac_t""$MAGIC_CMD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    echo $ac_n "checking for file""... $ac_c" 1>&6
-+echo "configure:2332: checking for file" >&5
-+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case $MAGIC_CMD in
-+  /*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  ac_save_MAGIC_CMD="$MAGIC_CMD"
-+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="/usr/bin:$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    egrep "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  MAGIC_CMD="$ac_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  echo "$ac_t""$MAGIC_CMD" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+
-+  fi
-+  ;;
-+esac
-+
-+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2403: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+  echo "$ac_t""$RANLIB" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+if test -z "$ac_cv_prog_RANLIB"; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2435: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_RANLIB="ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-+fi
-+fi
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+  echo "$ac_t""$RANLIB" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+else
-+  RANLIB=":"
-+fi
-+fi
-+
-+# 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
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2470: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+STRIP="$ac_cv_prog_STRIP"
-+if test -n "$STRIP"; then
-+  echo "$ac_t""$STRIP" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+if test -z "$ac_cv_prog_STRIP"; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2502: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_STRIP="strip"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-+fi
-+fi
-+STRIP="$ac_cv_prog_STRIP"
-+if test -n "$STRIP"; then
-+  echo "$ac_t""$STRIP" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+else
-+  STRIP=":"
-+fi
-+fi
-+
-+
-+enable_dlopen=no
-+enable_win32_dll=no
-+
-+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
-+  enableval="$enable_libtool_lock"
-+  :
-+fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '#line 2551 "configure"' > conftest.$ac_ext
-+  if { (eval echo configure:2552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-+echo "configure:2573: checking whether the C compiler needs -belf" >&5
-+if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+     ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+     cat > conftest.$ac_ext <<EOF
-+#line 2586 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lt_cv_cc_needs_belf=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  lt_cv_cc_needs_belf=no
-+fi
-+rm -f conftest*
-+     ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+fi
-+
-+echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+
-+
-+esac
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+need_locks="$enable_libtool_lock"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+if test x"$host" != x"$build"; then
-+  ac_tool_prefix=${host_alias}-
-+else
-+  ac_tool_prefix=
-+fi
-+
-+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+case $host_os in
-+linux-gnu*) ;;
-+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-+esac
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  *)
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+# Allow CC to be a program name with arguments.
-+set dummy $CC
-+compiler="$2"
-+
-+echo $ac_n "checking for objdir""... $ac_c" 1>&6
-+echo "configure:2713: checking for objdir" >&5
-+rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+echo "$ac_t""$objdir" 1>&6
-+
-+
-+# Check whether --with-pic or --without-pic was given.
-+if test "${with_pic+set}" = set; then
-+  withval="$with_pic"
-+  pic_mode="$withval"
-+else
-+  pic_mode=default
-+fi
-+
-+test -z "$pic_mode" && pic_mode=default
-+
-+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
-+# in isolation, and that seeing it set (from the cache) indicates that
-+# the associated values are set (in the cache) correctly too.
-+echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
-+echo "configure:2740: checking for $compiler option to produce PIC" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+   lt_cv_prog_cc_pic=
-+  lt_cv_prog_cc_shlib=
-+  lt_cv_prog_cc_wl=
-+  lt_cv_prog_cc_static=
-+  lt_cv_prog_cc_no_builtin=
-+  lt_cv_prog_cc_can_build_shared=$can_build_shared
-+
-+  if test "$GCC" = yes; then
-+    lt_cv_prog_cc_wl='-Wl,'
-+    lt_cv_prog_cc_static='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # Below there is a dirty hack to force normal static linking with -ldl
-+      # The problem is because libdl dynamically linked with both libc and
-+      # libC (AIX C++ library), which obviously doesn't included in libraries
-+      # list by gcc. This cause undefined symbols with -static flags.
-+      # This hack allows C programs to be linked with "-static -ldl", but
-+      # not sure about C++ programs.
-+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_cv_prog_cc_pic='-fno-common'
-+      ;;
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	 lt_cv_prog_cc_pic=-Kconform_pic
-+      fi
-+      ;;
-+    *)
-+      lt_cv_prog_cc_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for PIC flags for the system compiler.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_cv_prog_cc_static='-Bstatic'
-+      else
-+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
-+      lt_cv_prog_cc_pic='+Z'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      # PIC (with -KPIC) is the default.
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    newsos6)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      # All OSF/1 code is PIC.
-+      lt_cv_prog_cc_wl='-Wl,'
-+      lt_cv_prog_cc_static='-non_shared'
-+      ;;
-+
-+    sco3.2v5*)
-+      lt_cv_prog_cc_pic='-Kpic'
-+      lt_cv_prog_cc_static='-dn'
-+      lt_cv_prog_cc_shlib='-belf'
-+      ;;
-+
-+    solaris*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    sunos4*)
-+      lt_cv_prog_cc_pic='-PIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Qoption ld '
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+      lt_cv_prog_cc_pic='-KPIC'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      lt_cv_prog_cc_wl='-Wl,'
-+      ;;
-+
-+    uts4*)
-+      lt_cv_prog_cc_pic='-pic'
-+      lt_cv_prog_cc_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_cv_prog_cc_pic='-Kconform_pic'
-+	lt_cv_prog_cc_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    *)
-+      lt_cv_prog_cc_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
-+fi
-+
-+if test -z "$lt_cv_prog_cc_pic"; then
-+  echo "$ac_t""none" 1>&6
-+else
-+  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
-+
-+  # Check to make sure the pic_flag actually works.
-+  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
-+echo "configure:2888: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
-+  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+      save_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
-+    cat > conftest.$ac_ext <<EOF
-+#line 2895 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+        case $host_os in
-+      hpux9* | hpux10* | hpux11*)
-+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
-+	# they create non-PIC objects.  So, if there were any warnings, we
-+	# assume that PIC is not supported.
-+	if test -s conftest.err; then
-+	  lt_cv_prog_cc_pic_works=no
-+	else
-+	  lt_cv_prog_cc_pic_works=yes
-+	fi
-+	;;
-+      *)
-+	lt_cv_prog_cc_pic_works=yes
-+	;;
-+      esac
-+    
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+        lt_cv_prog_cc_pic_works=no
-+    
-+fi
-+rm -f conftest*
-+    CFLAGS="$save_CFLAGS"
-+  
-+fi
-+
-+
-+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
-+    lt_cv_prog_cc_pic=
-+    lt_cv_prog_cc_can_build_shared=no
-+  else
-+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
-+  fi
-+
-+  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
-+fi
-+
-+# Check for any special shared library compilation flags.
-+if test -n "$lt_cv_prog_cc_shlib"; then
-+  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
-+  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
-+  else
-+   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
-+    lt_cv_prog_cc_can_build_shared=no
-+  fi
-+fi
-+
-+echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
-+echo "configure:2954: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
-+if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+    lt_cv_prog_cc_static_works=no
-+  save_LDFLAGS="$LDFLAGS"
-+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2962 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lt_cv_prog_cc_static_works=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+
-+
-+# Belt *and* braces to stop my trousers falling down:
-+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-+echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
-+
-+pic_flag="$lt_cv_prog_cc_pic"
-+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
-+wl="$lt_cv_prog_cc_wl"
-+link_static_flag="$lt_cv_prog_cc_static"
-+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
-+can_build_shared="$lt_cv_prog_cc_can_build_shared"
-+
-+
-+# Check to see if options -o and -c are simultaneously supported by compiler
-+echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
-+echo "configure:2996: checking if $compiler supports -c -o file.$ac_objext" >&5
-+if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+$rm -r conftest 2>/dev/null
-+mkdir conftest
-+cd conftest
-+echo "int some_variable = 0;" > conftest.$ac_ext
-+mkdir out
-+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
-+# that will create temporary files in the current directory regardless of
-+# the output directory.  Thus, making CWD read-only will cause this test
-+# to fail, enabling locking or at least warning the user not to do parallel
-+# builds.
-+chmod -w .
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
-+compiler_c_o=no
-+if { (eval echo configure:3015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
-+  # The compiler can only warn and ignore the option if not recognized
-+  # So say no if there are warnings
-+  if test -s out/conftest.err; then
-+    lt_cv_compiler_c_o=no
-+  else
-+    lt_cv_compiler_c_o=yes
-+  fi
-+else
-+  # Append any errors to the config.log.
-+  cat out/conftest.err 1>&5
-+  lt_cv_compiler_c_o=no
-+fi
-+CFLAGS="$save_CFLAGS"
-+chmod u+w .
-+$rm conftest* out/*
-+rmdir out
-+cd ..
-+rmdir conftest
-+$rm -r conftest 2>/dev/null
-+
-+fi
-+
-+compiler_c_o=$lt_cv_compiler_c_o
-+echo "$ac_t""$compiler_c_o" 1>&6
-+
-+if test x"$compiler_c_o" = x"yes"; then
-+  # Check to see if we can write to a .lo
-+  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
-+echo "configure:3044: checking if $compiler supports -c -o file.lo" >&5
-+  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+  lt_cv_compiler_o_lo=no
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -c -o conftest.lo"
-+  save_objext="$ac_objext"
-+  ac_objext=lo
-+  cat > conftest.$ac_ext <<EOF
-+#line 3055 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+int some_variable = 0;
-+; return 0; }
-+EOF
-+if { (eval echo configure:3062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+      # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      lt_cv_compiler_o_lo=no
-+    else
-+      lt_cv_compiler_o_lo=yes
-+    fi
-+  
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  ac_objext="$save_objext"
-+  CFLAGS="$save_CFLAGS"
-+  
-+fi
-+
-+  compiler_o_lo=$lt_cv_compiler_o_lo
-+  echo "$ac_t""$compiler_o_lo" 1>&6
-+else
-+  compiler_o_lo=no
-+fi
-+
-+# Check to see if we can do hard links to lock some files if needed
-+hard_links="nottested"
-+if test "$compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
-+echo "configure:3093: checking if we can lock with hard links" >&5
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  echo "$ac_t""$hard_links" 1>&6
-+  if test "$hard_links" = no; then
-+    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+if test "$GCC" = yes; then
-+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-+  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
-+echo "configure:3112: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  save_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
-+  compiler_rtti_exceptions=no
-+  cat > conftest.$ac_ext <<EOF
-+#line 3118 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+int some_variable = 0;
-+; return 0; }
-+EOF
-+if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+      # The compiler can only warn and ignore the option if not recognized
-+    # So say no if there are warnings
-+    if test -s conftest.err; then
-+      compiler_rtti_exceptions=no
-+    else
-+      compiler_rtti_exceptions=yes
-+    fi
-+  
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+  CFLAGS="$save_CFLAGS"
-+  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
-+
-+  if test "$compiler_rtti_exceptions" = "yes"; then
-+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+  else
-+    no_builtin_flag=' -fno-builtin'
-+  fi
-+fi
-+
-+# See if the linker supports building shared libraries.
-+echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
-+echo "configure:3152: checking whether the linker ($LD) supports shared libraries" >&5
-+
-+allow_undefined_flag=
-+no_undefined_flag=
-+need_lib_prefix=unknown
-+need_version=unknown
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+archive_cmds=
-+archive_expsym_cmds=
-+old_archive_from_new_cmds=
-+old_archive_from_expsyms_cmds=
-+export_dynamic_flag_spec=
-+whole_archive_flag_spec=
-+thread_safe_flag_spec=
-+hardcode_into_libs=no
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+hardcode_shlibpath_var=unsupported
-+runpath_var=
-+link_all_deplibs=unknown
-+always_export_symbols=no
-+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+# include_expsyms should be a list of space-separated symbols to be *always*
-+# included in the symbol list
-+include_expsyms=
-+# exclude_expsyms can be an egrep regular expression of symbols to exclude
-+# it will be wrapped by ` (' and `)$', so one must not match beginning or
-+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+# as well as any symbol that contains `d'.
-+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+# platforms (ab)use it in PIC code, but their linkers get confused if
-+# the symbol is explicitly referenced.  Since portable code cannot
-+# rely on this symbol name, it's probably fine to never include it in
-+# preloaded symbol tables.
-+extract_expsyms_cmds=
-+
-+case $host_os in
-+cygwin* | mingw* | pw32*)
-+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+  # When not using gcc, we currently assume that we are using
-+  # Microsoft Visual C++.
-+  if test "$GCC" != yes; then
-+    with_gnu_ld=no
-+  fi
-+  ;;
-+openbsd*)
-+  with_gnu_ld=no
-+  ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # If archive_cmds runs LD, not CC, wlarc should be empty
-+  wlarc='${wl}'
-+
-+  # See if GNU ld supports shared libraries.
-+  case $host_os in
-+  aix3* | aix4* | aix5*)
-+    # On AIX, the GNU linker is very broken
-+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
-+    ld_shlibs=no
-+    cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+
-+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+    # that the semantics of dynamic libraries on AmigaOS, at least up
-+    # to version 4, is to share data among multiple programs linked
-+    # with the same dynamic library.  Since this doesn't match the
-+    # behavior of shared libraries on other platforms, we can use
-+    # them.
-+    ld_shlibs=no
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      allow_undefined_flag=unsupported
-+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+
-+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
-+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
-+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
-+      else $CC -o impgen impgen.c ; fi)~
-+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
-+
-+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
-+
-+    # cygwin and mingw dlls have different entry points and sets of symbols
-+    # to exclude.
-+    # FIXME: what about values for MSVC?
-+    dll_entry=__cygwin_dll_entry@12
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
-+    case $host_os in
-+    mingw*)
-+      # mingw values
-+      dll_entry=_DllMainCRTStartup@12
-+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
-+      ;;
-+    esac
-+
-+    # mingw and cygwin differ, and it's simplest to just exclude the union
-+    # of the two symbol sets.
-+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
-+
-+    # recent cygwin and mingw systems supply a stub DllMain which the user
-+    # can override, but on older systems we have to supply one (in ltdll.c)
-+    if test "x$lt_cv_need_dllmain" = "xyes"; then
-+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
-+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
-+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-+    else
-+      ltdll_obj=
-+      ltdll_cmds=
-+    fi
-+
-+    # Extract the symbol export list from an `--export-all' def file,
-+    # then regenerate the def file from the symbol export list, so that
-+    # the compiled dll only exports the symbol export list.
-+    # Be careful not to strip the DATA tag left be newer dlltools.
-+    export_symbols_cmds="$ltdll_cmds"'
-+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
-+
-+    # If the export-symbols file already is a .def file (1st line
-+    # is EXPORTS), use it as is.
-+    # If DATA tags from a recent dlltool are present, honour them!
-+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname-def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname-def;
-+	_lt_hint=1;
-+	cat $export_symbols | while read symbol; do
-+	 set dummy \$symbol;
-+	 case \$# in
-+	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-+	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
-+	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
-+	 esac;
-+	 _lt_hint=`expr 1 + \$_lt_hint`;
-+	done;
-+      fi~
-+      '"$ltdll_cmds"'
-+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+      wlarc=
-+    else
-+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    fi
-+    ;;
-+
-+  solaris* | sysv5*)
-+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
-+      ld_shlibs=no
-+      cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-+  sunos4*)
-+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    wlarc=
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+  esac
-+
-+  if test "$ld_shlibs" = yes; then
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    case $host_os in
-+    cygwin* | mingw* | pw32*)
-+      # dlltool doesn't understand --whole-archive et. al.
-+      whole_archive_flag_spec=
-+      ;;
-+    *)
-+      # ancient GNU ld didn't support --whole-archive et. al.
-+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
-+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+	whole_archive_flag_spec=
-+      fi
-+      ;;
-+    esac
-+  fi
-+else
-+  # PORTME fill in a description of your system's linker (not GNU ld)
-+  case $host_os in
-+  aix3*)
-+    allow_undefined_flag=unsupported
-+    always_export_symbols=yes
-+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+    # Note: this linker hardcodes the directories in LIBPATH if there
-+    # are no directories specified by -L.
-+    hardcode_minus_L=yes
-+    if test "$GCC" = yes && test -z "$link_static_flag"; then
-+      # Neither direct hardcoding nor static linking is supported with a
-+      # broken collect2.
-+      hardcode_direct=unsupported
-+    fi
-+    ;;
-+
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  ;;
-+	  esac
-+	done
-+      esac
-+
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    hardcode_direct=yes
-+    archive_cmds=''
-+    hardcode_libdir_separator=':'
-+    if test "$GCC" = yes; then
-+      case $host_os in aix4.[012]|aix4.[012].*)
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  hardcode_direct=yes
-+	else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	fi
-+      esac
-+
-+      shared_flag='-shared'
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	shared_flag='${wl}-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
-+    # It seems that -bexpall can do strange things, so it is better to
-+    # generate a list of symbols to export.
-+    always_export_symbols=yes
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      allow_undefined_flag='-berok'
-+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+    else
-+      if test "$host_cpu" = ia64; then
-+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	allow_undefined_flag="-z nodefs"
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='${wl}-berok'
-+	# This is a bit strange, but is similar to how AIX traditionally builds
-+	# it's shared libraries.
-+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+
-+  amigaos*)
-+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    # see comment about different semantics on the GNU ld section
-+    ld_shlibs=no
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    # hardcode_libdir_flag_spec is actually meaningless, as there is
-+    # no search path for DLLs.
-+    hardcode_libdir_flag_spec=' '
-+    allow_undefined_flag=unsupported
-+    # Tell ltmain to make .lib files, not .a files.
-+    libext=lib
-+    # FIXME: Setting linknames here is a bad hack.
-+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+    # The linker will automatically build a .lib file if we build a DLL.
-+    old_archive_from_new_cmds='true'
-+    # FIXME: Should let the user specify the lib program.
-+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+    fix_srcfile_path='`cygpath -w "$srcfile"`'
-+    ;;
-+
-+  darwin* | rhapsody*)
-+    case "$host_os" in
-+    rhapsody* | darwin1.[012])
-+      allow_undefined_flag='-undefined suppress'
-+      ;;
-+    *) # Darwin 1.3 on
-+      allow_undefined_flag='-flat_namespace -undefined suppress'
-+      ;;
-+    esac
-+    # FIXME: Relying on posixy $() will cause problems for
-+    #        cross-compilation, but unfortunately the echo tests do not
-+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-+    #	     `"' quotes if we put them in here... so don't!
-+    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+    # We need to add '_' to the symbols in $export_symbols first
-+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    whole_archive_flag_spec='-all_load $convenience'
-+    ;;
-+
-+  freebsd1*)
-+    ld_shlibs=no
-+    ;;
-+
-+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+  # support.  Future versions do this automatically, but an explicit c++rt0.o
-+  # does not break anything, and helps significantly (at the cost of a little
-+  # extra space).
-+  freebsd2.2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+  freebsd2*)
-+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+  freebsd*)
-+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_os in
-+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-+    esac
-+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes # Not in the search PATH, but as the default
-+			 # location of the library.
-+    export_dynamic_flag_spec='${wl}-E'
-+    ;;
-+
-+  irix5* | irix6* | nonstopux*)
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    link_all_deplibs=yes
-+    ;;
-+
-+  netbsd*)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+    else
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+    fi
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  newsos6)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  openbsd*)
-+    hardcode_direct=yes
-+    hardcode_shlibpath_var=no
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+    else
-+      case "$host_os" in
-+      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_libdir_flag_spec='-R$libdir'
-+        ;;
-+      *)
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        ;;
-+      esac
-+    fi
-+    ;;
-+
-+  os2*)
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_minus_L=yes
-+    allow_undefined_flag=unsupported
-+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+    ;;
-+
-+  osf3*)
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+    fi
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+    if test "$GCC" = yes; then
-+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    else
-+      allow_undefined_flag=' -expect_unresolved \*'
-+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+      #Both c and cxx compiler support -rpath directly
-+      hardcode_libdir_flag_spec='-rpath $libdir'
-+    fi
-+    hardcode_libdir_separator=:
-+    ;;
-+
-+  sco3.2v5*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    runpath_var=LD_RUN_PATH
-+    hardcode_runpath_var=yes
-+    export_dynamic_flag_spec='${wl}-Bexport'
-+    ;;
-+
-+  solaris*)
-+    # gcc --version < 3.0 without binutils cannot create self contained
-+    # shared libraries reliably, requiring libgcc.a to resolve some of
-+    # the object symbols generated in some cases.  Libraries that use
-+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
-+    # a copy of libgcc.a into every shared library to guarantee resolving
-+    # such symbols causes other problems:  According to Tim Van Holder
-+    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
-+    # (to the application) exception stack for one thing.
-+    no_undefined_flag=' -z defs'
-+    if test "$GCC" = yes; then
-+      case `$CC --version 2>/dev/null` in
-+      [12].*)
-+	cat <<EOF 1>&2
-+
-+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
-+*** create self contained shared libraries on Solaris systems, without
-+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
-+*** -no-undefined support, which will at least allow you to build shared
-+*** libraries.  However, you may find that when you link such libraries
-+*** into an application without using GCC, you have to manually add
-+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
-+*** upgrade to a newer version of GCC.  Another option is to rebuild your
-+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-+
-+EOF
-+        no_undefined_flag=
-+	;;
-+      esac
-+    fi
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec='-R$libdir'
-+    hardcode_shlibpath_var=no
-+    case $host_os in
-+    solaris2.[0-5] | solaris2.[0-5].*) ;;
-+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+    esac
-+    link_all_deplibs=yes
-+    ;;
-+
-+  sunos4*)
-+    if test "x$host_vendor" = xsequent; then
-+      # Use $CC to link under sequent, because it throws in some extra .o
-+      # files that make .init and .fini sections work.
-+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+    fi
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_direct=yes
-+    hardcode_minus_L=yes
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4)
-+    case $host_vendor in
-+      sni)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=yes # is this really true???
-+        ;;
-+      siemens)
-+        ## LD is ld it makes a PLAMLIB
-+        ## CC just makes a GrossModule.
-+        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+        reload_cmds='$CC -r -o $output$reload_objs'
-+        hardcode_direct=no
-+        ;;
-+      motorola)
-+        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+        ;;
-+    esac
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4.3*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_shlibpath_var=no
-+    export_dynamic_flag_spec='-Bexport'
-+    ;;
-+
-+  sysv5*)
-+    no_undefined_flag=' -z text'
-+    # $CC -shared without GNU ld will not create a library from C++
-+    # object files and a static libstdc++, better avoid it by now
-+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+    hardcode_libdir_flag_spec=
-+    hardcode_shlibpath_var=no
-+    runpath_var='LD_RUN_PATH'
-+    ;;
-+
-+  uts4*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  dgux*)
-+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_libdir_flag_spec='-L$libdir'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  sysv4*MP*)
-+    if test -d /usr/nec; then
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      runpath_var=LD_RUN_PATH
-+      hardcode_runpath_var=yes
-+      ld_shlibs=yes
-+    fi
-+    ;;
-+
-+  sysv4.2uw2*)
-+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+    hardcode_direct=yes
-+    hardcode_minus_L=no
-+    hardcode_shlibpath_var=no
-+    hardcode_runpath_var=yes
-+    runpath_var=LD_RUN_PATH
-+    ;;
-+
-+  sysv5uw7* | unixware7*)
-+    no_undefined_flag='${wl}-z ${wl}text'
-+    if test "$GCC" = yes; then
-+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    else
-+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+    fi
-+    runpath_var='LD_RUN_PATH'
-+    hardcode_shlibpath_var=no
-+    ;;
-+
-+  *)
-+    ld_shlibs=no
-+    ;;
-+  esac
-+fi
-+echo "$ac_t""$ld_shlibs" 1>&6
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+# Check hardcoding attributes.
-+echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
-+echo "configure:3851: checking how to hardcode library paths into programs" >&5
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+   test -n "$runpath_var"; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$hardcode_shlibpath_var" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+echo "$ac_t""$hardcode_action" 1>&6
-+
-+striplib=
-+old_striplib=
-+echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
-+echo "configure:3879: checking whether stripping libraries is possible" >&5
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  echo "$ac_t""yes" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+# PORTME Fill in your ld.so characteristics
-+echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
-+echo "configure:3893: checking dynamic linker characteristics" >&5
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}.so$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	     echo ' yes '
-+	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	  :
-+	else
-+	  can_build_shared=no
-+	fi
-+	;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can
-+    # not hardcode correct soname into executable. Probably we can
-+    # add versioning support to collect2, so additional links can
-+    # be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}.so$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  hardcode_into_libs=yes
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}.so'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi4*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  export_dynamic_flag_spec=-rdynamic
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  need_version=no
-+  need_lib_prefix=no
-+  case $GCC,$host_os in
-+  yes,cygwin*)
-+    library_names_spec='$libname.dll.a'
-+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog .libs/$dlname \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    ;;
-+  yes,mingw*)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
-+    ;;
-+  yes,pw32*)
-+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
-+    ;;
-+  *)
-+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  # FIXME: Relying on posixy $() will cause problems for
-+  #        cross-compilation, but unfortunately the echo tests do not
-+  #        yet detect zsh echo's removal of \ escapes.
-+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
-+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd*-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU/FreeBSD ld.so'
-+  ;;
-+
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  *)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  dynamic_linker="$host_os dld.sl"
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  shlibpath_var=SHLIB_PATH
-+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-+  soname_spec='${libname}${release}.sl$major'
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)          version_type=irix ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux-gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
-+    soname_spec='${libname}${release}.so$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case "$host_os" in
-+    openbsd2.[89] | openbsd2.[89].*)
-+      shlibpath_overrides_runpath=no
-+      ;;
-+    *)
-+      shlibpath_overrides_runpath=yes
-+      ;;
-+    esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  need_lib_prefix=no
-+  library_names_spec='$libname.dll $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_version=no
-+  need_lib_prefix=no
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+sco3.2v5*)
-+  version_type=osf
-+  soname_spec='${libname}${release}.so$major'
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
-+    soname_spec='$libname.so.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+echo "$ac_t""$dynamic_linker" 1>&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+# Report the final consequences.
-+echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
-+echo "configure:4317: checking if libtool supports shared libraries" >&5
-+echo "$ac_t""$can_build_shared" 1>&6
-+
-+echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
-+echo "configure:4321: checking whether to build shared libraries" >&5
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+  ;;
-+esac
-+echo "$ac_t""$enable_shared" 1>&6
-+
-+echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
-+echo "configure:4344: checking whether to build static libraries" >&5
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+echo "$ac_t""$enable_static" 1>&6
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  *)
-+    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-+echo "configure:4385: checking for shl_load" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 4390 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shl_load(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shl_load();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+shl_load();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_shl_load=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-+echo "configure:4431: checking for shl_load in -ldld" >&5
-+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4439 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char shl_load();
-+
-+int main() {
-+shl_load()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-+echo "configure:4469: checking for dlopen" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 4474 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+dlopen();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_dlopen=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-+echo "configure:4515: checking for dlopen in -ldl" >&5
-+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldl  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4523 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-+echo "configure:4553: checking for dlopen in -lsvld" >&5
-+ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lsvld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4561 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dlopen();
-+
-+int main() {
-+dlopen()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+  echo "$ac_t""no" 1>&6
-+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-+echo "configure:4591: checking for dld_link in -ldld" >&5
-+ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldld  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4599 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char dld_link();
-+
-+int main() {
-+dld_link()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+	      
-+fi
-+
-+	    
-+fi
-+
-+	  
-+fi
-+
-+	
-+fi
-+
-+      
-+fi
-+
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-+echo "configure:4666: checking whether a program can dlopen itself" >&5
-+if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 4676 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+    
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self" 1>&6
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      LDFLAGS="$LDFLAGS $link_static_flag"
-+      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
-+echo "configure:4760: checking whether a statically linked program can dlopen itself" >&5
-+if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 4770 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+
-+    exit (status);
-+}
-+EOF
-+  if { (eval echo configure:4831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+      
-+fi
-+
-+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+
-+if test "$enable_shared" = yes && test "$GCC" = yes; then
-+  case $archive_cmds in
-+  *'~'*)
-+    # FIXME: we may have to deal with multi-command sequences.
-+    ;;
-+  '$CC '*)
-+    # Test whether the compiler implicitly links with -lc since on some
-+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+    # to ld, don't add -lc before -lgcc.
-+    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
-+echo "configure:4880: checking whether -lc should be explicitly linked in" >&5
-+    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  $rm conftest*
-+    echo 'static int dummy;' > conftest.$ac_ext
-+
-+    if { (eval echo configure:4887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+      soname=conftest
-+      lib=conftest
-+      libobjs=conftest.$ac_objext
-+      deplibs=
-+      wl=$lt_cv_prog_cc_wl
-+      compiler_flags=-v
-+      linker_flags=-v
-+      verstring=
-+      output_objdir=.
-+      libname=conftest
-+      save_allow_undefined_flag=$allow_undefined_flag
-+      allow_undefined_flag=
-+      if { (eval echo configure:4900: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
-+      then
-+	lt_cv_archive_cmds_need_lc=no
-+      else
-+	lt_cv_archive_cmds_need_lc=yes
-+      fi
-+      allow_undefined_flag=$save_allow_undefined_flag
-+    else
-+      cat conftest.err 1>&5
-+    fi
-+fi
-+
-+    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
-+    ;;
-+  esac
-+fi
-+need_lc=${lt_cv_archive_cmds_need_lc-yes}
-+
-+# The second clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  :
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  test -f Makefile && make "$ltmain"
-+fi
-+
-+if test -f "$ltmain"; then
-+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
-+  $rm -f "${ofile}T"
-+
-+  echo creating $ofile
-+
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS SED \
-+    AR AR_FLAGS CC LD LN_S NM SHELL \
-+    reload_flag reload_cmds wl \
-+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
-+    library_names_spec soname_spec \
-+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
-+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd export_symbols_cmds \
-+    deplibs_check_method allow_undefined_flag no_undefined_flag \
-+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
-+    global_symbol_to_c_name_address \
-+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+
-+    case $var in
-+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
-+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
-+  cat <<__EOF__ > "${ofile}T"
-+#! $SHELL
-+
-+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="${SED} -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$need_lc
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# The default C compiler.
-+CC=$lt_CC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_pic_flag
-+pic_mode=$pic_mode
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_compiler_c_o
-+
-+# Can we write directly to a .lo ?
-+compiler_o_lo=$lt_compiler_o_lo
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_link_static_flag
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
- 
--int main() {
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
--; return 0; }
--EOF
--if { (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  lt_cv_cc_needs_belf=yes
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  lt_cv_cc_needs_belf=no
--fi
--rm -f conftest*
--fi
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
- 
--echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
- 
-+# ### END LIBTOOL CONFIG
- 
--esac
-+__EOF__
- 
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "${ofile}T"
- 
--# Save cache, so that ltconfig can load it
--cat > confcache <<\EOF
--# 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.  It is not useful on other systems.
--# If it contains results you don't want to keep, you may remove or edit it.
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | os2*)
-+    cat <<'EOF' >> "${ofile}T"
-+      # This is a source program that is used to create dlls on Windows
-+      # Don't remove nor modify the starting and closing comments
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
- #
--# By default, configure uses ./config.cache as the cache file,
--# creating it if it does not exist already.  You can give configure
--# the --cache-file=FILE option to use a different cache file; that is
--# what configure does when it calls configure scripts in
--# subdirectories, so they share the cache.
--# Giving --cache-file=/dev/null disables caching, for debugging configure.
--# config.status only pays attention to the cache file if you give it the
--# --recheck option to rerun configure.
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+	# This is a source program that is used to create import libraries
-+	# on Windows for dlls which lack them. Don't remove nor modify the
-+	# starting and closing comments
-+# /* impgen.c starts here */
-+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
-+#
-+#  This file is part of GNU libtool.
-+#
-+#  This program is free software; you can redistribute it and/or modify
-+#  it under the terms of the GNU General Public License as published by
-+#  the Free Software Foundation; either version 2 of the License, or
-+#  (at your option) any later version.
-+#
-+#  This program is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+#  GNU General Public License for more details.
-+#
-+#  You should have received a copy of the GNU General Public License
-+#  along with this program; if not, write to the Free Software
-+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#  */
-+#
-+# #include <stdio.h>		/* for printf() */
-+# #include <unistd.h>		/* for open(), lseek(), read() */
-+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
-+# #include <string.h>		/* for strdup() */
-+#
-+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
-+# #ifndef O_BINARY
-+# #define O_BINARY 0
-+# #endif
-+#
-+# static unsigned int
-+# pe_get16 (fd, offset)
-+#      int fd;
-+#      int offset;
-+# {
-+#   unsigned char b[2];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 2);
-+#   return b[0] + (b[1]<<8);
-+# }
-+#
-+# static unsigned int
-+# pe_get32 (fd, offset)
-+#     int fd;
-+#     int offset;
-+# {
-+#   unsigned char b[4];
-+#   lseek (fd, offset, SEEK_SET);
-+#   read (fd, b, 4);
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# static unsigned int
-+# pe_as32 (ptr)
-+#      void *ptr;
-+# {
-+#   unsigned char *b = ptr;
-+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
-+# }
-+#
-+# int
-+# main (argc, argv)
-+#     int argc;
-+#     char *argv[];
-+# {
-+#     int dll;
-+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
-+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
-+#     unsigned long name_rvas, nexp;
-+#     unsigned char *expdata, *erva;
-+#     char *filename, *dll_name;
-+#
-+#     filename = argv[1];
-+#
-+#     dll = open(filename, O_RDONLY|O_BINARY);
-+#     if (dll < 1)
-+# 	return 1;
-+#
-+#     dll_name = filename;
- #
-+#     for (i=0; filename[i]; i++)
-+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
-+# 	    dll_name = filename + i +1;
-+#
-+#     pe_header_offset = pe_get32 (dll, 0x3c);
-+#     opthdr_ofs = pe_header_offset + 4 + 20;
-+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
-+#
-+#     if (num_entries < 1) /* no exports */
-+# 	return 1;
-+#
-+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
-+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
-+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
-+#     secptr = (pe_header_offset + 4 + 20 +
-+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
-+#
-+#     expptr = 0;
-+#     for (i = 0; i < nsections; i++)
-+#     {
-+# 	char sname[8];
-+# 	unsigned long secptr1 = secptr + 40 * i;
-+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
-+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
-+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
-+# 	lseek(dll, secptr1, SEEK_SET);
-+# 	read(dll, sname, 8);
-+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
-+# 	{
-+# 	    expptr = fptr + (export_rva - vaddr);
-+# 	    if (export_rva + export_size > vaddr + vsize)
-+# 		export_size = vsize - (export_rva - vaddr);
-+# 	    break;
-+# 	}
-+#     }
-+#
-+#     expdata = (unsigned char*)malloc(export_size);
-+#     lseek (dll, expptr, SEEK_SET);
-+#     read (dll, expdata, export_size);
-+#     erva = expdata - export_rva;
-+#
-+#     nexp = pe_as32 (expdata+24);
-+#     name_rvas = pe_as32 (expdata+32);
-+#
-+#     printf ("EXPORTS\n");
-+#     for (i = 0; i<nexp; i++)
-+#     {
-+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
-+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
-+#     }
-+#
-+#     return 0;
-+# }
-+# /* impgen.c ends here */
-+
- EOF
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# 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.
--(set) 2>&1 |
--  case `(ac_space=' '; set | grep ac_space) 2>&1` in
--  *ac_space=\ *)
--    # `set' does not quote correctly, so add quotes (double-quote substitution
--    # turns \\\\ into \\, and sed turns \\ into \).
--    sed -n \
--      -e "s/'/'\\\\''/g" \
--      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
--    ;;
--  *)
--    # `set' quotes correctly as required by POSIX, so do not add quotes.
--    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-     ;;
--  esac >> confcache
--if cmp -s $cache_file confcache; then
--  :
--else
--  if test -w $cache_file; then
--    echo "updating cache $cache_file"
--    cat confcache > $cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-+
-+  mv -f "${ofile}T" "$ofile" || \
-+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
-+  chmod +x "$ofile"
- fi
--rm -f confcache
- 
- 
--# Actually configure libtool.  ac_aux_dir is where install-sh is found.
--CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
--LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
--DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
--|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
--# Reload cache, that may have been modified by ltconfig
--if test -r "$cache_file"; then
--  echo "loading cache $cache_file"
--  . $cache_file
--else
--  echo "creating cache $cache_file"
--  > $cache_file
--fi
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
--# Redirect the config.log output again, so that the ltconfig log is not
--# clobbered by the next message.
--exec 5>>./config.log
-+# Prevent multiple expansion
-+
- 
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
--echo "configure:1559: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo "configure:5486: checking whether to enable maintainer-specific portions of Makefiles" >&5
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-   enableval="$enable_maintainer_mode"
-@@ -1585,7 +5512,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:1589: checking host system type" >&5
-+echo "configure:5516: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -1701,7 +5628,7 @@
- 
- # Build time sanity check...
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:1705: checking whether build environment is sane" >&5
-+echo "configure:5632: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -1743,7 +5670,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1747: checking for $ac_word" >&5
-+echo "configure:5674: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1773,7 +5700,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1777: checking for $ac_word" >&5
-+echo "configure:5704: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1824,7 +5751,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1828: checking for $ac_word" >&5
-+echo "configure:5755: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1856,7 +5783,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:5787: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1867,12 +5794,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 1871 "configure"
-+#line 5798 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -1898,12 +5825,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1902: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:5829: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1907: checking whether we are using GNU C" >&5
-+echo "configure:5834: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1912,7 +5839,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -1931,7 +5858,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1935: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:5862: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1962,32 +5889,54 @@
-   fi
- fi
- 
--echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:1967: checking for POSIXized ISC" >&5
--if test -d /etc/conf/kconfig.d &&
--  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
--then
--  echo "$ac_t""yes" 1>&6
--  ISC=yes # If later tests want to check for ISC.
--  cat >> confdefs.h <<\EOF
--#define _POSIX_SOURCE 1
-+
-+        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-+echo "configure:5895: checking for strerror in -lcposix" >&5
-+ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lcposix  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 5903 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char strerror();
-+
-+int main() {
-+strerror()
-+; return 0; }
- EOF
-+if { (eval echo configure:5914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
- 
--  if test "$GCC" = yes; then
--    CC="$CC -posix"
--  else
--    CC="$CC -Xp"
--  fi
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  LIBS="$LIBS -lcposix"
- else
-   echo "$ac_t""no" 1>&6
--  ISC=
- fi
- 
-+  
-+
- 
- 
- 
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:1991: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "configure:5940: checking for ${CC-cc} option to accept ANSI C" >&5
- if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2003,7 +5952,7 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   cat > conftest.$ac_ext <<EOF
--#line 2007 "configure"
-+#line 5956 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -2040,7 +5989,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   am_cv_prog_cc_stdc="$ac_arg"; break
- else
-@@ -2075,7 +6024,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:2079: checking for a BSD compatible install" >&5
-+echo "configure:6028: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2128,7 +6077,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:2132: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:6081: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2180,12 +6129,12 @@
- # define a MAINT-like variable REBUILD which is set if Perl
- # and awk are found, so autogenerated sources can be rebuilt
- 
--for ac_prog in gawk mawk nawk awk
-+for ac_prog in mawk gawk 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
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2189: checking for $ac_word" >&5
-+echo "configure:6138: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2219,7 +6168,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2223: checking for $ac_word" >&5
-+echo "configure:6172: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2253,7 +6202,7 @@
- # Extract the first word of "indent", so it can be a program name with args.
- set dummy indent; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2257: checking for $ac_word" >&5
-+echo "configure:6206: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_INDENT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2290,7 +6239,7 @@
- 
- 
- echo $ac_n "checking whether make is GNU Make""... $ac_c" 1>&6
--echo "configure:2294: checking whether make is GNU Make" >&5
-+echo "configure:6243: checking whether make is GNU Make" >&5
- STRIP_BEGIN=
- STRIP_END=
- if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
-@@ -2307,93 +6256,43 @@
- 
- # i18n stuff
- ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5"
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:2312: checking how to run the C preprocessor" >&5
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
--  CPP=
--fi
--if test -z "$CPP"; then
--if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-+# Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:6263: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--    # This must be in double quotes, not single quotes, because CPP may get
--  # substituted into the Makefile and "${CC-cc}" will confuse make.
--  CPP="${CC-cc} -E"
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp.
--  cat > conftest.$ac_ext <<EOF
--#line 2327 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -E -traditional-cpp"
--  cat > conftest.$ac_ext <<EOF
--#line 2344 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -nologo -E"
--  cat > conftest.$ac_ext <<EOF
--#line 2361 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP=/lib/cpp
--fi
--rm -f conftest*
--fi
--rm -f conftest*
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_RANLIB="ranlib"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
- fi
--rm -f conftest*
--  ac_cv_prog_CPP="$CPP"
- fi
--  CPP="$ac_cv_prog_CPP"
-+RANLIB="$ac_cv_prog_RANLIB"
-+if test -n "$RANLIB"; then
-+  echo "$ac_t""$RANLIB" 1>&6
- else
--  ac_cv_prog_CPP="$CPP"
-+  echo "$ac_t""no" 1>&6
- fi
--echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:2392: checking for ANSI C header files" >&5
-+echo "configure:6291: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2397 "configure"
-+#line 6296 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -2401,7 +6300,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2418,7 +6317,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 2422 "configure"
-+#line 6321 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -2436,7 +6335,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 2440 "configure"
-+#line 6339 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -2457,7 +6356,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2461 "configure"
-+#line 6360 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -2468,7 +6367,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -2492,12 +6391,12 @@
- fi
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:2496: checking for working const" >&5
-+echo "configure:6395: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2501 "configure"
-+#line 6400 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -2546,7 +6445,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -2567,21 +6466,21 @@
- fi
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:2571: checking for inline" >&5
-+echo "configure:6470: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 2578 "configure"
-+#line 6477 "configure"
- #include "confdefs.h"
- 
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:2585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -2607,12 +6506,12 @@
- esac
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:2611: checking for off_t" >&5
-+echo "configure:6510: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2616 "configure"
-+#line 6515 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -2640,12 +6539,12 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:2644: checking for size_t" >&5
-+echo "configure:6543: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2649 "configure"
-+#line 6548 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -2675,19 +6574,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:2679: checking for working alloca.h" >&5
-+echo "configure:6578: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2684 "configure"
-+#line 6583 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -2708,12 +6607,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:2712: checking for alloca" >&5
-+echo "configure:6611: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2717 "configure"
-+#line 6616 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -2741,7 +6640,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -2773,12 +6672,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:2777: checking whether alloca needs Cray hooks" >&5
-+echo "configure:6676: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2782 "configure"
-+#line 6681 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -2803,12 +6702,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2807: checking for $ac_func" >&5
-+echo "configure:6706: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2812 "configure"
-+#line 6711 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2831,7 +6730,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2858,7 +6757,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:2862: checking stack direction for C alloca" >&5
-+echo "configure:6761: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2866,7 +6765,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2870 "configure"
-+#line 6769 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -2885,7 +6784,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -2910,17 +6809,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2914: checking for $ac_hdr" >&5
-+echo "configure:6813: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2919 "configure"
-+#line 6818 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2949,12 +6848,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2953: checking for $ac_func" >&5
-+echo "configure:6852: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2958 "configure"
-+#line 6857 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2977,7 +6876,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3002,7 +6901,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:3006: checking for working mmap" >&5
-+echo "configure:6905: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3010,7 +6909,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3014 "configure"
-+#line 6913 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -3150,7 +7049,7 @@
- }
- 
- EOF
--if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:7053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -3178,17 +7077,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3182: checking for $ac_hdr" >&5
-+echo "configure:7081: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3187 "configure"
-+#line 7086 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3218,12 +7117,12 @@
- strdup __argz_count __argz_stringify __argz_next
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3222: checking for $ac_func" >&5
-+echo "configure:7121: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3227 "configure"
-+#line 7126 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3246,7 +7145,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3275,12 +7174,12 @@
-      for ac_func in stpcpy
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3279: checking for $ac_func" >&5
-+echo "configure:7178: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3284 "configure"
-+#line 7183 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3303,7 +7202,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3335,21 +7234,21 @@
- 
-    fi
- 
--   if test $ac_cv_header_locale_h = yes; then
--    echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
--echo "configure:3341: checking for LC_MESSAGES" >&5
-+   
-+  echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-+echo "configure:7240: checking for LC_MESSAGES" >&5
- if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3346 "configure"
-+#line 7245 "configure"
- #include "confdefs.h"
- #include <locale.h>
- int main() {
- return LC_MESSAGES
- ; return 0; }
- EOF
--if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   am_cv_val_LC_MESSAGES=yes
- else
-@@ -3362,15 +7261,15 @@
- fi
- 
- echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
--    if test $am_cv_val_LC_MESSAGES = yes; then
--      cat >> confdefs.h <<\EOF
-+  if test $am_cv_val_LC_MESSAGES = yes; then
-+    cat >> confdefs.h <<\EOF
- #define HAVE_LC_MESSAGES 1
- EOF
- 
--    fi
-   fi
-+
-    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
--echo "configure:3374: checking whether NLS is requested" >&5
-+echo "configure:7273: checking whether NLS is requested" >&5
-         # Check whether --enable-nls or --disable-nls was given.
- if test "${enable_nls+set}" = set; then
-   enableval="$enable_nls"
-@@ -3402,17 +7301,17 @@
- 
- 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
--echo "configure:3406: checking for libintl.h" >&5
-+echo "configure:7305: checking for libintl.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3411 "configure"
-+#line 7310 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3429,19 +7328,19 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for dgettext in libc""... $ac_c" 1>&6
--echo "configure:3433: checking for dgettext in libc" >&5
-+echo "configure:7332: checking for dgettext in libc" >&5
- if eval "test \"`echo '$''{'gt_cv_func_dgettext_libc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3438 "configure"
-+#line 7337 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- int main() {
- return (int) dgettext ("","")
- ; return 0; }
- EOF
--if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gt_cv_func_dgettext_libc=yes
- else
-@@ -3457,7 +7356,7 @@
- 
- 	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
- 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
--echo "configure:3461: checking for bindtextdomain in -lintl" >&5
-+echo "configure:7360: checking for bindtextdomain in -lintl" >&5
- ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3465,7 +7364,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lintl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3469 "configure"
-+#line 7368 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3476,7 +7375,7 @@
- bindtextdomain()
- ; return 0; }
- EOF
--if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3492,12 +7391,12 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for dgettext in libintl""... $ac_c" 1>&6
--echo "configure:3496: checking for dgettext in libintl" >&5
-+echo "configure:7395: checking for dgettext in libintl" >&5
- if eval "test \"`echo '$''{'gt_cv_func_dgettext_libintl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
--echo "configure:3501: checking for dgettext in -lintl" >&5
-+echo "configure:7400: checking for dgettext in -lintl" >&5
- ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3505,7 +7404,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lintl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3509 "configure"
-+#line 7408 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3516,7 +7415,7 @@
- dgettext()
- ; return 0; }
- EOF
--if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3559,7 +7458,7 @@
- 	      # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3563: checking for $ac_word" >&5
-+echo "configure:7462: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3584,7 +7483,7 @@
- esac
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
--if test -n "$MSGFMT"; then
-+if test "$MSGFMT" != "no"; then
-   echo "$ac_t""$MSGFMT" 1>&6
- else
-   echo "$ac_t""no" 1>&6
-@@ -3593,12 +7492,12 @@
- 		for ac_func in dcgettext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3597: checking for $ac_func" >&5
-+echo "configure:7496: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3602 "configure"
-+#line 7501 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3621,7 +7520,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3648,7 +7547,7 @@
- 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3652: checking for $ac_word" >&5
-+echo "configure:7551: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3684,7 +7583,7 @@
- 		# Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3688: checking for $ac_word" >&5
-+echo "configure:7587: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3709,14 +7608,14 @@
- esac
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
--if test -n "$XGETTEXT"; then
-+if test "$XGETTEXT" != ":"; then
-   echo "$ac_t""$XGETTEXT" 1>&6
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
- 		cat > conftest.$ac_ext <<EOF
--#line 3720 "configure"
-+#line 7619 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3724,7 +7623,7 @@
- 			       return _nl_msg_cat_cntr
- ; return 0; }
- EOF
--if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   CATOBJEXT=.gmo
- 		   DATADIRNAME=share
-@@ -3754,7 +7653,7 @@
- 
-         if test "$CATOBJEXT" = "NONE"; then
- 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
--echo "configure:3758: checking whether catgets can be used" >&5
-+echo "configure:7657: checking whether catgets can be used" >&5
- 	  # Check whether --with-catgets or --without-catgets was given.
- if test "${with_catgets+set}" = set; then
-   withval="$with_catgets"
-@@ -3767,7 +7666,7 @@
- 
- 	  if test "$nls_cv_use_catgets" = "yes"; then
- 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
--echo "configure:3771: checking for main in -li" >&5
-+echo "configure:7670: checking for main in -li" >&5
- ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3775,14 +7674,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-li  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3779 "configure"
-+#line 7678 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3810,12 +7709,12 @@
- fi
- 
- 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
--echo "configure:3814: checking for catgets" >&5
-+echo "configure:7713: checking for catgets" >&5
- if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3819 "configure"
-+#line 7718 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char catgets(); below.  */
-@@ -3838,7 +7737,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_catgets=yes"
- else
-@@ -3860,7 +7759,7 @@
- 	       # Extract the first word of "gencat", so it can be a program name with args.
- set dummy gencat; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3864: checking for $ac_word" >&5
-+echo "configure:7763: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4000,7 +7899,7 @@
-        LINGUAS=
-      else
-        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
--echo "configure:4004: checking for catalogs to be installed" >&5
-+echo "configure:7903: checking for catalogs to be installed" >&5
-        NEW_LINGUAS=
-        for lang in ${LINGUAS=$ALL_LINGUAS}; do
-          case "$ALL_LINGUAS" in
-@@ -4028,17 +7927,17 @@
-    if test "$CATOBJEXT" = ".cat"; then
-      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
--echo "configure:4032: checking for linux/version.h" >&5
-+echo "configure:7931: checking for linux/version.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4037 "configure"
-+#line 7936 "configure"
- #include "confdefs.h"
- #include <linux/version.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4109,8 +8008,34 @@
- gtklocaledir='${prefix}/${DATADIRNAME}/locale'
- 
- 
-+echo $ac_n "checking for nl_langinfo (CODESET)""... $ac_c" 1>&6
-+echo "configure:8013: checking for nl_langinfo (CODESET)" >&5
-+cat > conftest.$ac_ext <<EOF
-+#line 8015 "configure"
-+#include "confdefs.h"
-+#include <langinfo.h>
-+int main() {
-+char *codeset = nl_langinfo (CODESET);
-+; return 0; }
-+EOF
-+if { (eval echo configure:8022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_CODESET 1
-+EOF
-+
-+   have_codeset=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  have_codeset=no
-+fi
-+rm -f conftest*
-+echo "$ac_t""$have_codeset" 1>&6
-+
- echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
--echo "configure:4114: checking for extra flags to get ANSI library prototypes" >&5
-+echo "configure:8039: checking for extra flags to get ANSI library prototypes" >&5
- 
- gtk_save_LIBS=$LIBS
- LIBS="$LIBS -lm"
-@@ -4119,12 +8044,12 @@
- 
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4123 "configure"
-+#line 8048 "configure"
- #include "confdefs.h"
- #include <math.h>
-              int main (void) { return (log(1) != log(1.)); }
- EOF
--if { (eval echo configure:4128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   echo "$ac_t""none needed" 1>&6
- else
-@@ -4138,12 +8063,12 @@
-      
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4142 "configure"
-+#line 8067 "configure"
- #include "confdefs.h"
- #include <math.h>
- 	         int main (void) { return (log(1) != log(1.)); }
- EOF
--if { (eval echo configure:4147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   echo "$ac_t""-std1" 1>&6
- else
-@@ -4164,16 +8089,16 @@
- LIBS=$gtk_save_LIBS
- 
- echo $ac_n "checking for extra flags for POSIX compliance""... $ac_c" 1>&6
--echo "configure:4168: checking for extra flags for POSIX compliance" >&5
-+echo "configure:8093: checking for extra flags for POSIX compliance" >&5
- cat > conftest.$ac_ext <<EOF
--#line 4170 "configure"
-+#line 8095 "configure"
- #include "confdefs.h"
- #include <dirent.h>
- int main() {
- DIR *dir;
- ; return 0; }
- EOF
--if { (eval echo configure:4177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   echo "$ac_t""none needed" 1>&6
- else
-@@ -4183,14 +8108,14 @@
-   gtk_save_CFLAGS=$CFLAGS
-   CFLAGS="$CFLAGS -posix"
-   cat > conftest.$ac_ext <<EOF
--#line 4187 "configure"
-+#line 8112 "configure"
- #include "confdefs.h"
- #include <dirent.h>
- int main() {
- DIR *dir;
- ; return 0; }
- EOF
--if { (eval echo configure:4194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   echo "$ac_t""-posix" 1>&6
- else
-@@ -4266,7 +8191,7 @@
-   # Extract the first word of "glib-config", so it can be a program name with args.
- set dummy glib-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4270: checking for $ac_word" >&5
-+echo "configure:8195: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4301,7 +8226,7 @@
- 
-   min_glib_version=1.2.8
-   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
--echo "configure:4305: checking for GLIB - version >= $min_glib_version" >&5
-+echo "configure:8230: checking for GLIB - version >= $min_glib_version" >&5
-   no_glib=""
-   if test "$GLIB_CONFIG" = "no" ; then
-     no_glib=yes
-@@ -4324,7 +8249,7 @@
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4328 "configure"
-+#line 8253 "configure"
- #include "confdefs.h"
- 
- #include <glib.h>
-@@ -4400,7 +8325,7 @@
- }
- 
- EOF
--if { (eval echo configure:4404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -4434,7 +8359,7 @@
-           CFLAGS="$CFLAGS $GLIB_CFLAGS"
-           LIBS="$LIBS $GLIB_LIBS"
-           cat > conftest.$ac_ext <<EOF
--#line 4438 "configure"
-+#line 8363 "configure"
- #include "confdefs.h"
- 
- #include <glib.h>
-@@ -4444,7 +8369,7 @@
-  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
- ; return 0; }
- EOF
--if { (eval echo configure:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-    echo "*** The test program compiled, but did not run. This usually means"
-           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-@@ -4540,7 +8465,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:4544: checking for X" >&5
-+echo "configure:8469: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -4602,12 +8527,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 4606 "configure"
-+#line 8531 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -4676,14 +8601,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4680 "configure"
-+#line 8605 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:4687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -4789,17 +8714,17 @@
-     case "`(uname -sr) 2>/dev/null`" in
-     "SunOS 5"*)
-       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
--echo "configure:4793: checking whether -R must be followed by a space" >&5
-+echo "configure:8718: checking whether -R must be followed by a space" >&5
-       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-       cat > conftest.$ac_ext <<EOF
--#line 4796 "configure"
-+#line 8721 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_nospace=yes
- else
-@@ -4815,14 +8740,14 @@
-       else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
- 	cat > conftest.$ac_ext <<EOF
--#line 4819 "configure"
-+#line 8744 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_space=yes
- else
-@@ -4854,7 +8779,7 @@
-     # libraries were built with DECnet support.  And karl@cs.umb.edu says
-     # the Alpha needs dnet_stub (dnet does not exist).
-     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:4858: checking for dnet_ntoa in -ldnet" >&5
-+echo "configure:8783: checking for dnet_ntoa in -ldnet" >&5
- ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4862,7 +8787,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4866 "configure"
-+#line 8791 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4873,7 +8798,7 @@
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:4877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4895,7 +8820,7 @@
- 
-     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:4899: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo "configure:8824: checking for dnet_ntoa in -ldnet_stub" >&5
- ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4903,7 +8828,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4907 "configure"
-+#line 8832 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4914,7 +8839,7 @@
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4943,12 +8868,12 @@
-     # The nsl library prevents programs from opening the X display
-     # on Irix 5.2, according to dickey@clark.net.
-     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:4947: checking for gethostbyname" >&5
-+echo "configure:8872: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4952 "configure"
-+#line 8877 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname(); below.  */
-@@ -4971,7 +8896,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -4992,7 +8917,7 @@
- 
-     if test $ac_cv_func_gethostbyname = no; then
-       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:4996: checking for gethostbyname in -lnsl" >&5
-+echo "configure:8921: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5000,7 +8925,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5004 "configure"
-+#line 8929 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5011,7 +8936,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:5015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5041,12 +8966,12 @@
-     # -lsocket must be given before -lnsl if both are needed.
-     # We assume that if connect needs -lnsl, so does gethostbyname.
-     echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:5045: checking for connect" >&5
-+echo "configure:8970: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5050 "configure"
-+#line 8975 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect(); below.  */
-@@ -5069,7 +8994,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
- else
-@@ -5090,7 +9015,7 @@
- 
-     if test $ac_cv_func_connect = no; then
-       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:5094: checking for connect in -lsocket" >&5
-+echo "configure:9019: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5098,7 +9023,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5102 "configure"
-+#line 9027 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5109,7 +9034,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5133,12 +9058,12 @@
- 
-     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-     echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:5137: checking for remove" >&5
-+echo "configure:9062: checking for remove" >&5
- if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5142 "configure"
-+#line 9067 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove(); below.  */
-@@ -5161,7 +9086,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_remove=yes"
- else
-@@ -5182,7 +9107,7 @@
- 
-     if test $ac_cv_func_remove = no; then
-       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:5186: checking for remove in -lposix" >&5
-+echo "configure:9111: checking for remove in -lposix" >&5
- ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5190,7 +9115,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lposix  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5194 "configure"
-+#line 9119 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5201,7 +9126,7 @@
- remove()
- ; return 0; }
- EOF
--if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5225,12 +9150,12 @@
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-     echo $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:5229: checking for shmat" >&5
-+echo "configure:9154: checking for shmat" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5234 "configure"
-+#line 9159 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat(); below.  */
-@@ -5253,7 +9178,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_shmat=yes"
- else
-@@ -5274,7 +9199,7 @@
- 
-     if test $ac_cv_func_shmat = no; then
-       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:5278: checking for shmat in -lipc" >&5
-+echo "configure:9203: checking for shmat in -lipc" >&5
- ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5282,7 +9207,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lipc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5286 "configure"
-+#line 9211 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5293,7 +9218,7 @@
- shmat()
- ; return 0; }
- EOF
--if { (eval echo configure:5297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5326,7 +9251,7 @@
-   # libraries we check for below, so use a different variable.
-   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
--echo "configure:5330: checking for IceConnectionNumber in -lICE" >&5
-+echo "configure:9255: checking for IceConnectionNumber in -lICE" >&5
- ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5334,7 +9259,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5338 "configure"
-+#line 9263 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5345,7 +9270,7 @@
- IceConnectionNumber()
- ; return 0; }
- EOF
--if { (eval echo configure:5349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5389,7 +9314,7 @@
- # Checks for libraries.
- # Check for the X11 library
- echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
--echo "configure:5393: checking for XOpenDisplay in -lX11" >&5
-+echo "configure:9318: checking for XOpenDisplay in -lX11" >&5
- ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5397,7 +9322,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5401 "configure"
-+#line 9326 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5408,7 +9333,7 @@
- XOpenDisplay()
- ; return 0; }
- EOF
--if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5433,7 +9358,7 @@
- if test "x$enable_shm" = "xyes"; then
-   # Check for the Xext library (needed for XShm extention)
-   echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
--echo "configure:5437: checking for XShmAttach in -lXext" >&5
-+echo "configure:9362: checking for XShmAttach in -lXext" >&5
- ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5441,7 +9366,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lXext $x_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5445 "configure"
-+#line 9370 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5452,7 +9377,7 @@
- XShmAttach()
- ; return 0; }
- EOF
--if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5472,7 +9397,7 @@
-   echo "$ac_t""no" 1>&6
- # On AIX, it is in XextSam instead, but we still need -lXext
-       echo $ac_n "checking for XShmAttach in -lXextSam""... $ac_c" 1>&6
--echo "configure:5476: checking for XShmAttach in -lXextSam" >&5
-+echo "configure:9401: checking for XShmAttach in -lXextSam" >&5
- ac_lib_var=`echo XextSam'_'XShmAttach | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5480,7 +9405,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lXextSam $x_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5484 "configure"
-+#line 9409 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5491,7 +9416,7 @@
- XShmAttach()
- ; return 0; }
- EOF
--if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5519,7 +9444,7 @@
- # Check for shaped window extension
- 
- echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
--echo "configure:5523: checking for XShapeCombineMask in -lXext" >&5
-+echo "configure:9448: checking for XShapeCombineMask in -lXext" >&5
- ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5527,7 +9452,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lXext $x_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5531 "configure"
-+#line 9456 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5538,7 +9463,7 @@
- XShapeCombineMask()
- ; return 0; }
- EOF
--if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5568,7 +9493,7 @@
- # Check for XConvertCase (X11R6 specific)
- 
- echo $ac_n "checking for XConvertCase in -lX11""... $ac_c" 1>&6
--echo "configure:5572: checking for XConvertCase in -lX11" >&5
-+echo "configure:9497: checking for XConvertCase in -lX11" >&5
- ac_lib_var=`echo X11'_'XConvertCase | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5576,7 +9501,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lX11 $x_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5580 "configure"
-+#line 9505 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5587,7 +9512,7 @@
- XConvertCase()
- ; return 0; }
- EOF
--if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5614,7 +9539,7 @@
- # Check for XIM support.
- 
- echo $ac_n "checking for XUnregisterIMInstantiateCallback in -lX11""... $ac_c" 1>&6
--echo "configure:5618: checking for XUnregisterIMInstantiateCallback in -lX11" >&5
-+echo "configure:9543: checking for XUnregisterIMInstantiateCallback in -lX11" >&5
- ac_lib_var=`echo X11'_'XUnregisterIMInstantiateCallback | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5622,7 +9547,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lX11 $x_libs $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5626 "configure"
-+#line 9551 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5633,7 +9558,7 @@
- XUnregisterIMInstantiateCallback()
- ; return 0; }
- EOF
--if { (eval echo configure:5637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5721,17 +9646,17 @@
-   # Check for shared memory
-   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
--echo "configure:5725: checking for sys/ipc.h" >&5
-+echo "configure:9650: checking for sys/ipc.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5730 "configure"
-+#line 9655 "configure"
- #include "confdefs.h"
- #include <sys/ipc.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -5758,17 +9683,17 @@
- 
-   ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6
--echo "configure:5762: checking for sys/shm.h" >&5
-+echo "configure:9687: checking for sys/shm.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5767 "configure"
-+#line 9692 "configure"
- #include "confdefs.h"
- #include <sys/shm.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -5796,7 +9721,7 @@
- 
-   # Check for the X shared memory extension header file
-   echo $ac_n "checking X11/extensions/XShm.h""... $ac_c" 1>&6
--echo "configure:5800: checking X11/extensions/XShm.h" >&5
-+echo "configure:9725: checking X11/extensions/XShm.h" >&5
-   if test "x$no_xext_lib" = "xyes"; then
-     echo "$ac_t""no" 1>&6
-     no_xshm=yes
-@@ -5817,13 +9742,13 @@
- # Check if X_LOCALE definition is necessary
- 
- echo $ac_n "checking need -DX_LOCALE""... $ac_c" 1>&6
--echo "configure:5821: checking need -DX_LOCALE" >&5
-+echo "configure:9746: checking need -DX_LOCALE" >&5
- 
- if test "$cross_compiling" = yes; then
-   need_x_locale=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5827 "configure"
-+#line 9752 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -5835,7 +9760,7 @@
-   return setlocale (LC_ALL, "${with_locale}") == NULL;
- }
- EOF
--if { (eval echo configure:5839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   need_x_locale=no
- else
-@@ -5855,10 +9780,10 @@
- else
-   if test x$with_native_locale = xyes ; then
-     echo $ac_n "checking functioning locale support""... $ac_c" 1>&6
--echo "configure:5859: checking functioning locale support" >&5
-+echo "configure:9784: checking functioning locale support" >&5
-   
-     cat > conftest.$ac_ext <<EOF
--#line 5862 "configure"
-+#line 9787 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int main() {
-@@ -5870,7 +9795,7 @@
-     
- ; return 0; }
- EOF
--if { (eval echo configure:5874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   use_native_locale=yes
- else
-@@ -5885,13 +9810,13 @@
- 
- if test x$use_native_locale = xyes ; then
-   echo $ac_n "checking if sizeof(wchar_t) == 4""... $ac_c" 1>&6
--echo "configure:5889: checking if sizeof(wchar_t) == 4" >&5
-+echo "configure:9814: checking if sizeof(wchar_t) == 4" >&5
- 
-   if test "$cross_compiling" = yes; then
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5895 "configure"
-+#line 9820 "configure"
- #include "confdefs.h"
- 
-   #include <stdlib.h>
-@@ -5902,7 +9827,7 @@
-     return (sizeof(wchar_t) == 4) ? 0 : 1;
-   }
- EOF
--if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -5926,12 +9851,12 @@
- 
- # Checks for header files.
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:5930: checking for ANSI C header files" >&5
-+echo "configure:9855: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5935 "configure"
-+#line 9860 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -5939,7 +9864,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -5956,7 +9881,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 5960 "configure"
-+#line 9885 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -5974,7 +9899,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 5978 "configure"
-+#line 9903 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -5995,7 +9920,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5999 "configure"
-+#line 9924 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -6006,7 +9931,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -6032,12 +9957,12 @@
- 
- # Checks for typedefs, structures, and compiler characteristics.
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:6036: checking for working const" >&5
-+echo "configure:9961: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6041 "configure"
-+#line 9966 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -6086,7 +10011,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -6109,12 +10034,12 @@
- 
- # Checks for library functions.
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:6113: checking return type of signal handlers" >&5
-+echo "configure:10038: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6118 "configure"
-+#line 10043 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -6131,7 +10056,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:6135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -6153,17 +10078,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6157: checking for $ac_hdr" >&5
-+echo "configure:10082: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6162 "configure"
-+#line 10087 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:10092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6192,12 +10117,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6196: checking for $ac_func" >&5
-+echo "configure:10121: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6201 "configure"
-+#line 10126 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6220,7 +10145,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6245,7 +10170,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:6249: checking for working mmap" >&5
-+echo "configure:10174: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6253,7 +10178,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6257 "configure"
-+#line 10182 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -6393,7 +10318,7 @@
- }
- 
- EOF
--if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -6419,12 +10344,12 @@
- for ac_func in getresuid
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6423: checking for $ac_func" >&5
-+echo "configure:10348: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6428 "configure"
-+#line 10353 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6447,7 +10372,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6472,12 +10397,12 @@
- done
- 
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:6476: checking for uid_t in sys/types.h" >&5
-+echo "configure:10401: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6481 "configure"
-+#line 10406 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -6508,16 +10433,16 @@
- 
- # Check if <sys/select.h> needs to be included for fd_set
- echo $ac_n "checking for fd_set""... $ac_c" 1>&6
--echo "configure:6512: checking for fd_set" >&5
-+echo "configure:10437: checking for fd_set" >&5
- cat > conftest.$ac_ext <<EOF
--#line 6514 "configure"
-+#line 10439 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
- fd_set readMask, writeMask;
- ; return 0; }
- EOF
--if { (eval echo configure:6521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gtk_ok=yes
- else
-@@ -6531,7 +10456,7 @@
-     echo "$ac_t""yes, found in sys/types.h" 1>&6
- else
-     cat > conftest.$ac_ext <<EOF
--#line 6535 "configure"
-+#line 10460 "configure"
- #include "confdefs.h"
- #include <sys/select.h>
- EOF
-@@ -6560,14 +10485,14 @@
- # Duplicate `widechar' tests from `glib'.
- # Check for wchar.h
- echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
--echo "configure:6564: checking for wchar.h" >&5
-+echo "configure:10489: checking for wchar.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 6566 "configure"
-+#line 10491 "configure"
- #include "confdefs.h"
- #include <wchar.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:10496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6590,14 +10515,14 @@
- 
- # Check for wctype.h (for iswalnum)
- echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
--echo "configure:6594: checking for wctype.h" >&5
-+echo "configure:10519: checking for wctype.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 6596 "configure"
-+#line 10521 "configure"
- #include "confdefs.h"
- #include <wctype.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:10526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6621,12 +10546,12 @@
- # in Solaris 2.5, `iswalnum' is in -lw
- GDK_WLIBS=
- echo $ac_n "checking for iswalnum""... $ac_c" 1>&6
--echo "configure:6625: checking for iswalnum" >&5
-+echo "configure:10550: checking for iswalnum" >&5
- if eval "test \"`echo '$''{'ac_cv_func_iswalnum'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6630 "configure"
-+#line 10555 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char iswalnum(); below.  */
-@@ -6649,7 +10574,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_iswalnum=yes"
- else
-@@ -6667,7 +10592,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6
--echo "configure:6671: checking for iswalnum in -lw" >&5
-+echo "configure:10596: checking for iswalnum in -lw" >&5
- ac_lib_var=`echo w'_'iswalnum | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6675,7 +10600,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lw  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6679 "configure"
-+#line 10604 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6686,7 +10611,7 @@
- iswalnum()
- ; return 0; }
- EOF
--if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6713,9 +10638,9 @@
- oLIBS="$LIBS"
- LIBS="$LIBS $GDK_WLIBS"
- echo $ac_n "checking if iswalnum() and friends are properly defined""... $ac_c" 1>&6
--echo "configure:6717: checking if iswalnum() and friends are properly defined" >&5
-+echo "configure:10642: checking if iswalnum() and friends are properly defined" >&5
- cat > conftest.$ac_ext <<EOF
--#line 6719 "configure"
-+#line 10644 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int main() {
-@@ -6735,7 +10660,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gtk_ok=yes
- else
-@@ -6937,9 +10862,14 @@
- s%@build_cpu@%$build_cpu%g
- s%@build_vendor@%$build_vendor%g
- s%@build_os@%$build_os%g
--s%@RANLIB@%$RANLIB%g
- s%@CC@%$CC%g
- s%@LN_S@%$LN_S%g
-+s%@OBJEXT@%$OBJEXT%g
-+s%@EXEEXT@%$EXEEXT%g
-+s%@ECHO@%$ECHO%g
-+s%@RANLIB@%$RANLIB%g
-+s%@STRIP@%$STRIP%g
-+s%@CPP@%$CPP%g
- s%@LIBTOOL@%$LIBTOOL%g
- s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
- s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-@@ -6951,7 +10881,6 @@
- s%@STRIP_DUMMY@%$STRIP_DUMMY%g
- s%@STRIP_BEGIN@%$STRIP_BEGIN%g
- s%@STRIP_END@%$STRIP_END%g
--s%@CPP@%$CPP%g
- s%@ALLOCA@%$ALLOCA%g
- s%@USE_NLS@%$USE_NLS%g
- s%@MSGFMT@%$MSGFMT%g
---- gtk+1.2-1.2.10.orig/configure.in
-+++ gtk+1.2-1.2.10/configure.in
-@@ -1,5 +1,7 @@
- # Process this file with autoconf to produce a configure script.
-+
- AC_INIT(gdk/gdktypes.h)
-+AC_PREREQ(2.13)
- 
- # In the following, there are a the following variants
- # of GLib cflags and libs variables
-@@ -192,6 +194,15 @@
- gtklocaledir='${prefix}/${DATADIRNAME}/locale'
- AC_SUBST(gtklocaledir)
- 
-+dnl Check for nl_langinfo and CODESET
-+AC_MSG_CHECKING([for nl_langinfo (CODESET)])
-+AC_TRY_COMPILE([#include <langinfo.h>],
-+	[char *codeset = nl_langinfo (CODESET);],
-+   AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
-+   have_codeset=yes,
-+   have_codeset=no)
-+AC_MSG_RESULT($have_codeset)
-+
- dnl The DU4 header files don't provide library prototypes unless 
- dnl -std1 is given to the native cc.
- AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
---- gtk+1.2-1.2.10.orig/ltmain.sh
-+++ gtk+1.2-1.2.10/ltmain.sh
-@@ -1,7 +1,8 @@
- # ltmain.sh - Provide generalized library-building support services.
--# NOTE: Changing this file will not affect anything until you rerun ltconfig.
-+# NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996-1999 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -48,14 +49,14 @@
- fi
- 
- # The name of this program.
--progname=`$echo "$0" | sed 's%^.*/%%'`
-+progname=`$echo "$0" | ${SED} 's%^.*/%%'`
- modename="$progname"
- 
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.3.4
--TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
-+VERSION=1.4.3
-+TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
- 
- default_mode=
- help="Try \`$progname --help' for more information."
-@@ -66,10 +67,19 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
-+Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
--SP2NL='tr \040 \012'
--NL2SP='tr \015\012 \040\040'
-+# test EBCDIC or ASCII                                                         
-+case `echo A|od -x` in                                                         
-+ *[Cc]1*) # EBCDIC based system                                                
-+  SP2NL="tr '\100' '\n'"                                                       
-+  NL2SP="tr '\r\n' '\100\100'"                                                 
-+  ;;                                                                           
-+ *) # Assume ASCII based system                                                
-+  SP2NL="tr '\040' '\012'"                                                     
-+  NL2SP="tr '\015\012' '\040\040'"                                             
-+  ;;                                                                           
-+esac                                                                           
- 
- # NLS nuisances.
- # Only set LANG and LC_ALL to C if already set.
-@@ -83,11 +93,8 @@
-   save_LANG="$LANG"; LANG=C; export LANG
- fi
- 
--if test "$LTCONFIG_VERSION" != "$VERSION"; then
--  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
--  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--  exit 1
--fi
-+# Make sure IFS has a sensible default
-+: ${IFS=" 	"}
- 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-   echo "$modename: not configured to build any kind of library" 1>&2
-@@ -113,16 +120,16 @@
-   arg="$1"
-   shift
- 
--  case "$arg" in
-+  case $arg in
-   -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-   *) optarg= ;;
-   esac
- 
-   # If the previous option needs an argument, assign it.
-   if test -n "$prev"; then
--    case "$prev" in
-+    case $prev in
-     execute_dlfiles)
--      eval "$prev=\"\$$prev \$arg\""
-+      execute_dlfiles="$execute_dlfiles $arg"
-       ;;
-     *)
-       eval "$prev=\$arg"
-@@ -135,7 +142,7 @@
-   fi
- 
-   # Have we seen a non-optional argument yet?
--  case "$arg" in
-+  case $arg in
-   --help)
-     show_help=yes
-     ;;
-@@ -146,7 +153,7 @@
-     ;;
- 
-   --config)
--    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
-+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-     exit 0
-     ;;
- 
-@@ -179,6 +186,8 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --preserve-dup-deps) duplicate_deps="yes" ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
-@@ -207,16 +216,21 @@
-   exit 1
- fi
- 
-+# If this variable is set in any of the actions, the command in it
-+# will be execed at the end.  This prevents here-documents from being
-+# left over by shells.
-+exec_cmd=
-+
- if test -z "$show_help"; then
- 
-   # Infer the operation mode.
-   if test -z "$mode"; then
--    case "$nonopt" in
--    *cc | *++ | gcc* | *-gcc*)
-+    case $nonopt in
-+    *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
-       mode=link
-       for arg
-       do
--	case "$arg" in
-+	case $arg in
- 	-c)
- 	   mode=compile
- 	   break
-@@ -261,12 +275,13 @@
-   help="Try \`$modename --help --mode=$mode' for more information."
- 
-   # These modes are in order of execution frequency so that they run quickly.
--  case "$mode" in
-+  case $mode in
-   # libtool compile mode
-   compile)
-     modename="$modename: compile"
-     # Get the compilation command and the source file.
-     base_compile=
-+    prev=
-     lastarg=
-     srcfile="$nonopt"
-     suppress_output=
-@@ -274,8 +289,34 @@
-     user_target=no
-     for arg
-     do
-+      case $prev in
-+      "") ;;
-+      xcompiler)
-+	# Aesthetically quote the previous argument.
-+	prev=
-+	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+
-+	case $arg in
-+	# Double-quote args containing other shell metacharacters.
-+	# Many Bourne shells cannot handle close brackets correctly
-+	# in scan sets, so we specify it separately.
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+
-+	# Add the previous argument to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-+      esac
-+
-       # Accept any command-line options.
--      case "$arg" in
-+      case $arg in
-       -o)
- 	if test "$user_target" != "no"; then
- 	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-@@ -288,9 +329,53 @@
- 	build_old_libs=yes
- 	continue
- 	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-+	lastarg=
-+	save_ifs="$IFS"; IFS=','
-+	for arg in $args; do
-+	  IFS="$save_ifs"
-+
-+	  # Double-quote args containing other shell metacharacters.
-+	  # Many Bourne shells cannot handle close brackets correctly
-+	  # in scan sets, so we specify it separately.
-+	  case $arg in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    arg="\"$arg\""
-+	    ;;
-+	  esac
-+	  lastarg="$lastarg $arg"
-+	done
-+	IFS="$save_ifs"
-+	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-+
-+	# Add the arguments to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-       esac
- 
--      case "$user_target" in
-+      case $user_target in
-       next)
- 	# The next one is the -o target name
- 	user_target=yes
-@@ -316,10 +401,10 @@
-       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
- 
-       # Double-quote args containing other shell metacharacters.
--      # Many Bourne shells cannot handle close brackets correctly in scan
--      # sets, so we specify it separately.
--      case "$lastarg" in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
-+      case $lastarg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	lastarg="\"$lastarg\""
- 	;;
-       esac
-@@ -332,7 +417,7 @@
-       fi
-     done
- 
--    case "$user_target" in
-+    case $user_target in
-     set)
-       ;;
-     no)
-@@ -348,7 +433,7 @@
-     # Recognize several different file suffixes.
-     # If the user specifies -o file.o, it is replaced with file.lo
-     xform='[cCFSfmso]'
--    case "$libobj" in
-+    case $libobj in
-     *.ada) xform=ada ;;
-     *.adb) xform=adb ;;
-     *.ads) xform=ads ;;
-@@ -363,7 +448,7 @@
- 
-     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
- 
--    case "$libobj" in
-+    case $libobj in
-     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-     *)
-       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-@@ -387,10 +472,21 @@
-     $run $rm $removelist
-     trap "$run $rm $removelist; exit 1" 1 2 15
- 
-+    # On Cygwin there's no "real" PIC flag so we must build both object types
-+    case $host_os in
-+    cygwin* | mingw* | pw32* | os2*)
-+      pic_mode=default
-+      ;;
-+    esac
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-+      # non-PIC code in shared libraries is not supported
-+      pic_mode=default
-+    fi
-+
-     # Calculate the filename of the output object if compiler does
-     # not support -o with -c
-     if test "$compiler_c_o" = no; then
--      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
-+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-       removelist="$removelist $output_obj $lockfile"
-       trap "$run $rm $removelist; exit 1" 1 2 15
-@@ -402,7 +498,7 @@
-     # Lock this critical section if it is needed
-     # We use this script file to make the link, it avoids creating a new file
-     if test "$need_locks" = yes; then
--      until ln "$0" "$lockfile" 2>/dev/null; do
-+      until $run ln "$0" "$lockfile" 2>/dev/null; do
- 	$show "Waiting for $lockfile to be removed"
- 	sleep 2
-       done
-@@ -434,8 +530,13 @@
-       # Without this assignment, base_compile gets emptied.
-       fbsd_hideous_sh_bug=$base_compile
- 
--      # All platforms use -DPIC, to notify preprocessed assembler code.
--      command="$base_compile $srcfile $pic_flag -DPIC"
-+      if test "$pic_mode" != no; then
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      else
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      fi
-       if test "$build_old_libs" = yes; then
- 	lo_libobj="$libobj"
- 	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-@@ -506,7 +607,8 @@
-       fi
- 
-       # If we have no pic_flag, then copy the object into place and finish.
--      if test -z "$pic_flag" && test "$build_old_libs" = yes; then
-+      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
-+	 test "$build_old_libs" = yes; then
- 	# Rename the .lo from within objdir to obj
- 	if test -f $obj; then
- 	  $show $rm $obj
-@@ -532,6 +634,10 @@
- 	# Now arrange that obj and lo_libobj become the same file
- 	$show "(cd $xdir && $LN_S $baseobj $libobj)"
- 	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
-+	  # Unlock the critical section if it was locked
-+	  if test "$need_locks" != no; then
-+	    $run $rm "$lockfile"
-+	  fi
- 	  exit 0
- 	else
- 	  error=$?
-@@ -546,7 +652,13 @@
- 
-     # Only build a position-dependent object if we build old libraries.
-     if test "$build_old_libs" = yes; then
--      command="$base_compile $srcfile"
-+      if test "$pic_mode" != yes; then
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      else
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
- 	output_obj="$obj"
-@@ -612,17 +724,17 @@
- 
-     # Unlock the critical section if it was locked
-     if test "$need_locks" != no; then
--      $rm "$lockfile"
-+      $run $rm "$lockfile"
-     fi
- 
-     exit 0
-     ;;
- 
-   # libtool link mode
--  link)
-+  link | relink)
-     modename="$modename: link"
--    case "$host" in
--    *-*-cygwin* | *-*-mingw* | *-*-os2*)
-+    case $host in
-+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-       # It is impossible to link a dll without this setting, and
-       # we shouldn't force the makefile maintainer to figure out
-       # which system we are compiling for in order to pass an extra
-@@ -635,179 +747,12 @@
-       # -no-undefined on the libtool link line when we can be certain
-       # that all symbols are satisfied, otherwise we get a static library.
-       allow_undefined=yes
--
--      # This is a source program that is used to create dlls on Windows
--      # Don't remove nor modify the starting and closing comments
--# /* ltdll.c starts here */
--# #define WIN32_LEAN_AND_MEAN
--# #include <windows.h>
--# #undef WIN32_LEAN_AND_MEAN
--# #include <stdio.h>
--#
--# #ifndef __CYGWIN__
--# #  ifdef __CYGWIN32__
--# #    define __CYGWIN__ __CYGWIN32__
--# #  endif
--# #endif
--#
--# #ifdef __cplusplus
--# extern "C" {
--# #endif
--# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
--# #ifdef __cplusplus
--# }
--# #endif
--#
--# #ifdef __CYGWIN__
--# #include <cygwin/cygwin_dll.h>
--# DECLARE_CYGWIN_DLL( DllMain );
--# #endif
--# HINSTANCE __hDllInstance_base;
--#
--# BOOL APIENTRY
--# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
--# {
--#   __hDllInstance_base = hInst;
--#   return TRUE;
--# }
--# /* ltdll.c ends here */
--      # This is a source program that is used to create import libraries
--      # on Windows for dlls which lack them. Don't remove nor modify the
--      # starting and closing comments
--# /* impgen.c starts here */
--# /*   Copyright (C) 1999 Free Software Foundation, Inc.
--# 
--#  This file is part of GNU libtool.
--# 
--#  This program is free software; you can redistribute it and/or modify
--#  it under the terms of the GNU General Public License as published by
--#  the Free Software Foundation; either version 2 of the License, or
--#  (at your option) any later version.
--# 
--#  This program is distributed in the hope that it will be useful,
--#  but WITHOUT ANY WARRANTY; without even the implied warranty of
--#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--#  GNU General Public License for more details.
--# 
--#  You should have received a copy of the GNU General Public License
--#  along with this program; if not, write to the Free Software
--#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#  */
--# 
--#  #include <stdio.h>		/* for printf() */
--#  #include <unistd.h>		/* for open(), lseek(), read() */
--#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
--#  #include <string.h>		/* for strdup() */
--# 
--#  static unsigned int
--#  pe_get16 (fd, offset)
--#       int fd;
--#       int offset;
--#  {
--#    unsigned char b[2];
--#    lseek (fd, offset, SEEK_SET);
--#    read (fd, b, 2);
--#    return b[0] + (b[1]<<8);
--#  }
--# 
--#  static unsigned int
--#  pe_get32 (fd, offset)
--#      int fd;
--#      int offset;
--#  {
--#    unsigned char b[4];
--#    lseek (fd, offset, SEEK_SET);
--#    read (fd, b, 4);
--#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
--#  }
--# 
--#  static unsigned int
--#  pe_as32 (ptr)
--#       void *ptr;
--#  {
--#    unsigned char *b = ptr;
--#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
--#  }
--# 
--#  int
--#  main (argc, argv)
--#      int argc;
--#      char *argv[];
--#  {
--#      int dll;
--#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
--#      unsigned long export_rva, export_size, nsections, secptr, expptr;
--#      unsigned long name_rvas, nexp;
--#      unsigned char *expdata, *erva;
--#      char *filename, *dll_name;
--# 
--#      filename = argv[1];
--# 
--#      dll = open(filename, O_RDONLY|O_BINARY);
--#      if (!dll)
--#  	return 1;
--# 
--#      dll_name = filename;
--#    
--#      for (i=0; filename[i]; i++)
--#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
--#  	    dll_name = filename + i +1;
--# 
--#      pe_header_offset = pe_get32 (dll, 0x3c);
--#      opthdr_ofs = pe_header_offset + 4 + 20;
--#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
--# 
--#      if (num_entries < 1) /* no exports */
--#  	return 1;
--# 
--#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
--#      export_size = pe_get32 (dll, opthdr_ofs + 100);
--#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
--#      secptr = (pe_header_offset + 4 + 20 +
--#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
--# 
--#      expptr = 0;
--#      for (i = 0; i < nsections; i++)
--#      {
--#  	char sname[8];
--#  	unsigned long secptr1 = secptr + 40 * i;
--#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
--#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
--#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
--#  	lseek(dll, secptr1, SEEK_SET);
--#  	read(dll, sname, 8);
--#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
--#  	{
--#  	    expptr = fptr + (export_rva - vaddr);
--#  	    if (export_rva + export_size > vaddr + vsize)
--#  		export_size = vsize - (export_rva - vaddr);
--#  	    break;
--#  	}
--#      }
--# 
--#      expdata = (unsigned char*)malloc(export_size);
--#      lseek (dll, expptr, SEEK_SET);
--#      read (dll, expdata, export_size);
--#      erva = expdata - export_rva;
--# 
--#      nexp = pe_as32 (expdata+24);
--#      name_rvas = pe_as32 (expdata+32);
--# 
--#      printf ("EXPORTS\n");
--#      for (i = 0; i<nexp; i++)
--#      {
--#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
--#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
--#      }
--# 
--#      return 0;
--#  }
--# /* impgen.c ends here */
-       ;;
-     *)
-       allow_undefined=yes
-       ;;
-     esac
-+    libtool_args="$nonopt"
-     compile_command="$nonopt"
-     finalize_command="$nonopt"
- 
-@@ -818,18 +763,13 @@
-     convenience=
-     old_convenience=
-     deplibs=
--    linkopts=
-+    old_deplibs=
-+    compiler_flags=
-+    linker_flags=
-+    dllsearchpath=
-+    lib_search_path=`pwd`
-+    inst_prefix_dir=
- 
--    if test -n "$shlibpath_var"; then
--      # get the directories listed in $shlibpath_var
--      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
--    else
--      lib_search_path=
--    fi
--    # now prepend the system-specific ones
--    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
--    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
--    
-     avoid_version=no
-     dlfiles=
-     dlprefiles=
-@@ -839,9 +779,9 @@
-     export_symbols_regex=
-     generated=
-     libobjs=
--    link_against_libtool_libs=
-     ltlibs=
-     module=no
-+    no_install=no
-     objs=
-     prefer_static_libs=no
-     preload=no
-@@ -858,7 +798,7 @@
-     # We need to know -static, to get the right output filenames.
-     for arg
-     do
--      case "$arg" in
-+      case $arg in
-       -all-static | -static)
- 	if test "X$arg" = "X-all-static"; then
- 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-@@ -887,17 +827,24 @@
-     while test $# -gt 0; do
-       arg="$1"
-       shift
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-+	;;
-+      *) qarg=$arg ;;
-+      esac
-+      libtool_args="$libtool_args $qarg"
- 
-       # If the previous option needs an argument, assign it.
-       if test -n "$prev"; then
--	case "$prev" in
-+	case $prev in
- 	output)
- 	  compile_command="$compile_command @OUTPUT@"
- 	  finalize_command="$finalize_command @OUTPUT@"
- 	  ;;
- 	esac
- 
--	case "$prev" in
-+	case $prev in
- 	dlfiles|dlprefiles)
- 	  if test "$preload" = no; then
- 	    # Add the symbol object into the linking commands.
-@@ -905,7 +852,7 @@
- 	    finalize_command="$finalize_command @SYMFILE@"
- 	    preload=yes
- 	  fi
--	  case "$arg" in
-+	  case $arg in
- 	  *.la | *.lo) ;;  # We handle these cases below.
- 	  force)
- 	    if test "$dlself" = no; then
-@@ -934,6 +881,7 @@
- 	      dlprefiles="$dlprefiles $arg"
- 	    fi
- 	    prev=
-+	    continue
- 	    ;;
- 	  esac
- 	  ;;
-@@ -951,6 +899,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+	inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	release)
- 	  release="-$arg"
- 	  prev=
-@@ -958,7 +911,7 @@
- 	  ;;
- 	rpath | xrpath)
- 	  # We need an absolute path.
--	  case "$arg" in
-+	  case $arg in
- 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
- 	  *)
- 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-@@ -979,17 +932,32 @@
- 	  prev=
- 	  continue
- 	  ;;
-+	xcompiler)
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  compile_command="$compile_command $qarg"
-+	  finalize_command="$finalize_command $qarg"
-+	  continue
-+	  ;;
-+	xlinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $wl$qarg"
-+	  prev=
-+	  compile_command="$compile_command $wl$qarg"
-+	  finalize_command="$finalize_command $wl$qarg"
-+	  continue
-+	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
- 	  prev=
- 	  continue
- 	  ;;
- 	esac
--      fi
-+      fi # test -n $prev
- 
-       prevarg="$arg"
- 
--      case "$arg" in
-+      case $arg in
-       -all-static)
- 	if test -n "$link_static_flag"; then
- 	  compile_command="$compile_command $link_static_flag"
-@@ -1026,7 +994,7 @@
- 
-       -export-symbols | -export-symbols-regex)
- 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
--	  $echo "$modename: not more than one -exported-symbols argument allowed"
-+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
- 	  exit 1
- 	fi
- 	if test "X$arg" = "X-export-symbols"; then
-@@ -1037,58 +1005,81 @@
- 	continue
- 	;;
- 
-+      -inst-prefix-dir)
-+       prev=inst_prefix
-+       continue
-+       ;;
-+
-+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+      # so, if we see these flags be careful not to treat them like -L
-+      -L[A-Z][A-Z]*:*)
-+	case $with_gcc/$host in
-+	no/*-*-irix* | no/*-*-nonstopux*)
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-       -L*)
- 	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
- 	# We need an absolute path.
--	case "$dir" in
-+	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  absdir=`cd "$dir" && pwd`
- 	  if test -z "$absdir"; then
--	    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
--	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
--	    absdir="$dir"
-+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-+	    exit 1
- 	  fi
- 	  dir="$absdir"
- 	  ;;
- 	esac
--	case " $deplibs " in
--	*" $arg "*) ;;
--	*) deplibs="$deplibs $arg";;
--	esac
--	case " $lib_search_path " in
--	*" $dir "*) ;;
--	*) lib_search_path="$lib_search_path $dir";;
-+	case "$deplibs " in
-+	*" -L$dir "*) ;;
-+	*)
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
-+	  ;;
- 	esac
--	case "$host" in
--	*-*-cygwin* | *-*-mingw* | *-*-os2*)
--	  dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
--	  case ":$dllsearchpath:" in
--	  ::) dllsearchpath="$dllsearchdir";;
--	  *":$dllsearchdir:"*) ;;
--	  *) dllsearchpath="$dllsearchpath:$dllsearchdir";;
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$dir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
- 	  esac
- 	  ;;
- 	esac
-+	continue
- 	;;
- 
-       -l*)
--	if test "$arg" = "-lc"; then
--	  case "$host" in
--	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
--	    # These systems don't actually have c library (as such)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-+	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-+	  *-*-mingw* | *-*-os2*)
-+	    # These systems don't actually have a C library (as such)
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
- 	  esac
--	elif test "$arg" = "-lm"; then
--	  case "$host" in
--	  *-*-cygwin* | *-*-beos*)
--	    # These systems don't actually have math library (as such)
-+	 elif test "X$arg" = "X-lc_r"; then
-+	  case $host in
-+	 *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
- 	  esac
- 	fi
- 	deplibs="$deplibs $arg"
-+	continue
- 	;;
- 
-       -module)
-@@ -1096,6 +1087,25 @@
- 	continue
- 	;;
- 
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
-+
-+      -no-install)
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  # The PATH hackery in wrapper scripts is required on Windows
-+	  # in order for the loader to find any dlls it needs.
-+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-+	  fast_install=no
-+	  ;;
-+	*) no_install=yes ;;
-+	esac
-+	continue
-+	;;
-+
-       -no-undefined)
- 	allow_undefined=no
- 	continue
-@@ -1121,7 +1131,7 @@
-       -R*)
- 	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
- 	# We need an absolute path.
--	case "$dir" in
-+	case $dir in
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-@@ -1136,11 +1146,11 @@
- 	;;
- 
-       -static)
--	# If we have no pic_flag, then this is the same as -all-static.
--	if test -z "$pic_flag" && test -n "$link_static_flag"; then
--	  compile_command="$compile_command $link_static_flag"
--	  finalize_command="$finalize_command $link_static_flag"
--	fi
-+	# The effects of -static are defined in a previous loop.
-+	# We used to do the same as -all-static on platforms that
-+	# didn't have a PIC flag, but the assumption that the effects
-+	# would be equivalent was wrong.  It would break on at least
-+	# Digital Unix and AIX.
- 	continue
- 	;;
- 
-@@ -1154,28 +1164,71 @@
- 	continue
- 	;;
- 
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Wl,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-+	arg=
-+	save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $wl$flag"
-+	  linker_flags="$linker_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
-+
-       # Some other compiler flag.
-       -* | +*)
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
- 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--	case "$arg" in
--	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	  arg="\"$arg\""
- 	  ;;
- 	esac
- 	;;
- 
--      *.o | *.obj | *.a | *.lib)
--	# A standard object.
--	objs="$objs $arg"
--	;;
--
--      *.lo)
--	# A library object.
-+      *.lo | *.$objext)
-+	# A library or standard object.
- 	if test "$prev" = dlfiles; then
--	  dlfiles="$dlfiles $arg"
--	  if test "$build_libtool_libs" = yes && test "$dlopen" = yes; then
-+	  # This file was specified with -dlopen.
-+	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+	    dlfiles="$dlfiles $arg"
- 	    prev=
- 	    continue
- 	  else
-@@ -1188,357 +1241,917 @@
- 	  # Preload the old-style object.
- 	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
- 	  prev=
-+	else
-+	  case $arg in
-+	  *.lo) libobjs="$libobjs $arg" ;;
-+	  *) objs="$objs $arg" ;;
-+	  esac
- 	fi
--	libobjs="$libobjs $arg"
-+	;;
-+
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
-+	continue
- 	;;
- 
-       *.la)
- 	# A libtool-controlled library.
- 
--	dlname=
--	libdir=
--	library_names=
--	old_library=
--
--	# Check to see that this really is a libtool archive.
--	if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	if test "$prev" = dlfiles; then
-+	  # This library was specified with -dlopen.
-+	  dlfiles="$dlfiles $arg"
-+	  prev=
-+	elif test "$prev" = dlprefiles; then
-+	  # The library was specified with -dlpreopen.
-+	  dlprefiles="$dlprefiles $arg"
-+	  prev=
- 	else
--	  $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
--	  exit 1
-+	  deplibs="$deplibs $arg"
- 	fi
-+	continue
-+	;;
- 
--	# If the library was installed with an old release of libtool,
--	# it will not redefine variable installed.
--	installed=yes
--
--	# Read the .la file
--	# If there is no directory component, then add one.
--	case "$arg" in
--	*/* | *\\*) . $arg ;;
--	*) . ./$arg ;;
-+      # Some other compiler argument.
-+      *)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
- 	esac
-+	;;
-+      esac # arg
- 
--	# Get the name of the library we link against.
--	linklib=
--	for l in $old_library $library_names; do
--	  linklib="$l"
--	done
--
--	if test -z "$linklib"; then
--	  $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
--	  exit 1
--	fi
--
--	# Find the relevant object directory and library name.
--	name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
--
--	if test "X$installed" = Xyes; then
--	  dir="$libdir"
--	else
--	  dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
--	  if test "X$dir" = "X$arg"; then
--	    dir="$objdir"
--	  else
--	    dir="$dir/$objdir"
--	  fi
--	fi
-+      # Now actually substitute the argument into the commands.
-+      if test -n "$arg"; then
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+      fi
-+    done # argument parsing loop
- 
--	if test -n "$dependency_libs"; then
--	  # Extract -R and -L from dependency_libs
--	  temp_deplibs=
--	  for deplib in $dependency_libs; do
--	    case "$deplib" in
--	    -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
--		 case " $rpath $xrpath " in
--		 *" $temp_xrpath "*) ;;
--		 *) xrpath="$xrpath $temp_xrpath";;
--		 esac;;
--	    -L*) case "$compile_command $temp_deplibs " in
--		 *" $deplib "*) ;;
--		 *) temp_deplibs="$temp_deplibs $deplib";;
--		 esac
--		 temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
--		 case " $lib_search_path " in
--		 *" $temp_dir "*) ;;
--		 *) lib_search_path="$lib_search_path $temp_dir";;
--		 esac
--		 ;;
--	    *) temp_deplibs="$temp_deplibs $deplib";;
--	    esac
--	  done
--	  dependency_libs="$temp_deplibs"
--	fi
-+    if test -n "$prev"; then
-+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
- 
--	if test -z "$libdir"; then
--	  # It is a libtool convenience library, so add in its objects.
--	  convenience="$convenience $dir/$old_library"
--	  old_convenience="$old_convenience $dir/$old_library"
--	  deplibs="$deplibs$dependency_libs"
--	  compile_command="$compile_command $dir/$old_library$dependency_libs"
--	  finalize_command="$finalize_command $dir/$old_library$dependency_libs"
--	  continue
--	fi
-+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+      eval arg=\"$export_dynamic_flag_spec\"
-+      compile_command="$compile_command $arg"
-+      finalize_command="$finalize_command $arg"
-+    fi
- 
--	# This library was specified with -dlopen.
--	if test "$prev" = dlfiles; then
--	  dlfiles="$dlfiles $arg"
--	  if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then
--	    # If there is no dlname, no dlopen support or we're linking statically,
--	    # we need to preload.
--	    prev=dlprefiles
--	  else
--	    # We should not create a dependency on this library, but we
--	    # may need any libraries it requires.
--	    compile_command="$compile_command$dependency_libs"
--	    finalize_command="$finalize_command$dependency_libs"
--	    prev=
--	    continue
--	  fi
--	fi
-+    # calculate the name of the file, without its directory
-+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-+    libobjs_save="$libobjs"
- 
--	# The library was specified with -dlpreopen.
--	if test "$prev" = dlprefiles; then
--	  # Prefer using a static library (so that no silly _DYNAMIC symbols
--	  # are required to link).
--	  if test -n "$old_library"; then
--	    dlprefiles="$dlprefiles $dir/$old_library"
--	  else
--	    dlprefiles="$dlprefiles $dir/$linklib"
--	  fi
--	  prev=
--	fi
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      shlib_search_path=
-+    fi
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
- 
--	if test -n "$library_names" &&
--	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
--	  link_against_libtool_libs="$link_against_libtool_libs $arg"
--	  if test -n "$shlibpath_var"; then
--	    # Make sure the rpath contains only unique directories.
--	    case "$temp_rpath " in
--	    *" $dir "*) ;;
--	    *) temp_rpath="$temp_rpath $dir" ;;
--	    esac
--	  fi
-+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-+    if test "X$output_objdir" = "X$output"; then
-+      output_objdir="$objdir"
-+    else
-+      output_objdir="$output_objdir/$objdir"
-+    fi
-+    # Create the object directory.
-+    if test ! -d $output_objdir; then
-+      $show "$mkdir $output_objdir"
-+      $run $mkdir $output_objdir
-+      status=$?
-+      if test $status -ne 0 && test ! -d $output_objdir; then
-+	exit $status
-+      fi
-+    fi
- 
--	  # We need an absolute path.
--	  case "$dir" in
--	  [\\/] | [A-Za-z]:[\\/]*) absdir="$dir" ;;
--	  *)
--	    absdir=`cd "$dir" && pwd`
--	    if test -z "$absdir"; then
--	      $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
--	      $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
--	      absdir="$dir"
--	    fi
--	    ;;
--	  esac
--	  
--	  # This is the magic to use -rpath.
--	  # Skip directories that are in the system default run-time
--	  # search path, unless they have been requested with -R.
--	  case " $sys_lib_dlsearch_path " in
--	  *" $absdir "*) ;;
--	  *)
--	    case "$compile_rpath " in
--	    *" $absdir "*) ;;
--	    *) compile_rpath="$compile_rpath $absdir" 
--	    esac
--	    ;;
--	  esac
-+    # Determine the type of output
-+    case $output in
-+    "")
-+      $echo "$modename: you must specify an output file" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+      ;;
-+    *.$libext) linkmode=oldlib ;;
-+    *.lo | *.$objext) linkmode=obj ;;
-+    *.la) linkmode=lib ;;
-+    *) linkmode=prog ;; # Anything else should be a program.
-+    esac
- 
--	  case " $sys_lib_dlsearch_path " in
--	  *" $libdir "*) ;;
-+    specialdeplibs=
-+    libs=
-+    # Find all interdependent deplibs by searching for libraries
-+    # that are linked more than once (e.g. -la -lb -la)
-+    for deplib in $deplibs; do
-+      if test "X$duplicate_deps" = "Xyes" ; then
-+	case "$libs " in
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	esac
-+      fi
-+      libs="$libs $deplib"
-+    done
-+    deplibs=
-+    newdependency_libs=
-+    newlib_search_path=
-+    need_relink=no # whether we're linking any uninstalled libtool libraries
-+    notinst_deplibs= # not-installed libtool libraries
-+    notinst_path= # paths that contain not-installed libtool libraries
-+    case $linkmode in
-+    lib)
-+	passes="conv link"
-+	for file in $dlfiles $dlprefiles; do
-+	  case $file in
-+	  *.la) ;;
- 	  *)
--	    case "$finalize_rpath " in
--	    *" $libdir "*) ;;
--	    *) finalize_rpath="$finalize_rpath $libdir"
--	    esac
-+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-+	    exit 1
- 	    ;;
- 	  esac
--
--	  lib_linked=yes
--	  case "$hardcode_action" in
--	  immediate | unsupported)
--	    if test "$hardcode_direct" = no; then
--	      compile_command="$compile_command $dir/$linklib"
--	      deplibs="$deplibs $dir/$linklib"
--	      case "$host" in
--	      *-*-cygwin* | *-*-mingw* | *-*-os2*)
--		dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
--		if test -n "$dllsearchpath"; then
--		  dllsearchpath="$dllsearchpath:$dllsearchdir"
--		else
--		  dllsearchpath="$dllsearchdir"
--		fi
--		;;
--	      esac
--	    elif test "$hardcode_minus_L" = no; then
--	      case "$host" in
--	      *-*-sunos*)
--		compile_shlibpath="$compile_shlibpath$dir:"
--		;;
--	      esac
--	      case "$compile_command " in
--	      *" -L$dir "*) ;;
--	      *) compile_command="$compile_command -L$dir";;
--	      esac
--	      compile_command="$compile_command -l$name"
--	      deplibs="$deplibs -L$dir -l$name"
--	    elif test "$hardcode_shlibpath_var" = no; then
--	      case ":$compile_shlibpath:" in
--	      *":$dir:"*) ;;
--	      *) compile_shlibpath="$compile_shlibpath$dir:";;
--	      esac
--	      compile_command="$compile_command -l$name"
--	      deplibs="$deplibs -l$name"
-+	done
-+	;;
-+    prog)
-+	compile_deplibs=
-+	finalize_deplibs=
-+	alldeplibs=no
-+	newdlfiles=
-+	newdlprefiles=
-+	passes="conv scan dlopen dlpreopen link"
-+	;;
-+    *)  passes="conv"
-+	;;
-+    esac
-+    for pass in $passes; do
-+      if test $linkmode = prog; then
-+	# Determine which files to process
-+	case $pass in
-+	dlopen)
-+	  libs="$dlfiles"
-+	  save_deplibs="$deplibs" # Collect dlpreopened libraries
-+	  deplibs=
-+	  ;;
-+	dlpreopen) libs="$dlprefiles" ;;
-+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	esac
-+      fi
-+      for deplib in $libs; do
-+	lib=
-+	found=no
-+	case $deplib in
-+	-l*)
-+	  if test $linkmode = oldlib && test $linkmode = obj; then
-+	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
-+	    continue
-+	  fi
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+	    # Search the libtool library
-+	    lib="$searchdir/lib${name}.la"
-+	    if test -f "$lib"; then
-+	      found=yes
-+	      break
-+	    fi
-+	  done
-+	  if test "$found" != yes; then
-+	    # deplib doesn't seem to be a libtool library
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
--	      lib_linked=no
-+	      deplibs="$deplib $deplibs"
-+	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
- 	    fi
-+	    continue
-+	  fi
-+	  ;; # -l
-+	-L*)
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test $pass = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    ;;
--
--	  relink)
--	    if test "$hardcode_direct" = yes; then
--	      compile_command="$compile_command $absdir/$linklib"
--	      deplibs="$deplibs $absdir/$linklib"
--	    elif test "$hardcode_minus_L" = yes; then
--	      case "$compile_command " in
--	      *" -L$absdir "*) ;;
--	      *) compile_command="$compile_command -L$absdir";;
--	      esac
--	      compile_command="$compile_command -l$name"
--	      deplibs="$deplibs -L$absdir -l$name"
--	    elif test "$hardcode_shlibpath_var" = yes; then
--	      case ":$compile_shlibpath:" in
--	      *":$absdir:"*) ;;
--	      *) compile_shlibpath="$compile_shlibpath$absdir:";;
--	      esac
--	      compile_command="$compile_command -l$name"
--	      deplibs="$deplibs -l$name"
-+	  prog)
-+	    if test $pass = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test $pass = scan; then
-+	      deplibs="$deplib $deplibs"
-+	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    else
--	      lib_linked=no
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
- 	    ;;
--
- 	  *)
--	    lib_linked=no
-+	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
- 	    ;;
--	  esac
-+	  esac # linkmode
-+	  continue
-+	  ;; # -L
-+	-R*)
-+	  if test $pass = link; then
-+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-+	    # Make sure the xrpath contains only unique directories.
-+	    case "$xrpath " in
-+	    *" $dir "*) ;;
-+	    *) xrpath="$xrpath $dir" ;;
-+	    esac
-+	  fi
-+	  deplibs="$deplib $deplibs"
-+	  continue
-+	  ;;
-+	*.la) lib="$deplib" ;;
-+	*.$libext)
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  case $linkmode in
-+	  lib)
-+	    if test "$deplibs_check_method" != pass_all; then
-+	      echo
-+	      echo "*** Warning: Trying to link with static lib archive $deplib."
-+	      echo "*** I have the capability to make that library automatically link in when"
-+	      echo "*** you link to this library.  But I can only do this if you have a"
-+	      echo "*** shared version of the library, which you do not appear to have"
-+	      echo "*** because the file extensions .$libext of this argument makes me believe"
-+	      echo "*** that it is just a static archive that I should not used here."
-+	    else
-+	      echo
-+	      echo "*** Warning: Linking the shared library $output against the"
-+	      echo "*** static library $deplib is not portable!"
-+	      deplibs="$deplib $deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  prog)
-+	    if test $pass != link; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  esac # linkmode
-+	  ;; # *.$libext
-+	*.lo | *.$objext)
-+	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlopen support or we're linking statically,
-+	    # we need to preload.
-+	    newdlprefiles="$newdlprefiles $deplib"
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    newdlfiles="$newdlfiles $deplib"
-+	  fi
-+	  continue
-+	  ;;
-+	%DEPLIBS%)
-+	  alldeplibs=yes
-+	  continue
-+	  ;;
-+	esac # case $deplib
-+	if test $found = yes || test -f "$lib"; then :
-+	else
-+	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Check to see that this really is a libtool archive.
-+	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+	  exit 1
-+	fi
-+
-+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$ladir" = "X$lib" && ladir="."
-+
-+	dlname=
-+	dlopen=
-+	dlpreopen=
-+	libdir=
-+	library_names=
-+	old_library=
-+	# If the library was installed with an old release of libtool,
-+	# it will not redefine variable installed.
-+	installed=yes
-+
-+	# Read the .la file
-+	case $lib in
-+	*/* | *\\*) . $lib ;;
-+	*) . ./$lib ;;
-+	esac
-+
-+	if test "$linkmode,$pass" = "lib,link" ||
-+	   test "$linkmode,$pass" = "prog,scan" ||
-+	   { test $linkmode = oldlib && test $linkmode = obj; }; then
-+	   # Add dl[pre]opened files of deplib
-+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+	fi
- 
--	  if test "$lib_linked" != yes; then
--	    $echo "$modename: configuration error: unsupported hardcode properties"
-+	if test $pass = conv; then
-+	  # Only check for convenience libraries
-+	  deplibs="$lib $deplibs"
-+	  if test -z "$libdir"; then
-+	    if test -z "$old_library"; then
-+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	      exit 1
-+	    fi
-+	    # It is a libtool convenience library, so add in its objects.
-+	    convenience="$convenience $ladir/$objdir/$old_library"
-+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+              if test "X$duplicate_deps" = "Xyes" ; then
-+	        case "$tmp_libs " in
-+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	        esac
-+              fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
-+	  elif test $linkmode != prog && test $linkmode != lib; then
-+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
- 	    exit 1
- 	  fi
-+	  continue
-+	fi # $pass = conv
- 
--	  # Finalize command for both is simple: just hardcode it.
--	  if test "$hardcode_direct" = yes; then
--	    finalize_command="$finalize_command $libdir/$linklib"
--	  elif test "$hardcode_minus_L" = yes; then
--	    case "$finalize_command " in
--	    *" -L$libdir "*) ;;
--	    *) finalize_command="$finalize_command -L$libdir";;
--	    esac
--	    finalize_command="$finalize_command -l$name"
--	  elif test "$hardcode_shlibpath_var" = yes; then
--	    case ":$finalize_shlibpath:" in
--	    *":$libdir:"*) ;;
--	    *) finalize_shlibpath="$finalize_shlibpath$libdir:";;
--	    esac
--	    finalize_command="$finalize_command -l$name"
-+	# Get the name of the library we link against.
-+	linklib=
-+	for l in $old_library $library_names; do
-+	  linklib="$l"
-+	done
-+	if test -z "$linklib"; then
-+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# This library was specified with -dlopen.
-+	if test $pass = dlopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-+	    exit 1
-+	  fi
-+	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlname, no dlopen support or we're linking
-+	    # statically, we need to preload.
-+	    dlprefiles="$dlprefiles $lib"
- 	  else
--	    # We cannot seem to hardcode it, guess we'll fake it.
--	    case "$finalize_command " in
--	    *" -L$dir "*) ;;
--	    *) finalize_command="$finalize_command -L$libdir";;
--	    esac
--	    finalize_command="$finalize_command -l$name"
-+	    newdlfiles="$newdlfiles $lib"
-+	  fi
-+	  continue
-+	fi # $pass = dlopen
-+
-+	# We need an absolute path.
-+	case $ladir in
-+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-+	*)
-+	  abs_ladir=`cd "$ladir" && pwd`
-+	  if test -z "$abs_ladir"; then
-+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-+	    abs_ladir="$ladir"
-+	  fi
-+	  ;;
-+	esac
-+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+
-+	# Find the relevant object directory and library name.
-+	if test "X$installed" = Xyes; then
-+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	  else
-+	    dir="$libdir"
-+	    absdir="$libdir"
- 	  fi
- 	else
--	  # Transform directly to old archives if we don't build new libraries.
--	  if test -n "$pic_flag" && test -z "$old_library"; then
--	    $echo "$modename: cannot find static library for \`$arg'" 1>&2
-+	  dir="$ladir/$objdir"
-+	  absdir="$abs_ladir/$objdir"
-+	  # Remove this search path later
-+	  notinst_path="$notinst_path $abs_ladir"
-+	fi # $installed = yes
-+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+
-+	# This library was specified with -dlpreopen.
-+	if test $pass = dlpreopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
- 	    exit 1
- 	  fi
-+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	  # are required to link).
-+	  if test -n "$old_library"; then
-+	    newdlprefiles="$newdlprefiles $dir/$old_library"
-+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	  elif test -n "$dlname"; then
-+	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+	  else
-+	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	  fi
-+	fi # $pass = dlpreopen
- 
--	  # Here we assume that one of hardcode_direct or hardcode_minus_L
--	  # is not unsupported.  This is valid on all known static and
--	  # shared platforms.
--	  if test "$hardcode_direct" != unsupported; then
--	    test -n "$old_library" && linklib="$old_library"
--	    compile_command="$compile_command $dir/$linklib"
--	    finalize_command="$finalize_command $dir/$linklib"
-+	if test -z "$libdir"; then
-+	  # Link the convenience library
-+	  if test $linkmode = lib; then
-+	    deplibs="$dir/$old_library $deplibs"
-+	  elif test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$dir/$old_library $compile_deplibs"
-+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
- 	  else
--	    case "$compile_command " in
--	    *" -L$dir "*) ;;
--	    *) compile_command="$compile_command -L$dir";;
-+	    deplibs="$lib $deplibs"
-+	  fi
-+	  continue
-+	fi
-+
-+	if test $linkmode = prog && test $pass != link; then
-+	  newlib_search_path="$newlib_search_path $ladir"
-+	  deplibs="$lib $deplibs"
-+
-+	  linkalldeplibs=no
-+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+	     test "$build_libtool_libs" = no; then
-+	    linkalldeplibs=yes
-+	  fi
-+
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    case $deplib in
-+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
- 	    esac
--	    compile_command="$compile_command -l$name"
--	    case "$finalize_command " in
--	    *" -L$dir "*) ;;
--	    *) finalize_command="$finalize_command -L$dir";;
-+	    # Need to link against all dependency_libs?
-+	    if test $linkalldeplibs = yes; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      # Need to hardcode shared library paths
-+	      # or/and link against static libraries
-+	      newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done # for deplib
-+	  continue
-+	fi # $linkmode = prog...
-+
-+	link_static=no # Whether the deplib will be linked statically
-+	if test -n "$library_names" &&
-+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+	  # Link against this shared library
-+
-+	  if test "$linkmode,$pass" = "prog,link" ||
-+	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
- 	    esac
--	    finalize_command="$finalize_command -l$name"
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    if test $linkmode = prog; then
-+	      # We need to hardcode the library path
-+	      if test -n "$shlibpath_var"; then
-+		# Make sure the rpath contains only unique directories.
-+		case "$temp_rpath " in
-+		*" $dir "*) ;;
-+		*" $absdir "*) ;;
-+		*) temp_rpath="$temp_rpath $dir" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi # $linkmode,$pass = prog,link...
-+
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
- 	  fi
--	fi
- 
--	# Add in any libraries that this one depends upon.
--	compile_command="$compile_command$dependency_libs"
--	finalize_command="$finalize_command$dependency_libs"
--	continue
--	;;
-+	  if test "$installed" = no; then
-+	    notinst_deplibs="$notinst_deplibs $lib"
-+	    need_relink=yes
-+	  fi
-+
-+	  if test -n "$old_archive_from_expsyms_cmds"; then
-+	    # figure out the soname
-+	    set dummy $library_names
-+	    realname="$2"
-+	    shift; shift
-+	    libname=`eval \\$echo \"$libname_spec\"`
-+	    # use dlname if we got it. it's perfectly good, no?
-+	    if test -n "$dlname"; then
-+	      soname="$dlname"
-+	    elif test -n "$soname_spec"; then
-+	      # bleh windows
-+	      case $host in
-+	      *cygwin*)
-+		major=`expr $current - $age`
-+		versuffix="-$major"
-+		;;
-+	      esac
-+	      eval soname=\"$soname_spec\"
-+	    else
-+	      soname="$realname"
-+	    fi
- 
--      # Some other compiler argument.
--      *)
--	# Unknown arguments in both finalize_command and compile_command need
--	# to be aesthetically quoted because they are evaled later.
--	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--	case "$arg" in
--	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
--	  arg="\"$arg\""
--	  ;;
--	esac
--	;;
--      esac
-+	    # Make a new name for the extract_expsyms_cmds to use
-+	    soroot="$soname"
-+	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
-+	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
- 
--      # Now actually substitute the argument into the commands.
--      if test -n "$arg"; then
--	compile_command="$compile_command $arg"
--	finalize_command="$finalize_command $arg"
--      fi
--    done
-+	    # If the library has no export list, then create one now
-+	    if test -f "$output_objdir/$soname-def"; then :
-+	    else
-+	      $show "extracting exported symbol list from \`$soname'"
-+	      save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$extract_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
- 
--    if test -n "$prev"; then
--      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
--      $echo "$help" 1>&2
--      exit 1
--    fi
-+	    # Create $newlib
-+	    if test -f "$output_objdir/$newlib"; then :; else
-+	      $show "generating import library for \`$soname'"
-+	      save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+	    # make sure the library variables are pointing to the new library
-+	    dir=$output_objdir
-+	    linklib=$newlib
-+	  fi # test -n $old_archive_from_expsyms_cmds
-+
-+	  if test $linkmode = prog || test "$mode" != relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    lib_linked=yes
-+	    case $hardcode_action in
-+	    immediate | unsupported)
-+	      if test "$hardcode_direct" = no; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = no; then
-+		case $host in
-+		*-*-sunos*) add_shlibpath="$dir" ;;
-+		esac
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = no; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    relink)
-+	      if test "$hardcode_direct" = yes; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = yes; then
-+		add_dir="-L$dir"
-+		# Try looking first in the location we're being installed to.
-+		if test -n "$inst_prefix_dir"; then
-+		  case "$libdir" in
-+		  [\/]*)
-+		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		    ;;
-+		  esac
-+		fi
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = yes; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    *) lib_linked=no ;;
-+	    esac
- 
--    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
--      eval arg=\"$export_dynamic_flag_spec\"
--      compile_command="$compile_command $arg"
--      finalize_command="$finalize_command $arg"
--    fi
-+	    if test "$lib_linked" != yes; then
-+	      $echo "$modename: configuration error: unsupported hardcode properties"
-+	      exit 1
-+	    fi
- 
--    oldlibs=
--    # calculate the name of the file, without its directory
--    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
--    libobjs_save="$libobjs"
-+	    if test -n "$add_shlibpath"; then
-+	      case :$compile_shlibpath: in
-+	      *":$add_shlibpath:"*) ;;
-+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      esac
-+	    fi
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	      if test "$hardcode_direct" != yes && \
-+		 test "$hardcode_minus_L" != yes && \
-+		 test "$hardcode_shlibpath_var" = yes; then
-+		case :$finalize_shlibpath: in
-+		*":$libdir:"*) ;;
-+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi
- 
--    case "$output" in
--    "")
--      $echo "$modename: you must specify an output file" 1>&2
--      $echo "$help" 1>&2
--      exit 1
--      ;;
-+	  if test $linkmode = prog || test "$mode" = relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    # Finalize command for both is simple: just hardcode it.
-+	    if test "$hardcode_direct" = yes; then
-+	      add="$libdir/$linklib"
-+	    elif test "$hardcode_minus_L" = yes; then
-+	      add_dir="-L$libdir"
-+	      add="-l$name"
-+	    elif test "$hardcode_shlibpath_var" = yes; then
-+	      case :$finalize_shlibpath: in
-+	      *":$libdir:"*) ;;
-+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      esac
-+	      add="-l$name"
-+	    else
-+	      # We cannot seem to hardcode it, guess we'll fake it.
-+	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		[\/]*)
-+		  add_dir="-L$inst_prefix_dir$libdir $add_dir"
-+		  ;;
-+		esac
-+	      fi
-+	      add="-l$name"
-+	    fi
- 
--    *.a | *.lib)
--      if test -n "$link_against_libtool_libs"; then
--	$echo "$modename: error: cannot link libtool libraries into archives" 1>&2
--	exit 1
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	    fi
-+	  fi
-+	elif test $linkmode = prog; then
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+
-+	  # Try to link the static library
-+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-+	  # is not unsupported.  This is valid on all known static and
-+	  # shared platforms.
-+	  if test "$hardcode_direct" != unsupported; then
-+	    test -n "$old_library" && linklib="$old_library"
-+	    compile_deplibs="$dir/$linklib $compile_deplibs"
-+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+	  else
-+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+	  fi
-+	elif test "$build_libtool_libs" = yes; then
-+	  # Not a shared library
-+	  if test "$deplibs_check_method" != pass_all; then
-+	    # We're trying link a shared library against a static one
-+	    # but the system doesn't support it.
-+
-+	    # Just print a warning and add the library to dependency_libs so
-+	    # that the program can be linked against the static library.
-+	    echo
-+	    echo "*** Warning: This system can not link to static lib archive $lib."
-+	    echo "*** I have the capability to make that library automatically link in when"
-+	    echo "*** you link to this library.  But I can only do this if you have a"
-+	    echo "*** shared version of the library, which you do not appear to have."
-+	    if test "$module" = yes; then
-+	      echo "*** But as you try to build a module library, libtool will still create "
-+	      echo "*** a static module, that should work as long as the dlopening application"
-+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+	      if test -z "$global_symbol_pipe"; then
-+		echo
-+		echo "*** However, this would only work if libtool was able to extract symbol"
-+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		echo "*** not find such a program.  So, this module is probably useless."
-+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      fi
-+	      if test "$build_old_libs" = no; then
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  else
-+	    convenience="$convenience $dir/$old_library"
-+	    old_convenience="$old_convenience $dir/$old_library"
-+	    deplibs="$dir/$old_library $deplibs"
-+	    link_static=yes
-+	  fi
-+	fi # link shared/static library?
-+
-+	if test $linkmode = lib; then
-+	  if test -n "$dependency_libs" &&
-+	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-+	       test $link_static = yes; }; then
-+	    # Extract -R from dependency_libs
-+	    temp_deplibs=
-+	    for libdir in $dependency_libs; do
-+	      case $libdir in
-+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-+		   case " $xrpath " in
-+		   *" $temp_xrpath "*) ;;
-+		   *) xrpath="$xrpath $temp_xrpath";;
-+		   esac;;
-+	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      esac
-+	    done
-+	    dependency_libs="$temp_deplibs"
-+	  fi
-+
-+	  newlib_search_path="$newlib_search_path $absdir"
-+	  # Link against this library
-+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+	  # ... and its dependency_libs
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done
-+
-+	  if test $link_all_deplibs != no; then
-+	    # Add the search paths of all dependency libraries
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      -L*) path="$deplib" ;;
-+	      *.la)
-+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-+		test "X$dir" = "X$deplib" && dir="."
-+		# We need an absolute path.
-+		case $dir in
-+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+		*)
-+		  absdir=`cd "$dir" && pwd`
-+		  if test -z "$absdir"; then
-+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-+		    absdir="$dir"
-+		  fi
-+		  ;;
-+		esac
-+		if grep "^installed=no" $deplib > /dev/null; then
-+		  path="-L$absdir/$objdir"
-+		else
-+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		  if test -z "$libdir"; then
-+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		    exit 1
-+		  fi
-+		  if test "$absdir" != "$libdir"; then
-+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+		  fi
-+		  path="-L$absdir"
-+		fi
-+		;;
-+	      *) continue ;;
-+	      esac
-+	      case " $deplibs " in
-+	      *" $path "*) ;;
-+	      *) deplibs="$deplibs $path" ;;
-+	      esac
-+	    done
-+	  fi # link_all_deplibs != no
-+	fi # linkmode = lib
-+      done # for deplib in $libs
-+      if test $pass = dlpreopen; then
-+	# Link the dlpreopened libraries before other libraries
-+	for deplib in $save_deplibs; do
-+	  deplibs="$deplib $deplibs"
-+	done
-       fi
-+      if test $pass != dlopen; then
-+	test $pass != scan && dependency_libs="$newdependency_libs"
-+	if test $pass != conv; then
-+	  # Make sure lib_search_path contains only unique directories.
-+	  lib_search_path=
-+	  for dir in $newlib_search_path; do
-+	    case "$lib_search_path " in
-+	    *" $dir "*) ;;
-+	    *) lib_search_path="$lib_search_path $dir" ;;
-+	    esac
-+	  done
-+	  newlib_search_path=
-+	fi
- 
--      if test -n "$deplibs"; then
--	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-+	if test "$linkmode,$pass" != "prog,link"; then
-+	  vars="deplibs"
-+	else
-+	  vars="compile_deplibs finalize_deplibs"
-+	fi
-+	for var in $vars dependency_libs; do
-+	  # Add libraries to $var in reverse order
-+	  eval tmp_libs=\"\$$var\"
-+	  new_libs=
-+	  for deplib in $tmp_libs; do
-+	    case $deplib in
-+	    -L*) new_libs="$deplib $new_libs" ;;
-+	    *)
-+	      case " $specialdeplibs " in
-+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+	      *)
-+		case " $new_libs " in
-+		*" $deplib "*) ;;
-+		*) new_libs="$deplib $new_libs" ;;
-+		esac
-+		;;
-+	      esac
-+	      ;;
-+	    esac
-+	  done
-+	  tmp_libs=
-+	  for deplib in $new_libs; do
-+	    case $deplib in
-+	    -L*)
-+	      case " $tmp_libs " in
-+	      *" $deplib "*) ;;
-+	      *) tmp_libs="$tmp_libs $deplib" ;;
-+	      esac
-+	      ;;
-+	    *) tmp_libs="$tmp_libs $deplib" ;;
-+	    esac
-+	  done
-+	  eval $var=\"$tmp_libs\"
-+	done # for var
-       fi
-+      if test "$pass" = "conv" &&
-+       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
-+	libs="$deplibs" # reset libs
-+	deplibs=
-+      fi
-+    done # for pass
-+    if test $linkmode = prog; then
-+      dlfiles="$newdlfiles"
-+      dlprefiles="$newdlprefiles"
-+    fi
- 
-+    case $linkmode in
-+    oldlib)
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-       fi
-@@ -1566,11 +2179,12 @@
-       # Now set the variables for building old libraries.
-       build_libtool_libs=no
-       oldlibs="$output"
-+      objs="$objs$old_deplibs"
-       ;;
- 
--    *.la)
-+    lib)
-       # Make sure we only generate libraries of the form `libNAME.la'.
--      case "$outputname" in
-+      case $outputname in
-       lib*)
- 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 	eval libname=\"$libname_spec\"
-@@ -1591,26 +2205,20 @@
- 	;;
-       esac
- 
--      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
--      if test "X$output_objdir" = "X$output"; then
--	output_objdir="$objdir"
--      else
--	output_objdir="$output_objdir/$objdir"
--      fi
--
-       if test -n "$objs"; then
--	$echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
--	exit 1
--      fi
--
--      # How the heck are we supposed to write a wrapper for a shared library?
--      if test -n "$link_against_libtool_libs"; then
--	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
--	 exit 1
-+	if test "$deplibs_check_method" != pass_all; then
-+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-+	  exit 1
-+	else
-+	  echo
-+	  echo "*** Warning: Linking the shared library $output against the non-libtool"
-+	  echo "*** objects $objs is not portable!"
-+	  libobjs="$libobjs $objs"
-+	fi
-       fi
- 
--      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
--	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
-+      if test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-       fi
- 
-       set dummy $rpath
-@@ -1628,7 +2236,6 @@
- 	  build_libtool_libs=convenience
- 	  build_old_libs=yes
- 	fi
--	dependency_libs="$deplibs"
- 
- 	if test -n "$vinfo"; then
- 	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
-@@ -1640,7 +2247,7 @@
-       else
- 
- 	# Parse the version information argument.
--	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
-+	save_ifs="$IFS"; IFS=':'
- 	set dummy $vinfo 0 0 0
- 	IFS="$save_ifs"
- 
-@@ -1655,8 +2262,8 @@
- 	age="$4"
- 
- 	# Check that each of the things are valid numbers.
--	case "$current" in
--	0 | [1-9] | [1-9][0-9]*) ;;
-+	case $current in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -1664,8 +2271,8 @@
- 	  ;;
- 	esac
- 
--	case "$revision" in
--	0 | [1-9] | [1-9][0-9]*) ;;
-+	case $revision in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -1673,8 +2280,8 @@
- 	  ;;
- 	esac
- 
--	case "$age" in
--	0 | [1-9] | [1-9][0-9]*) ;;
-+	case $age in
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -1692,21 +2299,49 @@
- 	major=
- 	versuffix=
- 	verstring=
--	case "$version_type" in
-+	case $version_type in
- 	none) ;;
- 
--	irix)
-+	darwin)
-+	  # Like Linux, but with the current version available in
-+	  # verstring for coding it into the library header
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
-+	  # Darwin ld doesn't like 0 for these options...
-+	  minor_current=`expr $current + 1`
-+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  ;;
-+
-+	freebsd-aout)
-+	  major=".$current"
-+	  versuffix=".$current.$revision";
-+	  ;;
-+
-+	freebsd-elf)
-+	  major=".$current"
-+	  versuffix=".$current";
-+	  ;;
-+
-+	irix | nonstopux)
- 	  major=`expr $current - $age + 1`
--	  versuffix="$major.$revision"
--	  verstring="sgi$major.$revision"
-+
-+	  case $version_type in
-+	    nonstopux) verstring_prefix=nonstopux ;;
-+	    *)         verstring_prefix=sgi ;;
-+	  esac
-+	  verstring="$verstring_prefix$major.$revision"
- 
- 	  # Add in all the interfaces that we are compatible with.
- 	  loop=$revision
- 	  while test $loop != 0; do
- 	    iface=`expr $revision - $loop`
- 	    loop=`expr $loop - 1`
--	    verstring="sgi$major.$iface:$verstring"
-+	    verstring="$verstring_prefix$major.$iface:$verstring"
- 	  done
-+
-+	  # Before this point, $major must not contain `.'.
-+	  major=.$major
-+	  versuffix="$major.$revision"
- 	  ;;
- 
- 	linux)
-@@ -1715,7 +2350,7 @@
- 	  ;;
- 
- 	osf)
--	  major=`expr $current - $age`
-+	  major=.`expr $current - $age`
- 	  versuffix=".$current.$age.$revision"
- 	  verstring="$current.$age.$revision"
- 
-@@ -1736,21 +2371,11 @@
- 	  versuffix=".$current.$revision"
- 	  ;;
- 
--	freebsd-aout)
--	  major=".$current"
--	  versuffix=".$current.$revision";
--	  ;;
--
--	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
--	  ;;
--
- 	windows)
--	  # Like Linux, but with '-' rather than '.', since we only
--	  # want one extension on Windows 95.
-+	  # Use '-' rather than '.', since we only want one
-+	  # extension on DOS 8.3 filesystems.
- 	  major=`expr $current - $age`
--	  versuffix="-$major-$age-$revision"
-+	  versuffix="-$major"
- 	  ;;
- 
- 	*)
-@@ -1764,6 +2389,16 @@
- 	if test -z "$vinfo" && test -n "$release"; then
- 	  major=
- 	  verstring="0.0"
-+	  case $version_type in
-+	  darwin)
-+	    # we can't check for "0.0" in archive_cmds due to quoting
-+	    # problems, so we reset it completely
-+	    verstring=""
-+	    ;;
-+	  *)
-+	    verstring="0.0"
-+	    ;;
-+	  esac
- 	  if test "$need_version" = no; then
- 	    versuffix=
- 	  else
-@@ -1777,7 +2412,7 @@
- 	  versuffix=
- 	  verstring=""
- 	fi
--	
-+
- 	# Check to see if the archive will have undefined symbols.
- 	if test "$allow_undefined" = yes; then
- 	  if test "$allow_undefined_flag" = unsupported; then
-@@ -1785,34 +2420,16 @@
- 	    build_libtool_libs=no
- 	    build_old_libs=yes
- 	  fi
--	else
--	  # Don't allow undefined symbols.
--	  allow_undefined_flag="$no_undefined_flag"
--	fi
--
--	dependency_libs="$deplibs"
--	case "$host" in
--	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
--	  # these systems don't actually have a c library (as such)!
--	  ;;
--	*)
--	  # Add libc to deplibs on all other systems.
--	  deplibs="$deplibs -lc"
--	  ;;
--	esac
-+	else
-+	  # Don't allow undefined symbols.
-+	  allow_undefined_flag="$no_undefined_flag"
-+	fi
-       fi
- 
--      # Create the output directory, or remove our outputs if we need to.
--      if test -d $output_objdir; then
-+      if test "$mode" != relink; then
-+	# Remove our outputs.
- 	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
- 	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
--      else
--	$show "$mkdir $output_objdir"
--	$run $mkdir $output_objdir
--	status=$?
--	if test $status -ne 0 && test ! -d $output_objdir; then
--	  exit $status
--	fi
-       fi
- 
-       # Now set the variables for building old libraries.
-@@ -1823,7 +2440,73 @@
- 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-       fi
- 
-+      # Eliminate all temporary directories.
-+      for path in $notinst_path; do
-+	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-+	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-+	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+      done
-+
-+      if test -n "$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	temp_xrpath=
-+	for libdir in $xrpath; do
-+	  temp_xrpath="$temp_xrpath -R$libdir"
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
-+	  dependency_libs="$temp_xrpath $dependency_libs"
-+	fi
-+      fi
-+
-+      # Make sure dlfiles contains only unique files that won't be dlpreopened
-+      old_dlfiles="$dlfiles"
-+      dlfiles=
-+      for lib in $old_dlfiles; do
-+	case " $dlprefiles $dlfiles " in
-+	*" $lib "*) ;;
-+	*) dlfiles="$dlfiles $lib" ;;
-+	esac
-+      done
-+
-+      # Make sure dlprefiles contains only unique files
-+      old_dlprefiles="$dlprefiles"
-+      dlprefiles=
-+      for lib in $old_dlprefiles; do
-+	case "$dlprefiles " in
-+	*" $lib "*) ;;
-+	*) dlprefiles="$dlprefiles $lib" ;;
-+	esac
-+      done
-+
-       if test "$build_libtool_libs" = yes; then
-+	if test -n "$rpath"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	    # these systems don't actually have a c library (as such)!
-+	    ;;
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C library is in the System framework
-+	    deplibs="$deplibs -framework System"
-+	    ;;
-+	  *-*-netbsd*)
-+	    # Don't link with libc until the a.out ld.so is fixed.
-+	    ;;
-+	  *-*-openbsd* | *-*-freebsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    ;;
-+	  *)
-+	    # Add libc to deplibs on all other systems if necessary.
-+	    if test $build_libtool_need_lc = "yes"; then
-+	      deplibs="$deplibs -lc"
-+	    fi
-+	    ;;
-+	  esac
-+	fi
-+
- 	# Transform deplibs into only deplibs that can be linked in shared.
- 	name_save=$name
- 	libname_save=$libname
-@@ -1838,7 +2521,7 @@
- 	major=""
- 	newdeplibs=
- 	droppeddeps=no
--	case "$deplibs_check_method" in
-+	case $deplibs_check_method in
- 	pass_all)
- 	  # Don't check for shared/static.  Everything works.
- 	  # This might be a little naive.  We might want to check
-@@ -1863,7 +2546,7 @@
- 	    for i in $deplibs; do
- 	      name="`expr $i : '-l\(.*\)'`"
- 	      # If $name is empty we are operating on a -L argument.
--	      if test "$name" != "" ; then
-+	      if test -n "$name" && test "$name" != "0"; then
- 		libname=`eval \\$echo \"$libname_spec\"`
- 		deplib_matches=`eval \\$echo \"$library_names_spec\"`
- 		set dummy $deplib_matches
-@@ -1873,22 +2556,24 @@
- 		else
- 		  droppeddeps=yes
- 		  echo
--		  echo "*** Warning: This library needs some functionality provided by $i."
-+		  echo "*** Warning: dynamic linker does not accept needed library $i."
- 		  echo "*** I have the capability to make that library automatically link in when"
- 		  echo "*** you link to this library.  But I can only do this if you have a"
--		  echo "*** shared version of the library, which you do not appear to have."
-+		  echo "*** shared version of the library, which I believe you do not have"
-+		  echo "*** because a test_compile did reveal that the linker did not use it for"
-+		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
- 		fi
- 	      else
- 		newdeplibs="$newdeplibs $i"
- 	      fi
- 	    done
- 	  else
--	    # Error occured in the first compile.  Let's try to salvage the situation:
--	    # Compile a seperate program for each library.
-+	    # Error occured in the first compile.  Let's try to salvage
-+	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
- 	      name="`expr $i : '-l\(.*\)'`"
- 	     # If $name is empty we are operating on a -L argument.
--	      if test "$name" != "" ; then
-+	      if test -n "$name" && test "$name" != "0"; then
- 		$rm conftest
- 		$CC -o conftest conftest.c $i
- 		# Did it work?
-@@ -1903,10 +2588,12 @@
- 		  else
- 		    droppeddeps=yes
- 		    echo
--		    echo "*** Warning: This library needs some functionality provided by $i."
-+		    echo "*** Warning: dynamic linker does not accept needed library $i."
- 		    echo "*** I have the capability to make that library automatically link in when"
- 		    echo "*** you link to this library.  But I can only do this if you have a"
--		    echo "*** shared version of the library, which you do not appear to have."
-+		    echo "*** shared version of the library, which you do not appear to have"
-+		    echo "*** because a test_compile did reveal that the linker did not use this one"
-+		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
- 		  fi
- 		else
- 		  droppeddeps=yes
-@@ -1924,19 +2611,19 @@
- 	  ;;
- 	file_magic*)
- 	  set dummy $deplibs_check_method
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
-+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
- 	  for a_deplib in $deplibs; do
- 	    name="`expr $a_deplib : '-l\(.*\)'`"
- 	    # If $name is empty we are operating on a -L argument.
--	    if test "$name" != "" ; then
-+	    if test -n "$name" && test "$name" != "0"; then
- 	      libname=`eval \\$echo \"$libname_spec\"`
--	      for i in $lib_search_path; do
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- 		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- 		    for potent_lib in $potential_libs; do
- 		      # Follow soft links.
- 		      if ls -lLd "$potent_lib" 2>/dev/null \
- 			 | grep " -> " >/dev/null; then
--			continue 
-+			continue
- 		      fi
- 		      # The statement above tries to avoid entering an
- 		      # endless loop below, in case of cyclic links.
-@@ -1945,14 +2632,14 @@
- 		      # but so what?
- 		      potlib="$potent_lib"
- 		      while test -h "$potlib" 2>/dev/null; do
--			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
--			case "$potliblink" in
-+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-+			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
- 			esac
- 		      done
- 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
--			 | sed 10q \
-+			 | ${SED} 10q \
- 			 | egrep "$file_magic_regex" > /dev/null; then
- 			newdeplibs="$newdeplibs $a_deplib"
- 			a_deplib=""
-@@ -1963,10 +2650,59 @@
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
- 		echo
--		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-+		echo "*** Warning: linker path does not have real file for library $a_deplib."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  echo "*** with $libname but no candidates were found. (...for file magic test)"
-+		else
-+		  echo "*** with $libname and none of the candidates passed a file format test"
-+		  echo "*** using a file magic. Last file checked: $potlib"
-+		fi
-+	      fi
-+	    else
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	    fi
-+	  done # Gone through all deplibs.
-+	  ;;
-+	match_pattern*)
-+	  set dummy $deplibs_check_method
-+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    # If $name is empty we are operating on a -L argument.
-+	    if test -n "$name" && test "$name" != "0"; then
-+	      libname=`eval \\$echo \"$libname_spec\"`
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		for potent_lib in $potential_libs; do
-+		  potlib="$potent_lib" # see symlink-check below in file_magic test
-+		  if eval echo \"$potent_lib\" 2>/dev/null \
-+		      | ${SED} 10q \
-+		      | egrep "$match_pattern_regex" > /dev/null; then
-+		    newdeplibs="$newdeplibs $a_deplib"
-+		    a_deplib=""
-+		    break 2
-+		  fi
-+		done
-+	      done
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		echo
-+		echo "*** Warning: linker path does not have real file for library $a_deplib."
- 		echo "*** I have the capability to make that library automatically link in when"
- 		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have."
-+		echo "*** shared version of the library, which you do not appear to have"
-+		echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-+		else
-+		  echo "*** with $libname and none of the candidates passed a file format test"
-+		  echo "*** using a regex pattern. Last file checked: $potlib"
-+		fi
- 	      fi
- 	    else
- 	      # Add a -L argument.
-@@ -1996,6 +2732,13 @@
- 	libname=$libname_save
- 	name=$name_save
- 
-+	case $host in
-+	*-*-rhapsody* | *-*-darwin1.[012])
-+	  # On Rhapsody replace the C library is the System framework
-+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	  ;;
-+	esac
-+
- 	if test "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
- 	    echo
-@@ -2021,6 +2764,21 @@
- 	    echo "*** The inter-library dependencies that have been dropped here will be"
- 	    echo "*** automatically added whenever a program is linked with this library"
- 	    echo "*** or is declared to -dlopen it."
-+
-+	    if test $allow_undefined = no; then
-+	      echo
-+	      echo "*** Since this library must not contain undefined symbols,"
-+	      echo "*** because either the platform does not support them or"
-+	      echo "*** it was explicitly requested with -no-undefined,"
-+	      echo "*** libtool will only create a static version of it."
-+	      if test "$build_old_libs" = no; then
-+		oldlibs="$output_objdir/$libname.$libext"
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
- 	  fi
- 	fi
- 	# Done checking deplibs!
-@@ -2031,9 +2789,64 @@
-       library_names=
-       old_library=
-       dlname=
--      
-+
-       # Test again, we may have decided not to build it any more
-       if test "$build_libtool_libs" = yes; then
-+	if test $hardcode_into_libs = yes; then
-+	  # Hardcode the library paths
-+	  hardcode_libdirs=
-+	  dep_rpath=
-+	  rpath="$finalize_rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-+	  for libdir in $rpath; do
-+	    if test -n "$hardcode_libdir_flag_spec"; then
-+	      if test -n "$hardcode_libdir_separator"; then
-+		if test -z "$hardcode_libdirs"; then
-+		  hardcode_libdirs="$libdir"
-+		else
-+		  # Just accumulate the unique libdirs.
-+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		    ;;
-+		  *)
-+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		    ;;
-+		  esac
-+		fi
-+	      else
-+		eval flag=\"$hardcode_libdir_flag_spec\"
-+		dep_rpath="$dep_rpath $flag"
-+	      fi
-+	    elif test -n "$runpath_var"; then
-+	      case "$perm_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) perm_rpath="$perm_rpath $libdir" ;;
-+	      esac
-+	    fi
-+	  done
-+	  # Substitute the hardcoded libdirs into the rpath.
-+	  if test -n "$hardcode_libdir_separator" &&
-+	     test -n "$hardcode_libdirs"; then
-+	    libdir="$hardcode_libdirs"
-+	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-+	  fi
-+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-+	    # We should set the runpath_var.
-+	    rpath=
-+	    for dir in $perm_rpath; do
-+	      rpath="$rpath$dir:"
-+	    done
-+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-+	  fi
-+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-+	fi
-+
-+	shlibpath="$finalize_shlibpath"
-+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	if test -n "$shlibpath"; then
-+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-+	fi
-+
- 	# Get the real and link names of the library.
- 	eval library_names=\"$library_names_spec\"
- 	set dummy $library_names
-@@ -2045,6 +2858,7 @@
- 	else
- 	  soname="$realname"
- 	fi
-+	test -z "$dlname" && dlname=$soname
- 
- 	lib="$output_objdir/$realname"
- 	for link
-@@ -2079,7 +2893,7 @@
- 	    export_symbols="$output_objdir/$libname.exp"
- 	    $run $rm $export_symbols
- 	    eval cmds=\"$export_symbols_cmds\"
--	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	    save_ifs="$IFS"; IFS='~'
- 	    for cmd in $cmds; do
- 	      IFS="$save_ifs"
- 	      $show "$cmd"
-@@ -2116,7 +2930,7 @@
- 
- 	    for xlib in $convenience; do
- 	      # Extract the objects.
--	      case "$xlib" in
-+	      case $xlib in
- 	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- 	      *) xabs=`pwd`"/$xlib" ;;
- 	      esac
-@@ -2141,16 +2955,32 @@
- 
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
--	  linkopts="$linkopts $flag"
-+	  linker_flags="$linker_flags $flag"
-+	fi
-+
-+	# Make a backup of the uninstalled library when relinking
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
- 	fi
- 
- 	# Do each of the archive commands.
- 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- 	  eval cmds=\"$archive_expsym_cmds\"
- 	else
-+	  save_deplibs="$deplibs"
-+	  for conv in $convenience; do
-+	    tmp_deplibs=
-+	    for test_deplib in $deplibs; do
-+	      if test "$test_deplib" != "$conv"; then
-+		tmp_deplibs="$tmp_deplibs $test_deplib"
-+	      fi
-+	    done
-+	    deplibs="$tmp_deplibs"
-+	  done
- 	  eval cmds=\"$archive_cmds\"
-+	  deplibs="$save_deplibs"
- 	fi
--	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	save_ifs="$IFS"; IFS='~'
- 	for cmd in $cmds; do
- 	  IFS="$save_ifs"
- 	  $show "$cmd"
-@@ -2158,6 +2988,12 @@
- 	done
- 	IFS="$save_ifs"
- 
-+	# Restore the uninstalled library and exit
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+	  exit 0
-+	fi
-+
- 	# Create links to the real library.
- 	for linkname in $linknames; do
- 	  if test "$realname" != "$linkname"; then
-@@ -2174,12 +3010,7 @@
-       fi
-       ;;
- 
--    *.lo | *.o | *.obj)
--      if test -n "$link_against_libtool_libs"; then
--	$echo "$modename: error: cannot link libtool libraries into objects" 1>&2
--	exit 1
--      fi
--
-+    obj)
-       if test -n "$deplibs"; then
- 	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-       fi
-@@ -2204,9 +3035,9 @@
- 	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-       fi
- 
--      case "$output" in
-+      case $output in
-       *.lo)
--	if test -n "$objs"; then
-+	if test -n "$objs$old_deplibs"; then
- 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
- 	  exit 1
- 	fi
-@@ -2230,7 +3061,7 @@
-       gentop=
-       # reload_cmds runs $LD directly, so let us get rid of
-       # -Wl from whole_archive_flag_spec
--      wl= 
-+      wl=
- 
-       if test -n "$convenience"; then
- 	if test -n "$whole_archive_flag_spec"; then
-@@ -2249,7 +3080,7 @@
- 
- 	  for xlib in $convenience; do
- 	    # Extract the objects.
--	    case "$xlib" in
-+	    case $xlib in
- 	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- 	    *) xabs=`pwd`"/$xlib" ;;
- 	    esac
-@@ -2273,11 +3104,11 @@
-       fi
- 
-       # Create the old-style object.
--      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
-+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
- 
-       output="$obj"
-       eval cmds=\"$reload_cmds\"
--      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+      save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
- 	IFS="$save_ifs"
- 	$show "$cmd"
-@@ -2308,12 +3139,12 @@
- 	exit 0
-       fi
- 
--      if test -n "$pic_flag"; then
-+      if test -n "$pic_flag" || test "$pic_mode" != default; then
- 	# Only do commands if we really have different PIC objects.
- 	reload_objs="$libobjs $reload_conv_objs"
- 	output="$libobj"
- 	eval cmds=\"$reload_cmds\"
--	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	save_ifs="$IFS"; IFS='~'
- 	for cmd in $cmds; do
- 	  IFS="$save_ifs"
- 	  $show "$cmd"
-@@ -2344,8 +3175,10 @@
-       exit 0
-       ;;
- 
--    # Anything else should be a program.
--    *)
-+    prog)
-+      case $host in
-+	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-+      esac
-       if test -n "$vinfo"; then
- 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-       fi
-@@ -2355,20 +3188,34 @@
-       fi
- 
-       if test "$preload" = yes; then
--	if test "$dlopen" = unknown && test "$dlopen_self" = unknown &&
-+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
- 	   test "$dlopen_self_static" = unknown; then
- 	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
--	fi 
-+	fi
-       fi
--    
-+
-+      case $host in
-+      *-*-rhapsody* | *-*-darwin1.[012])
-+	# On Rhapsody replace the C library is the System framework
-+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	case $host in
-+	*darwin*)
-+	  # Don't allow lazy linking, it breaks C++ global constructors
-+	  compile_command="$compile_command ${wl}-bind_at_load"
-+	  finalize_command="$finalize_command ${wl}-bind_at_load"
-+	  ;;
-+	esac
-+	;;
-+      esac
-+
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
-+
-       if test -n "$rpath$xrpath"; then
- 	# If the user specified any rpath flags, then add them.
- 	for libdir in $rpath $xrpath; do
- 	  # This is the magic to use -rpath.
--	  case "$compile_rpath " in
--	  *" $libdir "*) ;;
--	  *) compile_rpath="$compile_rpath $libdir" ;;
--	  esac
- 	  case "$finalize_rpath " in
- 	  *" $libdir "*) ;;
- 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-@@ -2386,7 +3233,7 @@
- 	      hardcode_libdirs="$libdir"
- 	    else
- 	      # Just accumulate the unique libdirs.
--	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
-@@ -2404,6 +3251,14 @@
- 	  *) perm_rpath="$perm_rpath $libdir" ;;
- 	  esac
- 	fi
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$libdir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  esac
-+	  ;;
-+	esac
-       done
-       # Substitute the hardcoded libdirs into the rpath.
-       if test -n "$hardcode_libdir_separator" &&
-@@ -2422,7 +3277,7 @@
- 	      hardcode_libdirs="$libdir"
- 	    else
- 	      # Just accumulate the unique libdirs.
--	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
- 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		;;
- 	      *)
-@@ -2449,23 +3304,6 @@
-       fi
-       finalize_rpath="$rpath"
- 
--      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
--      if test "X$output_objdir" = "X$output"; then
--	output_objdir="$objdir"
--      else
--	output_objdir="$output_objdir/$objdir"
--      fi
--
--      # Create the binary in the object directory, then wrap it.
--      if test ! -d $output_objdir; then
--	$show "$mkdir $output_objdir"
--	$run $mkdir $output_objdir
--	status=$?
--	if test $status -ne 0 && test ! -d $output_objdir; then
--	  exit $status
--	fi
--      fi
--
-       if test -n "$libobjs" && test "$build_old_libs" = yes; then
- 	# Transform all the library objects into standard objects.
- 	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-@@ -2482,7 +3320,7 @@
-       fi
- 
-       if test -n "$dlsyms"; then
--	case "$dlsyms" in
-+	case $dlsyms in
- 	"") ;;
- 	*.c)
- 	  # Discover the nlist of each of the dlfiles.
-@@ -2514,7 +3352,7 @@
- 	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
- 
- 	    # Add our own program objects to the symbol list.
--	    progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- 	    for arg in $progfiles; do
- 	      $show "extracting global C symbols from \`$arg'"
- 	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-@@ -2524,7 +3362,7 @@
- 	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
- 	      $run eval '$mv "$nlist"T "$nlist"'
- 	    fi
--	    
-+
- 	    if test -n "$export_symbols_regex"; then
- 	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
- 	      $run eval '$mv "$nlist"T "$nlist"'
-@@ -2534,9 +3372,9 @@
- 	    if test -z "$export_symbols"; then
- 	      export_symbols="$output_objdir/$output.exp"
- 	      $run $rm $export_symbols
--	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	    else
--	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
- 	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
- 	      $run eval 'mv "$nlist"T "$nlist"'
- 	    fi
-@@ -2544,7 +3382,7 @@
- 
- 	  for arg in $dlprefiles; do
- 	    $show "extracting global C symbols from \`$arg'"
--	    name=`echo "$arg" | sed -e 's%^.*/%%'`
-+	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
- 	    $run eval 'echo ": $name " >> "$nlist"'
- 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
- 	  done
-@@ -2559,7 +3397,13 @@
- 	    fi
- 
- 	    # Try sorting and uniquifying the output.
--	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
-+	    if grep -v "^: " < "$nlist" |
-+		if sort -k 3 </dev/null >/dev/null 2>&1; then
-+		  sort -k 3
-+		else
-+		  sort +2
-+		fi |
-+		uniq > "$nlist"S; then
- 	      :
- 	    else
- 	      grep -v "^: " < "$nlist" > "$nlist"S
-@@ -2576,27 +3420,25 @@
- #undef lt_preloaded_symbols
- 
- #if defined (__STDC__) && __STDC__
--# define lt_ptr_t void *
-+# define lt_ptr void *
- #else
--# define lt_ptr_t char *
-+# define lt_ptr char *
- # define const
- #endif
- 
- /* The mapping between symbol names and symbols. */
- const struct {
-   const char *name;
--  lt_ptr_t address;
-+  lt_ptr address;
- }
- lt_preloaded_symbols[] =
- {\
- "
- 
--	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
--		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
--		  < "$nlist" >> "$output_objdir/$dlsyms"
-+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
- 
- 	    $echo >> "$output_objdir/$dlsyms" "\
--  {0, (lt_ptr_t) 0}
-+  {0, (lt_ptr) 0}
- };
- 
- /* This works around a problem in FreeBSD linker */
-@@ -2613,13 +3455,13 @@
- 	  fi
- 
- 	  pic_flag_for_symtable=
--	  case "$host" in
-+	  case $host in
- 	  # compiling the symbol table file with pic_flag works around
- 	  # a FreeBSD bug that causes programs to crash when -lm is
- 	  # linked before any other PIC object.  But we must not use
- 	  # pic_flag when linking with -static.  The problem exists in
- 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
--	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
- 	    case "$compile_command " in
- 	    *" -static "*) ;;
- 	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
-@@ -2658,7 +3500,7 @@
- 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-       fi
- 
--      if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
-+      if test $need_relink = no || test "$build_libtool_libs" != yes; then
- 	# Replace the output file specification.
- 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- 	link_command="$compile_command$compile_rpath"
-@@ -2667,7 +3509,7 @@
- 	$show "$link_command"
- 	$run eval "$link_command"
- 	status=$?
--	
-+
- 	# Delete the generated files.
- 	if test -n "$dlsyms"; then
- 	  $show "$rm $output_objdir/${outputname}S.${objext}"
-@@ -2681,7 +3523,7 @@
- 	# We should set the shlibpath_var
- 	rpath=
- 	for dir in $temp_rpath; do
--	  case "$dir" in
-+	  case $dir in
- 	  [\\/]* | [A-Za-z]:[\\/]*)
- 	    # Absolute path.
- 	    rpath="$rpath$dir:"
-@@ -2723,11 +3565,24 @@
- 	fi
-       fi
- 
-+      if test "$no_install" = yes; then
-+	# We don't need to create a wrapper script.
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	# Replace the output file specification.
-+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	# Delete the old output file.
-+	$run $rm $output
-+	# Link the executable and exit
-+	$show "$link_command"
-+	$run eval "$link_command" || exit $?
-+	exit 0
-+      fi
-+
-       if test "$hardcode_action" = relink; then
- 	# Fast installation is not supported
- 	link_command="$compile_var$compile_command$compile_rpath"
- 	relink_command="$finalize_var$finalize_command$finalize_rpath"
--	
-+
- 	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
- 	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-       else
-@@ -2747,7 +3602,7 @@
- 
-       # Replace the output file specification.
-       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
--      
-+
-       # Delete the old output files.
-       $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
- 
-@@ -2759,12 +3614,24 @@
- 
-       # Quote the relink command for shipping.
-       if test -n "$relink_command"; then
-+	# Preserve any variables that may affect compiler behavior
-+	for var in $variables_saved_for_relink; do
-+	  if eval test -z \"\${$var+set}\"; then
-+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	  elif eval var_value=\$$var; test -z "$var_value"; then
-+	    relink_command="$var=; export $var; $relink_command"
-+	  else
-+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	  fi
-+	done
-+	relink_command="(cd `pwd`; $relink_command)"
- 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-       fi
- 
-       # Quote $echo for shipping.
-       if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
--	case "$0" in
-+	case $0 in
- 	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
- 	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
- 	esac
-@@ -2778,7 +3645,12 @@
- 	# win32 will think the script is a binary if it has
- 	# a .exe suffix, so we strip it off here.
- 	case $output in
--	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
-+	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
-+	esac
-+	# test for cygwin because mv fails w/o .exe extensions
-+	case $host in
-+	  *cygwin*) exeext=.exe ;;
-+	  *) exeext= ;;
- 	esac
- 	$rm $output
- 	trap "$rm $output; exit 1" 1 2 15
-@@ -2797,7 +3669,7 @@
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
-+Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
-@@ -2809,7 +3681,7 @@
- # This environment variable determines our operation mode.
- if test \"\$libtool_install_magic\" = \"$magic\"; then
-   # install mode needs the following variable:
--  link_against_libtool_libs='$link_against_libtool_libs'
-+  notinst_deplibs='$notinst_deplibs'
- else
-   # When we are sourced in execute mode, \$file and \$echo are already set.
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-@@ -2835,20 +3707,20 @@
-   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
-   # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-   while test -n \"\$file\"; do
-     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
- 
-     # If there was a directory component, then change thisdir.
-     if test \"x\$destdir\" != \"x\$file\"; then
-       case \"\$destdir\" in
--      [\\/]* | [A-Za-z]:[\\/]*) thisdir=\"\$destdir\" ;;
-+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-       *) thisdir=\"\$thisdir/\$destdir\" ;;
-       esac
-     fi
- 
-     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-   done
- 
-   # Try to get the absolute directory name.
-@@ -2858,11 +3730,11 @@
- 
- 	if test "$fast_install" = yes; then
- 	  echo >> $output "\
--  program=lt-'$outputname'
-+  program=lt-'$outputname'$exeext
-   progdir=\"\$thisdir/$objdir\"
--  
-+
-   if test ! -f \"\$progdir/\$program\" || \\
--     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
- 
-     file=\"\$\$-\$program\"
-@@ -2877,8 +3749,9 @@
- 
-     # relink executable if necessary
-     if test -n \"\$relink_command\"; then
--      if (cd \"\$thisdir\" && eval \$relink_command); then :
-+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-       else
-+	$echo \"\$relink_command_output\" >&2
- 	$rm \"\$progdir/\$file\"
- 	exit 1
-       fi
-@@ -2907,7 +3780,7 @@
-     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
- 
-     # Some systems cannot cope with colon-terminated $shlibpath_var
--    # The second colon is a workaround for a bug in BeOS R4 sed
-+    # The second colon is a workaround for a bug in BeOS R4 ${SED}
-     $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
- 
-     export $shlibpath_var
-@@ -2927,13 +3800,21 @@
-       # Run the actual program with our arguments.
- "
- 	case $host in
--	*-*-cygwin* | *-*-mingw | *-*-os2*)
--	  # win32 systems need to use the prog path for dll
--	  # lookup to work
-+	# win32 systems need to use the prog path for dll
-+	# lookup to work
-+	*-*-cygwin* | *-*-pw32*)
-+	  $echo >> $output "\
-+      exec \$progdir/\$program \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
-       exec \$progdir\\\\\$program \${1+\"\$@\"}
- "
- 	  ;;
-+
- 	*)
- 	  $echo >> $output "\
-       # Export the path to the program.
-@@ -2975,7 +3856,7 @@
- 	  oldobjs="$libobjs_save"
- 	  build_libtool_libs=no
- 	else
--	  oldobjs="$objs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
-+	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
- 	fi
- 	addlibs="$old_convenience"
-       fi
-@@ -2991,11 +3872,11 @@
- 	  exit $status
- 	fi
- 	generated="$generated $gentop"
--	  
-+
- 	# Add in members from convenience archives.
- 	for xlib in $addlibs; do
- 	  # Extract the objects.
--	  case "$xlib" in
-+	  case $xlib in
- 	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- 	  *) xabs=`pwd`"/$xlib" ;;
- 	  esac
-@@ -3041,7 +3922,7 @@
- 
- 	eval cmds=\"$old_archive_cmds\"
-       fi
--      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+      save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
- 	IFS="$save_ifs"
- 	$show "$cmd"
-@@ -3056,19 +3937,26 @@
-     fi
- 
-     # Now create the libtool archive.
--    case "$output" in
-+    case $output in
-     *.la)
-       old_library=
-       test "$build_old_libs" = yes && old_library="$libname.$libext"
-       $show "creating $output"
- 
--      if test -n "$xrpath"; then
--	temp_xrpath=
--	for libdir in $xrpath; do
--	  temp_xrpath="$temp_xrpath -R$libdir"
--	done
--	dependency_libs="$temp_xrpath $dependency_libs"
--      fi
-+      # Preserve any variables that may affect compiler behavior
-+      for var in $variables_saved_for_relink; do
-+	if eval test -z \"\${$var+set}\"; then
-+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	elif eval var_value=\$$var; test -z "$var_value"; then
-+	  relink_command="$var=; export $var; $relink_command"
-+	else
-+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	fi
-+      done
-+      # Quote the link command for shipping.
-+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- 
-       # Only create the output if not a dry run.
-       if test -z "$run"; then
-@@ -3078,8 +3966,52 @@
- 	      break
- 	    fi
- 	    output="$output_objdir/$outputname"i
-+	    # Replace all uninstalled libtool libraries with the installed ones
-+	    newdependency_libs=
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      *.la)
-+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		if test -z "$libdir"; then
-+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		  exit 1
-+		fi
-+		newdependency_libs="$newdependency_libs $libdir/$name"
-+		;;
-+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-+	      esac
-+	    done
-+	    dependency_libs="$newdependency_libs"
-+	    newdlfiles=
-+	    for lib in $dlfiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlfiles="$newdlfiles $libdir/$name"
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlprefiles="$newdlprefiles $libdir/$name"
-+	    done
-+	    dlprefiles="$newdlprefiles"
- 	  fi
- 	  $rm $output
-+	  # place dlname in correct position for cygwin
-+	  tdlname=$dlname
-+	  case $host,$output,$installed,$module,$dlname in
-+	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	  esac
- 	  $echo > $output "\
- # $outputname - a libtool library file
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-@@ -3088,7 +4020,7 @@
- # It is necessary for linking the library.
- 
- # The name that we can dlopen(3).
--dlname='$dlname'
-+dlname='$tdlname'
- 
- # Names of this library.
- library_names='$library_names'
-@@ -3107,16 +4039,23 @@
- # Is this an already installed library?
- installed=$installed
- 
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
-+
- # Directory that this library needs to be installed in:
--libdir='$install_libdir'\
--"
-+libdir='$install_libdir'"
-+	  if test "$installed" = no && test $need_relink = yes; then
-+	    $echo >> $output "\
-+relink_command=\"$relink_command\""
-+	  fi
- 	done
-       fi
- 
-       # Do a symbolic link so that the libtool archive can be found in
-       # LD_LIBRARY_PATH before the program is installed.
-       $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
--      $run eval "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" || exit $?
-+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-       ;;
-     esac
-     exit 0
-@@ -3128,10 +4067,12 @@
- 
-     # There may be an optional sh(1) argument at the beginning of
-     # install_prog (especially on Windows NT).
--    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
-+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+       # Allow the use of GNU shtool's install command.
-+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-       # Aesthetically quote it.
-       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
--      case "$arg" in
-+      case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
- 	arg="\"$arg\""
- 	;;
-@@ -3147,7 +4088,7 @@
-     # The real first argument should be the name of the installation program.
-     # Aesthetically quote it.
-     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--    case "$arg" in
-+    case $arg in
-     *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-       arg="\"$arg\""
-       ;;
-@@ -3170,7 +4111,7 @@
- 	continue
-       fi
- 
--      case "$arg" in
-+      case $arg in
-       -d) isdir=yes ;;
-       -f) prev="-f" ;;
-       -g) prev="-g" ;;
-@@ -3195,7 +4136,7 @@
- 
-       # Aesthetically quote the argument.
-       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--      case "$arg" in
-+      case $arg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
- 	arg="\"$arg\""
- 	;;
-@@ -3246,11 +4187,11 @@
- 	exit 1
-       fi
-     fi
--    case "$destdir" in
-+    case $destdir in
-     [\\/]* | [A-Za-z]:[\\/]*) ;;
-     *)
-       for file in $files; do
--	case "$file" in
-+	case $file in
- 	*.lo) ;;
- 	*)
- 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-@@ -3272,15 +4213,15 @@
-     for file in $files; do
- 
-       # Do each installation.
--      case "$file" in
--      *.a | *.lib)
-+      case $file in
-+      *.$libext)
- 	# Do the static libraries later.
- 	staticlibs="$staticlibs $file"
- 	;;
- 
-       *.la)
- 	# Check to see that this really is a libtool archive.
--	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- 	else
- 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
- 	  $echo "$help" 1>&2
-@@ -3289,8 +4230,9 @@
- 
- 	library_names=
- 	old_library=
-+	relink_command=
- 	# If there is no directory component, then add one.
--	case "$file" in
-+	case $file in
- 	*/* | *\\*) . $file ;;
- 	*) . ./$file ;;
- 	esac
-@@ -3309,10 +4251,38 @@
- 	  esac
- 	fi
- 
--	dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
- 	test "X$dir" = "X$file/" && dir=
- 	dir="$dir$objdir"
- 
-+	if test -n "$relink_command"; then
-+          # Determine the prefix the user has applied to our future dir.
-+          inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-+ 
-+          # Don't allow the user to place us outside of our expected
-+          # location b/c this prevents finding dependent libraries that
-+          # are installed to the same prefix.
-+          if test "$inst_prefix_dir" = "$destdir"; then
-+            $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+            exit 1
-+          fi
-+ 
-+          if test -n "$inst_prefix_dir"; then
-+            # Stick the inst_prefix_dir data into the link command.
-+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+          else
-+            relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+          fi
-+
-+	  $echo "$modename: warning: relinking \`$file'" 1>&2
-+	  $show "$relink_command"
-+	  if $run eval "$relink_command"; then :
-+	  else
-+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+	    exit 1
-+	  fi
-+	fi
-+
- 	# See the names of the shared library.
- 	set dummy $library_names
- 	if test -n "$2"; then
-@@ -3320,9 +4290,16 @@
- 	  shift
- 	  shift
- 
-+	  srcname="$realname"
-+	  test -n "$relink_command" && srcname="$realname"T
-+
- 	  # Install the shared library and build the symlinks.
--	  $show "$install_prog $dir/$realname $destdir/$realname"
--	  $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
-+	  $show "$install_prog $dir/$srcname $destdir/$realname"
-+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-+	  if test -n "$stripme" && test -n "$striplib"; then
-+	    $show "$striplib $destdir/$realname"
-+	    $run eval "$striplib $destdir/$realname" || exit $?
-+	  fi
- 
- 	  if test $# -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
-@@ -3338,7 +4315,7 @@
- 	  # Do each command in the postinstall commands.
- 	  lib="$destdir/$realname"
- 	  eval cmds=\"$postinstall_cmds\"
--	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	  save_ifs="$IFS"; IFS='~'
- 	  for cmd in $cmds; do
- 	    IFS="$save_ifs"
- 	    $show "$cmd"
-@@ -3369,11 +4346,11 @@
- 	fi
- 
- 	# Deduce the name of the destination old-style object file.
--	case "$destfile" in
-+	case $destfile in
- 	*.lo)
- 	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
- 	  ;;
--	*.o | *.obj)
-+	*.$objext)
- 	  staticdest="$destfile"
- 	  destfile=
- 	  ;;
-@@ -3411,40 +4388,55 @@
- 	fi
- 
- 	# Do a test to see if this is really a libtool program.
--	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--	  link_against_libtool_libs=
-+	case $host in
-+	*cygwin*|*mingw*)
-+	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
-+	    ;;
-+	*)
-+	    wrapper=$file
-+	    ;;
-+	esac
-+	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-+	  notinst_deplibs=
- 	  relink_command=
- 
- 	  # If there is no directory component, then add one.
--	  case "$file" in
--	  */* | *\\*) . $file ;;
--	  *) . ./$file ;;
-+	  case $file in
-+	  */* | *\\*) . $wrapper ;;
-+	  *) . ./$wrapper ;;
- 	  esac
- 
- 	  # Check the variables that should have been set.
--	  if test -z "$link_against_libtool_libs"; then
--	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-+	  if test -z "$notinst_deplibs"; then
-+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
- 	    exit 1
- 	  fi
- 
- 	  finalize=yes
--	  for lib in $link_against_libtool_libs; do
-+	  for lib in $notinst_deplibs; do
- 	    # Check to see that each library is installed.
- 	    libdir=
- 	    if test -f "$lib"; then
- 	      # If there is no directory component, then add one.
--	      case "$lib" in
-+	      case $lib in
- 	      */* | *\\*) . $lib ;;
- 	      *) . ./$lib ;;
- 	      esac
- 	    fi
--	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
-+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
- 	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- 	      finalize=no
- 	    fi
- 	  done
- 
-+	  relink_command=
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $wrapper ;;
-+	  *) . ./$wrapper ;;
-+	  esac
-+
- 	  outputname=
- 	  if test "$fast_install" = no && test -n "$relink_command"; then
- 	    if test "$finalize" = yes && test -z "$run"; then
-@@ -3456,6 +4448,7 @@
- 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
- 		continue
- 	      fi
-+	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	      outputname="$tmpdir/$file"
- 	      # Replace the output file specification.
- 	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-@@ -3477,6 +4470,23 @@
- 	  fi
- 	fi
- 
-+	# remove .exe since cygwin /usr/bin/install will append another
-+	# one anyways
-+	case $install_prog,$host in
-+	/usr/bin/install*,*cygwin*)
-+	  case $file:$destfile in
-+	  *.exe:*.exe)
-+	    # this is ok
-+	    ;;
-+	  *.exe:*)
-+	    destfile=$destfile.exe
-+	    ;;
-+	  *:*.exe)
-+	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
- 	$show "$install_prog$stripme $file $destfile"
- 	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
- 	test -n "$outputname" && ${rm}r "$tmpdir"
-@@ -3493,9 +4503,14 @@
-       $show "$install_prog $file $oldlib"
-       $run eval "$install_prog \$file \$oldlib" || exit $?
- 
-+      if test -n "$stripme" && test -n "$striplib"; then
-+	$show "$old_striplib $oldlib"
-+	$run eval "$old_striplib $oldlib" || exit $?
-+      fi
-+
-       # Do each command in the postinstall commands.
-       eval cmds=\"$old_postinstall_cmds\"
--      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+      save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
- 	IFS="$save_ifs"
- 	$show "$cmd"
-@@ -3511,11 +4526,10 @@
-     if test -n "$current_libdirs"; then
-       # Maybe just do a dry run.
-       test -n "$run" && current_libdirs=" -n$current_libdirs"
--      exec $SHELL $0 --finish$current_libdirs
--      exit 1
-+      exec_cmd='$SHELL $0 --finish$current_libdirs'
-+    else
-+      exit 0
-     fi
--
--    exit 0
-     ;;
- 
-   # libtool finish mode
-@@ -3534,7 +4548,7 @@
- 	if test -n "$finish_cmds"; then
- 	  # Do each command in the finish commands.
- 	  eval cmds=\"$finish_cmds\"
--	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	  save_ifs="$IFS"; IFS='~'
- 	  for cmd in $cmds; do
- 	    IFS="$save_ifs"
- 	    $show "$cmd"
-@@ -3553,7 +4567,7 @@
-     fi
- 
-     # Exit here if they wanted silent mode.
--    test "$show" = : && exit 0
-+    test "$show" = ":" && exit 0
- 
-     echo "----------------------------------------------------------------------"
-     echo "Libraries have been installed in:"
-@@ -3563,7 +4577,7 @@
-     echo
-     echo "If you ever happen to want to link against installed libraries"
-     echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
-+    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-     echo "flag during linking and do at least one of the following:"
-     if test -n "$shlibpath_var"; then
-       echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-@@ -3613,10 +4627,10 @@
-       fi
- 
-       dir=
--      case "$file" in
-+      case $file in
-       *.la)
- 	# Check to see that this really is a libtool archive.
--	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- 	else
- 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- 	  $echo "$help" 1>&2
-@@ -3628,7 +4642,7 @@
- 	library_names=
- 
- 	# If there is no directory component, then add one.
--	case "$file" in
-+	case $file in
- 	*/* | *\\*) . $file ;;
- 	*) . ./$file ;;
- 	esac
-@@ -3683,13 +4697,13 @@
-     args=
-     for file
-     do
--      case "$file" in
-+      case $file in
-       -*) ;;
-       *)
- 	# Do a test to see if this is really a libtool program.
--	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- 	  # If there is no directory component, then add one.
--	  case "$file" in
-+	  case $file in
- 	  */* | *\\*) . $file ;;
- 	  *) . ./$file ;;
- 	  esac
-@@ -3706,8 +4720,8 @@
- 
-     if test -z "$run"; then
-       if test -n "$shlibpath_var"; then
--        # Export the shlibpath_var.
--        eval "export $shlibpath_var"
-+	# Export the shlibpath_var.
-+	eval "export $shlibpath_var"
-       fi
- 
-       # Restore saved enviroment variables
-@@ -3718,31 +4732,35 @@
- 	LANG="$save_LANG"; export LANG
-       fi
- 
--      # Now actually exec the command.
--      eval "exec \$cmd$args"
--
--      $echo "$modename: cannot exec \$cmd$args"
--      exit 1
-+      # Now prepare to actually exec the command.
-+      exec_cmd="\$cmd$args"
-     else
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
--        eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
--        $echo "export $shlibpath_var"
-+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-+	$echo "export $shlibpath_var"
-       fi
-       $echo "$cmd$args"
-       exit 0
-     fi
-     ;;
- 
--  # libtool uninstall mode
--  uninstall)
--    modename="$modename: uninstall"
-+  # libtool clean and uninstall mode
-+  clean | uninstall)
-+    modename="$modename: $mode"
-     rm="$nonopt"
-     files=
-+    rmforce=
-+    exit_status=0
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
- 
-     for arg
-     do
--      case "$arg" in
-+      case $arg in
-+      -f) rm="$rm $arg"; rmforce=yes ;;
-       -*) rm="$rm $arg" ;;
-       *) files="$files $arg" ;;
-       esac
-@@ -3754,53 +4772,86 @@
-       exit 1
-     fi
- 
-+    rmdirs=
-+
-     for file in $files; do
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
--      test "X$dir" = "X$file" && dir=.
-+      if test "X$dir" = "X$file"; then
-+	dir=.
-+	objdir="$objdir"
-+      else
-+	objdir="$dir/$objdir"
-+      fi
-       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+      test $mode = uninstall && objdir="$dir"
-+
-+      # Remember objdir for removal later, being careful to avoid duplicates
-+      if test $mode = clean; then
-+	case " $rmdirs " in
-+	  *" $objdir "*) ;;
-+	  *) rmdirs="$rmdirs $objdir" ;;
-+	esac
-+      fi
-+
-+      # Don't error if the file doesn't exist and rm -f was used.
-+      if (test -L "$file") >/dev/null 2>&1 \
-+	|| (test -h "$file") >/dev/null 2>&1 \
-+	|| test -f "$file"; then
-+	:
-+      elif test -d "$file"; then
-+	exit_status=1
-+	continue
-+      elif test "$rmforce" = yes; then
-+	continue
-+      fi
- 
-       rmfiles="$file"
- 
--      case "$name" in
-+      case $name in
-       *.la)
- 	# Possibly a libtool archive, so verify it.
--	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- 	  . $dir/$name
- 
- 	  # Delete the libtool libraries and symlinks.
- 	  for n in $library_names; do
--	    rmfiles="$rmfiles $dir/$n"
-+	    rmfiles="$rmfiles $objdir/$n"
- 	  done
--	  test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
-+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- 
--	  $show "$rm $rmfiles"
--	  $run $rm $rmfiles
--
--	  if test -n "$library_names"; then
--	    # Do each command in the postuninstall commands.
--	    eval cmds=\"$postuninstall_cmds\"
--	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
--	    for cmd in $cmds; do
-+	  if test $mode = uninstall; then
-+	    if test -n "$library_names"; then
-+	      # Do each command in the postuninstall commands.
-+	      eval cmds=\"$postuninstall_cmds\"
-+	      save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
- 	      IFS="$save_ifs"
--	      $show "$cmd"
--	      $run eval "$cmd"
--	    done
--	    IFS="$save_ifs"
--	  fi
-+	    fi
- 
--	  if test -n "$old_library"; then
--	    # Do each command in the old_postuninstall commands.
--	    eval cmds=\"$old_postuninstall_cmds\"
--	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
--	    for cmd in $cmds; do
-+	    if test -n "$old_library"; then
-+	      # Do each command in the old_postuninstall commands.
-+	      eval cmds=\"$old_postuninstall_cmds\"
-+	      save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
- 	      IFS="$save_ifs"
--	      $show "$cmd"
--	      $run eval "$cmd"
--	    done
--	    IFS="$save_ifs"
-+	    fi
-+	    # FIXME: should reinstall the best remaining shared library.
- 	  fi
--
--	  # FIXME: should reinstall the best remaining shared library.
- 	fi
- 	;;
- 
-@@ -3809,17 +4860,35 @@
- 	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
- 	  rmfiles="$rmfiles $dir/$oldobj"
- 	fi
--	$show "$rm $rmfiles"
--	$run $rm $rmfiles
- 	;;
- 
-       *)
--	$show "$rm $rmfiles"
--	$run $rm $rmfiles
-+	# Do a test to see if this is a libtool program.
-+	if test $mode = clean &&
-+	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  relink_command=
-+	  . $dir/$file
-+
-+	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	  if test "$fast_install" = yes && test -n "$relink_command"; then
-+	    rmfiles="$rmfiles $objdir/lt-$name"
-+	  fi
-+	fi
- 	;;
-       esac
-+      $show "$rm $rmfiles"
-+      $run $rm $rmfiles || exit_status=1
-     done
--    exit 0
-+
-+    # Try to remove the ${objdir}s in the directories where we deleted files
-+    for dir in $rmdirs; do
-+      if test -d "$dir"; then
-+	$show "rmdir $dir"
-+	$run rmdir $dir >/dev/null 2>&1
-+      fi
-+    done
-+
-+    exit $exit_status
-     ;;
- 
-   "")
-@@ -3829,13 +4898,20 @@
-     ;;
-   esac
- 
--  $echo "$modename: invalid operation mode \`$mode'" 1>&2
--  $echo "$generic_help" 1>&2
--  exit 1
-+  if test -z "$exec_cmd"; then
-+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+    $echo "$generic_help" 1>&2
-+    exit 1
-+  fi
- fi # test -z "$show_help"
- 
-+if test -n "$exec_cmd"; then
-+  eval exec $exec_cmd
-+  exit 1
-+fi
-+
- # We need to display help for each of the modes.
--case "$mode" in
-+case $mode in
- "") $echo \
- "Usage: $modename [OPTION]... [MODE-ARG]...
- 
-@@ -3854,6 +4930,7 @@
- 
- MODE must be one of the following:
- 
-+      clean           remove files from the build directory
-       compile         compile a source file into a libtool object
-       execute         automatically set library path, then run a program
-       finish          complete the installation of libtool libraries
-@@ -3866,6 +4943,20 @@
-   exit 0
-   ;;
- 
-+clean)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-+
-+Remove files from the build directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+  ;;
-+
- compile)
-   $echo \
- "Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-@@ -3875,6 +4966,8 @@
- This mode accepts the following additional options:
- 
-   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-   -static           always build a \`.o' file suitable for static linking
- 
- COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-@@ -3954,6 +5047,8 @@
-   -LLIBDIR          search LIBDIR for required installed libraries
-   -lNAME            OUTPUT-FILE requires the installed library libNAME
-   -module           build a library that can dlopened
-+  -no-fast-install  disable the fast-install mode
-+  -no-install       link a not-installable executable
-   -no-undefined     declare that a library does not refer to external symbols
-   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-   -release RELEASE  specify package release information
---- gtk+1.2-1.2.10.orig/gtk.m4
-+++ gtk+1.2-1.2.10/gtk.m4
-@@ -4,7 +4,7 @@
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl 
- dnl Get the cflags and libraries from the gtk-config script
- dnl
---- gtk+1.2-1.2.10.orig/po/gtk+.pot
-+++ gtk+1.2-1.2.10/po/gtk+.pot
-@@ -6,13 +6,13 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2001-03-28 16:12-0500\n"
-+"POT-Creation-Date: 2002-04-30 02:21+0900\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=CHARSET\n"
--"Content-Transfer-Encoding: ENCODING\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
- #: gtk/gtkcolorsel.c:221
- msgid "Hue:"
-@@ -43,14 +43,14 @@
- msgstr ""
- 
- #. The OK button
--#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501
-+#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:482 gtk/gtkfontsel.c:3503
- #: gtk/gtkgamma.c:416
- msgid "OK"
- msgstr ""
- 
- #. The Cancel button
--#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:488 gtk/gtkfilesel.c:868
--#: gtk/gtkfilesel.c:968 gtk/gtkfilesel.c:1083 gtk/gtkfontsel.c:3514
-+#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:489 gtk/gtkfilesel.c:869
-+#: gtk/gtkfilesel.c:969 gtk/gtkfilesel.c:1085 gtk/gtkfontsel.c:3516
- #: gtk/gtkgamma.c:424
- msgid "Cancel"
- msgstr ""
-@@ -60,29 +60,29 @@
- msgstr ""
- 
- #. The directories clist
--#: gtk/gtkfilesel.c:430
-+#: gtk/gtkfilesel.c:431
- msgid "Directories"
- msgstr ""
- 
- #. The files clist
--#: gtk/gtkfilesel.c:449
-+#: gtk/gtkfilesel.c:450
- msgid "Files"
- msgstr ""
- 
--#: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478
-+#: gtk/gtkfilesel.c:520 gtk/gtkfilesel.c:1466
- #, c-format
- msgid "Directory unreadable: %s"
- msgstr ""
- 
--#: gtk/gtkfilesel.c:551
-+#: gtk/gtkfilesel.c:552
- msgid "Create Dir"
- msgstr ""
- 
--#: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937
-+#: gtk/gtkfilesel.c:563 gtk/gtkfilesel.c:938
- msgid "Delete File"
- msgstr ""
- 
--#: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041
-+#: gtk/gtkfilesel.c:574 gtk/gtkfilesel.c:1043
- msgid "Rename File"
- msgstr ""
- 
-@@ -91,39 +91,39 @@
- #. (GtkSignalFunc) gtk_file_selection_fileop_destroy,
- #. (gpointer) fs);
- #.
--#: gtk/gtkfilesel.c:734
-+#: gtk/gtkfilesel.c:735
- msgid "Error"
- msgstr ""
- 
- #. close button
--#: gtk/gtkfilesel.c:757 gtk/gtkinputdialog.c:354
-+#: gtk/gtkfilesel.c:758 gtk/gtkinputdialog.c:354
- msgid "Close"
- msgstr ""
- 
--#: gtk/gtkfilesel.c:832
-+#: gtk/gtkfilesel.c:833
- msgid "Create Directory"
- msgstr ""
- 
--#: gtk/gtkfilesel.c:846
-+#: gtk/gtkfilesel.c:847
- msgid "Directory name:"
- msgstr ""
- 
- #. buttons
--#: gtk/gtkfilesel.c:859
-+#: gtk/gtkfilesel.c:860
- msgid "Create"
- msgstr ""
- 
- #. buttons
--#: gtk/gtkfilesel.c:959
-+#: gtk/gtkfilesel.c:960
- msgid "Delete"
- msgstr ""
- 
- #. buttons
--#: gtk/gtkfilesel.c:1074
-+#: gtk/gtkfilesel.c:1076
- msgid "Rename"
- msgstr ""
- 
--#: gtk/gtkfilesel.c:1457
-+#: gtk/gtkfilesel.c:1444
- msgid "Selection: "
- msgstr ""
- 
-@@ -197,7 +197,7 @@
- msgid "Font"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410
-+#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2182 gtk/gtkfontsel.c:2412
- msgid "Font:"
- msgstr ""
- 
-@@ -280,23 +280,23 @@
- msgid "regular"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1972
-+#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1974
- msgid "italic"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1973
-+#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1975
- msgid "oblique"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1974
-+#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1976
- msgid "reverse italic"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1975
-+#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1977
- msgid "reverse oblique"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
-+#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1978
- msgid "other"
- msgstr ""
- 
-@@ -308,51 +308,51 @@
- msgid "[C]"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1792
-+#: gtk/gtkfontsel.c:1794
- msgid "The selected font is not available."
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1798
-+#: gtk/gtkfontsel.c:1800
- msgid "The selected font is not a valid font."
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1856
-+#: gtk/gtkfontsel.c:1858
- msgid "This is a 2-byte font and may not be displayed correctly."
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1960 gtk/gtkinputdialog.c:607
-+#: gtk/gtkfontsel.c:1962 gtk/gtkinputdialog.c:607
- msgid "(unknown)"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1971
-+#: gtk/gtkfontsel.c:1973
- msgid "roman"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1983
-+#: gtk/gtkfontsel.c:1985
- msgid "proportional"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1984
-+#: gtk/gtkfontsel.c:1986
- msgid "monospaced"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:1985
-+#: gtk/gtkfontsel.c:1987
- msgid "char cell"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:2185
-+#: gtk/gtkfontsel.c:2187
- msgid "Font: (Filter Applied)"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:2661
-+#: gtk/gtkfontsel.c:2663
- msgid "MAX_FONTS exceeded. Some fonts may be missing."
- msgstr ""
- 
--#: gtk/gtkfontsel.c:3508
-+#: gtk/gtkfontsel.c:3510
- msgid "Apply"
- msgstr ""
- 
--#: gtk/gtkfontsel.c:3530
-+#: gtk/gtkfontsel.c:3532
- msgid "Font Selection"
- msgstr ""
- 
-@@ -447,12 +447,12 @@
- msgid "Page %u"
- msgstr ""
- 
--#: gtk/gtkrc.c:1703
-+#: gtk/gtkrc.c:1759
- #, c-format
- msgid "Unable to locate image file in pixmap_path: \"%s\" line %d"
- msgstr ""
- 
--#: gtk/gtkrc.c:1706
-+#: gtk/gtkrc.c:1762
- #, c-format
- msgid "Unable to locate image file in pixmap_path: \"%s\""
- msgstr ""
---- gtk+1.2-1.2.10.orig/po/ca.po
-+++ gtk+1.2-1.2.10/po/ca.po
-@@ -1,16 +1,18 @@
--#
--# Ivan Vilata i Balaguer <al011097@alumail.uji.es>, 1999-2000
--# Softcatala <linux@softcatala.org>, 2000
-+# Catalan translation of GTK+ 1.2.
-+# Copyright � 1999, 2000, 2005 Free Software Foundation, Inc.
-+# Ivan Vilata i Balaguer <al011097@alumail.uji.es>, 1999, 2000.
-+# Softcatala <linux@softcatala.org>, 2000.
-+# Jordi Mallach <jordi@sindominio.net>, 2005.
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: gtk+ 1.2.6\n"
- "POT-Creation-Date: 2001-03-28 16:12-0500\n"
--"PO-Revision-Date: 1999-11-18 21:11+01:00\n"
--"Last-Translator: Softcatala <linux@softcatala.org>\n"
--"Language-Team: linux-ca@chanae.alphanet.ch\n"
-+"PO-Revision-Date: 2005-09-21 18:19+0200\n"
-+"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
-+"Language-Team: Catalan <tradgnome@softcatala.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=iso-8859-1\n"
-+"Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
- #: gtk/gtkcolorsel.c:221
-@@ -41,86 +43,94 @@
- msgid "Opacity:"
- msgstr "Opacitat:"
- 
--#. The OK button
--#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501
-+#  The OK button
-+#: gtk/gtkcolorsel.c:1727
-+#: gtk/gtkfilesel.c:481
-+#: gtk/gtkfontsel.c:3501
- #: gtk/gtkgamma.c:416
- msgid "OK"
--msgstr "Val"
-+msgstr "D'acord"
- 
--#. The Cancel button
--#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:488 gtk/gtkfilesel.c:868
--#: gtk/gtkfilesel.c:968 gtk/gtkfilesel.c:1083 gtk/gtkfontsel.c:3514
-+#  The Cancel button
-+#: gtk/gtkcolorsel.c:1733
-+#: gtk/gtkfilesel.c:488
-+#: gtk/gtkfilesel.c:868
-+#: gtk/gtkfilesel.c:968
-+#: gtk/gtkfilesel.c:1083
-+#: gtk/gtkfontsel.c:3514
- #: gtk/gtkgamma.c:424
- msgid "Cancel"
--msgstr "Cancel�lar"
-+msgstr "Cancel�la"
- 
- #: gtk/gtkcolorsel.c:1738
- msgid "Help"
- msgstr "Ajuda"
- 
--#. The directories clist
-+#  The directories clist
- #: gtk/gtkfilesel.c:430
- msgid "Directories"
- msgstr "Directoris"
- 
--#. The files clist
-+#  The files clist
- #: gtk/gtkfilesel.c:449
- msgid "Files"
- msgstr "Fitxers"
- 
--#: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478
-+#: gtk/gtkfilesel.c:519
-+#: gtk/gtkfilesel.c:1478
- #, c-format
- msgid "Directory unreadable: %s"
--msgstr "El directori no �s legible: %s"
-+msgstr "El directori no �s llegible: %s"
- 
- #: gtk/gtkfilesel.c:551
- msgid "Create Dir"
--msgstr "Crear directori"
-+msgstr "Crea un directori"
- 
--#: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937
-+#: gtk/gtkfilesel.c:562
-+#: gtk/gtkfilesel.c:937
- msgid "Delete File"
--msgstr "Esborrar fitxer"
-+msgstr "Suprimeix el fitxer"
- 
--#: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041
-+#: gtk/gtkfilesel.c:573
-+#: gtk/gtkfilesel.c:1041
- msgid "Rename File"
--msgstr "Reanomenar fitxer"
-+msgstr "Reanomena el fitxer"
- 
--#.
--#. gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
--#. (GtkSignalFunc) gtk_file_selection_fileop_destroy,
--#. (gpointer) fs);
--#.
-+#  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-+#  (GtkSignalFunc) gtk_file_selection_fileop_destroy,
-+#  (gpointer) fs);
- #: gtk/gtkfilesel.c:734
- msgid "Error"
- msgstr "Error"
- 
--#. close button
--#: gtk/gtkfilesel.c:757 gtk/gtkinputdialog.c:354
-+#  close button
-+#: gtk/gtkfilesel.c:757
-+#: gtk/gtkinputdialog.c:354
- msgid "Close"
--msgstr "Tancar"
-+msgstr "Tanca"
- 
- #: gtk/gtkfilesel.c:832
- msgid "Create Directory"
--msgstr "Crear directori"
-+msgstr "Crea un directori"
- 
- #: gtk/gtkfilesel.c:846
- msgid "Directory name:"
- msgstr "Nom del directori:"
- 
--#. buttons
-+#  buttons
- #: gtk/gtkfilesel.c:859
- msgid "Create"
--msgstr "Crear"
-+msgstr "Crea"
- 
- #. buttons
- #: gtk/gtkfilesel.c:959
- msgid "Delete"
--msgstr "Esborrar"
-+msgstr "Suprimeix"
- 
- #. buttons
- #: gtk/gtkfilesel.c:1074
- msgid "Rename"
--msgstr "Reanomenar"
-+msgstr "Reanomena"
- 
- #: gtk/gtkfilesel.c:1457
- msgid "Selection: "
-@@ -144,19 +154,19 @@
- 
- #: gtk/gtkfontsel.c:214
- msgid "Set Width:"
--msgstr "Establir ampl�ria:"
-+msgstr "Estableix l'amplada:"
- 
- #: gtk/gtkfontsel.c:215
- msgid "Add Style:"
--msgstr "Afegir estil:"
-+msgstr "Afegeix un estil:"
- 
- #: gtk/gtkfontsel.c:216
- msgid "Pixel Size:"
--msgstr "Tamany del p�xel:"
-+msgstr "Mida del p�xel:"
- 
- #: gtk/gtkfontsel.c:217
- msgid "Point Size:"
--msgstr "Tamany del punt:"
-+msgstr "Mida del punt:"
- 
- #: gtk/gtkfontsel.c:218
- msgid "Resolution X:"
-@@ -172,14 +182,14 @@
- 
- #: gtk/gtkfontsel.c:221
- msgid "Average Width:"
--msgstr "Ampl�ria mitjana:"
-+msgstr "Amplada mitjana:"
- 
- #: gtk/gtkfontsel.c:222
- msgid "Charset:"
- msgstr "Joc de car�cters:"
- 
--#. Number of internationalized titles here must match number
--#. of NULL initializers above
-+#  Number of internationalized titles here must match number
-+#  of NULL initializers above
- #: gtk/gtkfontsel.c:459
- msgid "Font Property"
- msgstr "Propietats de la font"
-@@ -196,7 +206,9 @@
- msgid "Font"
- msgstr "Font"
- 
--#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410
-+#: gtk/gtkfontsel.c:504
-+#: gtk/gtkfontsel.c:2180
-+#: gtk/gtkfontsel.c:2410
- msgid "Font:"
- msgstr "Font:"
- 
-@@ -206,11 +218,12 @@
- 
- #: gtk/gtkfontsel.c:514
- msgid "Size:"
--msgstr "Tamany:"
-+msgstr "Mida:"
- 
--#: gtk/gtkfontsel.c:646 gtk/gtkfontsel.c:868
-+#: gtk/gtkfontsel.c:646
-+#: gtk/gtkfontsel.c:868
- msgid "Reset Filter"
--msgstr "Reiniciar filtre"
-+msgstr "Reinicia el filtre"
- 
- #: gtk/gtkfontsel.c:660
- msgid "Metric:"
-@@ -224,7 +237,7 @@
- msgid "Pixels"
- msgstr "P�xels"
- 
--#. create the text entry widget
-+#  create the text entry widget
- #: gtk/gtkfontsel.c:687
- msgid "Preview:"
- msgstr "Vista pr�via:"
-@@ -270,7 +283,7 @@
- msgid "*"
- msgstr "*"
- 
--#. Convert '(nil)' weights to 'regular', since it looks nicer.
-+#  Convert '(nil)' weights to 'regular', since it looks nicer.
- #: gtk/gtkfontsel.c:1215
- msgid "(nil)"
- msgstr "(nul)"
-@@ -279,23 +292,28 @@
- msgid "regular"
- msgstr "regular"
- 
--#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1972
-+#: gtk/gtkfontsel.c:1220
-+#: gtk/gtkfontsel.c:1972
- msgid "italic"
- msgstr "it�lica"
- 
--#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1973
-+#: gtk/gtkfontsel.c:1221
-+#: gtk/gtkfontsel.c:1973
- msgid "oblique"
--msgstr "obl�qua"
-+msgstr "obliqua"
- 
--#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1974
-+#: gtk/gtkfontsel.c:1222
-+#: gtk/gtkfontsel.c:1974
- msgid "reverse italic"
- msgstr "it�lica inversa"
- 
--#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1975
-+#: gtk/gtkfontsel.c:1223
-+#: gtk/gtkfontsel.c:1975
- msgid "reverse oblique"
--msgstr "obl�qua inversa"
-+msgstr "obliqua inversa"
- 
--#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976
-+#: gtk/gtkfontsel.c:1224
-+#: gtk/gtkfontsel.c:1976
- msgid "other"
- msgstr "altra"
- 
-@@ -317,9 +335,10 @@
- 
- #: gtk/gtkfontsel.c:1856
- msgid "This is a 2-byte font and may not be displayed correctly."
--msgstr "Aquesta font �s de 2 octets i potser no es veja correctament."
-+msgstr "Aquesta font �s de 2 bytes i potser no es veur� correctament."
- 
--#: gtk/gtkfontsel.c:1960 gtk/gtkinputdialog.c:607
-+#: gtk/gtkfontsel.c:1960
-+#: gtk/gtkinputdialog.c:607
- msgid "(unknown)"
- msgstr "(desconegut)"
- 
-@@ -349,7 +368,7 @@
- 
- #: gtk/gtkfontsel.c:3508
- msgid "Apply"
--msgstr "Aplicar"
-+msgstr "Aplica"
- 
- #: gtk/gtkfontsel.c:3530
- msgid "Font Selection"
-@@ -363,7 +382,7 @@
- msgid "Gamma value"
- msgstr "Valor de gamma"
- 
--#. shell and main vbox
-+#  shell and main vbox
- #: gtk/gtkinputdialog.c:200
- msgid "Input"
- msgstr "Entrada"
-@@ -392,21 +411,21 @@
- msgid "Mode: "
- msgstr "Mode: "
- 
--#. The axis listbox
-+#  The axis listbox
- #: gtk/gtkinputdialog.c:307
- msgid "Axes"
- msgstr "Eixos"
- 
--#. Keys listbox
-+#  Keys listbox
- #: gtk/gtkinputdialog.c:323
- msgid "Keys"
- msgstr "Tecles"
- 
--#. We create the save button in any case, so that clients can
--#. connect to it, without paying attention to whether it exits
-+#  We create the save button in any case, so that clients can
-+#  connect to it, without paying attention to whether it exits
- #: gtk/gtkinputdialog.c:345
- msgid "Save"
--msgstr "Guardar"
-+msgstr "Desa"
- 
- #: gtk/gtkinputdialog.c:500
- msgid "X"
-@@ -432,16 +451,18 @@
- msgid "none"
- msgstr "cap"
- 
--#: gtk/gtkinputdialog.c:578 gtk/gtkinputdialog.c:614
-+#: gtk/gtkinputdialog.c:578
-+#: gtk/gtkinputdialog.c:614
- msgid "(disabled)"
- msgstr "(desactivat)"
- 
--#. and clear button
-+#  and clear button
- #: gtk/gtkinputdialog.c:692
- msgid "clear"
--msgstr "esborrar"
-+msgstr "neteja"
- 
--#: gtk/gtknotebook.c:2059 gtk/gtknotebook.c:4131
-+#: gtk/gtknotebook.c:2059
-+#: gtk/gtknotebook.c:4131
- #, c-format
- msgid "Page %u"
- msgstr "P�gina %u"
-@@ -464,3 +485,4 @@
- #: gtk/gtktipsquery.c:180
- msgid "--- No Tip ---"
- msgstr "-- Sense pista --"
-+
---- gtk+1.2-1.2.10.orig/gdk/Makefile.in
-+++ gtk+1.2-1.2.10/gdk/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-@@ -66,6 +66,8 @@
- CC = @CC@
- DATADIRNAME = @DATADIRNAME@
- DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
- GDK_WLIBS = @GDK_WLIBS@
- GENCAT = @GENCAT@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -101,12 +103,14 @@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- POFILES = @POFILES@
- POSUB = @POSUB@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
-+STRIP = @STRIP@
- STRIP_BEGIN = @STRIP_BEGIN@
- STRIP_DUMMY = @STRIP_DUMMY@
- STRIP_END = @STRIP_END@
-@@ -185,9 +189,10 @@
- gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \
- gdkrectangle.lo gdkregion.lo gdkselection.lo gdkvisual.lo gdkwindow.lo \
- gdkxid.lo gxid_lib.lo
-+bin_PROGRAMS =  @xinput_progs@
- PROGRAMS =  $(bin_PROGRAMS)
- 
--gxid_OBJECTS =  gxid.o
-+gxid_OBJECTS =  gxid.$(OBJEXT)
- gxid_DEPENDENCIES = 
- gxid_LDFLAGS = 
- CFLAGS = @CFLAGS@
-@@ -202,18 +207,25 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
-+DEP_FILES =  .deps/gdk.P .deps/gdkcc.P .deps/gdkcolor.P \
-+.deps/gdkcursor.P .deps/gdkdnd.P .deps/gdkdraw.P .deps/gdkevents.P \
-+.deps/gdkfont.P .deps/gdkgc.P .deps/gdkglobals.P .deps/gdkim.P \
-+.deps/gdkimage.P .deps/gdkinput.P .deps/gdkpixmap.P .deps/gdkproperty.P \
-+.deps/gdkrectangle.P .deps/gdkregion.P .deps/gdkrgb.P \
-+.deps/gdkselection.P .deps/gdkvisual.P .deps/gdkwindow.P .deps/gdkxid.P \
-+.deps/gxid.P .deps/gxid_lib.P
- SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
- OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
- 
- all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .s
-+.SUFFIXES: .S .c .lo .o .obj .s
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gdk/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -243,8 +255,10 @@
- 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
- 	done
- 
--.c.o:
--	$(COMPILE) -c $<
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
- 
- .s.o:
- 	$(COMPILE) -c $<
-@@ -254,6 +268,7 @@
- 
- mostlyclean-compile:
- 	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
- 
- clean-compile:
- 
-@@ -262,9 +277,6 @@
- 
- maintainer-clean-compile:
- 
--.c.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
- .s.lo:
- 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
- 
-@@ -309,8 +321,8 @@
- 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	done
- 
--gxid: $(gxid_OBJECTS) $(gxid_DEPENDENCIES)
--	@rm -f gxid
-+gxid$(EXEEXT): $(gxid_OBJECTS) $(gxid_DEPENDENCIES)
-+	@rm -f gxid$(EXEEXT)
- 	$(LINK) $(gxid_LDFLAGS) $(gxid_OBJECTS) $(gxid_LDADD) $(LIBS)
- 
- install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS)
-@@ -346,7 +358,7 @@
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
- 
- mostlyclean-tags:
- 
-@@ -362,6 +374,11 @@
- subdir = gdk
- 
- distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gdk/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -372,55 +389,38 @@
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
--gdk.lo gdk.o : gdk.c ../config.h gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
--	gdkprivate.h gdkinput.h gdkx.h gdkprivate.h gdki18n.h \
--	gdkkeysyms.h
--gdkcc.lo gdkcc.o : gdkcc.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
--	gdkprivate.h gdkx.h gdkprivate.h
--gdkcolor.lo gdkcolor.o : gdkcolor.c gdk.h gdktypes.h gdkcursors.h \
--	gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
--gdkcursor.lo gdkcursor.o : gdkcursor.c gdk.h gdktypes.h gdkcursors.h \
--	gdkrgb.h gdkprivate.h
--gdkdnd.lo gdkdnd.o : gdkdnd.c gdkx.h gdkprivate.h gdktypes.h \
--	gdkcursors.h gdk.h gdkrgb.h
--gdkdraw.lo gdkdraw.o : gdkdraw.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
--	gdkprivate.h
--gdkevents.lo gdkevents.o : gdkevents.c gdk.h gdktypes.h gdkcursors.h \
--	gdkrgb.h gdkx.h gdkprivate.h gdkprivate.h gdkkeysyms.h \
--	../config.h gdkinput.h
--gdkfont.lo gdkfont.o : gdkfont.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
--	gdkprivate.h ../config.h
--gdkgc.lo gdkgc.o : gdkgc.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
--	gdkprivate.h
--gdkglobals.lo gdkglobals.o : gdkglobals.c gdktypes.h gdkcursors.h \
--	gdkprivate.h gdktypes.h ../config.h
--gdkim.lo gdkim.o : gdkim.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
--	gdkprivate.h gdki18n.h gdkx.h gdkprivate.h ../config.h
--gdkimage.lo gdkimage.o : gdkimage.c ../config.h gdk.h gdktypes.h \
--	gdkcursors.h gdkrgb.h gdkprivate.h
--gdkinput.lo gdkinput.o : gdkinput.c ../config.h gdk.h gdktypes.h \
--	gdkcursors.h gdkrgb.h gdkx.h gdkprivate.h gdkprivate.h \
--	gdkinput.h gdkinputnone.h gdkinputcommon.h gdkinputxfree.h \
--	gdkinputgxi.h
--gdkpixmap.lo gdkpixmap.o : gdkpixmap.c ../config.h gdk.h gdktypes.h \
--	gdkcursors.h gdkrgb.h gdkprivate.h
--gdkproperty.lo gdkproperty.o : gdkproperty.c gdk.h gdktypes.h \
--	gdkcursors.h gdkrgb.h gdkprivate.h
--gdkrectangle.lo gdkrectangle.o : gdkrectangle.c gdk.h gdktypes.h \
--	gdkcursors.h gdkrgb.h
--gdkregion.lo gdkregion.o : gdkregion.c gdk.h gdktypes.h gdkcursors.h \
--	gdkrgb.h gdkprivate.h
--gdkrgb.lo gdkrgb.o : gdkrgb.c ../config.h gdk.h gdktypes.h gdkcursors.h \
--	gdkrgb.h gdkprivate.h gdkrgb.h
--gdkselection.lo gdkselection.o : gdkselection.c gdk.h gdktypes.h \
--	gdkcursors.h gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
--gdkvisual.lo gdkvisual.o : gdkvisual.c gdk.h gdktypes.h gdkcursors.h \
--	gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
--gdkwindow.lo gdkwindow.o : gdkwindow.c gdk.h gdktypes.h gdkcursors.h \
--	gdkrgb.h ../config.h gdkinput.h gdkprivate.h MwmUtil.h
--gdkxid.lo gdkxid.o : gdkxid.c gdkprivate.h gdktypes.h gdkcursors.h
--gxid_lib.lo gxid_lib.o : gxid_lib.c ../config.h gxid_lib.h gxid_proto.h
- 
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -462,19 +462,19 @@
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
- 		mostlyclean-libtool mostlyclean-binPROGRAMS \
--		mostlyclean-tags mostlyclean-generic
-+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
- 
- mostlyclean: mostlyclean-am
- 
- clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
--		clean-binPROGRAMS clean-tags clean-generic \
-+		clean-binPROGRAMS clean-tags clean-depend clean-generic \
- 		mostlyclean-am
- 
- clean: clean-am
- 
- distclean-am:  distclean-libLTLIBRARIES distclean-compile \
- 		distclean-libtool distclean-binPROGRAMS distclean-tags \
--		distclean-generic clean-am
-+		distclean-depend distclean-generic clean-am
- 	-rm -f libtool
- 
- distclean: distclean-am
-@@ -482,7 +482,8 @@
- maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
- 		maintainer-clean-compile maintainer-clean-libtool \
- 		maintainer-clean-binPROGRAMS maintainer-clean-tags \
--		maintainer-clean-generic distclean-am
-+		maintainer-clean-depend maintainer-clean-generic \
-+		distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
-@@ -497,12 +498,13 @@
- clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
- install-binPROGRAMS uninstall-libgdkincludeHEADERS \
- install-libgdkincludeHEADERS tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- 
- #
---- gtk+1.2-1.2.10.orig/gdk/gdk.c
-+++ gtk+1.2-1.2.10/gdk/gdk.c
-@@ -989,7 +989,7 @@
- void
- gdk_beep (void)
- {
--  XBell(gdk_display, 100);
-+  XBell(gdk_display, 0);
- }
- 
- /*
---- gtk+1.2-1.2.10.orig/gdk/gdkevents.c
-+++ gtk+1.2-1.2.10/gdk/gdkevents.c
-@@ -383,6 +383,7 @@
- struct _GdkExposeInfo
- {
-   Window window;
-+  GdkWindowPrivate *toplevel_window;
-   gboolean seen_nonmatching;
- };
- 
-@@ -400,10 +401,21 @@
-    * we'll get a whole bunch of them interspersed with
-    * expose events.
-    */
--  if (xevent->xany.type != Expose && 
--      xevent->xany.type != GravityNotify)
-+  switch (xevent->xany.type)
-     {
-+    case Expose:
-+    case GravityNotify:
-+      break;
-+    case ConfigureNotify:
-+      if (xevent->xconfigure.window != info->toplevel_window->xwindow)
-+	break;
-+      if (xevent->xconfigure.width == info->toplevel_window->width &&
-+	  xevent->xconfigure.height == info->toplevel_window->height)
-+	break;
-+      /* Fall through */
-+    default:
-       info->seen_nonmatching = TRUE;
-+      break;
-     }
- 
-   if (info->seen_nonmatching ||
-@@ -429,6 +441,7 @@
-   GdkEvent event;
- 
-   info.window = xevent->xany.window;
-+  info.toplevel_window = (GdkWindowPrivate *) gdk_window_get_toplevel (window);
-   info.seen_nonmatching = FALSE;
-   
-   rect1.x = xevent->xexpose.x;
---- gtk+1.2-1.2.10.orig/gdk/gdkfont.c
-+++ gtk+1.2-1.2.10/gdk/gdkfont.c
-@@ -26,6 +26,8 @@
- 
- #include <X11/Xlib.h>
- #include <X11/Xos.h>
-+#include <locale.h>
-+#include <langinfo.h>
- #include "gdk.h"
- #include "gdkprivate.h"
- 
-@@ -173,9 +175,24 @@
-   if (missing_charset_count)
-     {
-       gint i;
--      g_warning ("Missing charsets in FontSet creation\n");
--      for (i=0;i<missing_charset_count;i++)
--	g_warning ("    %s\n", missing_charset_list[i]);
-+      const char *codeset;
-+
-+      codeset = nl_langinfo (CODESET);
-+
-+      /* Hack - UTF-8 is likely to be rendered with a list of
-+       * possible legacy fallback charsets, so a failure here
-+       * shouldn't be warned about. But we don't want to suppress
-+       * this warning in general, since for other charcter sets
-+       * it gives a useful indication of what went wrong.
-+       */
-+      if (g_strcasecmp (codeset, "utf-8") != 0 &&
-+	  g_strcasecmp (codeset, "utf8") != 0) {
-+          g_printerr ("The font \"%s\" does not support all the required character sets for the current locale \"%s\"\n",
-+		      fontset_name, setlocale (LC_ALL, NULL));
-+          for (i=0;i<missing_charset_count;i++)
-+	    g_printerr ("  (Missing character set \"%s\")\n",
-+		        missing_charset_list[i]);
-+      }
-       XFreeStringList (missing_charset_list);
-     }
- 
-@@ -445,7 +462,6 @@
-   GdkFontPrivate *private;
-   XCharStruct *chars;
-   gint width;
--  guint ch = character & 0xff;  /* get rid of sign-extension */
-   XFontStruct *xfont;
-   XFontSet fontset;
- 
-@@ -458,21 +474,7 @@
-     case GDK_FONT_FONT:
-       /* only 8 bits characters are considered here */
-       xfont = (XFontStruct *) private->xfont;
--      if ((xfont->min_byte1 == 0) &&
--	  (xfont->max_byte1 == 0) &&
--	  (ch >= xfont->min_char_or_byte2) &&
--	  (ch <= xfont->max_char_or_byte2))
--	{
--	  chars = xfont->per_char;
--	  if (chars)
--	    width = chars[ch - xfont->min_char_or_byte2].width;
--	  else
--	    width = xfont->min_bounds.width;
--	}
--      else
--	{
--	  width = XTextWidth (xfont, &character, 1);
--	}
-+      width = XTextWidth (xfont, &character, 1);
-       break;
-     case GDK_FONT_FONTSET:
-       fontset = (XFontSet) private->xfont;
---- gtk+1.2-1.2.10.orig/gdk/gdkselection.c
-+++ gtk+1.2-1.2.10/gdk/gdkselection.c
-@@ -191,73 +191,6 @@
-   gdk_send_xevent (requestor, False, NoEventMask, (XEvent*) &xevent);
- }
- 
--
--/* The output of XmbTextPropertyToTextList may include stuff not valid
-- * for COMPOUND_TEXT. This routine tries to correct this by:
-- *
-- * a) Canonicalizing CR LF and CR to LF
-- * b) Stripping out all other non-allowed control characters
-- *
-- * See the COMPOUND_TEXT spec distributed with X for explanations
-- * what is allowed.
-- */
--static gchar *
--sanitize_ctext (const char *str,
--		gint       *length)
--{
--  gchar *result = g_malloc (*length + 1);
--  gint out_length = 0;
--  gint i;
--  const guchar *ustr = (const guchar *)str;
--
--  for (i=0; i < *length; i++)
--    {
--      guchar c = ustr[i];
--      
--      if (c == '\r')
--	{
--	  result[out_length++] = '\n';
--	  if (i + 1 < *length && ustr[i + 1] == '\n')
--	    i++;
--	}
--      else if (c == 27 /* ESC */)
--	{
--	  /* Check for "extended segments, which can contain arbitrary
--	   * octets. See CTEXT spec, section 6.
--	   */
--
--	  if (i + 5 < *length &&
--	      ustr[i + 1] == '%' &&
--	      ustr[i + 2] == '/' &&
--	      (ustr[i + 3] >= 48 && ustr[i + 3] <= 52) &&
--	      ustr[i + 4] >= 128 &&
--	      ustr[i + 5] >= 128)
--	    {
--	      int extra_len = 6 + (ustr[i + 4] - 128) * 128 + ustr[i + 5] - 128;
--	      extra_len = MAX (extra_len, *length - i);
--
--	      memcpy (result + out_length, ustr + i, extra_len);
--	      out_length += extra_len;
--	      i += extra_len - 1;
--	    }
--	  else
--	    result[out_length++] = c;	    
--	}
--      else if (c == '\n' || c == '\t' || c == 27 /* ESC */ ||
--	       (c >= 32 && c <= 127) ||	/* GL */
--	       c == 155 /* CONTROL SEQUENCE INTRODUCER */ ||	
--	       (c >= 160 && c <= 255)) /* GR */
--	{
--	  result[out_length++] = c;
--	}
--    }
--
--  result[out_length] = '\0';
--  *length = out_length;
--  
--  return result;
--}
--
- gint
- gdk_text_property_to_text_list (GdkAtom encoding, gint format, 
- 				guchar *text, gint length,
-@@ -266,32 +199,16 @@
-   XTextProperty property;
-   gint count = 0;
-   gint res;
--  gchar *sanitized_text = NULL;
- 
-   if (!list) 
-     return 0;
- 
-   property.encoding = encoding;
-   property.format = format;
--
--  if (encoding == gdk_atom_intern ("COMPOUND_TEXT", FALSE) && format == 8)
--    {
--      gint sanitized_text_length = length;
--      
--      property.value = sanitized_text = sanitize_ctext (text, &sanitized_text_length);
--      property.nitems = sanitized_text_length;
--    }
--  else
--    {
--      property.value = text;
--      property.nitems = length;
--    }
--  
-+  property.value = text;
-+  property.nitems = length;
-   res = XmbTextPropertyToTextList (GDK_DISPLAY(), &property, list, &count);
- 
--  if (sanitized_text)
--    g_free (sanitized_text);
--
-   if (res == XNoMemory || res == XLocaleNotSupported || 
-       res == XConverterNotFound)
-     return 0;
-@@ -314,8 +231,6 @@
- {
-   gint res;
-   XTextProperty property;
--  gint sanitized_text_length;
--  gchar *sanitized_text;
- 
-   res = XmbTextListToTextProperty (GDK_DISPLAY(), 
- 				   (char **)&str, 1, XCompoundTextStyle,
-@@ -334,17 +249,10 @@
-     *encoding = property.encoding;
-   if (format)
-     *format = property.format;
--
--  sanitized_text_length = property.nitems;
--  sanitized_text = sanitize_ctext (property.value, &sanitized_text_length);
--
-   if (ctext)
--    *ctext = sanitized_text;
--  else
--    g_free (sanitized_text);
--  
-+    *ctext = g_strdup (property.value);
-   if (length)
--    *length = sanitized_text_length;
-+    *length = property.nitems;
- 
-   if (property.value)
-     XFree (property.value);
---- gtk+1.2-1.2.10.orig/gtk/Makefile.in
-+++ gtk+1.2-1.2.10/gtk/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-@@ -66,6 +66,8 @@
- CC = @CC@
- DATADIRNAME = @DATADIRNAME@
- DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
- GDK_WLIBS = @GDK_WLIBS@
- GENCAT = @GENCAT@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -101,12 +103,14 @@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- POFILES = @POFILES@
- POSUB = @POSUB@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
-+STRIP = @STRIP@
- STRIP_BEGIN = @STRIP_BEGIN@
- STRIP_DUMMY = @STRIP_DUMMY@
- STRIP_END = @STRIP_END@
-@@ -135,9 +139,8 @@
- 
- # libtool stuff: set version and export symbols for resolving
- libgtkincludedir = $(includedir)/gtk-1.2/gtk
--libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
-+libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm								$(top_builddir)/gdk/libgdk.la				@STRIP_END@
- 
--#	$(top_builddir)/gdk/libgdk.la
- 
- #
- # setup source file variables
-@@ -191,7 +194,7 @@
- CLEANFILES =  $(gen_sources)
- 
- gtkconfdir = $(sysconfdir)/gtk
--gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
-+gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk 	gtkrc.utf-8 gtkrc.iso-8859-2 	gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 	gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
- 
- 
- #
-@@ -252,25 +255,28 @@
- gtktooltips.lo gtktree.lo gtktreeitem.lo gtktypeutils.lo gtkvbbox.lo \
- gtkvbox.lo gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \
- gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo gtkwindow.lo fnmatch.lo
-+noinst_PROGRAMS =  testgtk$(EXEEXT) testinput$(EXEEXT) \
-+testselection$(EXEEXT) testrgb$(EXEEXT) testdnd$(EXEEXT) \
-+simple$(EXEEXT)
- PROGRAMS =  $(noinst_PROGRAMS)
- 
- testgtk_SOURCES = testgtk.c
--testgtk_OBJECTS =  testgtk.o
-+testgtk_OBJECTS =  testgtk.$(OBJEXT)
- testgtk_LDFLAGS = 
- testinput_SOURCES = testinput.c
--testinput_OBJECTS =  testinput.o
-+testinput_OBJECTS =  testinput.$(OBJEXT)
- testinput_LDFLAGS = 
- testselection_SOURCES = testselection.c
--testselection_OBJECTS =  testselection.o
-+testselection_OBJECTS =  testselection.$(OBJEXT)
- testselection_LDFLAGS = 
- testrgb_SOURCES = testrgb.c
--testrgb_OBJECTS =  testrgb.o
-+testrgb_OBJECTS =  testrgb.$(OBJEXT)
- testrgb_LDFLAGS = 
- testdnd_SOURCES = testdnd.c
--testdnd_OBJECTS =  testdnd.o
-+testdnd_OBJECTS =  testdnd.$(OBJEXT)
- testdnd_LDFLAGS = 
- simple_SOURCES = simple.c
--simple_OBJECTS =  simple.o
-+simple_OBJECTS =  simple.$(OBJEXT)
- simple_LDFLAGS = 
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -286,18 +292,52 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
-+DEP_FILES =  .deps/fnmatch.P .deps/gtkaccelgroup.P .deps/gtkaccellabel.P \
-+.deps/gtkadjustment.P .deps/gtkalignment.P .deps/gtkarg.P \
-+.deps/gtkarrow.P .deps/gtkaspectframe.P .deps/gtkbbox.P .deps/gtkbin.P \
-+.deps/gtkbindings.P .deps/gtkbox.P .deps/gtkbutton.P \
-+.deps/gtkcalendar.P .deps/gtkcheckbutton.P .deps/gtkcheckmenuitem.P \
-+.deps/gtkclist.P .deps/gtkcolorsel.P .deps/gtkcombo.P \
-+.deps/gtkcontainer.P .deps/gtkctree.P .deps/gtkcurve.P .deps/gtkdata.P \
-+.deps/gtkdialog.P .deps/gtkdnd.P .deps/gtkdrawingarea.P \
-+.deps/gtkeditable.P .deps/gtkentry.P .deps/gtkeventbox.P \
-+.deps/gtkfilesel.P .deps/gtkfixed.P .deps/gtkfontsel.P .deps/gtkframe.P \
-+.deps/gtkgamma.P .deps/gtkgc.P .deps/gtkhandlebox.P .deps/gtkhbbox.P \
-+.deps/gtkhbox.P .deps/gtkhpaned.P .deps/gtkhruler.P .deps/gtkhscale.P \
-+.deps/gtkhscrollbar.P .deps/gtkhseparator.P .deps/gtkimage.P \
-+.deps/gtkinputdialog.P .deps/gtkinvisible.P .deps/gtkitem.P \
-+.deps/gtkitemfactory.P .deps/gtklabel.P .deps/gtklayout.P \
-+.deps/gtklist.P .deps/gtklistitem.P .deps/gtkmain.P .deps/gtkmarshal.P \
-+.deps/gtkmenu.P .deps/gtkmenubar.P .deps/gtkmenufactory.P \
-+.deps/gtkmenuitem.P .deps/gtkmenushell.P .deps/gtkmisc.P \
-+.deps/gtknotebook.P .deps/gtkobject.P .deps/gtkoptionmenu.P \
-+.deps/gtkpacker.P .deps/gtkpaned.P .deps/gtkpixmap.P .deps/gtkplug.P \
-+.deps/gtkpreview.P .deps/gtkprogress.P .deps/gtkprogressbar.P \
-+.deps/gtkradiobutton.P .deps/gtkradiomenuitem.P .deps/gtkrange.P \
-+.deps/gtkrc.P .deps/gtkruler.P .deps/gtkscale.P .deps/gtkscrollbar.P \
-+.deps/gtkscrolledwindow.P .deps/gtkselection.P .deps/gtkseparator.P \
-+.deps/gtksignal.P .deps/gtksocket.P .deps/gtkspinbutton.P \
-+.deps/gtkstatusbar.P .deps/gtkstyle.P .deps/gtktable.P \
-+.deps/gtktearoffmenuitem.P .deps/gtktext.P .deps/gtkthemes.P \
-+.deps/gtktipsquery.P .deps/gtktogglebutton.P .deps/gtktoolbar.P \
-+.deps/gtktooltips.P .deps/gtktree.P .deps/gtktreeitem.P \
-+.deps/gtktypeutils.P .deps/gtkvbbox.P .deps/gtkvbox.P \
-+.deps/gtkviewport.P .deps/gtkvpaned.P .deps/gtkvruler.P \
-+.deps/gtkvscale.P .deps/gtkvscrollbar.P .deps/gtkvseparator.P \
-+.deps/gtkwidget.P .deps/gtkwindow.P .deps/simple.P .deps/testdnd.P \
-+.deps/testgtk.P .deps/testinput.P .deps/testrgb.P .deps/testselection.P
- SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c
--OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o
-+OBJECTS = $(libgtk_la_OBJECTS) testgtk.$(OBJEXT) testinput.$(OBJEXT) testselection.$(OBJEXT) testrgb.$(OBJEXT) testdnd.$(OBJEXT) simple.$(OBJEXT)
- 
- all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .s
-+.SUFFIXES: .S .c .lo .o .obj .s
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gtk/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -329,8 +369,10 @@
- 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
- 	done
- 
--.c.o:
--	$(COMPILE) -c $<
-+# FIXME: We should only use cygpath when building on Windows,
-+# and only if it is available.
-+.c.obj:
-+	$(COMPILE) -c `cygpath -w $<`
- 
- .s.o:
- 	$(COMPILE) -c $<
-@@ -340,6 +382,7 @@
- 
- mostlyclean-compile:
- 	-rm -f *.o core *.core
-+	-rm -f *.$(OBJEXT)
- 
- clean-compile:
- 
-@@ -348,9 +391,6 @@
- 
- maintainer-clean-compile:
- 
--.c.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
- .s.lo:
- 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
- 
-@@ -379,28 +419,28 @@
- 
- maintainer-clean-noinstPROGRAMS:
- 
--testgtk: $(testgtk_OBJECTS) $(testgtk_DEPENDENCIES)
--	@rm -f testgtk
-+testgtk$(EXEEXT): $(testgtk_OBJECTS) $(testgtk_DEPENDENCIES)
-+	@rm -f testgtk$(EXEEXT)
- 	$(LINK) $(testgtk_LDFLAGS) $(testgtk_OBJECTS) $(testgtk_LDADD) $(LIBS)
- 
--testinput: $(testinput_OBJECTS) $(testinput_DEPENDENCIES)
--	@rm -f testinput
-+testinput$(EXEEXT): $(testinput_OBJECTS) $(testinput_DEPENDENCIES)
-+	@rm -f testinput$(EXEEXT)
- 	$(LINK) $(testinput_LDFLAGS) $(testinput_OBJECTS) $(testinput_LDADD) $(LIBS)
- 
--testselection: $(testselection_OBJECTS) $(testselection_DEPENDENCIES)
--	@rm -f testselection
-+testselection$(EXEEXT): $(testselection_OBJECTS) $(testselection_DEPENDENCIES)
-+	@rm -f testselection$(EXEEXT)
- 	$(LINK) $(testselection_LDFLAGS) $(testselection_OBJECTS) $(testselection_LDADD) $(LIBS)
- 
--testrgb: $(testrgb_OBJECTS) $(testrgb_DEPENDENCIES)
--	@rm -f testrgb
-+testrgb$(EXEEXT): $(testrgb_OBJECTS) $(testrgb_DEPENDENCIES)
-+	@rm -f testrgb$(EXEEXT)
- 	$(LINK) $(testrgb_LDFLAGS) $(testrgb_OBJECTS) $(testrgb_LDADD) $(LIBS)
- 
--testdnd: $(testdnd_OBJECTS) $(testdnd_DEPENDENCIES)
--	@rm -f testdnd
-+testdnd$(EXEEXT): $(testdnd_OBJECTS) $(testdnd_DEPENDENCIES)
-+	@rm -f testdnd$(EXEEXT)
- 	$(LINK) $(testdnd_LDFLAGS) $(testdnd_OBJECTS) $(testdnd_LDADD) $(LIBS)
- 
--simple: $(simple_OBJECTS) $(simple_DEPENDENCIES)
--	@rm -f simple
-+simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES)
-+	@rm -f simple$(EXEEXT)
- 	$(LINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS)
- 
- install-gtkconfDATA: $(gtkconf_DATA)
-@@ -455,7 +495,7 @@
- 	  awk '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
- 
- mostlyclean-tags:
- 
-@@ -471,6 +511,11 @@
- subdir = gtk
- 
- distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gtk/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -481,866 +526,38 @@
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
--fnmatch.lo fnmatch.o : fnmatch.c ../config.h fnmatch.h
--gtkaccelgroup.lo gtkaccelgroup.o : gtkaccelgroup.c gtkaccelgroup.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h ../gdk/gdkkeysyms.h \
--	gtksignal.h gtkmarshal.h gtkwidget.h gtkaccelgroup.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h
--gtkaccellabel.lo gtkaccellabel.o : gtkaccellabel.c gtkmain.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
--	gtkaccellabel.h gtklabel.h gtkmisc.h
--gtkadjustment.lo gtkadjustment.o : gtkadjustment.c gtkadjustment.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtksignal.h \
--	gtkmarshal.h
--gtkalignment.lo gtkalignment.o : gtkalignment.c gtkalignment.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h
--gtkarg.lo gtkarg.o : gtkarg.c gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkargcollector.c
--gtkarrow.lo gtkarrow.o : gtkarrow.c gtkarrow.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h
--gtkaspectframe.lo gtkaspectframe.o : gtkaspectframe.c gtkaspectframe.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkframe.h
--gtkbbox.lo gtkbbox.o : gtkbbox.c gtkbbox.h gtkbox.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkbin.lo gtkbin.o : gtkbin.c gtkbin.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkcontainer.h gtkenums.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h
--gtkbindings.lo gtkbindings.o : gtkbindings.c gtkbindings.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtksignal.h gtkmarshal.h gtkwidget.h \
--	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h gtkrc.h \
--	gtkwidget.h
--gtkbox.lo gtkbox.o : gtkbox.c gtkbox.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkcontainer.h gtkenums.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h
--gtkbutton.lo gtkbutton.o : gtkbutton.c gtkbutton.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
--	gtkmisc.h gtkmain.h gtksignal.h gtkmarshal.h
--gtkcalendar.lo gtkcalendar.o : gtkcalendar.c gtkcalendar.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtksignal.h gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkwidget.h \
--	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	../gdk/gdkkeysyms.h
--gtkcheckbutton.lo gtkcheckbutton.o : gtkcheckbutton.c gtkcheckbutton.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtktogglebutton.h gtkbutton.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
--	gtkmisc.h
--gtkcheckmenuitem.lo gtkcheckmenuitem.o : gtkcheckmenuitem.c \
--	gtkcheckmenuitem.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmenuitem.h gtkitem.h \
--	gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkaccellabel.h \
--	gtklabel.h gtkmisc.h gtksignal.h gtkmarshal.h
--gtkclist.lo gtkclist.o : gtkclist.c ../config.h gtkmain.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkclist.h gtksignal.h gtkmarshal.h \
--	gtkalignment.h gtkbin.h gtkcontainer.h gtklabel.h gtkmisc.h \
--	gtkbutton.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
--	gtkvscrollbar.h gtkbindings.h gtkdnd.h gtkselection.h \
--	gtkwindow.h ../gdk/gdkx.h ../gdk/gdkprivate.h \
--	../gdk/gdkkeysyms.h
--gtkcolorsel.lo gtkcolorsel.o : gtkcolorsel.c ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcolorsel.h gtkwindow.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h gtkbin.h \
--	gtkcontainer.h gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtkvbox.h gtkbox.h gtkframe.h gtkpreview.h gtkbutton.h \
--	gtkentry.h gtkeditable.h gtkhbox.h gtklabel.h gtkmisc.h \
--	gtkmain.h gtksignal.h gtkmarshal.h gtkrange.h gtkscale.h \
--	gtkhscale.h gtktable.h gtkeventbox.h gtkwindow.h gtkhbbox.h \
--	gtkbbox.h gtkintl.h ../config.h gtkdnd.h gtkselection.h \
--	gtkselection.h
--gtkcombo.lo gtkcombo.o : gtkcombo.c gtkarrow.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtklabel.h gtklist.h gtkcontainer.h \
--	gtklistitem.h gtkitem.h gtkbin.h gtkentry.h gtkeditable.h \
--	gtkeventbox.h gtkbutton.h gtklistitem.h gtkscrolledwindow.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkviewport.h gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h \
--	../gdk/gdkkeysyms.h gtkcombo.h gtkhbox.h gtkbox.h gtkframe.h
--gtkcontainer.lo gtkcontainer.o : gtkcontainer.c gtkcontainer.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkprivate.h \
--	gtksignal.h gtkmarshal.h gtkmain.h
--gtkctree.lo gtkctree.o : gtkctree.c gtkctree.h gtkclist.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtksignal.h gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkalignment.h \
--	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h gtkmisc.h \
--	gtkbutton.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
--	gtkvscrollbar.h gtkbindings.h gtkmain.h gtkdnd.h gtkselection.h \
--	../gdk/gdkx.h ../gdk/gdkprivate.h ../gdk/gdkkeysyms.h
--gtkcurve.lo gtkcurve.o : gtkcurve.c gtkcurve.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkdrawingarea.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkdrawingarea.h gtkmain.h \
--	gtkradiobutton.h gtkcheckbutton.h gtktogglebutton.h gtkbutton.h \
--	gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h gtktable.h
--gtkdata.lo gtkdata.o : gtkdata.c gtkdata.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtksignal.h gtkmarshal.h
--gtkdialog.lo gtkdialog.o : gtkdialog.c gtkbutton.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkdialog.h \
--	gtkwindow.h gtkhbox.h gtkbox.h gtkhseparator.h gtkseparator.h \
--	gtkvbox.h
--gtkdnd.lo gtkdnd.o : gtkdnd.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
--	gtkdnd.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkselection.h gtkinvisible.h gtkbin.h \
--	gtkcontainer.h gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h
--gtkdrawingarea.lo gtkdrawingarea.o : gtkdrawingarea.c gtkdrawingarea.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h
--gtkeditable.lo gtkeditable.o : gtkeditable.c ../gdk/gdkx.h \
--	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkkeysyms.h ../gdk/gdki18n.h gtkeditable.h ../gdk/gdk.h \
--	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkmain.h gtkselection.h \
--	gtksignal.h gtkmarshal.h
--gtkentry.lo gtkentry.o : gtkentry.c ../gdk/gdkkeysyms.h ../gdk/gdki18n.h \
--	gtkentry.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkeditable.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtkmain.h gtkselection.h gtksignal.h gtkmarshal.h gtkstyle.h
--gtkeventbox.lo gtkeventbox.o : gtkeventbox.c gtksignal.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkeventbox.h \
--	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h
--gtkfilesel.lo gtkfilesel.o : gtkfilesel.c fnmatch.h ../gdk/gdkkeysyms.h \
--	gtkbutton.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkentry.h gtkeditable.h gtkfilesel.h gtkwindow.h \
--	gtkhbox.h gtkbox.h gtkhbbox.h gtkbbox.h gtklabel.h gtkmisc.h \
--	gtklist.h gtklistitem.h gtkitem.h gtklistitem.h gtkmain.h \
--	gtkscrolledwindow.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
--	gtkvscrollbar.h gtkviewport.h gtksignal.h gtkmarshal.h \
--	gtkvbox.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
--	gtkoptionmenu.h gtkbutton.h gtkclist.h gtksignal.h \
--	gtkalignment.h gtklabel.h gtkdialog.h gtkintl.h ../config.h
--gtkfixed.lo gtkfixed.o : gtkfixed.c gtkfixed.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkfontsel.lo gtkfontsel.o : gtkfontsel.c ../gdk/gdkx.h \
--	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkkeysyms.h gtkbutton.h ../gdk/gdk.h ../gdk/gdkrgb.h \
--	gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtkcheckbutton.h gtktogglebutton.h gtkbutton.h gtkclist.h \
--	gtksignal.h gtkmarshal.h gtkalignment.h gtklabel.h gtkmisc.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkentry.h gtkeditable.h gtkfontsel.h gtkwindow.h gtknotebook.h \
--	gtkframe.h gtkhbbox.h gtkbbox.h gtkbox.h gtkhbox.h gtklabel.h \
--	gtknotebook.h gtkradiobutton.h gtkcheckbutton.h gtksignal.h \
--	gtktable.h gtkvbox.h gtkscrolledwindow.h gtkviewport.h \
--	gtkintl.h ../config.h
--gtkframe.lo gtkframe.o : gtkframe.c gtkframe.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkgamma.lo gtkgamma.o : gtkgamma.c gtkgamma.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkvbox.h \
--	gtkbox.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkcurve.h \
--	gtkdrawingarea.h gtkdialog.h gtkwindow.h gtkbin.h \
--	gtkdrawingarea.h gtkentry.h gtkeditable.h gtkhbox.h gtklabel.h \
--	gtkmisc.h gtkmain.h gtkpixmap.h gtkradiobutton.h \
--	gtkcheckbutton.h gtktogglebutton.h gtkbutton.h gtksignal.h \
--	gtkmarshal.h gtktable.h gtkvbox.h gtkwindow.h gtkintl.h \
--	../config.h
--gtkgc.lo gtkgc.o : gtkgc.c gtkgc.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h
--gtkhandlebox.lo gtkhandlebox.o : gtkhandlebox.c ../gdk/gdkx.h \
--	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	gtkhandlebox.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkinvisible.h \
--	gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h
--gtkhbbox.lo gtkhbbox.o : gtkhbbox.c gtkhbbox.h gtkbbox.h gtkbox.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkcontainer.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h
--gtkhbox.lo gtkhbox.o : gtkhbox.c gtkhbox.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbox.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkhpaned.lo gtkhpaned.o : gtkhpaned.c gtkhpaned.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkpaned.h gtkcontainer.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
--gtkhruler.lo gtkhruler.o : gtkhruler.c gtkhruler.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkruler.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h
--gtkhscale.lo gtkhscale.o : gtkhscale.c gtkhscale.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkscale.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtksignal.h gtkmarshal.h \
--	../gdk/gdkkeysyms.h
--gtkhscrollbar.lo gtkhscrollbar.o : gtkhscrollbar.c gtkhscrollbar.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkscrollbar.h gtkrange.h gtkadjustment.h \
--	gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h \
--	gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
--gtkhseparator.lo gtkhseparator.o : gtkhseparator.c gtkhseparator.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkseparator.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkimage.lo gtkimage.o : gtkimage.c gtkcontainer.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkimage.h gtkmisc.h
--gtkinputdialog.lo gtkinputdialog.o : gtkinputdialog.c \
--	../gdk/gdkkeysyms.h gtkbutton.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h gtkcontainer.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkentry.h gtkeditable.h gtkhbox.h \
--	gtkbox.h gtkhseparator.h gtkseparator.h gtkinputdialog.h \
--	gtkdialog.h gtkwindow.h gtklabel.h gtkmisc.h gtklistitem.h \
--	gtkitem.h gtkmain.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
--	gtknotebook.h gtkoptionmenu.h gtkbutton.h gtkscrolledwindow.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkviewport.h gtksignal.h gtkmarshal.h gtktable.h gtkvbox.h \
--	gtkintl.h ../config.h
--gtkinvisible.lo gtkinvisible.o : gtkinvisible.c gtksignal.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkinvisible.h \
--	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h
--gtkitem.lo gtkitem.o : gtkitem.c gtkitem.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
--	gtkmarshal.h
--gtkitemfactory.lo gtkitemfactory.o : gtkitemfactory.c gtkitemfactory.h \
--	gtkwidget.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkmenufactory.h \
--	gtkbindings.h gtksignal.h gtkmarshal.h gtkoptionmenu.h \
--	gtkbutton.h gtkbin.h gtkcontainer.h gtkmenubar.h gtkmenushell.h \
--	gtkmenu.h gtkmenuitem.h gtkitem.h gtkradiomenuitem.h \
--	gtkcheckmenuitem.h gtktearoffmenuitem.h gtkaccellabel.h \
--	gtklabel.h gtkmisc.h ../gdk/gdkkeysyms.h
--gtklabel.lo gtklabel.o : gtklabel.c gtklabel.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h ../gdk/gdkkeysyms.h ../gdk/gdki18n.h
--gtklayout.lo gtklayout.o : gtklayout.c gtklayout.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
--	gtkmarshal.h gtkprivate.h ../gdk/gdkx.h ../gdk/gdkprivate.h
--gtklist.lo gtklist.o : gtklist.c gtklist.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklistitem.h \
--	gtkitem.h gtkbin.h gtklistitem.h gtkmain.h gtksignal.h \
--	gtkmarshal.h gtklabel.h gtkmisc.h
--gtklistitem.lo gtklistitem.o : gtklistitem.c gtkbindings.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtklabel.h gtkmisc.h gtkwidget.h \
--	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtklistitem.h gtkitem.h gtkbin.h gtkcontainer.h gtklist.h \
--	gtklistitem.h gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
--gtkmain.lo gtkmain.o : gtkmain.c gtkbutton.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkdnd.h \
--	gtkselection.h gtkfeatures.h gtkhscrollbar.h gtkscrollbar.h \
--	gtkrange.h gtkhseparator.h gtkseparator.h gtkmain.h \
--	gtkpreview.h gtkrc.h gtkscrolledwindow.h gtkhscrollbar.h \
--	gtkvscrollbar.h gtkviewport.h gtkselection.h gtksignal.h \
--	gtkmarshal.h gtktable.h gtktext.h gtkeditable.h gtkvbox.h \
--	gtkbox.h gtkvscrollbar.h gtkwidget.h gtkwindow.h gtkprivate.h \
--	../gdk/gdki18n.h ../config.h gtkdebug.h gtkintl.h
--gtkmarshal.lo gtkmarshal.o : gtkmarshal.c gtkmarshal.h gtktypeutils.h \
--	gtktypebuiltins.h gtkobject.h gtkarg.h gtkenums.h gtkdebug.h
--gtkmenu.lo gtkmenu.o : gtkmenu.c ../gdk/gdkkeysyms.h gtkbindings.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtklabel.h gtkmisc.h \
--	gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkmain.h gtkmenu.h gtkmenushell.h gtkcontainer.h \
--	gtkmenuitem.h gtkitem.h gtkbin.h gtksignal.h gtkmarshal.h \
--	gtkwindow.h
--gtkmenubar.lo gtkmenubar.o : gtkmenubar.c ../gdk/gdkkeysyms.h \
--	gtkbindings.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkmain.h gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkmenubar.h gtkmenushell.h gtkcontainer.h \
--	gtkmenuitem.h gtkitem.h gtkbin.h
--gtkmenufactory.lo gtkmenufactory.o : gtkmenufactory.c gtkcheckmenuitem.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkmenu.h gtkmenushell.h gtkmenubar.h \
--	gtkmenufactory.h gtkmenuitem.h gtksignal.h gtkmarshal.h
--gtkmenuitem.lo gtkmenuitem.o : gtkmenuitem.c gtkaccellabel.h gtklabel.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtkmain.h gtkmenu.h gtkmenushell.h gtkcontainer.h gtkmenubar.h \
--	gtkmenuitem.h gtkitem.h gtkbin.h gtksignal.h gtkmarshal.h
--gtkmenushell.lo gtkmenushell.o : gtkmenushell.c ../gdk/gdkkeysyms.h \
--	gtkbindings.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkmain.h gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h \
--	gtktearoffmenuitem.h gtkmenuitem.h gtkmenushell.h gtksignal.h \
--	gtkmarshal.h
--gtkmisc.lo gtkmisc.o : gtkmisc.c gtkcontainer.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkmisc.h
--gtknotebook.lo gtknotebook.o : gtknotebook.c gtknotebook.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
--	gtkmarshal.h gtkmain.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
--	gtkitem.h gtkbin.h gtklabel.h gtkmisc.h ../gdk/gdkkeysyms.h \
--	gtkintl.h ../config.h
--gtkobject.lo gtkobject.o : gtkobject.c gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtksignal.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkobject.h gtkmarshal.h
--gtkoptionmenu.lo gtkoptionmenu.o : gtkoptionmenu.c gtkmenu.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkmenushell.h gtkcontainer.h gtkwidget.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkmenuitem.h gtkitem.h gtkbin.h \
--	gtkoptionmenu.h gtkbutton.h gtksignal.h gtkmarshal.h \
--	../gdk/gdkkeysyms.h
--gtkpacker.lo gtkpacker.o : gtkpacker.c gtkpacker.h gtkcontainer.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkpaned.lo gtkpaned.o : gtkpaned.c gtkpaned.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkhpaned.h \
--	gtkpaned.h
--gtkpixmap.lo gtkpixmap.o : gtkpixmap.c gtkcontainer.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkpixmap.h gtkmisc.h
--gtkplug.lo gtkplug.o : gtkplug.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
--	gtkplug.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkwindow.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkbin.h gtkcontainer.h \
--	gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkpreview.lo gtkpreview.o : gtkpreview.c ../gdk/gdkx.h \
--	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkpreview.h gtkwidget.h ../gdk/gdk.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
--gtkprogress.lo gtkprogress.o : gtkprogress.c gtkprogress.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
--gtkprogressbar.lo gtkprogressbar.o : gtkprogressbar.c ../config.h \
--	gtkprogressbar.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkprogress.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
--gtkradiobutton.lo gtkradiobutton.o : gtkradiobutton.c gtklabel.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtkradiobutton.h gtkcheckbutton.h gtktogglebutton.h gtkbutton.h \
--	gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h
--gtkradiomenuitem.lo gtkradiomenuitem.o : gtkradiomenuitem.c \
--	gtkaccellabel.h gtklabel.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkradiomenuitem.h gtkcheckmenuitem.h \
--	gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h
--gtkrange.lo gtkrange.o : gtkrange.c gtkmain.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkrange.h gtksignal.h gtkmarshal.h
--gtkrc.lo gtkrc.o : gtkrc.c gtkrc.h gtkstyle.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkbindings.h gtkthemes.h gtkintl.h ../config.h
--gtkruler.lo gtkruler.o : gtkruler.c gtkruler.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h
--gtkscale.lo gtkscale.o : gtkscale.c gtkcontainer.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkscale.h gtkrange.h
--gtkscrollbar.lo gtkscrollbar.o : gtkscrollbar.c gtkscrollbar.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkrange.h gtkadjustment.h gtkdata.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h
--gtkscrolledwindow.lo gtkscrolledwindow.o : gtkscrolledwindow.c \
--	gtkscrolledwindow.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkhscrollbar.h \
--	gtkscrollbar.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtkvscrollbar.h \
--	gtkviewport.h gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h
--gtkselection.lo gtkselection.o : gtkselection.c ../gdk/gdkx.h \
--	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	gtkmain.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkselection.h gtksignal.h gtkmarshal.h
--gtkseparator.lo gtkseparator.o : gtkseparator.c gtkseparator.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h
--gtksignal.lo gtksignal.o : gtksignal.c gtksignal.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkargcollector.c
--gtksocket.lo gtksocket.o : gtksocket.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
--	gtkwindow.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkbin.h gtkcontainer.h gtkwidget.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
--	gtksocket.h gtkdnd.h gtkselection.h
--gtkspinbutton.lo gtkspinbutton.o : gtkspinbutton.c ../gdk/gdkkeysyms.h \
--	gtkspinbutton.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkentry.h gtkeditable.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
--gtkstatusbar.lo gtkstatusbar.o : gtkstatusbar.c gtkframe.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
--	gtkmisc.h gtksignal.h gtkmarshal.h gtkstatusbar.h gtkhbox.h \
--	gtkbox.h
--gtkstyle.lo gtkstyle.o : gtkstyle.c gtkgc.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkrc.h \
--	gtkstyle.h gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkwidget.h gtkthemes.h \
--	../gdk/gdkprivate.h
--gtktable.lo gtktable.o : gtktable.c gtktable.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtktearoffmenuitem.lo gtktearoffmenuitem.o : gtktearoffmenuitem.c \
--	gtkmenu.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkmenushell.h gtkcontainer.h gtkwidget.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
--	gtktearoffmenuitem.h gtkmenuitem.h gtkitem.h gtkbin.h
--gtktext.lo gtktext.o : gtktext.c ../gdk/gdkkeysyms.h ../gdk/gdki18n.h \
--	gtkmain.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkselection.h gtksignal.h \
--	gtkmarshal.h gtktext.h gtkeditable.h line-wrap.xbm \
--	line-arrow.xbm
--gtkthemes.lo gtkthemes.o : gtkthemes.c gtkthemes.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkstyle.h gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkmain.h gtkrc.h gtkselection.h \
--	gtksignal.h gtkmarshal.h gtkwidget.h ../config.h gtkintl.h
--gtktipsquery.lo gtktipsquery.o : gtktipsquery.c gtktipsquery.h \
--	gtklabel.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtksignal.h gtkmarshal.h gtktooltips.h gtkmain.h gtkintl.h \
--	../config.h
--gtktogglebutton.lo gtktogglebutton.o : gtktogglebutton.c gtklabel.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtkmain.h gtksignal.h gtkmarshal.h gtktogglebutton.h \
--	gtkbutton.h gtkbin.h gtkcontainer.h
--gtktoolbar.lo gtktoolbar.o : gtktoolbar.c gtkbutton.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtktogglebutton.h gtkbutton.h gtkradiobutton.h gtkcheckbutton.h \
--	gtktogglebutton.h gtklabel.h gtkmisc.h gtkvbox.h gtkbox.h \
--	gtktoolbar.h gtkpixmap.h gtksignal.h gtkmarshal.h gtktooltips.h
--gtktooltips.lo gtktooltips.o : gtktooltips.c gtkmain.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkwidget.h gtkwindow.h gtkbin.h \
--	gtkcontainer.h gtksignal.h gtkmarshal.h gtkstyle.h \
--	gtktooltips.h
--gtktree.lo gtktree.o : gtktree.c gtktree.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtktreeitem.h \
--	gtkitem.h gtkbin.h gtkmain.h gtksignal.h gtkmarshal.h gtklist.h \
--	gtklistitem.h
--gtktreeitem.lo gtktreeitem.o : gtktreeitem.c gtklabel.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
--	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtktree.h gtkcontainer.h gtktreeitem.h \
--	gtkitem.h gtkbin.h gtkeventbox.h gtkpixmap.h gtkmain.h \
--	gtksignal.h gtkmarshal.h tree_plus.xpm tree_minus.xpm
--gtktypeutils.lo gtktypeutils.o : gtktypeutils.c gtktypeutils.h \
--	gtktypebuiltins.h makeenums.h ../gdk/gdkprivate.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdk.h \
--	../gdk/gdkrgb.h gtk.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtkenums.h gtkdebug.h gtkaccellabel.h gtklabel.h \
--	gtkmisc.h gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h \
--	gtkalignment.h gtkbin.h gtkcontainer.h gtkaspectframe.h \
--	gtkframe.h gtkarrow.h gtkbindings.h gtkbox.h gtkbbox.h \
--	gtkbutton.h gtkcalendar.h gtksignal.h gtkmarshal.h \
--	gtkcheckbutton.h gtktogglebutton.h gtkcheckmenuitem.h \
--	gtkmenuitem.h gtkitem.h gtkclist.h gtkhscrollbar.h \
--	gtkscrollbar.h gtkrange.h gtkvscrollbar.h gtkcolorsel.h \
--	gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h gtkeditable.h \
--	gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h gtktable.h \
--	gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h gtkcurve.h \
--	gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
--	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
--	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
--	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
--	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
--	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
--	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
--	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
--	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
--	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
--	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
--	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
--	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
--	gtkprivate.h gtktypebuiltins_vars.c gtktypebuiltins_evals.c \
--	gtktypebuiltins_ids.c
--gtkvbbox.lo gtkvbbox.o : gtkvbbox.c gtkvbbox.h gtkbbox.h gtkbox.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkcontainer.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h
--gtkvbox.lo gtkvbox.o : gtkvbox.c gtkvbox.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbox.h \
--	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkviewport.lo gtkviewport.o : gtkviewport.c gtksignal.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkviewport.h \
--	gtkadjustment.h gtkdata.h gtkbin.h gtkcontainer.h gtkwidget.h \
--	gtkaccelgroup.h gtkstyle.h
--gtkvpaned.lo gtkvpaned.o : gtkvpaned.c gtkvpaned.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkpaned.h gtkcontainer.h gtkenums.h gtkwidget.h \
--	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
--	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
--gtkvruler.lo gtkvruler.o : gtkvruler.c gtkvruler.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkruler.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h
--gtkvscale.lo gtkvscale.o : gtkvscale.c gtkvscale.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkscale.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtksignal.h gtkmarshal.h \
--	../gdk/gdkkeysyms.h
--gtkvscrollbar.lo gtkvscrollbar.o : gtkvscrollbar.c gtkvscrollbar.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkscrollbar.h gtkrange.h gtkadjustment.h \
--	gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h \
--	gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
--gtkvseparator.lo gtkvseparator.o : gtkvseparator.c gtkvseparator.h \
--	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
--	../gdk/gdkrgb.h gtkseparator.h gtkwidget.h gtkaccelgroup.h \
--	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
--	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
--gtkwidget.lo gtkwidget.o : gtkwidget.c gtkcontainer.h ../gdk/gdk.h \
--	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
--	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
--	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
--	gtkdata.h gtkstyle.h gtkmain.h gtkrc.h gtkselection.h \
--	gtksignal.h gtkmarshal.h gtkwidget.h gtkwindow.h gtkbin.h \
--	gtkcontainer.h gtkbindings.h gtkprivate.h ../gdk/gdkx.h \
--	../gdk/gdkprivate.h
--gtkwindow.lo gtkwindow.o : gtkwindow.c ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h ../gdk/gdkkeysyms.h \
--	../gdk/gdkx.h ../gdk/gdkprivate.h gtkprivate.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
--	gtkstyle.h gtkrc.h gtksignal.h gtkmarshal.h gtkwindow.h \
--	gtkbin.h gtkcontainer.h gtkbindings.h gtkmain.h
--simple.o: simple.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
--	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
--	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
--	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
--	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
--	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
--	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
--	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
--	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
--	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
--	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
--	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
--	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
--	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
--	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
--	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
--	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
--	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
--	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
--	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
--	../gdk/gdkprivate.h
--testdnd.o: testdnd.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
--	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
--	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
--	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
--	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
--	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
--	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
--	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
--	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
--	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
--	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
--	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
--	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
--	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
--	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
--	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
--	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
--	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
--	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
--	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
--testgtk.o: testgtk.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
--	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
--	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
--	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
--	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
--	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
--	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
--	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
--	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
--	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
--	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
--	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
--	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
--	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
--	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
--	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
--	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
--	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
--	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
--	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
--	../gdk/gdkx.h ../gdk/gdkprivate.h ../gdk/gdkkeysyms.h \
--	circles.xbm
--testinput.o: testinput.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
--	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
--	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
--	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
--	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
--	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
--	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
--	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
--	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
--	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
--	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
--	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
--	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
--	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
--	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
--	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
--	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
--	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
--	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
--	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
--testrgb.o: testrgb.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
--	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
--	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
--	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
--	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
--	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
--	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
--	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
--	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
--	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
--	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
--	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
--	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
--	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
--	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
--	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
--	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
--	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
--	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
--	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
--testselection.o: testselection.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
--	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
--	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
--	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
--	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
--	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
--	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
--	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
--	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
--	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
--	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
--	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
--	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
--	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
--	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
--	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
--	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
--	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
--	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
--	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
--	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
--	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
--	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
--	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
--	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
--	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
- 
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -1384,19 +601,20 @@
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
- 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
--		mostlyclean-tags mostlyclean-generic
-+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
- 
- mostlyclean: mostlyclean-am
- 
- clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
--		clean-noinstPROGRAMS clean-tags clean-generic \
--		mostlyclean-am
-+		clean-noinstPROGRAMS clean-tags clean-depend \
-+		clean-generic mostlyclean-am
- 
- clean: clean-am
- 
- distclean-am:  distclean-libLTLIBRARIES distclean-compile \
- 		distclean-libtool distclean-noinstPROGRAMS \
--		distclean-tags distclean-generic clean-am
-+		distclean-tags distclean-depend distclean-generic \
-+		clean-am
- 	-rm -f libtool
- 
- distclean: distclean-am
-@@ -1404,7 +622,8 @@
- maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
- 		maintainer-clean-compile maintainer-clean-libtool \
- 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
--		maintainer-clean-generic distclean-am
-+		maintainer-clean-depend maintainer-clean-generic \
-+		distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
-@@ -1420,10 +639,11 @@
- maintainer-clean-noinstPROGRAMS uninstall-gtkconfDATA \
- install-gtkconfDATA uninstall-libgtkincludeHEADERS \
- install-libgtkincludeHEADERS tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-local install-data-am install-data install-am install \
--uninstall-local uninstall-am uninstall all-redirect all-am all \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-local install-data-am install-data install-am \
-+install uninstall-local uninstall-am uninstall all-redirect all-am all \
- installdirs mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
---- gtk+1.2-1.2.10.orig/gtk/Makefile.am
-+++ gtk+1.2-1.2.10/gtk/Makefile.am
-@@ -31,8 +31,8 @@
- 	@x_ldflags@						\
- 	@x_libs@ 						\
- 	-lm							\
-+	$(top_builddir)/gdk/libgdk.la				\
- @STRIP_END@
--#	$(top_builddir)/gdk/libgdk.la
- 
- 
- #
-@@ -374,10 +374,12 @@
- 
- 
- gtkconfdir = $(sysconfdir)/gtk
--gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
--	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \
--	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
--	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
-+gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
-+	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
-+	gtkrc.utf-8 gtkrc.iso-8859-2 \
-+	gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \
-+	gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
-+	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW \
- 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
- 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
- 
---- gtk+1.2-1.2.10.orig/gtk/gtkentry.c
-+++ gtk+1.2-1.2.10/gtk/gtkentry.c
-@@ -2280,11 +2280,13 @@
- 			 gint               start,
- 			 gint               end)
- {
--  gint length = GTK_ENTRY (editable)->text_length;
-+  gint length;
-   
-   g_return_if_fail (editable != NULL);
-   g_return_if_fail (GTK_IS_ENTRY (editable));
- 
-+  length = GTK_ENTRY (editable)->text_length;
-+
-   if (end < 0)
-     end = length;
-   
---- gtk+1.2-1.2.10.orig/gtk/gtkfilesel.c
-+++ gtk+1.2-1.2.10/gtk/gtkfilesel.c
-@@ -325,7 +325,8 @@
- 
- static void gtk_file_selection_populate      (GtkFileSelection      *fs,
- 					      gchar                 *rel_path,
--					      gint                   try_complete);
-+					      gboolean               try_complete,
-+					      gboolean               reset_entry);
- static void gtk_file_selection_abort         (GtkFileSelection      *fs);
- 
- static void gtk_file_selection_update_history_menu (GtkFileSelection       *fs,
-@@ -522,7 +523,7 @@
-     }
-   else
-     {
--      gtk_file_selection_populate (filesel, "", FALSE);
-+      gtk_file_selection_populate (filesel, "", FALSE, TRUE);
-     }
- 
-   gtk_widget_grab_focus (filesel->selection_entry);
-@@ -637,7 +638,7 @@
-       name = last_slash + 1;
-     }
- 
--  gtk_file_selection_populate (filesel, buf, FALSE);
-+  gtk_file_selection_populate (filesel, buf, FALSE, TRUE);
- 
-   if (filesel->selection_entry)
-     gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), name);
-@@ -673,7 +674,7 @@
- 
-   if (filesel->selection_entry)
-     gtk_entry_set_text (GTK_ENTRY (filesel->selection_entry), pattern);
--  gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE);
-+  gtk_file_selection_populate (filesel, (gchar*) pattern, TRUE, TRUE);
- }
- 
- static void
-@@ -806,7 +807,7 @@
-   g_free (full_path);
-   
-   gtk_widget_destroy (fs->fileop_dialog);
--  gtk_file_selection_populate (fs, "", FALSE);
-+  gtk_file_selection_populate (fs, "", FALSE, FALSE);
- }
-   
- static void
-@@ -903,7 +904,7 @@
-   g_free (full_path);
-   
-   gtk_widget_destroy (fs->fileop_dialog);
--  gtk_file_selection_populate (fs, "", FALSE);
-+  gtk_file_selection_populate (fs, "", FALSE, TRUE);
- }
- 
- static void
-@@ -1009,8 +1010,9 @@
-   g_free (new_filename);
-   g_free (old_filename);
-   
-+  gtk_file_selection_populate (fs, "", FALSE, FALSE);
-+  gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), file);
-   gtk_widget_destroy (fs->fileop_dialog);
--  gtk_file_selection_populate (fs, "", FALSE);
- }
-   
- static void
-@@ -1112,7 +1114,7 @@
- 
-       text = g_strdup (text);
- 
--      gtk_file_selection_populate (fs, text, TRUE);
-+      gtk_file_selection_populate (fs, text, TRUE, TRUE);
- 
-       g_free (text);
- 
-@@ -1124,7 +1126,6 @@
-   return FALSE;
- }
- 
--
- static void
- gtk_file_selection_history_callback (GtkWidget *widget, gpointer data)
- {
-@@ -1142,7 +1143,7 @@
-     
-     if (callback_arg->menu_item == widget)
-       {
--	gtk_file_selection_populate (fs, callback_arg->directory, FALSE);
-+	gtk_file_selection_populate (fs, callback_arg->directory, FALSE, FALSE);
- 	break;
-       }
-     
-@@ -1272,7 +1273,7 @@
- 			       gpointer user_data)
- {
-   GtkFileSelection *fs = NULL;
--  gchar *filename, *temp = NULL;
-+  gchar *filename = NULL;
- 
-   g_return_if_fail (GTK_IS_CLIST (widget));
- 
-@@ -1280,39 +1281,23 @@
-   g_return_if_fail (fs != NULL);
-   g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
- 
--  gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &temp);
--  filename = g_strdup (temp);
--
--  if (filename)
--    {
--      if (bevent)
--	switch (bevent->type)
--	  {
--	  case GDK_2BUTTON_PRESS:
--	    gtk_file_selection_populate (fs, filename, FALSE);
--	    break;
--	  
--	  default:
--	    gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
--	    break;
--	  }
--      else
--	gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename);
--
--      g_free (filename);
--    }
-+  gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &filename);
-+  
-+  if (filename && bevent && bevent->type == GDK_2BUTTON_PRESS)
-+    gtk_file_selection_populate (fs, filename, FALSE, FALSE);
- }
- 
- static void
- gtk_file_selection_populate (GtkFileSelection *fs,
- 			     gchar            *rel_path,
--			     gint              try_complete)
-+			     gboolean          try_complete,
-+			     gboolean          reset_entry)
- {
-   CompletionState *cmpl_state;
-   PossibleCompletion* poss;
-   gchar* filename;
-   gint row;
--  gchar* rem_path = rel_path;
-+  gchar* rem_path;
-   gchar* sel_text;
-   gchar* text[2];
-   gint did_recurse = FALSE;
-@@ -1323,6 +1308,8 @@
-   
-   g_return_if_fail (fs != NULL);
-   g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
-+
-+  rem_path = rel_path = g_strdup (rel_path);
-   
-   cmpl_state = (CompletionState*) fs->cmpl_state;
-   poss = cmpl_completion_matches (rel_path, &rem_path, cmpl_state);
-@@ -1422,7 +1409,7 @@
- 
-               did_recurse = TRUE;
- 
--              gtk_file_selection_populate (fs, dir_name, TRUE);
-+              gtk_file_selection_populate (fs, dir_name, FALSE, TRUE);
- 
-               g_free (dir_name);
-             }
-@@ -1441,7 +1428,7 @@
- 	    gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), rem_path);
-         }
-     }
--  else
-+  else if (reset_entry)
-     {
-       if (fs->selection_entry)
- 	gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), "");
-@@ -1466,8 +1453,9 @@
- 	{
- 	  gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state));
- 	}
--      
-     }
-+
-+  g_free (rel_path);
- }
- 
- static void
---- gtk+1.2-1.2.10.orig/gtk/gtkfontsel.c
-+++ gtk+1.2-1.2.10/gtk/gtkfontsel.c
-@@ -1609,9 +1609,11 @@
-   
-   if (found)
-     {
--      fontsel->size = best_size;
--      gtk_clist_moveto(GTK_CLIST(fontsel->size_clist), best_row, -1, 0.5, 0);
--      gtk_clist_select_row(GTK_CLIST(fontsel->size_clist), best_row, 0);
-+		if (best_size != fontsel->selected_size) {
-+			fontsel->size = best_size;
-+			gtk_clist_moveto(GTK_CLIST(fontsel->size_clist), best_row, -1, 0.5, 0);
-+			gtk_clist_select_row(GTK_CLIST(fontsel->size_clist), best_row, 0);
-+		}
-     }
-   else
-     {
---- gtk+1.2-1.2.10.orig/gtk/gtkrc.c
-+++ gtk+1.2-1.2.10/gtk/gtkrc.c
-@@ -24,6 +24,7 @@
-  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
-  */
- 
-+#include <config.h>
- #include <X11/Xlocale.h>	/* so we get the right setlocale */
- #include <ctype.h>
- #include <unistd.h>
-@@ -33,6 +34,9 @@
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef HAVE_CODESET
-+#include <langinfo.h>
-+#endif
- 
- #include "gtkrc.h"
- #include "gtkbindings.h"
-@@ -440,7 +444,7 @@
- void
- gtk_rc_init (void)
- {
--  static gchar *locale_suffixes[3];
-+  static gchar *locale_suffixes[8];
-   static gint n_locale_suffixes = 0;
- 
-   gint i, j;
-@@ -449,9 +453,7 @@
- 
-   if (!initted)
-     {
--      gint length;
--      
--      char *locale = setlocale (LC_CTYPE, NULL);
-+      char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
-       char *p;
-       
-       initted = TRUE;
-@@ -470,39 +472,93 @@
- 	   * We normalize the charset into a standard form,
- 	   * which has all '-' and '_' characters removed,
- 	   * and is lowercase.
-+	   *
-+	   * the search is done in that order:
-+	   * gtkrc.ll_cc.lowercasecodeset
-+	   * gtkrc.ll_cc.normalizedcodeset
-+	   * gtkrc.ll.lowercasecodeset
-+	   * gtkrc.ll.normalizedcodeset
-+	   * gtkrc.lowercasecodeset
-+	   * gtkrc.normalizedcodeset
-+	   * gtkrc.ll_cc
-+	   * gtkrc.ll
-+	   * 
- 	   */
--	  gchar *normalized_locale;
-+	  char *codeset = NULL;
-+	  char *normalized_codeset = NULL;
-+	  char *cc = NULL;
-+	  char *ll;
-+	  char *tmp = NULL;
- 
- 	  p = strchr (locale, '@');
--	  length = p ? (p -locale) : strlen (locale);
-+	  if (p)
-+		  *p = '\0';
- 
-+#ifdef HAVE_CODESET
-+	  codeset = nl_langinfo (CODESET);
-+#endif
- 	  p = strchr (locale, '.');
-+	  if ((codeset==NULL) && (p))
-+		  codeset = p+1;
- 	  if (p)
--	    {
--	      gchar *tmp1 = g_strndup (locale, p - locale + 1);
--	      gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1));
--	      
--	      normalized_locale = g_strconcat (tmp1, tmp2, NULL);
--	      g_free (tmp1);
--	      g_free (tmp2);
--						 
--	      locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale);
--	      length = p - locale;
--	    }
--	  else
--	    normalized_locale = g_strndup (locale, length);
-+		  *p = '\0';
- 	  
--	  p = strchr (normalized_locale, '_');
--	  if (p)
-+	  if (codeset)
- 	    {
--	      locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
--	      length = p - normalized_locale;
-+		/* if codeset is the result of nl_langinfo() it is
-+		 * read-only so we need to copy it to a rw place */
-+		tmp = g_strdup(codeset);
-+		p = tmp;
-+		    
-+	  	while (*p)
-+	          {
-+		      /* tolower not used, because some locales are not
-+		       * compatible with C locale in lowercasing ascii */
-+		      if (*p >= 'A' && *p <= 'Z')
-+			      *p = (*p)-'A'+'a';
-+		      p++;
-+		  }
-+		codeset = tmp;
-+		normalized_codeset =
-+		       	_gtk_normalize_codeset(codeset, strlen(codeset));
-+		if (strcmp(normalized_codeset,codeset) == 0)
-+			normalized_codeset = NULL;
- 	    }
--	  
--	  locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
- 
--	  g_free (normalized_locale);
-+	  p = strchr (locale, '_');
-+	  if (p) {
-+		  cc = p+1;
-+		  *p = '\0';
-+	  }
-+
-+	  ll = locale;	
-+	
-+	  if (cc && codeset)
-+	    locale_suffixes[n_locale_suffixes++] =
-+	        g_strdup ( g_strconcat(ll,"_",cc,".",codeset,NULL));
-+          if (cc && normalized_codeset)
-+	    locale_suffixes[n_locale_suffixes++] =
-+	        g_strdup ( g_strconcat(ll,"_",cc,".",normalized_codeset,NULL));
-+	  if (codeset)
-+            locale_suffixes[n_locale_suffixes++] =
-+                g_strdup ( g_strconcat(ll,".",codeset,NULL));
-+          if (normalized_codeset)
-+	    locale_suffixes[n_locale_suffixes++] =
-+	        g_strdup ( g_strconcat(ll,".",normalized_codeset,NULL));
-+	  if (codeset)
-+	    locale_suffixes[n_locale_suffixes++] = 
-+		g_strdup ( codeset );
-+	  if (normalized_codeset)
-+	    locale_suffixes[n_locale_suffixes++] =
-+	        g_strdup ( normalized_codeset );
-+	  if (cc)
-+            locale_suffixes[n_locale_suffixes++] =
-+	        g_strdup ( g_strconcat(ll,"_",cc,NULL));
-+	  locale_suffixes[n_locale_suffixes++] = g_strdup ( ll );
-+
-+	  if (tmp) g_free (tmp);
- 	}
-+      g_free (locale);
-     }
-   
-   i = 0;
---- gtk+1.2-1.2.10.orig/gtk/gtkstyle.c
-+++ gtk+1.2-1.2.10/gtk/gtkstyle.c
-@@ -348,8 +348,9 @@
-       new_style->bg[i] = style->bg[i];
-       new_style->text[i] = style->text[i];
-       new_style->base[i] = style->base[i];
--      
--      new_style->bg_pixmap[i] = style->bg_pixmap[i];
-+
-+      if (style->bg_pixmap[i] && !(style->rc_style && style->rc_style->bg_pixmap_name[i]))
-+	new_style->bg_pixmap[i] = gdk_pixmap_ref (style->bg_pixmap[i]);
-     }
-   
-   gdk_font_unref (new_style->font);
---- gtk+1.2-1.2.10.orig/gtk/gtkwindow.c
-+++ gtk+1.2-1.2.10/gtk/gtkwindow.c
-@@ -859,13 +859,60 @@
-   GTK_OBJECT_CLASS(parent_class)->finalize (object);
- }
- 
-+
-+static void
-+reread_rc_files ()
-+{
-+  if (gtk_rc_reparse_all ())
-+    {
-+      /* If the above returned true, some of our RC files are out
-+       * of date, so we need to reset all our widgets. Our other
-+       * toplevel windows will also get the message, but by
-+       * then, the RC file will up to date, so we have to tell
-+       * them now.
-+       */
-+      GList *toplevels;
-+      
-+      toplevels = gtk_container_get_toplevels();
-+      while (toplevels)
-+	{
-+	  gtk_widget_reset_rc_styles (toplevels->data);
-+	  toplevels = toplevels->next;
-+	}
-+    }
-+}
-+
- static void
- gtk_window_show (GtkWidget *widget)
- {
-   GtkWindow *window = GTK_WINDOW (widget);
-   GtkContainer *container = GTK_CONTAINER (window);
-   gboolean need_resize;
-+  GList *toplevels;
-+  gboolean had_visible = FALSE;
- 
-+  /* If we have no windows shown at this point, then check for
-+   * theme changes before showing the window. We really should
-+   * be checking realized, not shown, but shown => realized,
-+   * and checking in realize might cause reentrancy problems.
-+   *
-+   * Plus, this allows us to get the new size right before
-+   * realizing.
-+   */
-+  toplevels = gtk_container_get_toplevels ();
-+  while (toplevels)
-+    {
-+      if (GTK_WIDGET_VISIBLE (toplevels->data))
-+	{
-+	  had_visible = TRUE;
-+	  break;
-+	}
-+      toplevels = toplevels->next;
-+    }
-+
-+  if (!had_visible)
-+    reread_rc_files ();
-+  
-   GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
- 
-   need_resize = container->need_resize || !GTK_WIDGET_REALIZED (widget);
-@@ -985,7 +1032,13 @@
-       break;
-     case EnterNotify:
-     case LeaveNotify:
--      if (xev->xcrossing.detail != NotifyInferior &&
-+      /* We only track the actual destination of keyboard events for real
-+       * toplevels, not for embedded toplevels such as GtkPlug. The reason for
-+       * this is that GtkPlug redirects events so the widget may effectively not
-+       * have the focus even if it actually has the focus.
-+       */
-+      if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () &&
-+	  xev->xcrossing.detail != NotifyInferior &&
- 	  xev->xcrossing.focus && !window->window_has_focus)
- 	{
- 	  window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE;
-@@ -1474,23 +1527,7 @@
- 	}
-     }
- 
--  if (gtk_rc_reparse_all ())
--    {
--      /* If the above returned true, some of our RC files are out
--       * of date, so we need to reset all our widgets. Our other
--       * toplevel windows will also get the message, but by
--       * then, the RC file will up to date, so we have to tell
--       * them now.
--       */
--      GList *toplevels;
--      
--      toplevels = gtk_container_get_toplevels();
--      while (toplevels)
--	{
--	  gtk_widget_reset_rc_styles (toplevels->data);
--	  toplevels = toplevels->next;
--	}
--    }
-+  reread_rc_files ();
- }
- 
- static gint
---- gtk+1.2-1.2.10.orig/gtk/gtkrc.zh_CN
-+++ gtk+1.2-1.2.10/gtk/gtkrc.zh_CN
-@@ -7,7 +7,7 @@
- #
- 
- style "gtk-default-zh-cn" {
--       fontset = "-adobe-helvetica-medium-r-normal--16-*-*-*-*-*-iso8859-1,\
-+       fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
- 		  -*-*-medium-r-normal--16-*-*-*-*-*-gb2312.1980-0,*-r-*"
- }
- class "GtkWidget" style "gtk-default-zh-cn"
---- gtk+1.2-1.2.10.orig/gtk/gtkrc.zh_TW
-+++ gtk+1.2-1.2.10/gtk/gtkrc.zh_TW
-@@ -0,0 +1,18 @@
-+# $(gtkconfigdir)/gtkrc.zh_TW
-+#
-+# This file defines the fontsets for Chinese language (ch) using
-+# the traditional chinese Big5 encoding as used in Taiwan (TW)
-+#
-+# 1999, Pablo Saratxaga <pablo@mandrakesoft.com>
-+#
-+
-+# IMPORTANT NOTE: The name of this file *MUST* be "gtkrc.zh_TW.big5"
-+# the lowercasing of "big5" is done on purpose, if you change it it won't work
-+
-+style "gtk-default-zh-tw" {
-+	fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-+		  -taipei-*-medium-r-normal--*-*-*-*-*-*-big5-0,\
-+		  -*-*-medium-r-normal--16-*-*-*-*-*-big5-0,*-r-*"
-+}
-+class "GtkWidget" style "gtk-default-zh-tw"
-+
---- gtk+1.2-1.2.10.orig/gtk/gtkrc.utf-8
-+++ gtk+1.2-1.2.10/gtk/gtkrc.utf-8
-@@ -0,0 +1,7 @@
-+style "default-text" {
-+       fontset = "-*-arial-medium-r-normal--*-120-*-*-*-*-iso10646-1,\
-+       		  -*-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"
-+}
-+
-+class "GtkWidget" style "default-text"
-+
---- gtk+1.2-1.2.10.orig/gtk/gtkrc.iso-8859-3
-+++ gtk+1.2-1.2.10/gtk/gtkrc.iso-8859-3
-@@ -0,0 +1,8 @@
-+style "gtk-default-eo" {
-+       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-+                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-+		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-3,\
-+		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-3,*-r-*"
-+}
-+class "GtkWidget" style "gtk-default-eo"
-+
---- gtk+1.2-1.2.10.orig/gtk/gtkrc.iso-8859-7
-+++ gtk+1.2-1.2.10/gtk/gtkrc.iso-8859-7
-@@ -0,0 +1,8 @@
-+style "gtk-default-el" {
-+       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-+		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-+		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-7,\
-+		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-7,*-r-*"
-+}
-+class "GtkWidget" style "gtk-default-el"
-+
---- gtk+1.2-1.2.10.orig/gtk/gtkrc.iso-8859-9
-+++ gtk+1.2-1.2.10/gtk/gtkrc.iso-8859-9
-@@ -0,0 +1,8 @@
-+style "gtk-default-tr" {
-+       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-+                  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-+		  -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-9,\
-+		  -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-9,*-r-*"
-+}
-+class "GtkWidget" style "gtk-default-tr"
-+
---- gtk+1.2-1.2.10.orig/docs/Makefile.in
-+++ gtk+1.2-1.2.10/docs/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
- 
--# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
-@@ -66,6 +66,8 @@
- CC = @CC@
- DATADIRNAME = @DATADIRNAME@
- DLLTOOL = @DLLTOOL@
-+ECHO = @ECHO@
-+EXEEXT = @EXEEXT@
- GDK_WLIBS = @GDK_WLIBS@
- GENCAT = @GENCAT@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -101,12 +103,14 @@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PERL = @PERL@
- POFILES = @POFILES@
- POSUB = @POSUB@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
-+STRIP = @STRIP@
- STRIP_BEGIN = @STRIP_BEGIN@
- STRIP_DUMMY = @STRIP_DUMMY@
- STRIP_END = @STRIP_END@
-@@ -138,7 +142,7 @@
- TUTORIAL_IT_FILES = html/gtk_tut_it.html     		html/gtk_tut_it-1.html   		html/gtk_tut_it-2.html   		html/gtk_tut_it-3.html   		html/gtk_tut_it-4.html   		html/gtk_tut_it-5.html   		html/gtk_tut_it-6.html   		html/gtk_tut_it-7.html   		html/gtk_tut_it-8.html   		html/gtk_tut_it-9.html   		html/gtk_tut_it-10.html  		html/gtk_tut_it-11.html  		html/gtk_tut_it-12.html  		html/gtk_tut_it-13.html  		html/gtk_tut_it-14.html  		html/gtk_tut_it-15.html  		html/gtk_tut_it-16.html  		html/gtk_tut_it-17.html  		html/gtk_tut_it-18.html  		html/gtk_tut_it-19.html  		html/gtk_tut_it-20.html  		html/gtk_tut_it-21.html  		html/gtk_tut_it-22.html  		html/gtk_tut_it-23.html  		html/gtk_tut_it-24.html			text/gtk_tut_it.txt
- 
- 
--FAQ_FILES = html/gtkfaq.html			html/gtkfaq-1.html       		html/gtkfaq-2.html       		html/gtkfaq-3.html       		html/gtkfaq-4.html       		html/gtkfaq-5.html       		html/gtkfaq-6.html       		html/gtkfaq-7.html			text/gtkfaq.txt
-+FAQ_FILES = html/gtkfaq.html			html/gtkfaq-1.html       		html/gtkfaq-2.html       		html/gtkfaq-3.html       		html/gtkfaq-4.html       		html/gtkfaq-5.html       		html/gtkfaq-6.html       		html/gtkfaq-7.html			html/gtkfaq-8.html			html/gtkfaq-9.html			text/gtkfaq.txt
- 
- 
- EXTRA_DIST =  	Changes-1.2.txt				debugging.txt				developers.txt				refcounting.txt				styles.txt				text_widget.txt 			widget_system.txt 			generation.txt			        gtk-config.txt  	        	gtk-config.1.in				texinfo.tex 				macros.texi				gtkdocs_fix				gtkfaq.sgml				gtk_tut.sgml				gtk_tut_it.sgml				gtk_tut_fr.sgml				gtk_tut_packbox1.gif 			gtk_tut_packbox2.gif 			html/gtk_tut_table.gif			html/gtk_tut_packbox1.gif 		html/gtk_tut_packbox2.gif 		gtk_tut_table.gif			$(TUTORIAL_FILES)			$(TUTORIAL_FR_FILES)			$(TUTORIAL_IT_FILES)			$(FAQ_FILES)
-@@ -159,15 +163,15 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -257,7 +261,7 @@
- 	else ii=; fi; \
- 	list='$(INFO_DEPS)'; \
- 	for file in $$list; do \
--	  test -z "$ii" \
-+	  test -z "$$ii" \
- 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
- 	done
- 	@$(NORMAL_UNINSTALL)
-@@ -343,6 +347,11 @@
- subdir = docs
- 
- distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile
- 	$(mkinstalldirs) $(distdir)/html $(distdir)/text
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
---- gtk+1.2-1.2.10.orig/docs/html/gtk_tut-13.html
-+++ gtk+1.2-1.2.10/docs/html/gtk_tut-13.html
-@@ -84,7 +84,7 @@
- gtk_menu_new and a "menu item" as created by the gtk_menu_item_new
- functions. The menu item will be an actual button with an associated
- action, whereas a menu will be a container holding menu items.
--<P>The gtk_menu_new_with_label and gtk_menu_new functions are just as
-+<P>The gtk_menu_item_new_with_label and gtk_menu_item_new functions are just as
- you'd expect after reading about the buttons. One creates a new menu
- item with a label already packed into it, and the other just creates a
- blank menu item.
---- gtk+1.2-1.2.10.orig/docs/html/gtkfaq-5.html
-+++ gtk+1.2-1.2.10/docs/html/gtkfaq-5.html
-@@ -553,12 +553,12 @@
- <BLOCKQUOTE><CODE>
- <PRE>
- gint
--signal_handler_event(GtkWiget *widget, GdkEvenButton *event, gpointer func_data)
-+signal_handler_event(GtkWidget *widget, GdkEventButton *event, gpointer func_data)
- {
-   if (GTK_IS_LIST_ITEM(widget) &amp;&amp;
-        (event->type==GDK_2BUTTON_PRESS ||
-         event->type==GDK_3BUTTON_PRESS) ) {
--    printf("I feel %s clicked on button %d\",
-+    printf("I feel %s clicked on button %d\n",
-            event->type==GDK_2BUTTON_PRESS ? "double" : "triple",
-            event->button);
-   }
---- gtk+1.2-1.2.10.orig/docs/html/gtkfaq-8.html
-+++ gtk+1.2-1.2.10/docs/html/gtkfaq-8.html
-@@ -0,0 +1,413 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-+<HTML>
-+<HEAD>
-+ <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
-+ <TITLE>GTK+ FAQ: About GLib</TITLE>
-+ <LINK HREF="gtkfaq-9.html" REL=next>
-+ <LINK HREF="gtkfaq-7.html" REL=previous>
-+ <LINK HREF="gtkfaq.html#toc8" REL=contents>
-+</HEAD>
-+<BODY BGCOLOR="#FFFFFF">
-+<A HREF="gtkfaq-9.html">Next</A>
-+<A HREF="gtkfaq-7.html">Previous</A>
-+<A HREF="gtkfaq.html#toc8">Contents</A>
-+<HR NOSHADE>
-+<H2><A NAME="s8">8.</A> <A HREF="gtkfaq.html#toc8">About GLib</A></H2>
-+
-+<H2><A NAME="ss8.1">8.1</A> <A HREF="gtkfaq.html#toc8.1">What is GLib?</A>
-+</H2>
-+
-+<P>GLib is a library of useful functions and definitions available for use 
-+when creating GDK and GTK applications. It provides replacements for some
-+standard libc functions, such as malloc, which are buggy on some systems.</P>
-+<P>It also provides routines for handling:
-+<UL>
-+<LI>Doubly Linked Lists</LI>
-+<LI>Singly Linked Lists</LI>
-+<LI>Timers</LI>
-+<LI>String Handling</LI>
-+<LI>A Lexical Scanner</LI>
-+<LI>Error Functions</LI>
-+</UL>
-+</P>
-+
-+<H2><A NAME="ss8.2">8.2</A> <A HREF="gtkfaq.html#toc8.2">How can I use the doubly linked lists?</A>
-+</H2>
-+
-+<P>The GList object is defined as:</P>
-+<P>
-+<BLOCKQUOTE><CODE>
-+<PRE>
-+typedef struct _GList GList;
-+
-+struct _GList
-+{
-+  gpointer data;
-+  GList *next;
-+  GList *prev;
-+};
-+</PRE>
-+</CODE></BLOCKQUOTE>
-+</P>
-+<P>To use the GList objects, simply :</P>
-+<P>
-+<BLOCKQUOTE><CODE>
-+<PRE>
-+GList   *list = NULL;
-+GList   *listrunner;
-+gint    array[] = { 1, 2, 3, 4, 5, 6 };
-+gint    pos;
-+gint    *value;
-+
-+/* add data to the list */
-+for (pos=0;pos &lt; sizeof array; pos++) {
-+  list = g_list_append(list, (gpointer)&amp;array[pos]);
-+}
-+
-+/* run through the list */
-+listrunner = g_list_first(list);
-+while (listrunner) {
-+  value = (gint *)listrunner->data;
-+  printf("%d\n", *value);
-+  listrunner = g_list_next(listrunner);
-+}
-+
-+/* removing datas from the list */
-+listrunner = g_list_first(list);
-+list = g_list_remove_link(list, listrunner);
-+list = g_list_remove(list, &amp;array[4]);
-+</PRE>
-+</CODE></BLOCKQUOTE>
-+</P>
-+<P>The same code is usable with singly linked lists (GSList objects) by replacing
-+g_list_* functions with the relevant g_slist_* ones (g_slist_append, 
-+g_slist_remove, ...). Just remember that since you can't go backward in a singly
-+linked list, there is no g_slist_first function - you'll need to keep a 
-+reference on the first node of the list.</P>
-+
-+
-+<H2><A NAME="ss8.3">8.3</A> <A HREF="gtkfaq.html#toc8.3">Memory does not seem to be released when I free the list nodes I've allocated</A>
-+</H2>
-+
-+<P>GLib tries to be "intelligent" on this special issue: it assumes that
-+you are likely to reuse the objects, so caches the allocated memory.
-+If you do not want to use this behavior, you'll probably want to set
-+up a special allocator.</P>
-+<P>To quote Tim Janik:
-+<BLOCKQUOTE>
-+If you have a certain portion of code that uses *lots* of GLists or
-+GNodes, and you know you'd better want to release all of them after a
-+short while, you'd want to use a GAllocator. Pushing an allocator into
-+g_list will make all subsequent glist operations private to that
-+allocator's memory pool (and thus you have to take care to pop the
-+allocator again, before making any external calls):
-+</BLOCKQUOTE>
-+</P>
-+<P>
-+<BLOCKQUOTE><CODE>
-+<PRE>
-+GAllocator *allocator;
-+GList *list = NULL;
-+guint i;
-+
-+/* set a new allocation pool for GList nodes */
-+allocator = g_allocator_new ("list heap", 1024);
-+g_list_push_allocator (allocator);
-+
-+/* do some list operations */
-+for (i = 0; i &lt; 4096; i++)
-+  list = g_list_prepend (list, NULL);
-+list = g_list_reverse (list);
-+
-+/* beware to pop allocator befor calling external functions */
-+g_list_pop_allocator ();
-+gtk_label_set_text (GTK_LABEL (some_label), "some text");
-+
-+/* and set our private glist pool again */
-+g_list_push_allocator (allocator);
-+
-+/* do some list operations */
-+g_list_free (list);
-+list = NULL;
-+for (i = 0; i &lt; 4096; i++)
-+  list = g_list_prepend (list, NULL);
-+  
-+/* and back out (while freeing all of the list nodes in our pool) */
-+g_list_pop_allocator ();
-+g_allocator_free (allocator);
-+</PRE>
-+</CODE></BLOCKQUOTE>
-+</P>
-+
-+<H2><A NAME="ss8.4">8.4</A> <A HREF="gtkfaq.html#toc8.4">Why use g_print, g_malloc, g_strdup and fellow glib functions? </A>
-+</H2>
-+
-+<P>Thanks to Tim Janik who wrote to gtk-list: (slightly modified)
-+<BLOCKQUOTE>
-+Regarding g_malloc(), g_free() and siblings, these functions are much
-+safer than their libc equivalents. For example, g_free() just returns
-+if called with NULL. Also, if USE_DMALLOC is defined, the definition
-+for these functions changes (in glib.h) to use MALLOC(), FREE() etc...
-+If MEM_PROFILE or MEM_CHECK are defined, there are even small
-+statistics made counting the used block sizes (shown by
-+g_mem_profile() / g_mem_check()).
-+<P>Considering the fact that glib provides an interface for memory chunks
-+to save space if you have lots of blocks that are always the same size
-+and to mark them ALLOC_ONLY if needed, it is just straight forward to
-+create a small saver (debug able) wrapper around the normal malloc/free
-+stuff as well - just like gdk covers Xlib. ;)</P>
-+<P>Using g_error() and g_warning() inside of applications like the GIMP
-+that fully rely on gtk even gives the opportunity to pop up a window
-+showing the messages inside of a gtk window with your own handler
-+(by using g_set_error_handler()) along the lines of <CODE>gtk_print()</CODE>
-+(inside of gtkmain.c).</P>
-+</BLOCKQUOTE>
-+</P>
-+
-+<H2><A NAME="ss8.5">8.5</A> <A HREF="gtkfaq.html#toc8.5">What's a GScanner and how do I use one? </A>
-+</H2>
-+
-+<P>A GScanner will tokenize your text, that is, it'll return an integer
-+for every word or number that appears in its input stream, following
-+certain (customizable) rules to perform this translation.
-+You still need to write the parsing functions on your own though.</P>
-+<P>Here's a little test program supplied by Tim Janik that will parse</P>
-+<P>
-+<PRE>
-+&lt;SYMBOL> = &lt;OPTIONAL-MINUS> &lt;NUMBER> ;
-+</PRE>
-+</P>
-+<P>constructs, while skipping "#\n" and "/**/" style comments.</P>
-+<P>
-+<PRE>
-+#include &lt;glib.h>
-+
-+/* some test text to be fed into the scanner */
-+static const gchar *test_text =
-+( "ping = 5;\n"
-+  "/* slide in some \n"
-+  " * comments, just for the\n"
-+  " * fun of it \n"
-+  " */\n"
-+  "pong = -6; \n"
-+  "\n"
-+  "# the next value is a float\n"
-+  "zonk = 0.7;\n"
-+  "# redefine ping\n"
-+  "ping = - 0.5;\n" );
-+
-+/* define enumeration values to be returned for specific symbols */
-+enum {
-+  SYMBOL_PING = G_TOKEN_LAST + 1,
-+  SYMBOL_PONG = G_TOKEN_LAST + 2,
-+  SYMBOL_ZONK = G_TOKEN_LAST + 3
-+};
-+
-+/* symbol array */
-+static const struct {
-+  gchar *symbol_name;
-+  guint  symbol_token;
-+} symbols[] = {
-+  { "ping", SYMBOL_PING, },
-+  { "pong", SYMBOL_PONG, },
-+  { "zonk", SYMBOL_ZONK, },
-+  { NULL, 0, },
-+}, *symbol_p = symbols;
-+
-+static gfloat ping = 0;
-+static gfloat pong = 0;
-+static gfloat zonk = 0;
-+
-+static guint
-+parse_symbol (GScanner *scanner)
-+{
-+  guint symbol;
-+  gboolean negate = FALSE;
-+
-+  /* expect a valid symbol */
-+  g_scanner_get_next_token (scanner);
-+  symbol = scanner->token;
-+  if (symbol &lt; SYMBOL_PING ||
-+      symbol > SYMBOL_ZONK)
-+    return G_TOKEN_SYMBOL;
-+
-+  /* expect '=' */
-+  g_scanner_get_next_token (scanner);
-+  if (scanner->token != '=')
-+    return '=';
-+
-+  /* feature optional '-' */
-+  g_scanner_peek_next_token (scanner);
-+  if (scanner->next_token == '-')
-+    {
-+      g_scanner_get_next_token (scanner);
-+      negate = !negate;
-+    }
-+
-+  /* expect a float (ints are converted to floats on the fly) */
-+  g_scanner_get_next_token (scanner);
-+  if (scanner->token != G_TOKEN_FLOAT)
-+    return G_TOKEN_FLOAT;
-+
-+  /* make sure the next token is a ';' */
-+  if (g_scanner_peek_next_token (scanner) != ';')
-+    {
-+      /* not so, eat up the non-semicolon and error out */
-+      g_scanner_get_next_token (scanner);
-+      return ';';
-+    }
-+
-+  /* assign value, eat the semicolon and exit successfully */
-+  switch (symbol)
-+    {
-+    case SYMBOL_PING:
-+      ping = negate ? - scanner->value.v_float : scanner->value.v_float;
-+      break;
-+    case SYMBOL_PONG:
-+      pong = negate ? - scanner->value.v_float : scanner->value.v_float;
-+      break;
-+    case SYMBOL_ZONK:
-+      zonk = negate ? - scanner->value.v_float : scanner->value.v_float;
-+      break;
-+    }
-+  g_scanner_get_next_token (scanner);
-+
-+  return G_TOKEN_NONE;
-+}
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  GScanner *scanner;
-+  guint expected_token;
-+
-+  scanner = g_scanner_new (NULL);
-+
-+  /* adjust lexing behaviour to suit our needs
-+   */
-+  /* convert non-floats (octal values, hex values...) to G_TOKEN_INT */
-+  scanner->config->numbers_2_int = TRUE;
-+  /* convert G_TOKEN_INT to G_TOKEN_FLOAT */
-+  scanner->config->int_2_float = TRUE;
-+  /* don't return G_TOKEN_SYMBOL, but the symbol's value */
-+  scanner->config->symbol_2_token = TRUE;
-+
-+  /* load symbols into the scanner */
-+  while (symbol_p->symbol_name)
-+    {
-+      g_scanner_add_symbol (scanner,
-+                            symbol_p->symbol_name,
-+                            GINT_TO_POINTER (symbol_p->symbol_token));
-+      symbol_p++;
-+    }
-+
-+  /* feed in the text */
-+  g_scanner_input_text (scanner, test_text, strlen (test_text));
-+
-+  /* give the error handler an idea on how the input is named */
-+  scanner->input_name = "test text";
-+
-+  /* scanning loop, we parse the input until its end is reached,
-+   * the scanner encountered a lexing error, or our sub routine came
-+   * across invalid syntax
-+   */
-+  do
-+    {
-+      expected_token = parse_symbol (scanner);
-+      
-+      g_scanner_peek_next_token (scanner);
-+    }
-+  while (expected_token == G_TOKEN_NONE &amp;&amp;
-+         scanner->next_token != G_TOKEN_EOF &amp;&amp;
-+         scanner->next_token != G_TOKEN_ERROR);
-+
-+  /* give an error message upon syntax errors */
-+  if (expected_token != G_TOKEN_NONE)
-+    g_scanner_unexp_token (scanner, expected_token, NULL, "symbol", NULL, NULL, TRUE);
-+
-+  /* finsish parsing */
-+  g_scanner_destroy (scanner);
-+
-+  /* print results */
-+  g_print ("ping: %f\n", ping);
-+  g_print ("pong: %f\n", pong);
-+  g_print ("zonk: %f\n", zonk);
-+  
-+  return 0;
-+}
-+</PRE>
-+</P>
-+<P>You need to understand that the scanner will parse its input and
-+tokenize it, it is up to you to interpret these tokens, not define
-+their types before they get parsed, e.g. watch gscanner parse a
-+string:</P>
-+<P>
-+<PRE>
-+"hi i am 17"
-+ |  | |  |
-+ |  | |  v
-+ |  | v  TOKEN_INT, value: 17
-+ |  v TOKEN_IDENTIFIER, value: "am"
-+ v  TOKEN_CHAR, value: 'i'
-+TOKEN_IDENTIFIER, value: "hi"
-+</PRE>
-+</P>
-+<P>If you configure the scanner with:
-+<PRE>
-+scanner->config->int_2_float = TRUE;
-+scanner->config->char_2_token = TRUE;
-+scanner->config->scan_symbols = TRUE;
-+</PRE>
-+</P>
-+<P>and add "am" as a symbol with
-+<PRE>
-+g_scanner_add_symbol (scanner, "am", "symbol value");
-+</PRE>
-+</P>
-+<P>GScanner will parse it as</P>
-+<P>
-+<PRE>
-+"hi i am 17"
-+ |  | |  |
-+ |  | |  v
-+ |  | v  TOKEN_FLOAT, value: 17.0  (automatic int->float conversion)
-+ |  | TOKEN_SYMBOL, value: "symbol value"  (a successfull hash table lookup
-+ |  |                                       turned a TOKEN_IDENTIFIER into a
-+ |  |                                       TOKEN_SYMBOL and took over the
-+ |  v                                       symbol's value)
-+ v  'i'  ('i' can be a valid token as well, as all chars >0 and &lt;256)
-+TOKEN_IDENTIFIER, value: "hi"
-+</PRE>
-+</P>
-+<P>You need to match the token sequence with your code, and if you encounter
-+something that you don't want, you error out:</P>
-+<P>
-+<PRE>
-+/* expect an identifier ("hi") */
-+g_scanner_get_next_token (scanner);
-+if (scanner->token != G_TOKEN_IDENTIFIER)
-+  return G_TOKEN_IDENTIFIER;
-+/* expect a token 'i' */
-+g_scanner_get_next_token (scanner);
-+if (scanner->token != 'i')
-+  return 'i';
-+/* expect a symbol ("am") */
-+g_scanner_get_next_token (scanner);
-+if (scanner->token != G_TOKEN_SYMBOL)
-+  return G_TOKEN_SYMBOL;
-+/* expect a float (17.0) */
-+g_scanner_get_next_token (scanner);
-+if (scanner->token != G_TOKEN_FLOAT)
-+  return G_TOKEN_FLOAT;
-+</PRE>
-+</P>
-+<P>If you got past here, you have parsed "hi i am 17" and would have
-+accepted "dooh i am 42" and  "bah i am 0.75" as well, but you would
-+have not accepted "hi 7 am 17" or "hi i hi 17".</P>
-+
-+<HR NOSHADE>
-+<A HREF="gtkfaq-9.html">Next</A>
-+<A HREF="gtkfaq-7.html">Previous</A>
-+<A HREF="gtkfaq.html#toc8">Contents</A>
-+</BODY>
-+</HTML>
---- gtk+1.2-1.2.10.orig/docs/html/gtkfaq-9.html
-+++ gtk+1.2-1.2.10/docs/html/gtkfaq-9.html
-@@ -0,0 +1,59 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-+<HTML>
-+<HEAD>
-+ <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
-+ <TITLE>GTK+ FAQ: GTK+ FAQ Contributions, Maintainers and Copyright</TITLE>
-+ <LINK HREF="gtkfaq-8.html" REL=previous>
-+ <LINK HREF="gtkfaq.html#toc9" REL=contents>
-+</HEAD>
-+<BODY BGCOLOR="#FFFFFF">
-+Next
-+<A HREF="gtkfaq-8.html">Previous</A>
-+<A HREF="gtkfaq.html#toc9">Contents</A>
-+<HR NOSHADE>
-+<H2><A NAME="s9">9.</A> <A HREF="gtkfaq.html#toc9">GTK+ FAQ Contributions, Maintainers and Copyright</A></H2>
-+
-+<P>If you would like to make a contribution to the FAQ, send either one
-+of us an e-mail message with the exact text you think should be
-+included (question and answer). With your help, this document can grow
-+and become more useful!</P>
-+<P>This document is maintained by 
-+Tony Gale 
-+<A HREF="mailto:gale@gtk.org">&lt;gale@gtk.org&gt;</A> 
-+Nathan Froyd 
-+<A HREF="mailto:maestrox@geocities.com">&lt;maestrox@geocities.com&gt;</A>,
-+and 
-+Emmanuel Deloget 
-+<A HREF="mailto:logout@free.fr">&lt;logout@free.fr&gt;</A>.
-+This FAQ was created by Shawn T. Amundson 
-+<A HREF="mailto:amundson@gimp.org">&lt;amundson@gimp.org&gt;</A> who continues to provide support.</P>
-+<P>Contributions should be sent to Tony Gale 
-+<A HREF="mailto:gale@gtk.org">&lt;gale@gtk.org&gt;</A></P>
-+<P>The GTK+ FAQ is Copyright (C) 1997-2000 by Shawn T. Amundson, 
-+Tony Gale, Emmanuel Deloget and Nathan Froyd.</P>
-+<P>Permission is granted to make and distribute verbatim copies of this
-+manual provided the copyright notice and this permission notice are
-+preserved on all copies.</P>
-+<P>Permission is granted to copy and distribute modified versions of this
-+document under the conditions for verbatim copying, provided that this
-+copyright notice is included exactly as in the original, and that the
-+entire resulting derived work is distributed under the terms of a
-+permission notice identical to this one.</P>
-+<P>Permission is granted to copy and distribute translations of this
-+document into another language, under the above conditions for
-+modified versions.</P>
-+<P>If you are intending to incorporate this document into a published
-+work, please contact one of the maintainers, and we will make an
-+effort to ensure that you have the most up to date information
-+available.</P>
-+<P>There is no guarentee that this document lives up to its intended
-+purpose.  This is simply provided as a free resource.  As such, the
-+authors and maintainers of the information provided within can not
-+make any guarentee that the information is even accurate.</P>
-+
-+<HR NOSHADE>
-+Next
-+<A HREF="gtkfaq-8.html">Previous</A>
-+<A HREF="gtkfaq.html#toc9">Contents</A>
-+</BODY>
-+</HTML>
---- gtk+1.2-1.2.10.orig/docs/Makefile.am
-+++ gtk+1.2-1.2.10/docs/Makefile.am
-@@ -99,6 +99,8 @@
- 	html/gtkfaq-5.html       	\
- 	html/gtkfaq-6.html       	\
- 	html/gtkfaq-7.html		\
-+	html/gtkfaq-8.html		\
-+	html/gtkfaq-9.html		\
- 	text/gtkfaq.txt
- 
- .PHONY: html htmldir faq tutorial tutorial_it tutorial_fr files
---- gtk+1.2-1.2.10.orig/docs/gtkfaq.sgml
-+++ gtk+1.2-1.2.10/docs/gtkfaq.sgml
-@@ -1418,12 +1418,12 @@
- 
- <tscreen><verb>
- gint
--signal_handler_event(GtkWiget *widget, GdkEvenButton *event, gpointer func_data)
-+signal_handler_event(GtkWidget *widget, GdkEventButton *event, gpointer func_data)
- {
-   if (GTK_IS_LIST_ITEM(widget) &&
-        (event->type==GDK_2BUTTON_PRESS ||
-         event->type==GDK_3BUTTON_PRESS) ) {
--    printf("I feel %s clicked on button %d\",
-+    printf("I feel %s clicked on button %d\n",
-            event->type==GDK_2BUTTON_PRESS ? "double" : "triple",
-            event->button);
-   }
---- gtk+1.2-1.2.10.orig/docs/gtk_tut.sgml
-+++ gtk+1.2-1.2.10/docs/gtk_tut.sgml
-@@ -9995,7 +9995,7 @@
- functions. The menu item will be an actual button with an associated
- action, whereas a menu will be a container holding menu items.
- 
--The gtk_menu_new_with_label and gtk_menu_new functions are just as
-+The gtk_menu_item_new_with_label and gtk_menu_item_new functions are just as
- you'd expect after reading about the buttons. One creates a new menu
- item with a label already packed into it, and the other just creates a
- blank menu item.
---- gtk+1.2-1.2.10.orig/debian/docs
-+++ gtk+1.2-1.2.10/debian/docs
-@@ -0,0 +1,5 @@
-+NEWS
-+README
-+TODO
-+ChangeLog.pre-1-0
-+debian/FAQ.Debian
---- gtk+1.2-1.2.10.orig/debian/FAQ.Debian
-+++ gtk+1.2-1.2.10/debian/FAQ.Debian
-@@ -0,0 +1,90 @@
-+GTK+ FAQ for Debian
-+---------------------
-+
-+Q. the following message is output. gtk+ doesn't provide it.
-+
-+The font "XLFD" does not support all the required character sets for the
-+current locale "LOCALE"
-+  (Missing character set "CHARSET")
-+
-+A1. Check if you have installed the *-transcoded packages
-+    (xfonts-base-transcoded, xfonts-75dpi-transcoded and
-+    xfonts-100dpi-transcoded). If not, try installing them.  If your problem
-+    persists, read on.
-+
-+A2. This means an application specified XLFD, but that font has no CHARSET
-+    LOCALE needs.
-+    If it's GTK+ application, you may specify invalid font on gtkrc.
-+    GTK+ will find gtkrc with the rules as the following:
-+
-+    1. gtkrc.ll_cc.lowercasecodeset
-+    2. gtkrc.ll_cc.normalizedcodeset
-+    3. gtkrc.ll.lowercasecodeset
-+    4. gtkrc.ll.normalizedcodeset
-+    5. gtkrc.lowercasecodeset
-+    6. gtkrc.normalizedcodeset
-+    7. gtkrc.ll_cc
-+    8. gtkrc.ll
-+
-+    normalize the charset into a standard form, which has all '-' and '_'
-+    characters removed.
-+
-+    Also GTK+ affect your locale. you can check that by the following code:
-+
-+    #include <stdio.h>
-+    #include <locale.h>
-+    #include <langinfo.h>
-+
-+    int main (void)
-+    {
-+    	setlocale (LC_CTYPE, "");
-+	printf ("%s\n", nl_langinfo (CODESET));
-+	return 0;
-+    }
-+
-+    for example, your /etc/locale.gen has:
-+    es_ES ISO-8859-1
-+    es_ES@euro ISO-8859-15
-+
-+    and if you set es_ES@euro to LC_CTYPE, result of that program should be:
-+    $ LC_CTYPE=es_ES@euro ./test
-+    ISO-8859-15
-+
-+    GTK+ use this value for lowercasecodeset and normalizedcodeset.
-+
-+    And GTK+ will find gtkrc in order of path as the following:
-+
-+    1. /etc/gtk
-+    2. ~/
-+
-+    Thus, you need to find invalid font according to the above rules.
-+
-+
-+    If you can't find invalid font or that isn't GTK+ app, but that is GNOME
-+    app, try to find gtkrc:
-+
-+    1. If you don't have strace, runs apt-get install strace.
-+    2. strace <your app> |& grep gtkrc | grep open
-+    3. If you get something, check the files found. invalid font should be
-+       specified in the files.
-+
-+    If you are still unable to find invalid font, try to check app's
-+    preferences and runs xlsfonts with XLFD.
-+
-+
-+Q.  the following warning is output.
-+
-+Gdk-WARNING **: locale not supported by C library.
-+
-+A.  You has no your locale data. check your locale and /etc/locale.gen and
-+    /usr/lib/locale/.
-+
-+
-+Q.  the following warning is output.
-+
-+Gdk-WARNING **: locale not supported by Xlib, locale set to C.
-+
-+A.  This means your locale supports by libc, but not Xlib. In most cases,
-+    you may specify invalid locale or Xlib has no aliases for the locale
-+    you specified.
-+
---- gtk+1.2-1.2.10.orig/debian/README.Debian
-+++ gtk+1.2-1.2.10/debian/README.Debian
-@@ -0,0 +1,18 @@
-+libgtk1.2 for Debian
-+----------------------
-+
-+The GIMP Tool Kit (gtk) is a set of widgets to help you program
-+programs for the X Windowing System easily and powerfully.
-+
-+gtk is the moving force behind The GNU Image Manipulation Program (The
-+GIMP) -- the number one freely-available image editing and creation
-+program available. 
-+
-+gtk is rapidly under development, and the source tree has officially
-+been separated from The GIMP now, as other teams of programmers
-+are beginning to write software using its great widget set -- like
-+GNOME, a desktop interface for X, and gzilla, a freely available
-+web browser for X.
-+
-+Ben Gertzfield <che@debian.org>, Mon, 29 Sep 1997 13:11:45 -0700
-+
---- gtk+1.2-1.2.10.orig/debian/copyright
-+++ gtk+1.2-1.2.10/debian/copyright
-@@ -0,0 +1,8 @@
-+This package was debianized by Ben Gertzfield <che@debian.org>
-+on Fri Oct 15 10:36:58 PDT 1999.
-+
-+The source may be fetched from http://www.gtk.org/ .
-+
-+It may be redistributed under the terms of the GNU LGPL, Version 2 or
-+later, found on Debian systems in the file /usr/share/common-licenses/LGPL-2.
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-doc.doc-base.gtk-faq
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-doc.doc-base.gtk-faq
-@@ -0,0 +1,17 @@
-+Document: gtk-faq
-+Title: GTK+ Frequently Asked Questions
-+Author: Nathan Froyd, Tony Gale, Shawn T. Amundson.
-+Abstract: This document is intended to answer questions that are
-+ likely to be frequently asked by programmers using GTK+ or people who
-+ are just looking at using GTK+.
-+Section: Apps/Programming
-+
-+Format: linuxdoc-sgml
-+Files: /usr/share/doc/libgtk1.2-doc/sgml/gtkfaq.sgml.gz
-+
-+Format: text
-+Files: /usr/share/doc/libgtk1.2-doc/gtkfaq.txt.gz
-+
-+Format: HTML
-+Index: /usr/share/doc/libgtk1.2-doc/faq-html/gtkfaq.html
-+Files: /usr/share/doc/libgtk1.2-doc/faq-html/*.html
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-common.dirs
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-common.dirs
-@@ -0,0 +1,4 @@
-+usr/share/locale
-+usr/share/themes
-+etc/gtk
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-common.files
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-common.files
-@@ -0,0 +1,3 @@
-+usr/share/locale/*
-+usr/share/themes/*
-+etc/gtk/*
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-common.postrm
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-common.postrm
-@@ -0,0 +1,29 @@
-+#! /bin/sh
-+# postrm script for #PACKAGE#
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+#        * <postrm> `remove'
-+#        * <postrm> `purge'
-+#        * <old-postrm> `upgrade' <new-version>
-+#        * <new-postrm> `failed-upgrade' <old-version>
-+#        * <new-postrm> `abort-install'
-+#        * <new-postrm> `abort-install' <old-version>
-+#        * <new-postrm> `abort-upgrade' <old-version>
-+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-+# for details, see /usr/share/doc/packaging-manual/
-+
-+if [ "$1" = "purge" ];
-+then
-+	rm -rf /etc/gtk/
-+fi
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-common.preinst
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-common.preinst
-@@ -0,0 +1,20 @@
-+#! /bin/sh
-+
-+set -e
-+
-+if [ "$1" = "upgrade" ];
-+then
-+	if test -L /usr/share/doc/libgtk1.2-common;
-+	then
-+		rm /usr/share/doc/libgtk1.2-common
-+	fi
-+fi
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
-+
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-dbg.dirs
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-dbg.dirs
-@@ -0,0 +1 @@
-+usr/lib/debug
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-dbg.files
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-dbg.files
-@@ -0,0 +1 @@
-+usr/lib/debug/*.so*
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-dbg.preinst
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-dbg.preinst
-@@ -0,0 +1,20 @@
-+#! /bin/sh
-+
-+set -e
-+
-+if [ "$1" = "upgrade" ];
-+then
-+	if [ -d /usr/share/doc/libgtk1.2-dbg -a ! -L /usr/share/doc/libgtk1.2-dbg ]
-+	then
-+		rm -rf /usr/share/doc/libgtk1.2-dbg
-+	fi
-+fi
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
-+
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-dev.dirs
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-dev.dirs
-@@ -0,0 +1,2 @@
-+usr/lib
-+usr/include
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-dev.examples
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-dev.examples
-@@ -0,0 +1,5 @@
-+examples/*
-+gtk/test*.c
-+gtk/testgtkrc*
-+gtk/test.xpm
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-dev.files
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-dev.files
-@@ -0,0 +1,7 @@
-+usr/bin/gtk-config
-+usr/include/*
-+usr/lib/lib*.{so,la,a}
-+usr/lib/pkgconfig/*.pc
-+usr/share/aclocal/*.m4
-+usr/share/man/man1/gtk-config.1*
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-doc.dirs
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-doc.dirs
-@@ -0,0 +1,7 @@
-+usr/share/doc/libgtk1.2-doc/faq-html
-+usr/share/doc/libgtk1.2-doc/gtk-tutorial-html
-+usr/share/doc/libgtk1.2-doc/gtk-tutorial-it-html
-+usr/share/doc/libgtk1.2-doc/gtk-tutorial-fr-html
-+usr/share/doc/libgtk1.2-doc/sgml
-+usr/share/doc/libgtk1.2-doc/texinfo
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-doc.doc-base.gtk-tutorial-fr
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-doc.doc-base.gtk-tutorial-fr
-@@ -0,0 +1,16 @@
-+Document: gtk-tutorial-fr
-+Title: GTK+ Tutorial in French
-+Author: Tony Gale and Ian Main
-+Abstract: This is a tutorial, in French, on how to use GTK (the GIMP Toolkit)
-+ through its C interface.
-+Section: Apps/Programming
-+
-+Format: linuxdoc-sgml
-+Files: /usr/share/doc/libgtk1.2-doc/sgml/gtk_tut_fr.sgml.gz
-+
-+Format: text
-+Files: /usr/share/doc/libgtk1.2-doc/gtk_tut_fr.txt.gz
-+
-+Format: HTML
-+Index: /usr/share/doc/libgtk1.2-doc/gtk-tutorial-fr-html/gtk_tut_fr.html
-+Files: /usr/share/doc/libgtk1.2-doc/gtk-tutorial-fr-html/*.html
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-doc.doc-base.gtk-tutorial
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-doc.doc-base.gtk-tutorial
-@@ -0,0 +1,16 @@
-+Document: gtk-tutorial
-+Title: GTK+ Tutorial
-+Author: Tony Gale and Ian Main
-+Abstract: This is a tutorial on how to use GTK (the GIMP Toolkit)
-+ through its C interface.
-+Section: Apps/Programming
-+
-+Format: linuxdoc-sgml
-+Files: /usr/share/doc/libgtk1.2-doc/sgml/gtk_tut.sgml.gz
-+
-+Format: text
-+Files: /usr/share/doc/libgtk1.2-doc/gtk_tut.txt.gz
-+
-+Format: HTML
-+Index: /usr/share/doc/libgtk1.2-doc/gtk-tutorial-html/gtk_tut.html
-+Files: /usr/share/doc/libgtk1.2-doc/gtk-tutorial-html/*.html
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-common.postinst
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-common.postinst
-@@ -0,0 +1,54 @@
-+#! /bin/sh
-+# postinst script for #PACKAGE#
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+#        * <postinst> `configure' <most-recently-configured-version>
-+#        * <old-postinst> `abort-upgrade' <new version>
-+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-+#          <new-version>
-+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-+#          <failed-install-package> <version> `removing'
-+#          <conflicting-package> <version>
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+#
-+# quoting from the policy:
-+#     Any necessary prompting should almost always be confined to the
-+#     post-installation script, and should be protected with a conditional
-+#     so that unnecessary prompting doesn't happen if a package's
-+#     installation fails and the `postinst' is called with `abort-upgrade',
-+#     `abort-remove' or `abort-deconfigure'.
-+
-+case "$1" in
-+    configure)
-+	# remove unnecessary gtkrc files
-+	for i in gtkrc.el gtkrc.eo gtkrc.tr; do		\
-+		if test -f /etc/gtkrc/$i; then		\
-+			echo "Removing unnecessary $i"	\
-+			rm -f /etc/gtkrc/$i;		\
-+		fi					\
-+	done
-+    ;;
-+
-+    abort-upgrade|abort-remove|abort-deconfigure)
-+
-+    ;;
-+
-+    *)
-+        echo "postinst called with unknown argument \`$1'" >&2
-+        exit 1
-+    ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
-+
-+
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-doc.doc-base.gtk-tutorial-it
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-doc.doc-base.gtk-tutorial-it
-@@ -0,0 +1,16 @@
-+Document: gtk-tutorial-it
-+Title: GTK+ Tutorial in Italian
-+Author: Tony Gale and Ian Main
-+Abstract: This is a tutorial, in Italian, on how to use GTK (the GIMP Toolkit)
-+ through its C interface.
-+Section: Apps/Programming
-+
-+Format: linuxdoc-sgml
-+Files: /usr/share/doc/libgtk1.2-doc/sgml/gtk_tut_it.sgml.gz
-+
-+Format: text
-+Files: /usr/share/doc/libgtk1.2-doc/gtk_tut_it.txt.gz
-+
-+Format: HTML
-+Index: /usr/share/doc/libgtk1.2-doc/gtk-tutorial-it-html/gtk_tut_it.html
-+Files: /usr/share/doc/libgtk1.2-doc/gtk-tutorial-it-html/*.html
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-doc.files
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-doc.files
-@@ -0,0 +1 @@
-+usr/share/info/*
---- gtk+1.2-1.2.10.orig/debian/libgtk1.2-doc.info
-+++ gtk+1.2-1.2.10/debian/libgtk1.2-doc.info
-@@ -0,0 +1,2 @@
-+docs/gtk.info
-+docs/gdk.info
---- gtk+1.2-1.2.10.orig/debian/compat
-+++ gtk+1.2-1.2.10/debian/compat
-@@ -0,0 +1 @@
-+4
---- gtk+1.2-1.2.10.orig/debian/fixed-ltmain.sh
-+++ gtk+1.2-1.2.10/debian/fixed-ltmain.sh
-@@ -0,0 +1,4997 @@
-+# ltmain.sh - Provide generalized library-building support services.
-+# NOTE: Changing this file will not affect anything until you rerun configure.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Check that we have a working $echo.
-+if test "X$1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X$1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+  # Yippee, $echo works!
-+  :
-+else
-+  # Restart under the correct shell, and then maybe $echo will work.
-+  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<EOF
-+$*
-+EOF
-+  exit 0
-+fi
-+
-+# The name of this program.
-+progname=`$echo "$0" | sed 's%^.*/%%'`
-+modename="$progname"
-+
-+# Constants.
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.4
-+TIMESTAMP=" (1.922 2001/04/25 00:05:37)"
-+
-+default_mode=
-+help="Try \`$progname --help' for more information."
-+magic="%%%MAGIC variable%%%"
-+mkdir="mkdir"
-+mv="mv -f"
-+rm="rm -f"
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e 1s/^X//'
-+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-+SP2NL='tr \040 \012'
-+NL2SP='tr \015\012 \040\040'
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+# We save the old values to restore during execute mode.
-+if test "${LC_ALL+set}" = set; then
-+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-+fi
-+if test "${LANG+set}" = set; then
-+  save_LANG="$LANG"; LANG=C; export LANG
-+fi
-+
-+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+  echo "$modename: not configured to build any kind of library" 1>&2
-+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+  exit 1
-+fi
-+
-+# Global variables.
-+mode=$default_mode
-+nonopt=
-+prev=
-+prevopt=
-+run=
-+show="$echo"
-+show_help=
-+execute_dlfiles=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+
-+# Parse our command line options once, thoroughly.
-+while test $# -gt 0
-+do
-+  arg="$1"
-+  shift
-+
-+  case $arg in
-+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-+  *) optarg= ;;
-+  esac
-+
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$prev"; then
-+    case $prev in
-+    execute_dlfiles)
-+      execute_dlfiles="$execute_dlfiles $arg"
-+      ;;
-+    *)
-+      eval "$prev=\$arg"
-+      ;;
-+    esac
-+
-+    prev=
-+    prevopt=
-+    continue
-+  fi
-+
-+  # Have we seen a non-optional argument yet?
-+  case $arg in
-+  --help)
-+    show_help=yes
-+    ;;
-+
-+  --version)
-+    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-+    exit 0
-+    ;;
-+
-+  --config)
-+    sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-+    exit 0
-+    ;;
-+
-+  --debug)
-+    echo "$progname: enabling shell trace mode"
-+    set -x
-+    ;;
-+
-+  --dry-run | -n)
-+    run=:
-+    ;;
-+
-+  --features)
-+    echo "host: $host"
-+    if test "$build_libtool_libs" = yes; then
-+      echo "enable shared libraries"
-+    else
-+      echo "disable shared libraries"
-+    fi
-+    if test "$build_old_libs" = yes; then
-+      echo "enable static libraries"
-+    else
-+      echo "disable static libraries"
-+    fi
-+    exit 0
-+    ;;
-+
-+  --finish) mode="finish" ;;
-+
-+  --mode) prevopt="--mode" prev=mode ;;
-+  --mode=*) mode="$optarg" ;;
-+
-+  --quiet | --silent)
-+    show=:
-+    ;;
-+
-+  -dlopen)
-+    prevopt="-dlopen"
-+    prev=execute_dlfiles
-+    ;;
-+
-+  -*)
-+    $echo "$modename: unrecognized option \`$arg'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+    ;;
-+
-+  *)
-+    nonopt="$arg"
-+    break
-+    ;;
-+  esac
-+done
-+
-+if test -n "$prevopt"; then
-+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-+  $echo "$help" 1>&2
-+  exit 1
-+fi
-+
-+if test -z "$show_help"; then
-+
-+  # Infer the operation mode.
-+  if test -z "$mode"; then
-+    case $nonopt in
-+    *cc | *++ | gcc* | *-gcc*)
-+      mode=link
-+      for arg
-+      do
-+	case $arg in
-+	-c)
-+	   mode=compile
-+	   break
-+	   ;;
-+	esac
-+      done
-+      ;;
-+    *db | *dbx | *strace | *truss)
-+      mode=execute
-+      ;;
-+    *install*|cp|mv)
-+      mode=install
-+      ;;
-+    *rm)
-+      mode=uninstall
-+      ;;
-+    *)
-+      # If we have no mode, but dlfiles were specified, then do execute mode.
-+      test -n "$execute_dlfiles" && mode=execute
-+
-+      # Just use the default operation mode.
-+      if test -z "$mode"; then
-+	if test -n "$nonopt"; then
-+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-+	else
-+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-+	fi
-+      fi
-+      ;;
-+    esac
-+  fi
-+
-+  # Only execute mode is allowed to have -dlopen flags.
-+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-+    $echo "$help" 1>&2
-+    exit 1
-+  fi
-+
-+  # Change the help message to a mode-specific one.
-+  generic_help="$help"
-+  help="Try \`$modename --help --mode=$mode' for more information."
-+
-+  # These modes are in order of execution frequency so that they run quickly.
-+  case $mode in
-+  # libtool compile mode
-+  compile)
-+    modename="$modename: compile"
-+    # Get the compilation command and the source file.
-+    base_compile=
-+    prev=
-+    lastarg=
-+    srcfile="$nonopt"
-+    suppress_output=
-+
-+    user_target=no
-+    for arg
-+    do
-+      case $prev in
-+      "") ;;
-+      xcompiler)
-+	# Aesthetically quote the previous argument.
-+	prev=
-+	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+
-+	case $arg in
-+	# Double-quote args containing other shell metacharacters.
-+	# Many Bourne shells cannot handle close brackets correctly
-+	# in scan sets, so we specify it separately.
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+
-+	# Add the previous argument to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-+      esac
-+
-+      # Accept any command-line options.
-+      case $arg in
-+      -o)
-+	if test "$user_target" != "no"; then
-+	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-+	  exit 1
-+	fi
-+	user_target=next
-+	;;
-+
-+      -static)
-+	build_old_libs=yes
-+	continue
-+	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-+	lastarg=
-+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
-+	for arg in $args; do
-+	  IFS="$save_ifs"
-+
-+	  # Double-quote args containing other shell metacharacters.
-+	  # Many Bourne shells cannot handle close brackets correctly
-+	  # in scan sets, so we specify it separately.
-+	  case $arg in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    arg="\"$arg\""
-+	    ;;
-+	  esac
-+	  lastarg="$lastarg $arg"
-+	done
-+	IFS="$save_ifs"
-+	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-+
-+	# Add the arguments to base_compile.
-+	if test -z "$base_compile"; then
-+	  base_compile="$lastarg"
-+	else
-+	  base_compile="$base_compile $lastarg"
-+	fi
-+	continue
-+	;;
-+      esac
-+
-+      case $user_target in
-+      next)
-+	# The next one is the -o target name
-+	user_target=yes
-+	continue
-+	;;
-+      yes)
-+	# We got the output file
-+	user_target=set
-+	libobj="$arg"
-+	continue
-+	;;
-+      esac
-+
-+      # Accept the current argument as the source file.
-+      lastarg="$srcfile"
-+      srcfile="$arg"
-+
-+      # Aesthetically quote the previous argument.
-+
-+      # Backslashify any backslashes, double quotes, and dollar signs.
-+      # These are the only characters that are still specially
-+      # interpreted inside of double-quoted scrings.
-+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-+
-+      # Double-quote args containing other shell metacharacters.
-+      # Many Bourne shells cannot handle close brackets correctly
-+      # in scan sets, so we specify it separately.
-+      case $lastarg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	lastarg="\"$lastarg\""
-+	;;
-+      esac
-+
-+      # Add the previous argument to base_compile.
-+      if test -z "$base_compile"; then
-+	base_compile="$lastarg"
-+      else
-+	base_compile="$base_compile $lastarg"
-+      fi
-+    done
-+
-+    case $user_target in
-+    set)
-+      ;;
-+    no)
-+      # Get the name of the library object.
-+      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-+      ;;
-+    *)
-+      $echo "$modename: you must specify a target with \`-o'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    # Recognize several different file suffixes.
-+    # If the user specifies -o file.o, it is replaced with file.lo
-+    xform='[cCFSfmso]'
-+    case $libobj in
-+    *.ada) xform=ada ;;
-+    *.adb) xform=adb ;;
-+    *.ads) xform=ads ;;
-+    *.asm) xform=asm ;;
-+    *.c++) xform=c++ ;;
-+    *.cc) xform=cc ;;
-+    *.cpp) xform=cpp ;;
-+    *.cxx) xform=cxx ;;
-+    *.f90) xform=f90 ;;
-+    *.for) xform=for ;;
-+    esac
-+
-+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-+
-+    case $libobj in
-+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-+    *)
-+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-+      exit 1
-+      ;;
-+    esac
-+
-+    if test -z "$base_compile"; then
-+      $echo "$modename: you must specify a compilation command" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    # Delete any leftover library objects.
-+    if test "$build_old_libs" = yes; then
-+      removelist="$obj $libobj"
-+    else
-+      removelist="$libobj"
-+    fi
-+
-+    $run $rm $removelist
-+    trap "$run $rm $removelist; exit 1" 1 2 15
-+
-+    # On Cygwin there's no "real" PIC flag so we must build both object types
-+    case $host_os in
-+    cygwin* | mingw* | pw32* | os2*)
-+      pic_mode=default
-+      ;;
-+    esac
-+    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
-+      # non-PIC code in shared libraries is not supported
-+      pic_mode=default
-+    fi
-+
-+    # Calculate the filename of the output object if compiler does
-+    # not support -o with -c
-+    if test "$compiler_c_o" = no; then
-+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      lockfile="$output_obj.lock"
-+      removelist="$removelist $output_obj $lockfile"
-+      trap "$run $rm $removelist; exit 1" 1 2 15
-+    else
-+      need_locks=no
-+      lockfile=
-+    fi
-+
-+    # Lock this critical section if it is needed
-+    # We use this script file to make the link, it avoids creating a new file
-+    if test "$need_locks" = yes; then
-+      until $run ln "$0" "$lockfile" 2>/dev/null; do
-+	$show "Waiting for $lockfile to be removed"
-+	sleep 2
-+      done
-+    elif test "$need_locks" = warn; then
-+      if test -f "$lockfile"; then
-+	echo "\
-+*** ERROR, $lockfile exists and contains:
-+`cat $lockfile 2>/dev/null`
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+      echo $srcfile > "$lockfile"
-+    fi
-+
-+    if test -n "$fix_srcfile_path"; then
-+      eval srcfile=\"$fix_srcfile_path\"
-+    fi
-+
-+    # Only build a PIC object if we are building libtool libraries.
-+    if test "$build_libtool_libs" = yes; then
-+      # Without this assignment, base_compile gets emptied.
-+      fbsd_hideous_sh_bug=$base_compile
-+
-+      if test "$pic_mode" != no; then
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      else
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      fi
-+      if test "$build_old_libs" = yes; then
-+	lo_libobj="$libobj"
-+	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$dir" = "X$libobj"; then
-+	  dir="$objdir"
-+	else
-+	  dir="$dir/$objdir"
-+	fi
-+	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-+
-+	if test -d "$dir"; then
-+	  $show "$rm $libobj"
-+	  $run $rm $libobj
-+	else
-+	  $show "$mkdir $dir"
-+	  $run $mkdir $dir
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d $dir; then
-+	    exit $status
-+	  fi
-+	fi
-+      fi
-+      if test "$compiler_o_lo" = yes; then
-+	output_obj="$libobj"
-+	command="$command -o $output_obj"
-+      elif test "$compiler_c_o" = yes; then
-+	output_obj="$obj"
-+	command="$command -o $output_obj"
-+      fi
-+
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	test -n "$output_obj" && $run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed, then go on to compile the next one
-+      if test x"$output_obj" != x"$libobj"; then
-+	$show "$mv $output_obj $libobj"
-+	if $run $mv $output_obj $libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # If we have no pic_flag, then copy the object into place and finish.
-+      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
-+	 test "$build_old_libs" = yes; then
-+	# Rename the .lo from within objdir to obj
-+	if test -f $obj; then
-+	  $show $rm $obj
-+	  $run $rm $obj
-+	fi
-+
-+	$show "$mv $libobj $obj"
-+	if $run $mv $libobj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+
-+	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$xdir" = "X$obj"; then
-+	  xdir="."
-+	else
-+	  xdir="$xdir"
-+	fi
-+	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
-+	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-+	# Now arrange that obj and lo_libobj become the same file
-+	$show "(cd $xdir && $LN_S $baseobj $libobj)"
-+	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
-+	  exit 0
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Allow error messages only from the first compilation.
-+      suppress_output=' >/dev/null 2>&1'
-+    fi
-+
-+    # Only build a position-dependent object if we build old libraries.
-+    if test "$build_old_libs" = yes; then
-+      if test "$pic_mode" != yes; then
-+	# Don't build PIC code
-+	command="$base_compile $srcfile"
-+      else
-+	# All platforms use -DPIC, to notify preprocessed assembler code.
-+	command="$base_compile $srcfile $pic_flag -DPIC"
-+      fi
-+      if test "$compiler_c_o" = yes; then
-+	command="$command -o $obj"
-+	output_obj="$obj"
-+      fi
-+
-+      # Suppress compiler output if we already did a PIC compilation.
-+      command="$command$suppress_output"
-+      $run $rm "$output_obj"
-+      $show "$command"
-+      if $run eval "$command"; then :
-+      else
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      if test "$need_locks" = warn &&
-+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-+	echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
-+
-+but it should contain:
-+$srcfile
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together.  If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+	$run $rm $removelist
-+	exit 1
-+      fi
-+
-+      # Just move the object if needed
-+      if test x"$output_obj" != x"$obj"; then
-+	$show "$mv $output_obj $obj"
-+	if $run $mv $output_obj $obj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+
-+      # Create an invalid libtool object if no PIC, so that we do not
-+      # accidentally link it into a program.
-+      if test "$build_libtool_libs" != yes; then
-+	$show "echo timestamp > $libobj"
-+	$run eval "echo timestamp > \$libobj" || exit $?
-+      else
-+	# Move the .lo from within objdir
-+	$show "$mv $libobj $lo_libobj"
-+	if $run $mv $libobj $lo_libobj; then :
-+	else
-+	  error=$?
-+	  $run $rm $removelist
-+	  exit $error
-+	fi
-+      fi
-+    fi
-+
-+    # Unlock the critical section if it was locked
-+    if test "$need_locks" != no; then
-+      $run $rm "$lockfile"
-+    fi
-+
-+    exit 0
-+    ;;
-+
-+  # libtool link mode
-+  link | relink)
-+    modename="$modename: link"
-+    case $host in
-+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+      # It is impossible to link a dll without this setting, and
-+      # we shouldn't force the makefile maintainer to figure out
-+      # which system we are compiling for in order to pass an extra
-+      # flag for every libtool invokation.
-+      # allow_undefined=no
-+
-+      # FIXME: Unfortunately, there are problems with the above when trying
-+      # to make a dll which has undefined symbols, in which case not
-+      # even a static library is built.  For now, we need to specify
-+      # -no-undefined on the libtool link line when we can be certain
-+      # that all symbols are satisfied, otherwise we get a static library.
-+      allow_undefined=yes
-+      ;;
-+    *)
-+      allow_undefined=yes
-+      ;;
-+    esac
-+    libtool_args="$nonopt"
-+    compile_command="$nonopt"
-+    finalize_command="$nonopt"
-+
-+    compile_rpath=
-+    finalize_rpath=
-+    compile_shlibpath=
-+    finalize_shlibpath=
-+    convenience=
-+    old_convenience=
-+    deplibs=
-+    old_deplibs=
-+    compiler_flags=
-+    linker_flags=
-+    dllsearchpath=
-+    lib_search_path=`pwd`
-+    inst_prefix_dir=
-+
-+    avoid_version=no
-+    dlfiles=
-+    dlprefiles=
-+    dlself=no
-+    export_dynamic=no
-+    export_symbols=
-+    export_symbols_regex=
-+    generated=
-+    libobjs=
-+    ltlibs=
-+    module=no
-+    no_install=no
-+    objs=
-+    prefer_static_libs=no
-+    preload=no
-+    prev=
-+    prevarg=
-+    release=
-+    rpath=
-+    xrpath=
-+    perm_rpath=
-+    temp_rpath=
-+    thread_safe=no
-+    vinfo=
-+
-+    # We need to know -static, to get the right output filenames.
-+    for arg
-+    do
-+      case $arg in
-+      -all-static | -static)
-+	if test "X$arg" = "X-all-static"; then
-+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-+	  fi
-+	  if test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	else
-+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+	    dlopen_self=$dlopen_self_static
-+	  fi
-+	fi
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	prefer_static_libs=yes
-+	break
-+	;;
-+      esac
-+    done
-+
-+    # See if our shared archives depend on static archives.
-+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-+
-+    # Go through the arguments, transforming them on the way.
-+    while test $# -gt 0; do
-+      arg="$1"
-+      shift
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-+	;;
-+      *) qarg=$arg ;;
-+      esac
-+      libtool_args="$libtool_args $qarg"
-+
-+      # If the previous option needs an argument, assign it.
-+      if test -n "$prev"; then
-+	case $prev in
-+	output)
-+	  compile_command="$compile_command @OUTPUT@"
-+	  finalize_command="$finalize_command @OUTPUT@"
-+	  ;;
-+	esac
-+
-+	case $prev in
-+	dlfiles|dlprefiles)
-+	  if test "$preload" = no; then
-+	    # Add the symbol object into the linking commands.
-+	    compile_command="$compile_command @SYMFILE@"
-+	    finalize_command="$finalize_command @SYMFILE@"
-+	    preload=yes
-+	  fi
-+	  case $arg in
-+	  *.la | *.lo) ;;  # We handle these cases below.
-+	  force)
-+	    if test "$dlself" = no; then
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  self)
-+	    if test "$prev" = dlprefiles; then
-+	      dlself=yes
-+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-+	      dlself=yes
-+	    else
-+	      dlself=needless
-+	      export_dynamic=yes
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  *)
-+	    if test "$prev" = dlfiles; then
-+	      dlfiles="$dlfiles $arg"
-+	    else
-+	      dlprefiles="$dlprefiles $arg"
-+	    fi
-+	    prev=
-+	    continue
-+	    ;;
-+	  esac
-+	  ;;
-+	expsyms)
-+	  export_symbols="$arg"
-+	  if test ! -f "$arg"; then
-+	    $echo "$modename: symbol file \`$arg' does not exist"
-+	    exit 1
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	expsyms_regex)
-+	  export_symbols_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+        inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	release)
-+	  release="-$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	rpath | xrpath)
-+	  # We need an absolute path.
-+	  case $arg in
-+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-+	  *)
-+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-+	    exit 1
-+	    ;;
-+	  esac
-+	  if test "$prev" = rpath; then
-+	    case "$rpath " in
-+	    *" $arg "*) ;;
-+	    *) rpath="$rpath $arg" ;;
-+	    esac
-+	  else
-+	    case "$xrpath " in
-+	    *" $arg "*) ;;
-+	    *) xrpath="$xrpath $arg" ;;
-+	    esac
-+	  fi
-+	  prev=
-+	  continue
-+	  ;;
-+	xcompiler)
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  compile_command="$compile_command $qarg"
-+	  finalize_command="$finalize_command $qarg"
-+	  continue
-+	  ;;
-+	xlinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $wl$qarg"
-+	  prev=
-+	  compile_command="$compile_command $wl$qarg"
-+	  finalize_command="$finalize_command $wl$qarg"
-+	  continue
-+	  ;;
-+	*)
-+	  eval "$prev=\"\$arg\""
-+	  prev=
-+	  continue
-+	  ;;
-+	esac
-+      fi # test -n $prev
-+
-+      prevarg="$arg"
-+
-+      case $arg in
-+      -all-static)
-+	if test -n "$link_static_flag"; then
-+	  compile_command="$compile_command $link_static_flag"
-+	  finalize_command="$finalize_command $link_static_flag"
-+	fi
-+	continue
-+	;;
-+
-+      -allow-undefined)
-+	# FIXME: remove this flag sometime in the future.
-+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-+	continue
-+	;;
-+
-+      -avoid-version)
-+	avoid_version=yes
-+	continue
-+	;;
-+
-+      -dlopen)
-+	prev=dlfiles
-+	continue
-+	;;
-+
-+      -dlpreopen)
-+	prev=dlprefiles
-+	continue
-+	;;
-+
-+      -export-dynamic)
-+	export_dynamic=yes
-+	continue
-+	;;
-+
-+      -export-symbols | -export-symbols-regex)
-+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-+	  exit 1
-+	fi
-+	if test "X$arg" = "X-export-symbols"; then
-+	  prev=expsyms
-+	else
-+	  prev=expsyms_regex
-+	fi
-+	continue
-+	;;
-+
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
-+
-+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+      # so, if we see these flags be careful not to treat them like -L
-+      -L[A-Z][A-Z]*:*)
-+	case $with_gcc/$host in
-+	no/*-*-irix*)
-+	  compile_command="$compile_command $arg"
-+	  finalize_command="$finalize_command $arg"
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -L*)
-+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  absdir=`cd "$dir" && pwd`
-+	  if test -z "$absdir"; then
-+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-+	    exit 1
-+	  fi
-+	  dir="$absdir"
-+	  ;;
-+	esac
-+	case "$deplibs " in
-+	*" -L$dir "*) ;;
-+	*)
-+	  deplibs="$deplibs -L$dir"
-+	  lib_search_path="$lib_search_path $dir"
-+	  ;;
-+	esac
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$dir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  esac
-+	  ;;
-+	esac
-+	continue
-+	;;
-+
-+      -l*)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-+	    # These systems don't actually have a C or math library (as such)
-+	    continue
-+	    ;;
-+	  *-*-mingw* | *-*-os2*)
-+	    # These systems don't actually have a C library (as such)
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  esac
-+	fi
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-+      -module)
-+	module=yes
-+	continue
-+	;;
-+
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
-+
-+      -no-install)
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  # The PATH hackery in wrapper scripts is required on Windows
-+	  # in order for the loader to find any dlls it needs.
-+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-+	  fast_install=no
-+	  ;;
-+	*) no_install=yes ;;
-+	esac
-+	continue
-+	;;
-+
-+      -no-undefined)
-+	allow_undefined=no
-+	continue
-+	;;
-+
-+      -o) prev=output ;;
-+
-+      -release)
-+	prev=release
-+	continue
-+	;;
-+
-+      -rpath)
-+	prev=rpath
-+	continue
-+	;;
-+
-+      -R)
-+	prev=xrpath
-+	continue
-+	;;
-+
-+      -R*)
-+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-+	# We need an absolute path.
-+	case $dir in
-+	[\\/]* | [A-Za-z]:[\\/]*) ;;
-+	*)
-+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+	case "$xrpath " in
-+	*" $dir "*) ;;
-+	*) xrpath="$xrpath $dir" ;;
-+	esac
-+	continue
-+	;;
-+
-+      -static)
-+	# The effects of -static are defined in a previous loop.
-+	# We used to do the same as -all-static on platforms that
-+	# didn't have a PIC flag, but the assumption that the effects
-+	# would be equivalent was wrong.  It would break on at least
-+	# Digital Unix and AIX.
-+	continue
-+	;;
-+
-+      -thread-safe)
-+	thread_safe=yes
-+	continue
-+	;;
-+
-+      -version-info)
-+	prev=vinfo
-+	continue
-+	;;
-+
-+      -Wc,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-+	arg=
-+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Wl,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-+	arg=
-+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case $flag in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  compiler_flags="$compiler_flags $wl$flag"
-+	  linker_flags="$linker_flags $flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
-+
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
-+
-+      # Some other compiler flag.
-+      -* | +*)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	;;
-+
-+      *.lo | *.$objext)
-+	# A library or standard object.
-+	if test "$prev" = dlfiles; then
-+	  # This file was specified with -dlopen.
-+	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+	    dlfiles="$dlfiles $arg"
-+	    prev=
-+	    continue
-+	  else
-+	    # If libtool objects are unsupported, then we need to preload.
-+	    prev=dlprefiles
-+	  fi
-+	fi
-+
-+	if test "$prev" = dlprefiles; then
-+	  # Preload the old-style object.
-+	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
-+	  prev=
-+	else
-+	  case $arg in
-+	  *.lo) libobjs="$libobjs $arg" ;;
-+	  *) objs="$objs $arg" ;;
-+	  esac
-+	fi
-+	;;
-+
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
-+	continue
-+	;;
-+
-+      *.la)
-+	# A libtool-controlled library.
-+
-+	if test "$prev" = dlfiles; then
-+	  # This library was specified with -dlopen.
-+	  dlfiles="$dlfiles $arg"
-+	  prev=
-+	elif test "$prev" = dlprefiles; then
-+	  # The library was specified with -dlpreopen.
-+	  dlprefiles="$dlprefiles $arg"
-+	  prev=
-+	else
-+	  deplibs="$deplibs $arg"
-+	fi
-+	continue
-+	;;
-+
-+      # Some other compiler argument.
-+      *)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	;;
-+      esac # arg
-+
-+      # Now actually substitute the argument into the commands.
-+      if test -n "$arg"; then
-+	compile_command="$compile_command $arg"
-+	finalize_command="$finalize_command $arg"
-+      fi
-+    done # argument parsing loop
-+
-+    if test -n "$prev"; then
-+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+      eval arg=\"$export_dynamic_flag_spec\"
-+      compile_command="$compile_command $arg"
-+      finalize_command="$finalize_command $arg"
-+    fi
-+
-+    # calculate the name of the file, without its directory
-+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-+    libobjs_save="$libobjs"
-+
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      shlib_search_path=
-+    fi
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+
-+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-+    if test "X$output_objdir" = "X$output"; then
-+      output_objdir="$objdir"
-+    else
-+      output_objdir="$output_objdir/$objdir"
-+    fi
-+    # Create the object directory.
-+    if test ! -d $output_objdir; then
-+      $show "$mkdir $output_objdir"
-+      $run $mkdir $output_objdir
-+      status=$?
-+      if test $status -ne 0 && test ! -d $output_objdir; then
-+	exit $status
-+      fi
-+    fi
-+
-+    # Determine the type of output
-+    case $output in
-+    "")
-+      $echo "$modename: you must specify an output file" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+      ;;
-+    *.$libext) linkmode=oldlib ;;
-+    *.lo | *.$objext) linkmode=obj ;;
-+    *.la) linkmode=lib ;;
-+    *) linkmode=prog ;; # Anything else should be a program.
-+    esac
-+
-+    specialdeplibs=
-+    libs=
-+    # Find all interdependent deplibs by searching for libraries
-+    # that are linked more than once (e.g. -la -lb -la)
-+    for deplib in $deplibs; do
-+      case "$libs " in
-+      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+      esac
-+      libs="$libs $deplib"
-+    done
-+    deplibs=
-+    newdependency_libs=
-+    newlib_search_path=
-+    need_relink=no # whether we're linking any uninstalled libtool libraries
-+    notinst_deplibs= # not-installed libtool libraries
-+    notinst_path= # paths that contain not-installed libtool libraries
-+    case $linkmode in
-+    lib)
-+	passes="conv link"
-+	for file in $dlfiles $dlprefiles; do
-+	  case $file in
-+	  *.la) ;;
-+	  *)
-+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-+	    exit 1
-+	    ;;
-+	  esac
-+	done
-+	;;
-+    prog)
-+	compile_deplibs=
-+	finalize_deplibs=
-+	alldeplibs=no
-+	newdlfiles=
-+	newdlprefiles=
-+	passes="conv scan dlopen dlpreopen link"
-+	;;
-+    *)  passes="conv"
-+	;;
-+    esac
-+    for pass in $passes; do
-+      if test $linkmode = prog; then
-+	# Determine which files to process
-+	case $pass in
-+	dlopen)
-+	  libs="$dlfiles"
-+	  save_deplibs="$deplibs" # Collect dlpreopened libraries
-+	  deplibs=
-+	  ;;
-+	dlpreopen) libs="$dlprefiles" ;;
-+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	esac
-+      fi
-+      for deplib in $libs; do
-+	lib=
-+	found=no
-+	case $deplib in
-+	-l*)
-+	  if test $linkmode = oldlib && test $linkmode = obj; then
-+	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
-+	    continue
-+	  fi
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+	    # Search the libtool library
-+	    lib="$searchdir/lib${name}.la"
-+	    if test -f "$lib"; then
-+	      found=yes
-+	      break
-+	    fi
-+	  done
-+	  if test "$found" != yes; then
-+	    # deplib doesn't seem to be a libtool library
-+	    if test "$linkmode,$pass" = "prog,link"; then
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      deplibs="$deplib $deplibs"
-+	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    continue
-+	  fi
-+	  ;; # -l
-+	-L*)
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test $pass = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+	    ;;
-+	  prog)
-+	    if test $pass = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test $pass = scan; then
-+	      deplibs="$deplib $deplibs"
-+	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    ;;
-+	  *)
-+	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
-+	    ;;
-+	  esac # linkmode
-+	  continue
-+	  ;; # -L
-+	-R*)
-+	  if test $pass = link; then
-+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-+	    # Make sure the xrpath contains only unique directories.
-+	    case "$xrpath " in
-+	    *" $dir "*) ;;
-+	    *) xrpath="$xrpath $dir" ;;
-+	    esac
-+	  fi
-+	  deplibs="$deplib $deplibs"
-+	  continue
-+	  ;;
-+	*.la) lib="$deplib" ;;
-+	*.$libext)
-+	  if test $pass = conv; then
-+	    deplibs="$deplib $deplibs"
-+	    continue
-+	  fi
-+	  case $linkmode in
-+	  lib)
-+	    if test "$deplibs_check_method" != pass_all; then
-+	      echo
-+	      echo "*** Warning: This library needs some functionality provided by $deplib."
-+	      echo "*** I have the capability to make that library automatically link in when"
-+	      echo "*** you link to this library.  But I can only do this if you have a"
-+	      echo "*** shared version of the library, which you do not appear to have."
-+	    else
-+	      echo
-+	      echo "*** Warning: Linking the shared library $output against the"
-+	      echo "*** static library $deplib is not portable!"
-+	      deplibs="$deplib $deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  prog)
-+	    if test $pass != link; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    continue
-+	    ;;
-+	  esac # linkmode
-+	  ;; # *.$libext
-+	*.lo | *.$objext)
-+	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlopen support or we're linking statically,
-+	    # we need to preload.
-+	    newdlprefiles="$newdlprefiles $deplib"
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    newdlfiles="$newdlfiles $deplib"
-+	  fi
-+	  continue
-+	  ;;
-+	%DEPLIBS%)
-+	  alldeplibs=yes
-+	  continue
-+	  ;;
-+	esac # case $deplib
-+	if test $found = yes || test -f "$lib"; then :
-+	else
-+	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Check to see that this really is a libtool archive.
-+	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+	  exit 1
-+	fi
-+
-+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$ladir" = "X$lib" && ladir="."
-+
-+	dlname=
-+	dlopen=
-+	dlpreopen=
-+	libdir=
-+	library_names=
-+	old_library=
-+	# If the library was installed with an old release of libtool,
-+	# it will not redefine variable installed.
-+	installed=yes
-+
-+	# Read the .la file
-+	case $lib in
-+	*/* | *\\*) . $lib ;;
-+	*) . ./$lib ;;
-+	esac
-+
-+	if test "$linkmode,$pass" = "lib,link" ||
-+	   test "$linkmode,$pass" = "prog,scan" ||
-+	   { test $linkmode = oldlib && test $linkmode = obj; }; then
-+	   # Add dl[pre]opened files of deplib
-+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+	fi
-+
-+	if test $pass = conv; then
-+	  # Only check for convenience libraries
-+	  deplibs="$lib $deplibs"
-+	  if test -z "$libdir"; then
-+	    if test -z "$old_library"; then
-+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	      exit 1
-+	    fi
-+	    # It is a libtool convenience library, so add in its objects.
-+	    convenience="$convenience $ladir/$objdir/$old_library"
-+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
-+	  elif test $linkmode != prog && test $linkmode != lib; then
-+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-+	    exit 1
-+	  fi
-+	  continue
-+	fi # $pass = conv
-+
-+	# Get the name of the library we link against.
-+	linklib=
-+	for l in $old_library $library_names; do
-+	  linklib="$l"
-+	done
-+	if test -z "$linklib"; then
-+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+	  exit 1
-+	fi
-+
-+	# This library was specified with -dlopen.
-+	if test $pass = dlopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-+	    exit 1
-+	  fi
-+	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	    # If there is no dlname, no dlopen support or we're linking
-+	    # statically, we need to preload.
-+	    dlprefiles="$dlprefiles $lib"
-+	  else
-+	    newdlfiles="$newdlfiles $lib"
-+	  fi
-+	  continue
-+	fi # $pass = dlopen
-+
-+	# We need an absolute path.
-+	case $ladir in
-+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-+	*)
-+	  abs_ladir=`cd "$ladir" && pwd`
-+	  if test -z "$abs_ladir"; then
-+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-+	    abs_ladir="$ladir"
-+	  fi
-+	  ;;
-+	esac
-+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+
-+	# Find the relevant object directory and library name.
-+	if test "X$installed" = Xyes; then
-+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	  else
-+	    dir="$libdir"
-+	    absdir="$libdir"
-+	  fi
-+	else
-+	  dir="$ladir/$objdir"
-+	  absdir="$abs_ladir/$objdir"
-+	  # Remove this search path later
-+	  notinst_path="$notinst_path $abs_ladir"
-+	fi # $installed = yes
-+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+
-+	# This library was specified with -dlpreopen.
-+	if test $pass = dlpreopen; then
-+	  if test -z "$libdir"; then
-+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-+	    exit 1
-+	  fi
-+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-+	  # are required to link).
-+	  if test -n "$old_library"; then
-+	    newdlprefiles="$newdlprefiles $dir/$old_library"
-+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-+	  elif test -n "$dlname"; then
-+	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+	  else
-+	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	  fi
-+	fi # $pass = dlpreopen
-+
-+	if test -z "$libdir"; then
-+	  # Link the convenience library
-+	  if test $linkmode = lib; then
-+	    deplibs="$dir/$old_library $deplibs"
-+	  elif test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$dir/$old_library $compile_deplibs"
-+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-+	  else
-+	    deplibs="$lib $deplibs"
-+	  fi
-+	  continue
-+	fi
-+
-+	if test $linkmode = prog && test $pass != link; then
-+	  newlib_search_path="$newlib_search_path $ladir"
-+	  deplibs="$lib $deplibs"
-+
-+	  linkalldeplibs=no
-+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+	     test "$build_libtool_libs" = no; then
-+	    linkalldeplibs=yes
-+	  fi
-+
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    case $deplib in
-+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-+	    esac
-+	    # Need to link against all dependency_libs?
-+	    if test $linkalldeplibs = yes; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      # Need to hardcode shared library paths
-+	      # or/and link against static libraries
-+	      newdependency_libs="$deplib $newdependency_libs"
-+	    fi
-+	    case "$tmp_libs " in
-+	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	    esac
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done # for deplib
-+	  continue
-+	fi # $linkmode = prog...
-+
-+	link_static=no # Whether the deplib will be linked statically
-+	if test -n "$library_names" &&
-+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+	  # Link against this shared library
-+
-+	  if test "$linkmode,$pass" = "prog,link" ||
-+	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    if test $linkmode = prog; then
-+	      # We need to hardcode the library path
-+	      if test -n "$shlibpath_var"; then
-+		# Make sure the rpath contains only unique directories.
-+		case "$temp_rpath " in
-+		*" $dir "*) ;;
-+		*" $absdir "*) ;;
-+		*) temp_rpath="$temp_rpath $dir" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi # $linkmode,$pass = prog,link...
-+
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+
-+	  if test "$installed" = no; then
-+	    notinst_deplibs="$notinst_deplibs $lib"
-+	    need_relink=no
-+	  fi
-+
-+	  if test -n "$old_archive_from_expsyms_cmds"; then
-+	    # figure out the soname
-+	    set dummy $library_names
-+	    realname="$2"
-+	    shift; shift
-+	    libname=`eval \\$echo \"$libname_spec\"`
-+	    # use dlname if we got it. it's perfectly good, no?
-+	    if test -n "$dlname"; then
-+	      soname="$dlname"
-+	    elif test -n "$soname_spec"; then
-+	      # bleh windows
-+	      case $host in
-+	      *cygwin*)
-+		major=`expr $current - $age`
-+		versuffix="-$major"
-+		;;
-+	      esac
-+	      eval soname=\"$soname_spec\"
-+	    else
-+	      soname="$realname"
-+	    fi
-+
-+	    # Make a new name for the extract_expsyms_cmds to use
-+	    soroot="$soname"
-+	    soname=`echo $soroot | sed -e 's/^.*\///'`
-+	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
-+
-+	    # If the library has no export list, then create one now
-+	    if test -f "$output_objdir/$soname-def"; then :
-+	    else
-+	      $show "extracting exported symbol list from \`$soname'"
-+	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$extract_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+
-+	    # Create $newlib
-+	    if test -f "$output_objdir/$newlib"; then :; else
-+	      $show "generating import library for \`$soname'"
-+	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd" || exit $?
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+	    # make sure the library variables are pointing to the new library
-+	    dir=$output_objdir
-+	    linklib=$newlib
-+	  fi # test -n $old_archive_from_expsyms_cmds
-+
-+	  if test $linkmode = prog || test "$mode" != relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    lib_linked=yes
-+	    case $hardcode_action in
-+	    immediate | unsupported)
-+	      if test "$hardcode_direct" = no; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = no; then
-+		case $host in
-+		*-*-sunos*) add_shlibpath="$dir" ;;
-+		esac
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = no; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    relink)
-+	      if test "$hardcode_direct" = yes; then
-+		add="$dir/$linklib"
-+	      elif test "$hardcode_minus_L" = yes; then
-+		add_dir="-L$dir"
-+		add="-l$name"
-+	      elif test "$hardcode_shlibpath_var" = yes; then
-+		add_shlibpath="$dir"
-+		add="-l$name"
-+	      else
-+		lib_linked=no
-+	      fi
-+	      ;;
-+	    *) lib_linked=no ;;
-+	    esac
-+
-+	    if test "$lib_linked" != yes; then
-+	      $echo "$modename: configuration error: unsupported hardcode properties"
-+	      exit 1
-+	    fi
-+
-+	    if test -n "$add_shlibpath"; then
-+	      case :$compile_shlibpath: in
-+	      *":$add_shlibpath:"*) ;;
-+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+	      esac
-+	    fi
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	      if test "$hardcode_direct" != yes && \
-+		 test "$hardcode_minus_L" != yes && \
-+		 test "$hardcode_shlibpath_var" = yes; then
-+		case :$finalize_shlibpath: in
-+		*":$libdir:"*) ;;
-+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+		esac
-+	      fi
-+	    fi
-+	  fi
-+
-+	  if test $linkmode = prog || test "$mode" = relink; then
-+	    add_shlibpath=
-+	    add_dir=
-+	    add=
-+	    # Finalize command for both is simple: just hardcode it.
-+	    if test "$hardcode_direct" = yes; then
-+	      add="$libdir/$linklib"
-+	    elif test "$hardcode_minus_L" = yes; then
-+	      # Try looking first in the location we're being installed to.
-+	      add_dir=
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		[\\/]*)
-+		  add_dir="-L$inst_prefix_dir$libdir"
-+		  ;;
-+		esac
-+	      fi
-+	      add_dir="$add_dir -L$libdir"
-+	      add="-l$name"
-+	    elif test "$hardcode_shlibpath_var" = yes; then
-+	      case :$finalize_shlibpath: in
-+	      *":$libdir:"*) ;;
-+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+	      esac
-+	      add="-l$name"
-+	    else
-+	      # We cannot seem to hardcode it, guess we'll fake it.
-+	      # Try looking first in the location we're being installed to.
-+	      add_dir=
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		[\\/]*)
-+		  add_dir="-L$inst_prefix_dir$libdir"
-+		  ;;
-+		esac
-+	      fi
-+	      add_dir="$add_dir -L$libdir"
-+	      add="-l$name"
-+	    fi
-+
-+	    if test $linkmode = prog; then
-+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+	    else
-+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+	      test -n "$add" && deplibs="$add $deplibs"
-+	    fi
-+	  fi
-+	elif test $linkmode = prog; then
-+	  if test "$alldeplibs" = yes &&
-+	     { test "$deplibs_check_method" = pass_all ||
-+	       { test "$build_libtool_libs" = yes &&
-+		 test -n "$library_names"; }; }; then
-+	    # We only need to search for static libraries
-+	    continue
-+	  fi
-+
-+	  # Try to link the static library
-+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-+	  # is not unsupported.  This is valid on all known static and
-+	  # shared platforms.
-+	  if test "$hardcode_direct" != unsupported; then
-+	    test -n "$old_library" && linklib="$old_library"
-+	    compile_deplibs="$dir/$linklib $compile_deplibs"
-+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+	  else
-+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+	  fi
-+	elif test "$build_libtool_libs" = yes; then
-+	  # Not a shared library
-+	  if test "$deplibs_check_method" != pass_all; then
-+	    # We're trying link a shared library against a static one
-+	    # but the system doesn't support it.
-+
-+	    # Just print a warning and add the library to dependency_libs so
-+	    # that the program can be linked against the static library.
-+	    echo
-+	    echo "*** Warning: This library needs some functionality provided by $lib."
-+	    echo "*** I have the capability to make that library automatically link in when"
-+	    echo "*** you link to this library.  But I can only do this if you have a"
-+	    echo "*** shared version of the library, which you do not appear to have."
-+	    if test "$module" = yes; then
-+	      echo "*** Therefore, libtool will create a static module, that should work "
-+	      echo "*** as long as the dlopening application is linked with the -dlopen flag."
-+	      if test -z "$global_symbol_pipe"; then
-+	        echo
-+	        echo "*** However, this would only work if libtool was able to extract symbol"
-+	        echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	        echo "*** not find such a program.  So, this module is probably useless."
-+	        echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      fi
-+	      if test "$build_old_libs" = no; then
-+	        build_libtool_libs=module
-+	        build_old_libs=yes
-+	      else
-+	        build_libtool_libs=no
-+	      fi
-+	    fi
-+	  else
-+	    convenience="$convenience $dir/$old_library"
-+	    old_convenience="$old_convenience $dir/$old_library"
-+	    deplibs="$dir/$old_library $deplibs"
-+	    link_static=yes
-+	  fi
-+	fi # link shared/static library?
-+
-+	if test $linkmode = lib; then
-+	  if test -n "$dependency_libs" &&
-+	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-+	       test $link_static = yes; }; then
-+	    # Extract -R from dependency_libs
-+	    temp_deplibs=
-+	    for libdir in $dependency_libs; do
-+	      case $libdir in
-+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-+		   case " $xrpath " in
-+		   *" $temp_xrpath "*) ;;
-+		   *) xrpath="$xrpath $temp_xrpath";;
-+		   esac;;
-+	      *) temp_deplibs="$temp_deplibs $libdir";;
-+	      esac
-+	    done
-+	    dependency_libs="$temp_deplibs"
-+	  fi
-+
-+	  newlib_search_path="$newlib_search_path $absdir"
-+	  # Link against this library
-+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+	  # ... and its dependency_libs
-+	  tmp_libs=
-+	  for deplib in $dependency_libs; do
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    case "$tmp_libs " in
-+	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	    esac
-+	    tmp_libs="$tmp_libs $deplib"
-+	  done
-+
-+	  if test $link_all_deplibs != no; then
-+	    # Add the search paths of all dependency libraries
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      -L*) path="$deplib" ;;
-+	      *.la)
-+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-+		test "X$dir" = "X$deplib" && dir="."
-+		# We need an absolute path.
-+		case $dir in
-+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+		*)
-+		  absdir=`cd "$dir" && pwd`
-+		  if test -z "$absdir"; then
-+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-+		    absdir="$dir"
-+		  fi
-+		  ;;
-+		esac
-+		if grep "^installed=no" $deplib > /dev/null; then
-+		  path="-L$absdir/$objdir"
-+		else
-+		  eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		  if test -z "$libdir"; then
-+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		    exit 1
-+		  fi
-+		  if test "$absdir" != "$libdir"; then
-+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+		  fi
-+		  path="-L$absdir"
-+		fi
-+		;;
-+	      *) continue ;;
-+	      esac
-+	      case " $deplibs " in
-+	      *" $path "*) ;;
-+	      *) deplibs="$deplibs $path" ;;
-+	      esac
-+	    done
-+	  fi # link_all_deplibs != no
-+	fi # linkmode = lib
-+      done # for deplib in $libs
-+      if test $pass = dlpreopen; then
-+	# Link the dlpreopened libraries before other libraries
-+	for deplib in $save_deplibs; do
-+	  deplibs="$deplib $deplibs"
-+	done
-+      fi
-+      if test $pass != dlopen; then
-+	test $pass != scan && dependency_libs="$newdependency_libs"
-+	if test $pass != conv; then
-+	  # Make sure lib_search_path contains only unique directories.
-+	  lib_search_path=
-+	  for dir in $newlib_search_path; do
-+	    case "$lib_search_path " in
-+	    *" $dir "*) ;;
-+	    *) lib_search_path="$lib_search_path $dir" ;;
-+	    esac
-+	  done
-+	  newlib_search_path=
-+	fi
-+
-+	if test "$linkmode,$pass" != "prog,link"; then
-+	  vars="deplibs"
-+	else
-+	  vars="compile_deplibs finalize_deplibs"
-+	fi
-+	for var in $vars dependency_libs; do
-+	  # Add libraries to $var in reverse order
-+	  eval tmp_libs=\"\$$var\"
-+	  new_libs=
-+	  for deplib in $tmp_libs; do
-+	    case $deplib in
-+	    -L*) new_libs="$deplib $new_libs" ;;
-+	    *)
-+	      case " $specialdeplibs " in
-+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+	      *)
-+		case " $new_libs " in
-+		*" $deplib "*) ;;
-+		*) new_libs="$deplib $new_libs" ;;
-+		esac
-+		;;
-+	      esac
-+	      ;;
-+	    esac
-+	  done
-+	  tmp_libs=
-+	  for deplib in $new_libs; do
-+	    case $deplib in
-+	    -L*)
-+	      case " $tmp_libs " in
-+	      *" $deplib "*) ;;
-+	      *) tmp_libs="$tmp_libs $deplib" ;;
-+	      esac
-+	      ;;
-+	    *) tmp_libs="$tmp_libs $deplib" ;;
-+	    esac
-+	  done
-+	  eval $var=\"$tmp_libs\"
-+	done # for var
-+      fi
-+      if test "$pass" = "conv" &&
-+       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
-+	libs="$deplibs" # reset libs
-+	deplibs=
-+      fi
-+    done # for pass
-+    if test $linkmode = prog; then
-+      dlfiles="$newdlfiles"
-+      dlprefiles="$newdlprefiles"
-+    fi
-+
-+    case $linkmode in
-+    oldlib)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$rpath"; then
-+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$xrpath"; then
-+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-+      fi
-+
-+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-+      fi
-+
-+      # Now set the variables for building old libraries.
-+      build_libtool_libs=no
-+      oldlibs="$output"
-+      objs="$objs$old_deplibs"
-+      ;;
-+
-+    lib)
-+      # Make sure we only generate libraries of the form `libNAME.la'.
-+      case $outputname in
-+      lib*)
-+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+	eval libname=\"$libname_spec\"
-+	;;
-+      *)
-+	if test "$module" = no; then
-+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+	if test "$need_lib_prefix" != no; then
-+	  # Add the "lib" prefix for modules if required
-+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+	  eval libname=\"$libname_spec\"
-+	else
-+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+	fi
-+	;;
-+      esac
-+
-+      if test -n "$objs"; then
-+	if test "$deplibs_check_method" != pass_all; then
-+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-+	  exit 1
-+	else
-+	  echo
-+	  echo "*** Warning: Linking the shared library $output against the non-libtool"
-+	  echo "*** objects $objs is not portable!"
-+	  libobjs="$libobjs $objs"
-+	fi
-+      fi
-+
-+      if test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-+      fi
-+
-+      set dummy $rpath
-+      if test $# -gt 2; then
-+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-+      fi
-+      install_libdir="$2"
-+
-+      oldlibs=
-+      if test -z "$rpath"; then
-+	if test "$build_libtool_libs" = yes; then
-+	  # Building a libtool convenience library.
-+	  libext=al
-+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-+	  build_libtool_libs=convenience
-+	  build_old_libs=yes
-+	fi
-+
-+	if test -n "$vinfo"; then
-+	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
-+	fi
-+
-+	if test -n "$release"; then
-+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-+	fi
-+      else
-+
-+	# Parse the version information argument.
-+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
-+	set dummy $vinfo 0 0 0
-+	IFS="$save_ifs"
-+
-+	if test -n "$8"; then
-+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	current="$2"
-+	revision="$3"
-+	age="$4"
-+
-+	# Check that each of the things are valid numbers.
-+	case $current in
-+	[0-9]*) ;;
-+	*)
-+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	case $revision in
-+	[0-9]*) ;;
-+	*)
-+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	case $age in
-+	[0-9]*) ;;
-+	*)
-+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	if test $age -gt $current; then
-+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Calculate the version variables.
-+	major=
-+	versuffix=
-+	verstring=
-+	case $version_type in
-+	none) ;;
-+
-+	darwin)
-+	  # Like Linux, but with the current version available in
-+	  # verstring for coding it into the library header
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
-+	  # Darwin ld doesn't like 0 for these options...
-+	  minor_current=`expr $current + 1`
-+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  ;;
-+
-+	freebsd-aout)
-+	  major=".$current"
-+	  versuffix=".$current.$revision";
-+	  ;;
-+
-+	freebsd-elf)
-+	  major=".$current"
-+	  versuffix=".$current";
-+	  ;;
-+
-+	irix)
-+	  major=`expr $current - $age + 1`
-+	  verstring="sgi$major.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$revision
-+	  while test $loop != 0; do
-+	    iface=`expr $revision - $loop`
-+	    loop=`expr $loop - 1`
-+	    verstring="sgi$major.$iface:$verstring"
-+	  done
-+
-+	  # Before this point, $major must not contain `.'.
-+	  major=.$major
-+	  versuffix="$major.$revision"
-+	  ;;
-+
-+	linux)
-+	  major=.`expr $current - $age`
-+	  versuffix="$major.$age.$revision"
-+	  ;;
-+
-+	osf)
-+	  major=`expr $current - $age`
-+	  versuffix=".$current.$age.$revision"
-+	  verstring="$current.$age.$revision"
-+
-+	  # Add in all the interfaces that we are compatible with.
-+	  loop=$age
-+	  while test $loop != 0; do
-+	    iface=`expr $current - $loop`
-+	    loop=`expr $loop - 1`
-+	    verstring="$verstring:${iface}.0"
-+	  done
-+
-+	  # Make executables depend on our current version.
-+	  verstring="$verstring:${current}.0"
-+	  ;;
-+
-+	sunos)
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
-+	  ;;
-+
-+	windows)
-+	  # Use '-' rather than '.', since we only want one
-+	  # extension on DOS 8.3 filesystems.
-+	  major=`expr $current - $age`
-+	  versuffix="-$major"
-+	  ;;
-+
-+	*)
-+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	# Clear the version info if we defaulted, and they specified a release.
-+	if test -z "$vinfo" && test -n "$release"; then
-+	  major=
-+	  verstring="0.0"
-+	  if test "$need_version" = no; then
-+	    versuffix=
-+	  else
-+	    versuffix=".0.0"
-+	  fi
-+	fi
-+
-+	# Remove version info from name if versioning should be avoided
-+	if test "$avoid_version" = yes && test "$need_version" = no; then
-+	  major=
-+	  versuffix=
-+	  verstring=""
-+	fi
-+
-+	# Check to see if the archive will have undefined symbols.
-+	if test "$allow_undefined" = yes; then
-+	  if test "$allow_undefined_flag" = unsupported; then
-+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-+	    build_libtool_libs=no
-+	    build_old_libs=yes
-+	  fi
-+	else
-+	  # Don't allow undefined symbols.
-+	  allow_undefined_flag="$no_undefined_flag"
-+	fi
-+      fi
-+
-+      if test "$mode" != relink; then
-+	# Remove our outputs.
-+	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-+	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
-+      fi
-+
-+      # Now set the variables for building old libraries.
-+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+
-+	# Transform .lo files to .o files.
-+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      # Eliminate all temporary directories.
-+      for path in $notinst_path; do
-+	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
-+	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
-+	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
-+      done
-+
-+      if test -n "$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	temp_xrpath=
-+	for libdir in $xrpath; do
-+	  temp_xrpath="$temp_xrpath -R$libdir"
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
-+	  dependency_libs="$temp_xrpath $dependency_libs"
-+	fi
-+      fi
-+
-+      # Make sure dlfiles contains only unique files that won't be dlpreopened
-+      old_dlfiles="$dlfiles"
-+      dlfiles=
-+      for lib in $old_dlfiles; do
-+	case " $dlprefiles $dlfiles " in
-+	*" $lib "*) ;;
-+	*) dlfiles="$dlfiles $lib" ;;
-+	esac
-+      done
-+
-+      # Make sure dlprefiles contains only unique files
-+      old_dlprefiles="$dlprefiles"
-+      dlprefiles=
-+      for lib in $old_dlprefiles; do
-+	case "$dlprefiles " in
-+	*" $lib "*) ;;
-+	*) dlprefiles="$dlprefiles $lib" ;;
-+	esac
-+      done
-+
-+      if test "$build_libtool_libs" = yes; then
-+	if test -n "$rpath"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+	    # these systems don't actually have a c library (as such)!
-+	    ;;
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C library is in the System framework
-+	    deplibs="$deplibs -framework System"
-+	    ;;
-+	  *-*-netbsd*)
-+	    # Don't link with libc until the a.out ld.so is fixed.
-+	    ;;
-+	  *)
-+	    # Add libc to deplibs on all other systems if necessary.
-+	    if test $build_libtool_need_lc = "yes"; then
-+	      deplibs="$deplibs -lc"
-+	    fi
-+	    ;;
-+	  esac
-+	fi
-+
-+	# Transform deplibs into only deplibs that can be linked in shared.
-+	name_save=$name
-+	libname_save=$libname
-+	release_save=$release
-+	versuffix_save=$versuffix
-+	major_save=$major
-+	# I'm not sure if I'm treating the release correctly.  I think
-+	# release should show up in the -l (ie -lgmp5) so we don't want to
-+	# add it in twice.  Is that correct?
-+	release=""
-+	versuffix=""
-+	major=""
-+	newdeplibs=
-+	droppeddeps=no
-+	case $deplibs_check_method in
-+	pass_all)
-+	  # Don't check for shared/static.  Everything works.
-+	  # This might be a little naive.  We might want to check
-+	  # whether the library exists or not.  But this is on
-+	  # osf3 & osf4 and I'm not really sure... Just
-+	  # implementing what was already the behaviour.
-+	  newdeplibs=$deplibs
-+	  ;;
-+	test_compile)
-+	  # This code stresses the "libraries are programs" paradigm to its
-+	  # limits. Maybe even breaks it.  We compile a program, linking it
-+	  # against the deplibs as a proxy for the library.  Then we can check
-+	  # whether they linked in statically or dynamically with ldd.
-+	  $rm conftest.c
-+	  cat > conftest.c <<EOF
-+	  int main() { return 0; }
-+EOF
-+	  $rm conftest
-+	  $CC -o conftest conftest.c $deplibs
-+	  if test $? -eq 0 ; then
-+	    ldd_output=`ldd conftest`
-+	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
-+	      # If $name is empty we are operating on a -L argument.
-+	      if test -n "$name" && test "$name" != "0"; then
-+		libname=`eval \\$echo \"$libname_spec\"`
-+		deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		set dummy $deplib_matches
-+		deplib_match=$2
-+		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		  newdeplibs="$newdeplibs $i"
-+		else
-+		  droppeddeps=yes
-+		  echo
-+		  echo "*** Warning: This library needs some functionality provided by $i."
-+		  echo "*** I have the capability to make that library automatically link in when"
-+		  echo "*** you link to this library.  But I can only do this if you have a"
-+		  echo "*** shared version of the library, which you do not appear to have."
-+		fi
-+	      else
-+		newdeplibs="$newdeplibs $i"
-+	      fi
-+	    done
-+	  else
-+	    # Error occured in the first compile.  Let's try to salvage the situation:
-+	    # Compile a seperate program for each library.
-+	    for i in $deplibs; do
-+	      name="`expr $i : '-l\(.*\)'`"
-+	     # If $name is empty we are operating on a -L argument.
-+	      if test -n "$name" && test "$name" != "0"; then
-+		$rm conftest
-+		$CC -o conftest conftest.c $i
-+		# Did it work?
-+		if test $? -eq 0 ; then
-+		  ldd_output=`ldd conftest`
-+		  libname=`eval \\$echo \"$libname_spec\"`
-+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		  set dummy $deplib_matches
-+		  deplib_match=$2
-+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		    newdeplibs="$newdeplibs $i"
-+		  else
-+		    droppeddeps=yes
-+		    echo
-+		    echo "*** Warning: This library needs some functionality provided by $i."
-+		    echo "*** I have the capability to make that library automatically link in when"
-+		    echo "*** you link to this library.  But I can only do this if you have a"
-+		    echo "*** shared version of the library, which you do not appear to have."
-+		  fi
-+		else
-+		  droppeddeps=yes
-+		  echo
-+		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  echo "***  make it link in!  You will probably need to install it or some"
-+		  echo "*** library that it depends on before this library will be fully"
-+		  echo "*** functional.  Installing it before continuing would be even better."
-+		fi
-+	      else
-+		newdeplibs="$newdeplibs $i"
-+	      fi
-+	    done
-+	  fi
-+	  ;;
-+	file_magic*)
-+	  set dummy $deplibs_check_method
-+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    # If $name is empty we are operating on a -L argument.
-+	    if test -n "$name" && test "$name" != "0"; then
-+	      libname=`eval \\$echo \"$libname_spec\"`
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		    for potent_lib in $potential_libs; do
-+		      # Follow soft links.
-+		      if ls -lLd "$potent_lib" 2>/dev/null \
-+			 | grep " -> " >/dev/null; then
-+			continue
-+		      fi
-+		      # The statement above tries to avoid entering an
-+		      # endless loop below, in case of cyclic links.
-+		      # We might still enter an endless loop, since a link
-+		      # loop can be closed while we follow links,
-+		      # but so what?
-+		      potlib="$potent_lib"
-+		      while test -h "$potlib" 2>/dev/null; do
-+			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
-+			case $potliblink in
-+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+			esac
-+		      done
-+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-+			 | sed 10q \
-+			 | egrep "$file_magic_regex" > /dev/null; then
-+			newdeplibs="$newdeplibs $a_deplib"
-+			a_deplib=""
-+			break 2
-+		      fi
-+		    done
-+	      done
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		echo
-+		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have."
-+	      fi
-+	    else
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	    fi
-+	  done # Gone through all deplibs.
-+	  ;;
-+	match_pattern*)
-+	  set dummy $deplibs_check_method
-+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  for a_deplib in $deplibs; do
-+	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    # If $name is empty we are operating on a -L argument.
-+	    if test -n "$name" && test "$name" != "0"; then
-+	      libname=`eval \\$echo \"$libname_spec\"`
-+	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		for potent_lib in $potential_libs; do
-+		  if eval echo \"$potent_lib\" 2>/dev/null \
-+		      | sed 10q \
-+		      | egrep "$match_pattern_regex" > /dev/null; then
-+		    newdeplibs="$newdeplibs $a_deplib"
-+		    a_deplib=""
-+		    break 2
-+		  fi
-+		done
-+	      done
-+	      if test -n "$a_deplib" ; then
-+		droppeddeps=yes
-+		echo
-+		echo "*** Warning: This library needs some functionality provided by $a_deplib."
-+		echo "*** I have the capability to make that library automatically link in when"
-+		echo "*** you link to this library.  But I can only do this if you have a"
-+		echo "*** shared version of the library, which you do not appear to have."
-+	      fi
-+	    else
-+	      # Add a -L argument.
-+	      newdeplibs="$newdeplibs $a_deplib"
-+	    fi
-+	  done # Gone through all deplibs.
-+	  ;;
-+	none | unknown | *)
-+	  newdeplibs=""
-+	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-+	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
-+	     grep . >/dev/null; then
-+	    echo
-+	    if test "X$deplibs_check_method" = "Xnone"; then
-+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-+	    else
-+	      echo "*** Warning: inter-library dependencies are not known to be supported."
-+	    fi
-+	    echo "*** All declared inter-library dependencies are being dropped."
-+	    droppeddeps=yes
-+	  fi
-+	  ;;
-+	esac
-+	versuffix=$versuffix_save
-+	major=$major_save
-+	release=$release_save
-+	libname=$libname_save
-+	name=$name_save
-+
-+	case $host in
-+	*-*-rhapsody* | *-*-darwin1.[012])
-+	  # On Rhapsody replace the C library is the System framework
-+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	  ;;
-+	esac
-+
-+	if test "$droppeddeps" = yes; then
-+	  if test "$module" = yes; then
-+	    echo
-+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-+	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
-+	    echo "*** a static module, that should work as long as the dlopening"
-+	    echo "*** application is linked with the -dlopen flag."
-+	    if test -z "$global_symbol_pipe"; then
-+	      echo
-+	      echo "*** However, this would only work if libtool was able to extract symbol"
-+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      echo "*** not find such a program.  So, this module is probably useless."
-+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	    fi
-+	    if test "$build_old_libs" = no; then
-+	      oldlibs="$output_objdir/$libname.$libext"
-+	      build_libtool_libs=module
-+	      build_old_libs=yes
-+	    else
-+	      build_libtool_libs=no
-+	    fi
-+	  else
-+	    echo "*** The inter-library dependencies that have been dropped here will be"
-+	    echo "*** automatically added whenever a program is linked with this library"
-+	    echo "*** or is declared to -dlopen it."
-+
-+	    if test $allow_undefined = no; then
-+	      echo
-+	      echo "*** Since this library must not contain undefined symbols,"
-+	      echo "*** because either the platform does not support them or"
-+	      echo "*** it was explicitly requested with -no-undefined,"
-+	      echo "*** libtool will only create a static version of it."
-+	      if test "$build_old_libs" = no; then
-+		oldlibs="$output_objdir/$libname.$libext"
-+		build_libtool_libs=module
-+		build_old_libs=yes
-+	      else
-+		build_libtool_libs=no
-+	      fi
-+	    fi
-+	  fi
-+	fi
-+	# Done checking deplibs!
-+	deplibs=$newdeplibs
-+      fi
-+
-+      # All the library-specific variables (install_libdir is set above).
-+      library_names=
-+      old_library=
-+      dlname=
-+
-+      # Test again, we may have decided not to build it any more
-+      if test "$build_libtool_libs" = yes; then
-+	if test $hardcode_into_libs = yes; then
-+	  # Hardcode the library paths
-+	  hardcode_libdirs=
-+	  dep_rpath=
-+	  rpath="$finalize_rpath"
-+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-+	  for libdir in $rpath; do
-+	    if test -n "$hardcode_libdir_flag_spec"; then
-+	      if test -n "$hardcode_libdir_separator"; then
-+		if test -z "$hardcode_libdirs"; then
-+		  hardcode_libdirs="$libdir"
-+		else
-+		  # Just accumulate the unique libdirs.
-+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		    ;;
-+		  *)
-+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		    ;;
-+		  esac
-+		fi
-+	      else
-+		eval flag=\"$hardcode_libdir_flag_spec\"
-+		dep_rpath="$dep_rpath $flag"
-+	      fi
-+	    elif test -n "$runpath_var"; then
-+	      case "$perm_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) perm_rpath="$perm_rpath $libdir" ;;
-+	      esac
-+	    fi
-+	  done
-+	  # Substitute the hardcoded libdirs into the rpath.
-+	  if test -n "$hardcode_libdir_separator" &&
-+	     test -n "$hardcode_libdirs"; then
-+	    libdir="$hardcode_libdirs"
-+	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-+	  fi
-+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-+	    # We should set the runpath_var.
-+	    rpath=
-+	    for dir in $perm_rpath; do
-+	      rpath="$rpath$dir:"
-+	    done
-+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-+	  fi
-+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-+	fi
-+
-+	shlibpath="$finalize_shlibpath"
-+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+	if test -n "$shlibpath"; then
-+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-+	fi
-+
-+	# Get the real and link names of the library.
-+	eval library_names=\"$library_names_spec\"
-+	set dummy $library_names
-+	realname="$2"
-+	shift; shift
-+
-+	if test -n "$soname_spec"; then
-+	  eval soname=\"$soname_spec\"
-+	else
-+	  soname="$realname"
-+	fi
-+	test -z "$dlname" && dlname=$soname
-+
-+	lib="$output_objdir/$realname"
-+	for link
-+	do
-+	  linknames="$linknames $link"
-+	done
-+
-+	# Ensure that we have .o objects for linkers which dislike .lo
-+	# (e.g. aix) in case we are running --disable-static
-+	for obj in $libobjs; do
-+	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+	  if test "X$xdir" = "X$obj"; then
-+	    xdir="."
-+	  else
-+	    xdir="$xdir"
-+	  fi
-+	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-+	  if test ! -f $xdir/$oldobj; then
-+	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
-+	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
-+	  fi
-+	done
-+
-+	# Use standard objects if they are pic
-+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+
-+	# Prepare the list of exported symbols
-+	if test -z "$export_symbols"; then
-+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-+	    $show "generating symbol list for \`$libname.la'"
-+	    export_symbols="$output_objdir/$libname.exp"
-+	    $run $rm $export_symbols
-+	    eval cmds=\"$export_symbols_cmds\"
-+	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	    for cmd in $cmds; do
-+	      IFS="$save_ifs"
-+	      $show "$cmd"
-+	      $run eval "$cmd" || exit $?
-+	    done
-+	    IFS="$save_ifs"
-+	    if test -n "$export_symbols_regex"; then
-+	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-+	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-+	    fi
-+	  fi
-+	fi
-+
-+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-+	fi
-+
-+	if test -n "$convenience"; then
-+	  if test -n "$whole_archive_flag_spec"; then
-+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+	  else
-+	    gentop="$output_objdir/${outputname}x"
-+	    $show "${rm}r $gentop"
-+	    $run ${rm}r "$gentop"
-+	    $show "mkdir $gentop"
-+	    $run mkdir "$gentop"
-+	    status=$?
-+	    if test $status -ne 0 && test ! -d "$gentop"; then
-+	      exit $status
-+	    fi
-+	    generated="$generated $gentop"
-+
-+	    for xlib in $convenience; do
-+	      # Extract the objects.
-+	      case $xlib in
-+	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	      *) xabs=`pwd`"/$xlib" ;;
-+	      esac
-+	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	      xdir="$gentop/$xlib"
-+
-+	      $show "${rm}r $xdir"
-+	      $run ${rm}r "$xdir"
-+	      $show "mkdir $xdir"
-+	      $run mkdir "$xdir"
-+	      status=$?
-+	      if test $status -ne 0 && test ! -d "$xdir"; then
-+		exit $status
-+	      fi
-+	      $show "(cd $xdir && $AR x $xabs)"
-+	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-+	    done
-+	  fi
-+	fi
-+
-+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-+	  eval flag=\"$thread_safe_flag_spec\"
-+	  linker_flags="$linker_flags $flag"
-+	fi
-+
-+	# Make a backup of the uninstalled library when relinking
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-+	fi
-+
-+	# Do each of the archive commands.
-+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+	  eval cmds=\"$archive_expsym_cmds\"
-+	else
-+	  eval cmds=\"$archive_cmds\"
-+	fi
-+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	for cmd in $cmds; do
-+	  IFS="$save_ifs"
-+	  $show "$cmd"
-+	  $run eval "$cmd" || exit $?
-+	done
-+	IFS="$save_ifs"
-+
-+	# Restore the uninstalled library and exit
-+	if test "$mode" = relink; then
-+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+	  exit 0
-+	fi
-+
-+	# Create links to the real library.
-+	for linkname in $linknames; do
-+	  if test "$realname" != "$linkname"; then
-+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-+	  fi
-+	done
-+
-+	# If -module or -export-dynamic was specified, set the dlname.
-+	if test "$module" = yes || test "$export_dynamic" = yes; then
-+	  # On all known operating systems, these are identical.
-+	  dlname="$soname"
-+	fi
-+      fi
-+      ;;
-+
-+    obj)
-+      if test -n "$deplibs"; then
-+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$rpath"; then
-+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$xrpath"; then
-+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-+      fi
-+
-+      case $output in
-+      *.lo)
-+	if test -n "$objs$old_deplibs"; then
-+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-+	  exit 1
-+	fi
-+	libobj="$output"
-+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-+	;;
-+      *)
-+	libobj=
-+	obj="$output"
-+	;;
-+      esac
-+
-+      # Delete the old objects.
-+      $run $rm $obj $libobj
-+
-+      # Objects from convenience libraries.  This assumes
-+      # single-version convenience libraries.  Whenever we create
-+      # different ones for PIC/non-PIC, this we'll have to duplicate
-+      # the extraction.
-+      reload_conv_objs=
-+      gentop=
-+      # reload_cmds runs $LD directly, so let us get rid of
-+      # -Wl from whole_archive_flag_spec
-+      wl=
-+
-+      if test -n "$convenience"; then
-+	if test -n "$whole_archive_flag_spec"; then
-+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+	else
-+	  gentop="$output_objdir/${obj}x"
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r "$gentop"
-+	  $show "mkdir $gentop"
-+	  $run mkdir "$gentop"
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d "$gentop"; then
-+	    exit $status
-+	  fi
-+	  generated="$generated $gentop"
-+
-+	  for xlib in $convenience; do
-+	    # Extract the objects.
-+	    case $xlib in
-+	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	    *) xabs=`pwd`"/$xlib" ;;
-+	    esac
-+	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	    xdir="$gentop/$xlib"
-+
-+	    $show "${rm}r $xdir"
-+	    $run ${rm}r "$xdir"
-+	    $show "mkdir $xdir"
-+	    $run mkdir "$xdir"
-+	    status=$?
-+	    if test $status -ne 0 && test ! -d "$xdir"; then
-+	      exit $status
-+	    fi
-+	    $show "(cd $xdir && $AR x $xabs)"
-+	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-+	  done
-+	fi
-+      fi
-+
-+      # Create the old-style object.
-+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+
-+      output="$obj"
-+      eval cmds=\"$reload_cmds\"
-+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+
-+      # Exit if we aren't doing a library object file.
-+      if test -z "$libobj"; then
-+	if test -n "$gentop"; then
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r $gentop
-+	fi
-+
-+	exit 0
-+      fi
-+
-+      if test "$build_libtool_libs" != yes; then
-+	if test -n "$gentop"; then
-+	  $show "${rm}r $gentop"
-+	  $run ${rm}r $gentop
-+	fi
-+
-+	# Create an invalid libtool object if no PIC, so that we don't
-+	# accidentally link it into a program.
-+	$show "echo timestamp > $libobj"
-+	$run eval "echo timestamp > $libobj" || exit $?
-+	exit 0
-+      fi
-+
-+      if test -n "$pic_flag" || test "$pic_mode" != default; then
-+	# Only do commands if we really have different PIC objects.
-+	reload_objs="$libobjs $reload_conv_objs"
-+	output="$libobj"
-+	eval cmds=\"$reload_cmds\"
-+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	for cmd in $cmds; do
-+	  IFS="$save_ifs"
-+	  $show "$cmd"
-+	  $run eval "$cmd" || exit $?
-+	done
-+	IFS="$save_ifs"
-+      else
-+	# Just create a symlink.
-+	$show $rm $libobj
-+	$run $rm $libobj
-+	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
-+	if test "X$xdir" = "X$libobj"; then
-+	  xdir="."
-+	else
-+	  xdir="$xdir"
-+	fi
-+	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
-+	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
-+	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
-+	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
-+      fi
-+
-+      if test -n "$gentop"; then
-+	$show "${rm}r $gentop"
-+	$run ${rm}r $gentop
-+      fi
-+
-+      exit 0
-+      ;;
-+
-+    prog)
-+      case $host in
-+	*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
-+      esac
-+      if test -n "$vinfo"; then
-+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-+      fi
-+
-+      if test -n "$release"; then
-+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-+      fi
-+
-+      if test "$preload" = yes; then
-+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-+	   test "$dlopen_self_static" = unknown; then
-+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-+	fi
-+      fi
-+
-+      case $host in
-+      *-*-rhapsody* | *-*-darwin1.[012])
-+	# On Rhapsody replace the C library is the System framework
-+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+	;;
-+      esac
-+
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
-+
-+      if test -n "$rpath$xrpath"; then
-+	# If the user specified any rpath flags, then add them.
-+	for libdir in $rpath $xrpath; do
-+	  # This is the magic to use -rpath.
-+	  case "$finalize_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-+	  esac
-+	done
-+      fi
-+
-+      # Now hardcode the library paths
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $compile_rpath $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) perm_rpath="$perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+	case $host in
-+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+	  case :$dllsearchpath: in
-+	  *":$libdir:"*) ;;
-+	  *) dllsearchpath="$dllsearchpath:$libdir";;
-+	  esac
-+	  ;;
-+	esac
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      compile_rpath="$rpath"
-+
-+      rpath=
-+      hardcode_libdirs=
-+      for libdir in $finalize_rpath; do
-+	if test -n "$hardcode_libdir_flag_spec"; then
-+	  if test -n "$hardcode_libdir_separator"; then
-+	    if test -z "$hardcode_libdirs"; then
-+	      hardcode_libdirs="$libdir"
-+	    else
-+	      # Just accumulate the unique libdirs.
-+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+		;;
-+	      *)
-+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+		;;
-+	      esac
-+	    fi
-+	  else
-+	    eval flag=\"$hardcode_libdir_flag_spec\"
-+	    rpath="$rpath $flag"
-+	  fi
-+	elif test -n "$runpath_var"; then
-+	  case "$finalize_perm_rpath " in
-+	  *" $libdir "*) ;;
-+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+	  esac
-+	fi
-+      done
-+      # Substitute the hardcoded libdirs into the rpath.
-+      if test -n "$hardcode_libdir_separator" &&
-+	 test -n "$hardcode_libdirs"; then
-+	libdir="$hardcode_libdirs"
-+	eval rpath=\" $hardcode_libdir_flag_spec\"
-+      fi
-+      finalize_rpath="$rpath"
-+
-+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+	# Transform all the library objects into standard objects.
-+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      dlsyms=
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+	  dlsyms="${outputname}S.c"
-+	else
-+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-+	fi
-+      fi
-+
-+      if test -n "$dlsyms"; then
-+	case $dlsyms in
-+	"") ;;
-+	*.c)
-+	  # Discover the nlist of each of the dlfiles.
-+	  nlist="$output_objdir/${outputname}.nm"
-+
-+	  $show "$rm $nlist ${nlist}S ${nlist}T"
-+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-+
-+	  # Parse the name list into a source file.
-+	  $show "creating $output_objdir/$dlsyms"
-+
-+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-+
-+#ifdef __cplusplus
-+extern \"C\" {
-+#endif
-+
-+/* Prevent the only kind of declaration conflicts we can make. */
-+#define lt_preloaded_symbols some_other_symbol
-+
-+/* External symbol declarations for the compiler. */\
-+"
-+
-+	  if test "$dlself" = yes; then
-+	    $show "generating symbol list for \`$output'"
-+
-+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-+
-+	    # Add our own program objects to the symbol list.
-+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	    for arg in $progfiles; do
-+	      $show "extracting global C symbols from \`$arg'"
-+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+	    done
-+
-+	    if test -n "$exclude_expsyms"; then
-+	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+	      $run eval '$mv "$nlist"T "$nlist"'
-+	    fi
-+
-+	    if test -n "$export_symbols_regex"; then
-+	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+	      $run eval '$mv "$nlist"T "$nlist"'
-+	    fi
-+
-+	    # Prepare the list of exported symbols
-+	    if test -z "$export_symbols"; then
-+	      export_symbols="$output_objdir/$output.exp"
-+	      $run $rm $export_symbols
-+	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	    else
-+	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-+	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-+	      $run eval 'mv "$nlist"T "$nlist"'
-+	    fi
-+	  fi
-+
-+	  for arg in $dlprefiles; do
-+	    $show "extracting global C symbols from \`$arg'"
-+	    name=`echo "$arg" | sed -e 's%^.*/%%'`
-+	    $run eval 'echo ": $name " >> "$nlist"'
-+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+	  done
-+
-+	  if test -z "$run"; then
-+	    # Make sure we have at least an empty file.
-+	    test -f "$nlist" || : > "$nlist"
-+
-+	    if test -n "$exclude_expsyms"; then
-+	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+	      $mv "$nlist"T "$nlist"
-+	    fi
-+
-+	    # Try sorting and uniquifying the output.
-+	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
-+	      :
-+	    else
-+	      grep -v "^: " < "$nlist" > "$nlist"S
-+	    fi
-+
-+	    if test -f "$nlist"S; then
-+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-+	    else
-+	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-+	    fi
-+
-+	    $echo >> "$output_objdir/$dlsyms" "\
-+
-+#undef lt_preloaded_symbols
-+
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[] =
-+{\
-+"
-+
-+	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
-+		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
-+		  < "$nlist" >> "$output_objdir/$dlsyms"
-+
-+	    $echo >> "$output_objdir/$dlsyms" "\
-+  {0, (lt_ptr_t) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif\
-+"
-+	  fi
-+
-+	  pic_flag_for_symtable=
-+	  case $host in
-+	  # compiling the symbol table file with pic_flag works around
-+	  # a FreeBSD bug that causes programs to crash when -lm is
-+	  # linked before any other PIC object.  But we must not use
-+	  # pic_flag when linking with -static.  The problem exists in
-+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+	    case "$compile_command " in
-+	    *" -static "*) ;;
-+	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
-+	    esac;;
-+	  *-*-hpux*)
-+	    case "$compile_command " in
-+	    *" -static "*) ;;
-+	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
-+	    esac
-+	  esac
-+
-+	  # Now compile the dynamic symbol file.
-+	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-+	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-+
-+	  # Clean up the generated files.
-+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-+
-+	  # Transform the symbol file into the correct name.
-+	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+	  ;;
-+	*)
-+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+      else
-+	# We keep going just in case the user didn't refer to
-+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-+	# really was required.
-+
-+	# Nullify the symbol file.
-+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      fi
-+
-+      if test $need_relink = no || test "$build_libtool_libs" != yes; then
-+	# Replace the output file specification.
-+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command="$compile_command$compile_rpath"
-+
-+	# We have no uninstalled library dependencies, so finalize right now.
-+	$show "$link_command"
-+	$run eval "$link_command"
-+	status=$?
-+
-+	# Delete the generated files.
-+	if test -n "$dlsyms"; then
-+	  $show "$rm $output_objdir/${outputname}S.${objext}"
-+	  $run $rm "$output_objdir/${outputname}S.${objext}"
-+	fi
-+
-+	exit $status
-+      fi
-+
-+      if test -n "$shlibpath_var"; then
-+	# We should set the shlibpath_var
-+	rpath=
-+	for dir in $temp_rpath; do
-+	  case $dir in
-+	  [\\/]* | [A-Za-z]:[\\/]*)
-+	    # Absolute path.
-+	    rpath="$rpath$dir:"
-+	    ;;
-+	  *)
-+	    # Relative path: add a thisdir entry.
-+	    rpath="$rpath\$thisdir/$dir:"
-+	    ;;
-+	  esac
-+	done
-+	temp_rpath="$rpath"
-+      fi
-+
-+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-+      fi
-+      if test -n "$finalize_shlibpath"; then
-+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-+      fi
-+
-+      compile_var=
-+      finalize_var=
-+      if test -n "$runpath_var"; then
-+	if test -n "$perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+	if test -n "$finalize_perm_rpath"; then
-+	  # We should set the runpath_var.
-+	  rpath=
-+	  for dir in $finalize_perm_rpath; do
-+	    rpath="$rpath$dir:"
-+	  done
-+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+	fi
-+      fi
-+
-+      if test "$no_install" = yes; then
-+	# We don't need to create a wrapper script.
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	# Replace the output file specification.
-+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	# Delete the old output file.
-+	$run $rm $output
-+	# Link the executable and exit
-+	$show "$link_command"
-+	$run eval "$link_command" || exit $?
-+	exit 0
-+      fi
-+
-+      if test "$hardcode_action" = relink; then
-+	# Fast installation is not supported
-+	link_command="$compile_var$compile_command$compile_rpath"
-+	relink_command="$finalize_var$finalize_command$finalize_rpath"
-+
-+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-+      else
-+	if test "$fast_install" != no; then
-+	  link_command="$finalize_var$compile_command$finalize_rpath"
-+	  if test "$fast_install" = yes; then
-+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	  else
-+	    # fast_install is set to needless
-+	    relink_command=
-+	  fi
-+	else
-+	  link_command="$compile_var$compile_command$compile_rpath"
-+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-+	fi
-+      fi
-+
-+      # Replace the output file specification.
-+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+
-+      # Delete the old output files.
-+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+
-+      $show "$link_command"
-+      $run eval "$link_command" || exit $?
-+
-+      # Now create the wrapper script.
-+      $show "creating $output"
-+
-+      # Quote the relink command for shipping.
-+      if test -n "$relink_command"; then
-+	# Preserve any variables that may affect compiler behavior
-+	for var in $variables_saved_for_relink; do
-+	  if eval test -z \"\${$var+set}\"; then
-+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	  elif eval var_value=\$$var; test -z "$var_value"; then
-+	    relink_command="$var=; export $var; $relink_command"
-+	  else
-+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	  fi
-+	done
-+	relink_command="cd `pwd`; $relink_command"
-+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Quote $echo for shipping.
-+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-+	case $0 in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-+	esac
-+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+      else
-+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-+      fi
-+
-+      # Only actually do things if our run command is non-null.
-+      if test -z "$run"; then
-+	# win32 will think the script is a binary if it has
-+	# a .exe suffix, so we strip it off here.
-+	case $output in
-+	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
-+	esac
-+	# test for cygwin because mv fails w/o .exe extensions
-+	case $host in
-+	  *cygwin*) exeext=.exe ;;
-+	  *) exeext= ;;
-+	esac
-+	$rm $output
-+	trap "$rm $output; exit 1" 1 2 15
-+
-+	$echo > $output "\
-+#! $SHELL
-+
-+# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# The $output program cannot be directly executed until all the libtool
-+# libraries that it depends on are installed.
-+#
-+# This wrapper script should never be moved out of the build directory.
-+# If it is, it will not operate correctly.
-+
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e 1s/^X//'
-+sed_quote_subst='$sed_quote_subst'
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+
-+relink_command=\"$relink_command\"
-+
-+# This environment variable determines our operation mode.
-+if test \"\$libtool_install_magic\" = \"$magic\"; then
-+  # install mode needs the following variable:
-+  notinst_deplibs='$notinst_deplibs'
-+else
-+  # When we are sourced in execute mode, \$file and \$echo are already set.
-+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+    echo=\"$qecho\"
-+    file=\"\$0\"
-+    # Make sure echo works.
-+    if test \"X\$1\" = X--no-reexec; then
-+      # Discard the --no-reexec flag, and continue.
-+      shift
-+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-+      # Yippee, \$echo works!
-+      :
-+    else
-+      # Restart under the correct shell, and then maybe \$echo will work.
-+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+    fi
-+  fi\
-+"
-+	$echo >> $output "\
-+
-+  # Find the directory that this script lives in.
-+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-+
-+  # Follow symbolic links until we get to the real thisdir.
-+  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
-+  while test -n \"\$file\"; do
-+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+
-+    # If there was a directory component, then change thisdir.
-+    if test \"x\$destdir\" != \"x\$file\"; then
-+      case \"\$destdir\" in
-+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-+      *) thisdir=\"\$thisdir/\$destdir\" ;;
-+      esac
-+    fi
-+
-+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
-+  done
-+
-+  # Try to get the absolute directory name.
-+  absdir=\`cd \"\$thisdir\" && pwd\`
-+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-+"
-+
-+	if test "$fast_install" = yes; then
-+	  echo >> $output "\
-+  program=lt-'$outputname'$exeext
-+  progdir=\"\$thisdir/$objdir\"
-+
-+  if test ! -f \"\$progdir/\$program\" || \\
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
-+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-+
-+    file=\"\$\$-\$program\"
-+
-+    if test ! -d \"\$progdir\"; then
-+      $mkdir \"\$progdir\"
-+    else
-+      $rm \"\$progdir/\$file\"
-+    fi"
-+
-+	  echo >> $output "\
-+
-+    # relink executable if necessary
-+    if test -n \"\$relink_command\"; then
-+      if (eval \$relink_command); then :
-+      else
-+	$rm \"\$progdir/\$file\"
-+	exit 1
-+      fi
-+    fi
-+
-+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-+    { $rm \"\$progdir/\$program\";
-+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-+    $rm \"\$progdir/\$file\"
-+  fi"
-+	else
-+	  echo >> $output "\
-+  program='$outputname'
-+  progdir=\"\$thisdir/$objdir\"
-+"
-+	fi
-+
-+	echo >> $output "\
-+
-+  if test -f \"\$progdir/\$program\"; then"
-+
-+	# Export our shlibpath_var if we have one.
-+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+	  $echo >> $output "\
-+    # Add our own library path to $shlibpath_var
-+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+
-+    # Some systems cannot cope with colon-terminated $shlibpath_var
-+    # The second colon is a workaround for a bug in BeOS R4 sed
-+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+
-+    export $shlibpath_var
-+"
-+	fi
-+
-+	# fixup the dll searchpath if we need to.
-+	if test -n "$dllsearchpath"; then
-+	  $echo >> $output "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
-+	$echo >> $output "\
-+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+      # Run the actual program with our arguments.
-+"
-+	case $host in
-+	# win32 systems need to use the prog path for dll
-+	# lookup to work
-+	*-*-cygwin* | *-*-pw32*)
-+	  $echo >> $output "\
-+      exec \$progdir/\$program \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2*)
-+	  $echo >> $output "\
-+      exec \$progdir\\\\\$program \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	*)
-+	  $echo >> $output "\
-+      # Export the path to the program.
-+      PATH=\"\$progdir:\$PATH\"
-+      export PATH
-+
-+      exec \$program \${1+\"\$@\"}
-+"
-+	  ;;
-+	esac
-+	$echo >> $output "\
-+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+      exit 1
-+    fi
-+  else
-+    # The program doesn't exist.
-+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-+    echo \"See the $PACKAGE documentation for more information.\" 1>&2
-+    exit 1
-+  fi
-+fi\
-+"
-+	chmod +x $output
-+      fi
-+      exit 0
-+      ;;
-+    esac
-+
-+    # See if we need to build an old-fashioned archive.
-+    for oldlib in $oldlibs; do
-+
-+      if test "$build_libtool_libs" = convenience; then
-+	oldobjs="$libobjs_save"
-+	addlibs="$convenience"
-+	build_libtool_libs=no
-+      else
-+	if test "$build_libtool_libs" = module; then
-+	  oldobjs="$libobjs_save"
-+	  build_libtool_libs=no
-+	else
-+	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
-+	fi
-+	addlibs="$old_convenience"
-+      fi
-+
-+      if test -n "$addlibs"; then
-+	gentop="$output_objdir/${outputname}x"
-+	$show "${rm}r $gentop"
-+	$run ${rm}r "$gentop"
-+	$show "mkdir $gentop"
-+	$run mkdir "$gentop"
-+	status=$?
-+	if test $status -ne 0 && test ! -d "$gentop"; then
-+	  exit $status
-+	fi
-+	generated="$generated $gentop"
-+
-+	# Add in members from convenience archives.
-+	for xlib in $addlibs; do
-+	  # Extract the objects.
-+	  case $xlib in
-+	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-+	  *) xabs=`pwd`"/$xlib" ;;
-+	  esac
-+	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-+	  xdir="$gentop/$xlib"
-+
-+	  $show "${rm}r $xdir"
-+	  $run ${rm}r "$xdir"
-+	  $show "mkdir $xdir"
-+	  $run mkdir "$xdir"
-+	  status=$?
-+	  if test $status -ne 0 && test ! -d "$xdir"; then
-+	    exit $status
-+	  fi
-+	  $show "(cd $xdir && $AR x $xabs)"
-+	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-+
-+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-+	done
-+      fi
-+
-+      # Do each command in the archive commands.
-+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-+	eval cmds=\"$old_archive_from_new_cmds\"
-+      else
-+	# Ensure that we have .o objects in place in case we decided
-+	# not to build a shared library, and have fallen back to building
-+	# static libs even though --disable-static was passed!
-+	for oldobj in $oldobjs; do
-+	  if test ! -f $oldobj; then
-+	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
-+	    if test "X$xdir" = "X$oldobj"; then
-+	      xdir="."
-+	    else
-+	      xdir="$xdir"
-+	    fi
-+	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
-+	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
-+	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
-+	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-+	  fi
-+	done
-+
-+	eval cmds=\"$old_archive_cmds\"
-+      fi
-+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+    done
-+
-+    if test -n "$generated"; then
-+      $show "${rm}r$generated"
-+      $run ${rm}r$generated
-+    fi
-+
-+    # Now create the libtool archive.
-+    case $output in
-+    *.la)
-+      old_library=
-+      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      $show "creating $output"
-+
-+      # Preserve any variables that may affect compiler behavior
-+      for var in $variables_saved_for_relink; do
-+	if eval test -z \"\${$var+set}\"; then
-+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+	elif eval var_value=\$$var; test -z "$var_value"; then
-+	  relink_command="$var=; export $var; $relink_command"
-+	else
-+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	fi
-+      done
-+      # Quote the link command for shipping.
-+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
-+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+
-+      # Only create the output if not a dry run.
-+      if test -z "$run"; then
-+	for installed in no yes; do
-+	  if test "$installed" = yes; then
-+	    if test -z "$install_libdir"; then
-+	      break
-+	    fi
-+	    output="$output_objdir/$outputname"i
-+	    # Replace all uninstalled libtool libraries with the installed ones
-+	    newdependency_libs=
-+	    for deplib in $dependency_libs; do
-+	      case $deplib in
-+	      *.la)
-+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-+		eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		if test -z "$libdir"; then
-+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+		  exit 1
-+		fi
-+		newdependency_libs="$newdependency_libs $libdir/$name"
-+		;;
-+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-+	      esac
-+	    done
-+	    dependency_libs="$newdependency_libs"
-+	    newdlfiles=
-+	    for lib in $dlfiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlfiles="$newdlfiles $libdir/$name"
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      if test -z "$libdir"; then
-+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+		exit 1
-+	      fi
-+	      newdlprefiles="$newdlprefiles $libdir/$name"
-+	    done
-+	    dlprefiles="$newdlprefiles"
-+	  fi
-+	  $rm $output
-+	  # place dlname in correct position for cygwin
-+	  tdlname=$dlname
-+	  case $host,$output,$installed,$module,$dlname in
-+	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	  esac
-+	  $echo > $output "\
-+# $outputname - a libtool library file
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
-+
-+# Names of this library.
-+library_names='$library_names'
-+
-+# The name of the static archive.
-+old_library='$old_library'
-+
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
-+
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
-+
-+# Is this an already installed library?
-+installed=$installed
-+
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
-+
-+# Directory that this library needs to be installed in:
-+libdir='$install_libdir'"
-+	  if test "$installed" = no && test $need_relink = yes; then
-+	    $echo >> $output "\
-+relink_command=\"$relink_command\""
-+	  fi
-+	done
-+      fi
-+
-+      # Do a symbolic link so that the libtool archive can be found in
-+      # LD_LIBRARY_PATH before the program is installed.
-+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-+      ;;
-+    esac
-+    exit 0
-+    ;;
-+
-+  # libtool install mode
-+  install)
-+    modename="$modename: install"
-+
-+    # There may be an optional sh(1) argument at the beginning of
-+    # install_prog (especially on Windows NT).
-+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+       # Allow the use of GNU shtool's install command.
-+       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+      # Aesthetically quote it.
-+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	arg="\"$arg\""
-+	;;
-+      esac
-+      install_prog="$arg "
-+      arg="$1"
-+      shift
-+    else
-+      install_prog=
-+      arg="$nonopt"
-+    fi
-+
-+    # The real first argument should be the name of the installation program.
-+    # Aesthetically quote it.
-+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+    case $arg in
-+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+      arg="\"$arg\""
-+      ;;
-+    esac
-+    install_prog="$install_prog$arg"
-+
-+    # We need to accept at least all the BSD install flags.
-+    dest=
-+    files=
-+    opts=
-+    prev=
-+    install_type=
-+    isdir=no
-+    stripme=
-+    for arg
-+    do
-+      if test -n "$dest"; then
-+	files="$files $dest"
-+	dest="$arg"
-+	continue
-+      fi
-+
-+      case $arg in
-+      -d) isdir=yes ;;
-+      -f) prev="-f" ;;
-+      -g) prev="-g" ;;
-+      -m) prev="-m" ;;
-+      -o) prev="-o" ;;
-+      -s)
-+	stripme=" -s"
-+	continue
-+	;;
-+      -*) ;;
-+
-+      *)
-+	# If the previous option needed an argument, then skip it.
-+	if test -n "$prev"; then
-+	  prev=
-+	else
-+	  dest="$arg"
-+	  continue
-+	fi
-+	;;
-+      esac
-+
-+      # Aesthetically quote the argument.
-+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+      case $arg in
-+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-+	arg="\"$arg\""
-+	;;
-+      esac
-+      install_prog="$install_prog $arg"
-+    done
-+
-+    if test -z "$install_prog"; then
-+      $echo "$modename: you must specify an install program" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test -n "$prev"; then
-+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    if test -z "$files"; then
-+      if test -z "$dest"; then
-+	$echo "$modename: no file or destination specified" 1>&2
-+      else
-+	$echo "$modename: you must specify a destination" 1>&2
-+      fi
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    # Strip any trailing slash from the destination.
-+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-+
-+    # Check to see that the destination is a directory.
-+    test -d "$dest" && isdir=yes
-+    if test "$isdir" = yes; then
-+      destdir="$dest"
-+      destname=
-+    else
-+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-+      test "X$destdir" = "X$dest" && destdir=.
-+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-+
-+      # Not a directory, so check to see that there is only one file specified.
-+      set dummy $files
-+      if test $# -gt 2; then
-+	$echo "$modename: \`$dest' is not a directory" 1>&2
-+	$echo "$help" 1>&2
-+	exit 1
-+      fi
-+    fi
-+    case $destdir in
-+    [\\/]* | [A-Za-z]:[\\/]*) ;;
-+    *)
-+      for file in $files; do
-+	case $file in
-+	*.lo) ;;
-+	*)
-+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+      done
-+      ;;
-+    esac
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    staticlibs=
-+    future_libdirs=
-+    current_libdirs=
-+    for file in $files; do
-+
-+      # Do each installation.
-+      case $file in
-+      *.$libext)
-+	# Do the static libraries later.
-+	staticlibs="$staticlibs $file"
-+	;;
-+
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	library_names=
-+	old_library=
-+	relink_command=
-+	# If there is no directory component, then add one.
-+	case $file in
-+	*/* | *\\*) . $file ;;
-+	*) . ./$file ;;
-+	esac
-+
-+	# Add the libdir to current_libdirs if it is the destination.
-+	if test "X$destdir" = "X$libdir"; then
-+	  case "$current_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) current_libdirs="$current_libdirs $libdir" ;;
-+	  esac
-+	else
-+	  # Note the libdir as a future libdir.
-+	  case "$future_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  esac
-+	fi
-+
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-+	test "X$dir" = "X$file/" && dir=
-+	dir="$dir$objdir"
-+
-+	if test -n "$relink_command"; then
-+	  # Determine the prefix the user has applied to our future dir.
-+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
-+
-+	  # Don't allow the user to place us outside of our expected
-+	  # location b/c this prevents finding dependent libraries that
-+	  # are installed to the same prefix.
-+	  if test "$inst_prefix_dir" = "$destdir"; then
-+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	    exit 1
-+	  fi
-+
-+	  if test -n "$inst_prefix_dir"; then
-+	    # Stick the inst_prefix_dir data into the link command.
-+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	  else
-+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+	  fi
-+
-+	  $echo "$modename: warning: relinking \`$file'" 1>&2
-+	  $show "$relink_command"
-+	  if $run eval "$relink_command"; then :
-+	  else
-+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+	    exit 1
-+	  fi
-+	fi
-+
-+	# See the names of the shared library.
-+	set dummy $library_names
-+	if test -n "$2"; then
-+	  realname="$2"
-+	  shift
-+	  shift
-+
-+	  srcname="$realname"
-+	  test -n "$relink_command" && srcname="$realname"T
-+
-+	  # Install the shared library and build the symlinks.
-+	  $show "$install_prog $dir/$srcname $destdir/$realname"
-+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-+	  if test -n "$stripme" && test -n "$striplib"; then
-+	    $show "$striplib $destdir/$realname"
-+	    $run eval "$striplib $destdir/$realname" || exit $?
-+	  fi
-+
-+	  if test $# -gt 0; then
-+	    # Delete the old symlinks, and create new ones.
-+	    for linkname
-+	    do
-+	      if test "$linkname" != "$realname"; then
-+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+	      fi
-+	    done
-+	  fi
-+
-+	  # Do each command in the postinstall commands.
-+	  lib="$destdir/$realname"
-+	  eval cmds=\"$postinstall_cmds\"
-+	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	  for cmd in $cmds; do
-+	    IFS="$save_ifs"
-+	    $show "$cmd"
-+	    $run eval "$cmd" || exit $?
-+	  done
-+	  IFS="$save_ifs"
-+	fi
-+
-+	# Install the pseudo-library for information purposes.
-+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	instname="$dir/$name"i
-+	$show "$install_prog $instname $destdir/$name"
-+	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+
-+	# Maybe install the static library, too.
-+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-+	;;
-+
-+      *.lo)
-+	# Install (i.e. copy) a libtool object.
-+
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Deduce the name of the destination old-style object file.
-+	case $destfile in
-+	*.lo)
-+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-+	  ;;
-+	*.$objext)
-+	  staticdest="$destfile"
-+	  destfile=
-+	  ;;
-+	*)
-+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	  ;;
-+	esac
-+
-+	# Install the libtool object if requested.
-+	if test -n "$destfile"; then
-+	  $show "$install_prog $file $destfile"
-+	  $run eval "$install_prog $file $destfile" || exit $?
-+	fi
-+
-+	# Install the old object if enabled.
-+	if test "$build_old_libs" = yes; then
-+	  # Deduce the name of the old-style object file.
-+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-+
-+	  $show "$install_prog $staticobj $staticdest"
-+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-+	fi
-+	exit 0
-+	;;
-+
-+      *)
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
-+	else
-+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  destfile="$destdir/$destfile"
-+	fi
-+
-+	# Do a test to see if this is really a libtool program.
-+	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  notinst_deplibs=
-+	  relink_command=
-+
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $file ;;
-+	  *) . ./$file ;;
-+	  esac
-+
-+	  # Check the variables that should have been set.
-+	  if test -z "$notinst_deplibs"; then
-+	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-+	    exit 1
-+	  fi
-+
-+	  finalize=yes
-+	  for lib in $notinst_deplibs; do
-+	    # Check to see that each library is installed.
-+	    libdir=
-+	    if test -f "$lib"; then
-+	      # If there is no directory component, then add one.
-+	      case $lib in
-+	      */* | *\\*) . $lib ;;
-+	      *) . ./$lib ;;
-+	      esac
-+	    fi
-+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    if test -n "$libdir" && test ! -f "$libfile"; then
-+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-+	      finalize=no
-+	    fi
-+	  done
-+
-+	  relink_command=
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $file ;;
-+	  *) . ./$file ;;
-+	  esac
-+
-+	  outputname=
-+	  if test "$fast_install" = no && test -n "$relink_command"; then
-+	    if test "$finalize" = yes && test -z "$run"; then
-+	      tmpdir="/tmp"
-+	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-+              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
-+              if test $? = 0 ; then :
-+              else
-+                tmpdir="$tmpdir/libtool-$$"
-+              fi
-+	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-+	      else
-+		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-+		continue
-+	      fi
-+	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	      outputname="$tmpdir/$file"
-+	      # Replace the output file specification.
-+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+	      $show "$relink_command"
-+	      if $run eval "$relink_command"; then :
-+	      else
-+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+		${rm}r "$tmpdir"
-+		continue
-+	      fi
-+	      file="$outputname"
-+	    else
-+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-+	    fi
-+	  else
-+	    # Install the binary that we compiled earlier.
-+	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	  fi
-+	fi
-+
-+	# remove .exe since cygwin /usr/bin/install will append another
-+	# one anyways
-+	case $install_prog,$host in
-+	/usr/bin/install*,*cygwin*)
-+	  case $file:$destfile in
-+	  *.exe:*.exe)
-+	    # this is ok
-+	    ;;
-+	  *.exe:*)
-+	    destfile=$destfile.exe
-+	    ;;
-+	  *:*.exe)
-+	    destfile=`echo $destfile | sed -e 's,.exe$,,'`
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+	$show "$install_prog$stripme $file $destfile"
-+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-+	test -n "$outputname" && ${rm}r "$tmpdir"
-+	;;
-+      esac
-+    done
-+
-+    for file in $staticlibs; do
-+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+
-+      # Set up the ranlib parameters.
-+      oldlib="$destdir/$name"
-+
-+      $show "$install_prog $file $oldlib"
-+      $run eval "$install_prog \$file \$oldlib" || exit $?
-+
-+      if test -n "$stripme" && test -n "$striplib"; then
-+	$show "$old_striplib $oldlib"
-+	$run eval "$old_striplib $oldlib" || exit $?
-+      fi
-+
-+      # Do each command in the postinstall commands.
-+      eval cmds=\"$old_postinstall_cmds\"
-+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+      for cmd in $cmds; do
-+	IFS="$save_ifs"
-+	$show "$cmd"
-+	$run eval "$cmd" || exit $?
-+      done
-+      IFS="$save_ifs"
-+    done
-+
-+    if test -n "$future_libdirs"; then
-+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-+    fi
-+
-+    if test -n "$current_libdirs"; then
-+      # Maybe just do a dry run.
-+      test -n "$run" && current_libdirs=" -n$current_libdirs"
-+      exec $SHELL $0 --finish$current_libdirs
-+      exit 1
-+    fi
-+
-+    exit 0
-+    ;;
-+
-+  # libtool finish mode
-+  finish)
-+    modename="$modename: finish"
-+    libdirs="$nonopt"
-+    admincmds=
-+
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      for dir
-+      do
-+	libdirs="$libdirs $dir"
-+      done
-+
-+      for libdir in $libdirs; do
-+	if test -n "$finish_cmds"; then
-+	  # Do each command in the finish commands.
-+	  eval cmds=\"$finish_cmds\"
-+	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	  for cmd in $cmds; do
-+	    IFS="$save_ifs"
-+	    $show "$cmd"
-+	    $run eval "$cmd" || admincmds="$admincmds
-+       $cmd"
-+	  done
-+	  IFS="$save_ifs"
-+	fi
-+	if test -n "$finish_eval"; then
-+	  # Do the single finish_eval.
-+	  eval cmds=\"$finish_eval\"
-+	  $run eval "$cmds" || admincmds="$admincmds
-+       $cmds"
-+	fi
-+      done
-+    fi
-+
-+    # Exit here if they wanted silent mode.
-+    test "$show" = ":" && exit 0
-+
-+    echo "----------------------------------------------------------------------"
-+    echo "Libraries have been installed in:"
-+    for libdir in $libdirs; do
-+      echo "   $libdir"
-+    done
-+    echo
-+    echo "If you ever happen to want to link against installed libraries"
-+    echo "in a given directory, LIBDIR, you must either use libtool, and"
-+    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    echo "flag during linking and do at least one of the following:"
-+    if test -n "$shlibpath_var"; then
-+      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      echo "     during execution"
-+    fi
-+    if test -n "$runpath_var"; then
-+      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      echo "     during linking"
-+    fi
-+    if test -n "$hardcode_libdir_flag_spec"; then
-+      libdir=LIBDIR
-+      eval flag=\"$hardcode_libdir_flag_spec\"
-+
-+      echo "   - use the \`$flag' linker flag"
-+    fi
-+    if test -n "$admincmds"; then
-+      echo "   - have your system administrator run these commands:$admincmds"
-+    fi
-+    if test -f /etc/ld.so.conf; then
-+      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+    fi
-+    echo
-+    echo "See any operating system documentation about shared libraries for"
-+    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+    echo "----------------------------------------------------------------------"
-+    exit 0
-+    ;;
-+
-+  # libtool execute mode
-+  execute)
-+    modename="$modename: execute"
-+
-+    # The first argument is the command name.
-+    cmd="$nonopt"
-+    if test -z "$cmd"; then
-+      $echo "$modename: you must specify a COMMAND" 1>&2
-+      $echo "$help"
-+      exit 1
-+    fi
-+
-+    # Handle -dlopen flags immediately.
-+    for file in $execute_dlfiles; do
-+      if test ! -f "$file"; then
-+	$echo "$modename: \`$file' is not a file" 1>&2
-+	$echo "$help" 1>&2
-+	exit 1
-+      fi
-+
-+      dir=
-+      case $file in
-+      *.la)
-+	# Check to see that this really is a libtool archive.
-+	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	else
-+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+	  $echo "$help" 1>&2
-+	  exit 1
-+	fi
-+
-+	# Read the libtool library.
-+	dlname=
-+	library_names=
-+
-+	# If there is no directory component, then add one.
-+	case $file in
-+	*/* | *\\*) . $file ;;
-+	*) . ./$file ;;
-+	esac
-+
-+	# Skip this library if it cannot be dlopened.
-+	if test -z "$dlname"; then
-+	  # Warn if it was a shared library.
-+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-+	  continue
-+	fi
-+
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$dir" = "X$file" && dir=.
-+
-+	if test -f "$dir/$objdir/$dlname"; then
-+	  dir="$dir/$objdir"
-+	else
-+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+	  exit 1
-+	fi
-+	;;
-+
-+      *.lo)
-+	# Just add the directory containing the .lo file.
-+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+	test "X$dir" = "X$file" && dir=.
-+	;;
-+
-+      *)
-+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-+	continue
-+	;;
-+      esac
-+
-+      # Get the absolute pathname.
-+      absdir=`cd "$dir" && pwd`
-+      test -n "$absdir" && dir="$absdir"
-+
-+      # Now add the directory to shlibpath_var.
-+      if eval "test -z \"\$$shlibpath_var\""; then
-+	eval "$shlibpath_var=\"\$dir\""
-+      else
-+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-+      fi
-+    done
-+
-+    # This variable tells wrapper scripts just to set shlibpath_var
-+    # rather than running their programs.
-+    libtool_execute_magic="$magic"
-+
-+    # Check if any of the arguments is a wrapper script.
-+    args=
-+    for file
-+    do
-+      case $file in
-+      -*) ;;
-+      *)
-+	# Do a test to see if this is really a libtool program.
-+	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  # If there is no directory component, then add one.
-+	  case $file in
-+	  */* | *\\*) . $file ;;
-+	  *) . ./$file ;;
-+	  esac
-+
-+	  # Transform arg to wrapped name.
-+	  file="$progdir/$program"
-+	fi
-+	;;
-+      esac
-+      # Quote arguments (to preserve shell metacharacters).
-+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-+      args="$args \"$file\""
-+    done
-+
-+    if test -z "$run"; then
-+      if test -n "$shlibpath_var"; then
-+	# Export the shlibpath_var.
-+	eval "export $shlibpath_var"
-+      fi
-+
-+      # Restore saved enviroment variables
-+      if test "${save_LC_ALL+set}" = set; then
-+	LC_ALL="$save_LC_ALL"; export LC_ALL
-+      fi
-+      if test "${save_LANG+set}" = set; then
-+	LANG="$save_LANG"; export LANG
-+      fi
-+
-+      # Now actually exec the command.
-+      eval "exec \$cmd$args"
-+
-+      $echo "$modename: cannot exec \$cmd$args"
-+      exit 1
-+    else
-+      # Display what would be done.
-+      if test -n "$shlibpath_var"; then
-+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-+	$echo "export $shlibpath_var"
-+      fi
-+      $echo "$cmd$args"
-+      exit 0
-+    fi
-+    ;;
-+
-+  # libtool clean and uninstall mode
-+  clean | uninstall)
-+    modename="$modename: $mode"
-+    rm="$nonopt"
-+    files=
-+    rmforce=
-+    exit_status=0
-+
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
-+
-+    for arg
-+    do
-+      case $arg in
-+      -f) rm="$rm $arg"; rmforce=yes ;;
-+      -*) rm="$rm $arg" ;;
-+      *) files="$files $arg" ;;
-+      esac
-+    done
-+
-+    if test -z "$rm"; then
-+      $echo "$modename: you must specify an RM program" 1>&2
-+      $echo "$help" 1>&2
-+      exit 1
-+    fi
-+
-+    rmdirs=
-+
-+    for file in $files; do
-+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+      if test "X$dir" = "X$file"; then
-+	dir=.
-+	objdir="$objdir"
-+      else
-+	objdir="$dir/$objdir"
-+      fi
-+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+      test $mode = uninstall && objdir="$dir"
-+
-+      # Remember objdir for removal later, being careful to avoid duplicates
-+      if test $mode = clean; then
-+	case " $rmdirs " in
-+	  *" $objdir "*) ;;
-+	  *) rmdirs="$rmdirs $objdir" ;;
-+	esac
-+      fi
-+
-+      # Don't error if the file doesn't exist and rm -f was used.
-+      if (test -L "$file") >/dev/null 2>&1 \
-+        || (test -h "$file") >/dev/null 2>&1 \
-+	|| test -f "$file"; then
-+        :
-+      elif test -d "$file"; then
-+        exit_status=1
-+	continue
-+      elif test "$rmforce" = yes; then
-+        continue
-+      fi
-+
-+      rmfiles="$file"
-+
-+      case $name in
-+      *.la)
-+	# Possibly a libtool archive, so verify it.
-+	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  . $dir/$name
-+
-+	  # Delete the libtool libraries and symlinks.
-+	  for n in $library_names; do
-+	    rmfiles="$rmfiles $objdir/$n"
-+	  done
-+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+
-+	  if test $mode = uninstall; then
-+	    if test -n "$library_names"; then
-+	      # Do each command in the postuninstall commands.
-+	      eval cmds=\"$postuninstall_cmds\"
-+	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+
-+	    if test -n "$old_library"; then
-+	      # Do each command in the old_postuninstall commands.
-+	      eval cmds=\"$old_postuninstall_cmds\"
-+	      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-+	      for cmd in $cmds; do
-+		IFS="$save_ifs"
-+		$show "$cmd"
-+		$run eval "$cmd"
-+		if test $? != 0 && test "$rmforce" != yes; then
-+		  exit_status=1
-+		fi
-+	      done
-+	      IFS="$save_ifs"
-+	    fi
-+	    # FIXME: should reinstall the best remaining shared library.
-+	  fi
-+	fi
-+	;;
-+
-+      *.lo)
-+	if test "$build_old_libs" = yes; then
-+	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
-+	  rmfiles="$rmfiles $dir/$oldobj"
-+	fi
-+	;;
-+
-+      *)
-+	# Do a test to see if this is a libtool program.
-+	if test $mode = clean &&
-+	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  relink_command=
-+	  . $dir/$file
-+
-+	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	  if test "$fast_install" = yes && test -n "$relink_command"; then
-+	    rmfiles="$rmfiles $objdir/lt-$name"
-+	  fi
-+	fi
-+	;;
-+      esac
-+      $show "$rm $rmfiles"
-+      $run $rm $rmfiles || exit_status=1
-+    done
-+
-+    # Try to remove the ${objdir}s in the directories where we deleted files
-+    for dir in $rmdirs; do
-+      if test -d "$dir"; then
-+	$show "rmdir $dir"
-+	$run rmdir $dir >/dev/null 2>&1
-+      fi
-+    done
-+
-+    exit $exit_status
-+    ;;
-+
-+  "")
-+    $echo "$modename: you must specify a MODE" 1>&2
-+    $echo "$generic_help" 1>&2
-+    exit 1
-+    ;;
-+  esac
-+
-+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+  $echo "$generic_help" 1>&2
-+  exit 1
-+fi # test -z "$show_help"
-+
-+# We need to display help for each of the modes.
-+case $mode in
-+"") $echo \
-+"Usage: $modename [OPTION]... [MODE-ARG]...
-+
-+Provide generalized library-building support services.
-+
-+    --config          show all configuration variables
-+    --debug           enable verbose shell tracing
-+-n, --dry-run         display commands without modifying any files
-+    --features        display basic configuration information and exit
-+    --finish          same as \`--mode=finish'
-+    --help            display this help message and exit
-+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-+    --quiet           same as \`--silent'
-+    --silent          don't print informational messages
-+    --version         print version information
-+
-+MODE must be one of the following:
-+
-+      clean           remove files from the build directory
-+      compile         compile a source file into a libtool object
-+      execute         automatically set library path, then run a program
-+      finish          complete the installation of libtool libraries
-+      install         install libraries or executables
-+      link            create a library or an executable
-+      uninstall       remove libraries from an installed directory
-+
-+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-+a more detailed description of MODE."
-+  exit 0
-+  ;;
-+
-+clean)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-+
-+Remove files from the build directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+  ;;
-+
-+compile)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-+
-+Compile a source file into a libtool library object.
-+
-+This mode accepts the following additional options:
-+
-+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-+  -prefer-pic       try to building PIC objects only
-+  -prefer-non-pic   try to building non-PIC objects only
-+  -static           always build a \`.o' file suitable for static linking
-+
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
-+
-+The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
-+  ;;
-+
-+execute)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-+
-+Automatically set library path, then run a program.
-+
-+This mode accepts the following additional options:
-+
-+  -dlopen FILE      add the directory containing FILE to the library path
-+
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
-+
-+If any of the ARGS are libtool executable wrappers, then they are translated
-+into their corresponding uninstalled binary, and any of their required library
-+directories are added to the library path.
-+
-+Then, COMMAND is executed, with ARGS as arguments."
-+  ;;
-+
-+finish)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-+
-+Complete the installation of libtool libraries.
-+
-+Each LIBDIR is a directory that contains libtool libraries.
-+
-+The commands that this mode executes may require superuser privileges.  Use
-+the \`--dry-run' option if you just want to see what would be executed."
-+  ;;
-+
-+install)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-+
-+Install executables or libraries.
-+
-+INSTALL-COMMAND is the installation command.  The first component should be
-+either the \`install' or \`cp' program.
-+
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+  ;;
-+
-+link)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-+
-+Link object files or libraries together to form another library, or to
-+create an executable program.
-+
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
-+
-+The following components of LINK-COMMAND are treated specially:
-+
-+  -all-static       do not do any dynamic linking at all
-+  -avoid-version    do not add a version suffix if possible
-+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-+  -export-symbols SYMFILE
-+		    try to export only the symbols listed in SYMFILE
-+  -export-symbols-regex REGEX
-+		    try to export only the symbols matching REGEX
-+  -LLIBDIR          search LIBDIR for required installed libraries
-+  -lNAME            OUTPUT-FILE requires the installed library libNAME
-+  -module           build a library that can dlopened
-+  -no-fast-install  disable the fast-install mode
-+  -no-install       link a not-installable executable
-+  -no-undefined     declare that a library does not refer to external symbols
-+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-+  -release RELEASE  specify package release information
-+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-+  -static           do not do any dynamic linking of libtool libraries
-+  -version-info CURRENT[:REVISION[:AGE]]
-+		    specify library version info [each variable defaults to 0]
-+
-+All other options (arguments beginning with \`-') are ignored.
-+
-+Every other argument is treated as a filename.  Files ending in \`.la' are
-+treated as uninstalled libtool libraries, other files are standard or library
-+object files.
-+
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
-+required, except when creating a convenience library.
-+
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
-+
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-+  ;;
-+
-+uninstall)
-+  $echo \
-+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-+
-+Remove libraries from an installation directory.
-+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+  ;;
-+
-+*)
-+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+  $echo "$help" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+echo
-+$echo "Try \`$modename --help' for more information about other modes."
-+
-+exit 0
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
---- gtk+1.2-1.2.10.orig/debian/rules
-+++ gtk+1.2-1.2.10/debian/rules
-@@ -0,0 +1,185 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# These are used for cross-compiling and for saving the configure script
-+# from having to guess our platform (since we know it already)
-+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+DEB_BUILD_GNU_CPU	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-+DEB_BUILD_GNU_SYSTEM	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-+
-+ifeq ($(DEB_BUILD_GNU_SYSTEM),kfreebsd-gnu)
-+DEB_BUILD_GNU_TYPE	= $(DEB_BUILD_GNU_CPU)-gnu
-+DEB_HOST_GNU_TYPE	= $(DEB_HOST_GNU_CPU)-gnu
-+endif
-+ifeq ($(DEB_BUILD_GNU_SYSTEM),knetbsd-gnu)
-+DEB_BUILD_GNU_TYPE	= $(DEB_BUILD_GNU_CPU)-gnu
-+DEB_HOST_GNU_TYPE	= $(DEB_HOST_GNU_CPU)-gnu
-+endif
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-+	INSTALL_PROGRAM += -s
-+endif
-+
-+##
-+version=$(shell dpkg-parsechangelog | grep '^Version: ' | sed -e 's/^Version: //' | sed -e 's/-.*//')
-+
-+__configure_options :=	--host=$(DEB_HOST_GNU_TYPE) \
-+			--build=$(DEB_BUILD_GNU_TYPE) \
-+			--prefix=/usr \
-+			--mandir=\$${prefix}/share/man \
-+			--infodir=\$${prefix}/share/info \
-+			--sysconfdir=/etc \
-+			--localstatedir=/var \
-+			--with-xinput=xfree
-+libpath=$(CURDIR)/gdk/.libs:$(CURDIR)/gtk/.libs
-+
-+config.status: configure
-+	dh_testdir
-+
-+	# When install the shared libraries, don't relink it
-+	cp debian/fixed-ltmain.sh $(CURDIR)/ltmain.sh
-+
-+	# Add here commands to configure the package.
-+	# so it avoid gcc bug for Alpha.
-+ifeq ("x$(DEB_BUILD_ARCH)","xalpha")
-+	CFLAGS="-g -O0 -Wall" ./configure $(__configure_options)
-+else
-+	./configure $(__configure_options)
-+endif
-+
-+	sed < libtool > libtool-2 \
-+	 -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
-+	 -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' && \
-+	mv libtool-2 libtool
-+
-+	touch $@
-+
-+build: build-stamp
-+build-stamp: config.status
-+	dh_testdir
-+
-+	# Add here commands to compile the package.
-+	$(MAKE) LD_LIBRARY_PATH=$(libpath):$(LD_LIBRARY_PATH)
-+
-+	touch $@
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp
-+
-+	# Add here commands to clean up after the build process.
-+	-$(MAKE) distclean
-+	-test -r /usr/share/misc/config.sub && \
-+	   cp -f /usr/share/misc/config.sub config.sub
-+	-test -r /usr/share/misc/config.guess && \
-+	   cp -f /usr/share/misc/config.guess config.guess
-+
-+	rm -rf po/ca.gmo
-+
-+	dh_clean
-+
-+install: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+
-+	# Add here commands to install the package into debian/tmp
-+	$(MAKE) install \
-+		prefix=$(CURDIR)/debian/libgtk1.2/usr \
-+		sysconfdir=$(CURDIR)/debian/libgtk1.2/etc \
-+		localstatedir=$(CURDIR)/debian/libgtk1.2/var \
-+		LD_LIBRARY_PATH=$(libpath):$(LD_LIBRARY_PATH)
-+
-+	# for -dbg
-+	mkdir -p $(CURDIR)/debian/libgtk1.2/usr/lib/debug
-+	for l in `find $(CURDIR)/debian/libgtk1.2/usr/lib -name '*.so*'`; do \
-+		cp -vdf $$l \
-+			$(CURDIR)/debian/libgtk1.2/usr/lib/debug/; \
-+	done
-+
-+	# for -doc
-+	cp docs/*.sgml $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/sgml/
-+	cp docs/text/*.txt $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/
-+	cp docs/*.texi $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/texinfo/
-+	cp docs/html/gtkfaq*.html $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/faq-html
-+	cp docs/html/gtk_tut-*.html $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/gtk-tutorial-html
-+	cp docs/html/*.gif $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/gtk-tutorial-html
-+	cp docs/html/gtk_tut.html $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/gtk-tutorial-html
-+	cp docs/html/gtk_tut_it*.html $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/gtk-tutorial-it-html
-+	cp docs/html/*.gif $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/gtk-tutorial-it-html
-+	cp docs/html/gtk_tut_fr*.html $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/gtk-tutorial-fr-html
-+	cp docs/html/*.gif $(CURDIR)/debian/libgtk1.2-doc/usr/share/doc/libgtk1.2-doc/gtk-tutorial-fr-html
-+
-+	dh_movefiles --sourcedir=debian/libgtk1.2
-+	-find $(CURDIR)/debian/libgtk1.2 -type d -empty | xargs rmdir -p 2>&1 > /dev/null
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+	dh_testdir -i
-+	dh_testroot -i
-+
-+	dh_installdocs -i
-+	dh_installdocs -plibgtk1.2-common -A debian/README.Debian
-+	dh_installdocs -plibgtk1.2-doc docs/debugging.txt docs/developers.txt docs/styles.txt docs/text_widget.txt docs/widget_system.txt docs/gtk-config.txt docs/refcounting.txt docs/Changes-1.2.txt docs/generation.txt
-+
-+	dh_installexamples -i
-+	dh_installmenu -i
-+	dh_installinfo -i
-+	dh_installchangelogs -i ChangeLog
-+	dh_compress -i
-+	dh_fixperms -i
-+	dh_installdeb -i
-+	dh_gencontrol -i
-+	dh_md5sums -i
-+	dh_builddeb -i
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+	dh_testdir -a
-+	dh_testroot -a
-+
-+#	dh_installdebconf -a
-+	dh_installdocs -a
-+
-+	rm -rf $(CURDIR)/debian/libgtk1.2-dbg/usr/share/doc/libgtk1.2-dbg
-+	dh_link -plibgtk1.2-dbg usr/share/doc/libgtk1.2 usr/share/doc/libgtk1.2-dbg
-+
-+	dh_installexamples -a
-+
-+	rm $(CURDIR)/debian/libgtk1.2-dev/usr/share/doc/libgtk1.2-dev/examples/find-examples.sh
-+
-+	dh_installmenu -a
-+#	dh_installlogrotate -a
-+#	dh_installemacsen -a
-+#	dh_installpam -a
-+#	dh_installmime -a
-+#	dh_installinit -a
-+#	dh_installcron -a
-+	dh_installman -a
-+	dh_installinfo -a
-+	dh_installchangelogs -a ChangeLog
-+	dh_strip -a -Nlibgtk1.2-dbg
-+	dh_compress -a
-+	dh_fixperms -a
-+	dh_makeshlibs -plibgtk1.2 -V "libgtk1.2 (>= ${version}-4)" -l$(libpath)
-+	dh_installdeb -a
-+#	dh_perl -a
-+	dh_shlibdeps -a
-+	dh_gencontrol -a
-+	dh_md5sums -a
-+	dh_builddeb -a
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install configure
---- gtk+1.2-1.2.10.orig/debian/changelog
-+++ gtk+1.2-1.2.10/debian/changelog
-@@ -0,0 +1,745 @@
-+gtk+1.2 (1.2.10-18) unstable; urgency=low
-+
-+  * GNOME team upload.
-+  * Add a static list of Uploaders for the GNOME team.
-+  * Update Catalan translation.
-+  * Cloak k*bsd-gnu systems as gnu to enable building on GNU/k*BSD. Normal
-+    updating of libtool appears to be troublesome (thanks Robert Millan;
-+    closes: #195921).
-+  * Patch gtk.m4 and acgtk.m4 to silence newer aclocal versions
-+    (closes: #267815).
-+  * Patch the file selector to do file autocompletion like every other
-+    application (thanks, Matt Zimmerman, even if you don't care at all
-+    only because the patch is 3 years old and everyone is using GTK2
-+    anyway :) closes: #148565).
-+
-+ -- Jordi Mallach <jordi@debian.org>  Thu,  6 Oct 2005 11:42:08 +0200
-+
-+gtk+1.2 (1.2.10-17) unstable; urgency=low
-+
-+  * debian/control:
-+    - updated the build-depends for the separated xlibs-dev.
-+      (closes: Bug#241781)
-+    - updated the Depends of libgtk1.2-dev for the separated xlibs-dev.
-+      (closes: Bug#254694, 241507)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Wed, 23 Jun 2004 22:18:58 +0900
-+
-+gtk+1.2 (1.2.10-16) unstable; urgency=low
-+
-+  * updated libtool stuff. (closes: Bug#195827)
-+    - acgtk.m4: moved some m4 macros from acinclude.m4.
-+    - acinclude.m4: removed.
-+    - configure.in: add AC_PREREQ(2.13)
-+    - ltconfig: removed.
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Thu,  5 Jun 2003 12:54:52 +0900
-+
-+gtk+1.2 (1.2.10-15) unstable; urgency=low
-+
-+  * debian/control:
-+    - bumped Standards-Version to 3.5.10.0.
-+    - depends on versioned libgtk1.2-common.
-+    - changed the sections for libgtk1.2-dev and libgtk1.2-dbg to libdevel.
-+  * debian/compat:
-+    - use it instead of DH_COMPAT.
-+  * debian/rules:
-+    - support noopt for DEB_BUILD_OPTIONS.
-+  * debian/FAQ.Debian:
-+    - add xfonts-*-transcoded stuff. Thanks to Kovacs Baldvin
-+      <baldvin@angel.elte.hu>
-+  * debian/libgtk1.2-common.postinst:
-+    - do remove the unnecessary gtkrc files. (closes: Bug#159817)
-+  * gtk/Makefile.in:
-+    - fix the undefined non-weak symbols. (closes: Bug#187351)
-+  * gdk/gdkfont.c:
-+    - fix possibly unnecessary missing fontset warning on UTF-8 locale.
-+      (closes: Bug#186025)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Sun,  1 Jun 2003 10:59:28 +0900
-+
-+gtk+1.2 (1.2.10-14) unstable; urgency=low
-+
-+  * debian/control: s/Recommends/Suggests/ for devhelp-book-gtk.
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Thu, 22 Aug 2002 19:33:00 +0900
-+
-+gtk+1.2 (1.2.10-13) unstable; urgency=low
-+
-+  * debian/control: add devhelp-book-gtk to Recommends. (closes: Bug#148354)
-+  * gtk/gtkentry.c: applied a patch to fix a segfault bug in
-+    gtk_entry_set_selection(). Thanks Jan Gregor.
-+  * gtk/gtkrc.zh_{CN,TW}: changed a font size for iso8859-1 to 12 Geoffrey Lee
-+    suggested. (closes: Bug#157739)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Thu, 22 Aug 2002 02:50:14 +0900
-+
-+gtk+1.2 (1.2.10-12) unstable; urgency=low
-+
-+  * Applied some patches from RH.
-+    - gdk/gdkselection.c: don't screw up CTEXT for UTF-8 locales.
-+    - gtk/gtkfilesel.c: fix delete-filename-on-dir-change problem. (closes:
-+      Bug#106897)
-+    - gdk/gdkevents.c: improve expose compression.
-+    - gdk/gdkfont.c: fix problem with width computation for missing
-+      characters.
-+    - gdk/gdkfont.c: improve warning for missing fontset elements.
-+    - gtk/gtkstyle.c: fix refcounting problem in gtk_style_copy() that might
-+      affect theme switching.
-+    - gtk/gtkwindow.c: fix for theme switching.
-+  * debian/FAQ.Debian: update.
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Mon, 13 May 2002 03:47:10 +0900
-+
-+gtk+1.2 (1.2.10-11) unstable; urgency=low
-+
-+  * Add gtkfaq-[89].html (closes: Bug#142682)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Mon, 15 Apr 2002 02:19:49 +0900
-+
-+gtk+1.2 (1.2.10-10) unstable; urgency=low
-+
-+  * Fixed typo in FAQ (closes: Bug#30034)
-+  * Fixed typo in tutorial (closes: Bug#113079)
-+  * debian/FAQ.Debian: Added.
-+  * debian/libgtk1.2-doc.info: added. fix running install-info on postinst
-+    (closes: Bug#135981)
-+  * debian/rules: changed as the following:
-+    - support DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE.
-+    - support debug and nostrip for DEB_BUILD_OPTIONS.
-+    - copying the latest config.sub and config.guess.
-+  * gtkrc.utf-8: add arial font. (closes: Bug#135354)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Fri, 22 Mar 2002 08:32:55 +0900
-+
-+gtk+1.2 (1.2.10-9) unstable; urgency=medium
-+
-+  * Fixed the duplicate conffiles.
-+  * Fixed symlink transition for -dbg. (closes: Bug#125596)
-+  * Fixed Gtk?Paned widget misdisplayed on Alpha again...
-+    (closes: Bug#123579)
-+  * Fixed a correct entry for gtkrc.utf-8. (closes: Bug#114934)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Thu, 20 Dec 2001 01:48:29 +0900
-+
-+gtk+1.2 (1.2.10-8) unstable; urgency=low
-+
-+  * Fixed fails to purge cleanly (closes: Bug#122745)
-+  * Note: Don't use --enable-debug=yes.
-+    it give us any strange problem.
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Fri,  7 Dec 2001 16:41:39 +0900
-+
-+gtk+1.2 (1.2.10-7) unstable; urgency=low
-+
-+  * Fixed remove obsolates conffiles by purge.
-+  * Fixed incorrect handling pointer in back-ported patch of gtkrc.
-+    (closes: Bug#122603)
-+  * Fixed search order for gtkrc again... (closes: Bug#121467)
-+  * Hmm I'm not sure, but pull down --enable-debug=minimum because
-+    make sure the cause of strange problem. so it's a default value.
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Thu,  6 Dec 2001 23:52:12 +0900
-+
-+gtk+1.2 (1.2.10-6) unstable; urgency=low
-+
-+  * Fixed uninstallable problem (closes: Bug#122208)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Tue,  4 Dec 2001 00:48:16 +0900
-+
-+gtk+1.2 (1.2.10-5) unstable; urgency=low
-+
-+  * Applied back-ported patch from CVS.
-+    fix search order for gtkrc. (closes: Bug#121467)
-+  * Applied back-ported patch from CVS.
-+    fix focus problem (closes: Bug#108099)
-+  * Removed duplicate info files. (closes: Bug#121734)
-+  * Closed these bugs because it already fixed in the latest version.
-+    (closes: Bug#94698, Bug#29661, Bug#35039, Bug#46541, Bug#64728)
-+  * Added Depends: pkg-config for -dev.
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Sun,  2 Dec 2001 19:54:49 +0900
-+
-+gtk+1.2 (1.2.10-4) unstable; urgency=low
-+
-+  * Fixed missing files (closes: Bug#56912)
-+  * Closed this bug because it already fixed in the latest version.
-+    (closes: Bug#72585, Bug#28148, Bug#69409, Bug#117990)
-+  * re-created debian/ (closes: Bug#44913)
-+  * -dbg package contains shared libraries for debugging. so if you
-+    need static link, add -static to compiler option and use
-+    static libraries which is included in libgtk1.2-dev.
-+    (closes: Bug#98349)
-+  * Moved pkg-config files to -dev (closes: Bug#103199)
-+  * Fixed GtkHPaned widget are misdisplayed on Alpha.
-+    (closes: Bug#115315)
-+  * Includes example codes on -dev. (closes: Bug#112347)
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Sat, 24 Nov 2001 21:40:38 +0900
-+
-+gtk+1.2 (1.2.10-3) unstable; urgency=low
-+
-+  * Fixed a problem where fractional sizes caused infinite loop.
-+    (closes: Bug#100678)
-+  * Closed NMU fix (closes: Bug#114923, Bug#109808, Bug#48129, Bug#53524,
-+    Bug#67903)
-+  * Fixed some lintian error.
-+  * I took over this package from Ben.
-+
-+ -- Akira TAGOH <tagoh@debian.org>  Sat, 17 Nov 2001 10:55:55 +0900
-+
-+gtk+1.2 (1.2.10-2.1) unstable; urgency=low
-+
-+  * NMU
-+  * Re-run libtoolize & aclocal for new arch support.  Closes: #114923.
-+
-+ -- LaMont Jones <lamont@debian.org>  Sun, 21 Oct 2001 11:20:07 -0600
-+
-+gtk+1.2 (1.2.10-2) unstable; urgency=low
-+
-+  * It looks like --with-native-locale=yes (change made in 1.2.10-1)
-+    broke Swedish support.  I guess it doesn't work.  Removed.
-+    (Closes: #108441)
-+  * Patch to not override X's beep level. (Closes: #94081, #110961)
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  8 Oct 2001 09:56:37 +0900
-+
-+gtk+1.2 (1.2.10-1) unstable; urgency=low
-+
-+  * New upstream version.  
-+  * This new version fixes all locale-related bugs recently
-+    reported.  Note that if you don't want high ASCII characters to 
-+    be silently munched with glibc 2.2, at least set LANG=en_US to
-+    get it away from the default to C, which no longer allows high
-+    ASCII characters.  (Closes: #74796, #77263, #89379, #90776, #89125,
-+    #89129, #89806)
-+  * Build with --with-native-locale=yes.  Should fix all locales-related
-+    segfaults recently reported. (But if you want high ASCII chars
-+    to appear when using libc 2.2, you should set LANG=en_US at least,
-+    or it'll default to LANG=C and filter all high ASCII characters!)
-+    (Closes: #89125, #89129)
-+  * Add support in debian/rules for adding -g and not stripping if
-+    DEB_BUILD_OPTIONS contains "debug" or "nostrip", respectively.
-+    (Closes: #33952, #34007)
-+  * Remove dependancy on gconv-modules. (Closes: #89082)
-+  
-+ -- Ben Gertzfield <che@debian.org>  Sun,  1 Apr 2001 21:58:04 -0700
-+
-+gtk+1.2 (1.2.9-2) unstable; urgency=medium
-+
-+  * Bump Build-Depends to require libglib1.2 (>= 1.2.9-1).
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue,  6 Mar 2001 08:54:13 -0800
-+
-+gtk+1.2 (1.2.9-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Include Changes-1.2.txt in libgtk1.2-doc. (Closes: #48129)
-+  * Fixed bashisms in debian/rules long ago. (Closes: #69409)
-+  * Note: include files have been moved into /usr/include/gtk-1-2/
-+    to allow parallel installation with gtk+ 2.0.  Remember to
-+    use gtk-config to compile programs!
-+  * A note from upstream says that there were a lot of locale fixes
-+    in this release.  Let's hope so!
-+  * Setuid/setgid GTK+ programs will now refuse to initialize.  Remember
-+    to drop all setuid/setgid privileges before initializing GTK+!
-+  * Several out-of-date documents were removed upstream: gdk-tutorial
-+    and gtk-manual are available online now.
-+  * About the FAQ missing page bugs: the pages just don't seem to
-+    get generated from the SGML no matter what I do; I'm not
-+    removing them by hand or anything.  I'll spend more time looking
-+    into this later..
-+
-+ -- Ben Gertzfield <che@debian.org>  Fri,  2 Mar 2001 16:39:36 -0800
-+
-+gtk+1.2 (1.2.8-4) unstable; urgency=low
-+
-+  * Change dependancy for libgtk1.2-dev to xlibs-dev. Closes: #80744
-+  * Fixed in 1.2.8-2 (dpkg 1.6.8 issue) Closes: #63081
-+  * It's perfectly easy to make a binary-only upload of gtk+1.2.
-+    There are no weird dependancies between the Arch: all package
-+    (libgtk1.2-doc) and the others; libgtk1.2-dev and libgtk1.2-dbg
-+    merely Suggest: libgtk1.2-doc.  Wichert, please supply more context
-+    with your bug reports next time!  Closes: #77462
-+  * I can set LANG=fr_FR no problem with gtk+ 1.2.8 if I've uncommented
-+    the line in /etc/locale.gen and run locale-gen.  Not a bug.
-+    Closes: #83636
-+  * Not a bug. (the packages are not corrupt on any mirrors I've
-+    seen.) Closes: #81406
-+  * Previously fixed bugs: Closes: #67996, #66867, #81406
-+  
-+ -- Ben Gertzfield <che@debian.org>  Wed, 28 Feb 2001 10:37:42 -0800
-+
-+gtk+1.2 (1.2.8-3) unstable; urgency=low
-+
-+  * D'oh. Add Source-Depends on libglib1.2-dev (>= 1.2.8).
-+    Closes: #81201
-+
-+ -- Ben Gertzfield <che@debian.org>  Thu,  4 Jan 2001 10:28:22 -0800
-+
-+gtk+1.2 (1.2.8-2) unstable; urgency=low
-+
-+  * Bump Standards-Version to 3.2.1.
-+  * Fix bashism in debian/rules. Closes: #79384
-+  * Workaround for lack of MAXPATHLEN on hurd. Closes: #72312
-+  * Add Pre-Depends and preinst check for dpkg 1.6.8 for multiple
-+    Conflicts/Replaces.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sat, 23 Dec 2000 14:37:40 -0800
-+
-+gtk+1.2 (1.2.8-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Wed, 24 May 2000 19:55:03 -0700
-+
-+gtk+1.2 (1.2.7-1) frozen unstable; urgency=HIGH
-+
-+  * New upstream version *must* make it into frozen, as it fixes
-+    RC i18n bugs.
-+  * i18n bugs fixed: #56503, #57805, #57498, #57403
-+
-+ -- Ben Gertzfield <che@debian.org>  Thu, 17 Feb 2000 09:34:04 -0800
-+
-+gtk+1.2 (1.2.6-2) frozen unstable; urgency=HIGH
-+
-+  * Change dependancy from gconv-modules | libc6 (<< 2.1) to just
-+    gconv-modules to fix upgrade path. (Otherwise apt gets very
-+    very confused.) Closes: #56477, #56528, #56530, #56535, #56857
-+
-+ -- Ben Gertzfield <che@debian.org>  Wed,  2 Feb 2000 08:28:46 -0800
-+
-+gtk+1.2 (1.2.6-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Move docs and info to /usr/share/{doc,info}.
-+
-+ -- Ben Gertzfield <che@debian.org>  Fri, 15 Oct 1999 10:35:06 -0700
-+
-+gtk+1.2 (1.2.5-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Fri, 24 Sep 1999 09:36:27 -0700
-+
-+gtk+1.2 (1.2.4-3) unstable; urgency=low
-+
-+  * Change Depends: for libgtk1.2 to depend on gconv-modules | libc6 (<< 2.1)
-+    (Closes: #44442)
-+
-+ -- Ben Gertzfield <che@debian.org>  Wed,  8 Sep 1999 07:05:25 -0700
-+
-+gtk+1.2 (1.2.4-2) unstable; urgency=low
-+
-+  * Add Depends: on gconv-modules to fix locales
-+    problems. (Closes: #40704, #43800)
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 31 Aug 1999 09:31:55 -0700
-+
-+gtk+1.2 (1.2.4-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 24 Aug 1999 13:00:44 -0700
-+
-+gtk+1.2 (1.2.3-2) unstable; urgency=low
-+
-+  * Fix depends of -dev and -dbg to always depend on exact version of lib.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 27 Jul 1999 15:30:25 -0700
-+
-+gtk+1.2 (1.2.3-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Make shlibs stricter, as binary interface has changed.
-+  * Register docs with doc-base.
-+  * Reorganize docs in libgtk1.2-doc, include texinfo and sgml formats.
-+  * Wow. I never included the actual GTK+ manual in HTML or text forms
-+    before..
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 11 May 1999 22:04:15 -0700
-+
-+gtk+1.2 (1.2.2-1) unstable; urgency=low
-+
-+  * New upstream version. (Note that the 1.2.2-2 uploaded originally
-+    was a typo)
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 27 Apr 1999 11:32:07 -0700
-+
-+gtk+1.2 (1.2.1-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Loosen up shlibs; now programs compiled against GTK+ 1.2 depend on
-+    libgtk1.2 (>= 1.2.0).
-+
-+ -- Ben Gertzfield <che@debian.org>  Thu, 25 Mar 1999 10:43:35 -0800
-+
-+gtk+1.2 (1.2.0-1) unstable; urgency=low
-+
-+  * New stable upstream version. Woo woo!
-+
-+ -- Ben Gertzfield <che@debian.org>  Thu, 25 Feb 1999 23:46:11 -0800
-+
-+gtk+1.1.16 (1.1.16-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Defaults to debug being on now. Normal libgtk1.1.16 packages will
-+    be built with --enable-debug=minimum.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 16 Feb 1999 17:11:00 -0800
-+
-+gtk+1.1.15 (1.1.15-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  8 Feb 1999 17:08:36 -0800
-+
-+gtk+1.1.14 (1.1.14-1) unstable; urgency=low
-+
-+  * Okay, *this* is GTK+ 1.1.14 upstream release. Sheesh.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sat, 30 Jan 1999 18:16:19 -0800
-+
-+gtk+1.1.13 (1:1.1.13-1) unstable; urgency=low
-+
-+  * Crap, crap, crap. The GTK+ folks had told me that 1.1.14 was binary-
-+    compatible with 1.1.13. It's not. It doesn't even have the same soname;
-+    I shouldn't have trusted them. :) This is really version 1.1.13 again.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sat, 30 Jan 1999 17:28:29 -0800
-+
-+gtk+1.1.13 (1.1.14-1) unstable; urgency=low
-+
-+  * New upstream version. Note source name did not change, as the
-+    soname is still .13, because .14 and .13 are binary compatible.
-+  * Make absolutely sure the postinst for libgtk1.1.13 only calls
-+    ldconfig on 'configure' calls
-+
-+ -- Ben Gertzfield <che@debian.org>  Fri, 29 Jan 1999 21:11:44 -0800
-+
-+gtk+1.1.13 (1.1.13-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Now libgtk1.1.x-dev Depends: on xlib6g-dev
-+
-+ -- Ben Gertzfield <che@debian.org>  Wed, 20 Jan 1999 18:34:15 -0800
-+
-+gtk+1.1.12 (1.1.12-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  4 Jan 1999 14:27:45 -0800
-+
-+gtk+1.1.11 (1.1.11-1) unstable; urgency=low
-+
-+  * New upstream version. (They skipped 1.1.10.)
-+
-+ -- Ben Gertzfield <che@debian.org>  Wed, 30 Dec 1998 22:27:43 -0800
-+
-+gtk+1.1.9 (1.1.9-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Now debian/rules uses $(version) variable to make my life easier.
-+  * debian/doc-postinst debian/doc-prerm: new files, which are copied
-+    to the versioned names for debhelper goodness from debian/rules
-+    and cleaned in debian/rules clean
-+
-+ -- Ben Gertzfield <che@debian.org>  Thu, 17 Dec 1998 11:24:44 -0800
-+
-+gtk+1.1.6 (1.1.6-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Wed,  9 Dec 1998 08:06:44 -0800
-+
-+gtk+1.1.5 (1.1.5-3) unstable; urgency=low
-+
-+  * Rebuild to fix bug #30459
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  7 Dec 1998 12:58:05 -0800
-+
-+gtk+1.1.5 (1.1.5-2) unstable; urgency=low
-+
-+  * Now libgtk1.1.5-dev Provides: libgtk-dev and libgtk1.1-dev.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sun, 29 Nov 1998 18:51:05 -0800
-+
-+gtk+1.1.5 (1.1.5-1) unstable; urgency=low
-+
-+  * Now the source and binary packages *all* specifically have the version
-+    number in them. This is so a new release of glib or gtk+ does not break
-+    all apps dependant upon glib or gtk+'s unstable branch.
-+  * Removed --enable-debug=no from libgtk1.1 build; it was causing problems
-+  * Now includes themes support! Yay!
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 24 Nov 1998 14:28:06 -0800
-+
-+gtk+1.1 (1:1.1.3-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Now libgtk1.1-dev and libgtk1.1-dbg depend on ${Source-Version} of
-+    libgtk1.1/libgtk1.1-dev as libglib1.1 does.
-+
-+ -- Ben Gertzfield <che@debian.org>  Thu,  5 Nov 1998 10:59:43 -0800
-+
-+gtk+1.1 (1:1.1.2-2) unstable; urgency=low
-+
-+  * Same change as to gtk+_1.0.6-2 -- new clean-dbg target to deal
-+    with my brain-fart that was helped along by an old broken
-+    debhelper.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 29 Sep 1998 12:28:31 -0700
-+
-+gtk+1.1 (1:1.1.2-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Now depends upon instead of recommends glib1.1/glib-dev.
-+  * New libgtk1.1-dbg package.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 21 Sep 1998 23:16:53 -0700
-+
-+gtk+1.1 (1:1.1.1-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue,  4 Aug 1998 22:45:02 -0700
-+
-+gtk+1.1 (1:1.1.0-1) unstable; urgency=low
-+
-+  * New packages for the unstable development branch of GTK+, 1.1.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 27 Jul 1998 14:04:40 -0700
-+
-+gtk+ (1:1.0.5-1) unstable; urgency=low
-+
-+  * New upstream version:
-+  * - Minor documentation fixups
-+  * - Fixes for clist (pixmap clipping), notebook, optionmenu, spinbutton
-+      and text widgets.
-+  * - Minor fixup about base class initializations in the type system.
-+  * - Fix for a major bug in the signal code that would cause random crashes.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 27 Jul 1998 11:34:53 -0700
-+
-+gtk+ (1:1.0.4-1) frozen unstable; urgency=low
-+
-+  * This is the final release of gtk+ that, along with GIMP, will be
-+    released into Debian 2.0.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  1 Jun 1998 22:10:33 -0700
-+
-+gtk+ (1:1.0.3-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 26 May 1998 17:20:26 -0700
-+
-+gtk+ (1:1.0.2-2) frozen unstable; urgency=low
-+
-+  * Added 'Replaces: libgtk-dev (<< 1.0.2)' to control for libgtk1.
-+    Fixes bug #22842.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 26 May 1998 12:49:49 -0700
-+
-+gtk+ (1:1.0.2-1) frozen unstable; urgency=low
-+
-+  * New stable upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 18 May 1998 12:17:52 -0700
-+
-+gtk+ (1:1.0.1-1) frozen unstable; urgency=low
-+
-+  * This is a bug-fix-only upstream release.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  4 May 1998 21:50:01 -0700
-+
-+gtk+ (1:1.0.0-1) frozen unstable; urgency=low
-+
-+  * Hooray! Version 1.0.0 has been released! This will hopefully
-+    be the final Debian version of gtk+ for hamm.
-+  * .gifs added to libgtk-doc, fixes bug #20720.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 13 Apr 1998 20:32:06 -0700
-+
-+gtk+ (1:0.99.10-1) frozen unstable; urgency=low
-+
-+  * New upstream version, lots more bugfixes.
-+  * Built without .deps directories.
-+  * Renamed ChangeLog.gz to changelog.gz in libgtk-doc, fixes lintian
-+    error.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue,  7 Apr 1998 23:42:36 -0700
-+
-+gtk+ (1:0.99.9-1) frozen unstable; urgency=low
-+
-+  * New upstream version, fixes many bugs with color displays.
-+  * Hopefully fixed all lintian warnings.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sun, 29 Mar 1998 13:46:25 -0800
-+
-+gtk+ (1:0.99.8-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * New file included in libgtk-dev: /usr/share/aclocal/gtk.m4,
-+    to help autoconf/automake developers use gtk and gtk-config
-+    more easily.
-+  * New file included in libgtk-doc: /usr/doc/libgtk-doc/gtk-config.txt
-+    Please refer to this doc when developing for gtk or compiling
-+    and running into odd path-related errors.
-+    
-+ -- Ben Gertzfield <che@debian.org>  Thu, 19 Mar 1998 19:58:53 -0800
-+
-+gtk+ (1:0.99.7-4) frozen unstable; urgency=low
-+
-+  * Rebuild with native Debian libtool to have libraries properly
-+    linked with libc and libX et al.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue, 17 Mar 1998 16:05:13 -0800
-+
-+gtk+ (1:0.99.7-3) frozen unstable; urgency=low
-+
-+  * Accidentally included all the html docs in /usr/doc/libgtk-doc/faq-html;
-+    moved the tutorial into /usr/doc/libgtk-doc/tutorial-html.
-+  * Included the Italian Gtk+ Tutorial in 
-+    /usr/doc/libgtk-doc/italian-tutorial-html.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 16 Mar 1998 22:39:57 -0800
-+
-+gtk+ (1:0.99.7-2) unstable; urgency=low
-+
-+  * Upstream source added a /usr/lib/glib/ directory that I didn't
-+    notice; included this directory in libgtk-dev.
-+  * Realized that Xinput support was broken because I was doing
-+    ./configure --enable-xinput=xfree instead of ./configure
-+    --with-xinput=xfree. Fixed.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sun, 15 Mar 1998 19:17:05 -0800
-+
-+gtk+ (1:0.99.7-1) unstable; urgency=low
-+
-+  * New upstream release -- THIS IS INCOMPATIBLE WITH OLDER RELEASES!
-+    All Gtk-using packages *will* need patches to work with this Gtk!
-+  * Upstream release includes 'gtk-config' script to check installed
-+    version of Gtk; included said script in libgtk-dev in /usr/bin.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sun, 15 Mar 1998 11:03:03 -0800
-+
-+gtk+ (1:0.99.5-2) unstable; urgency=low
-+
-+  * Modified libgtk-doc to Replace: libgtk-dev (<< 1:0.99.4) to
-+    deal with both packages including the same .info files.
-+    Fixes bug #19533.
-+  * Also noticed that libgtk-dev depended on libgtk1 without
-+    an epoch! Fixed.
-+
-+ -- Ben Gertzfield <che@debian.org>  Thu, 12 Mar 1998 13:37:11 -0800
-+
-+gtk+ (1:0.99.5-1) unstable; urgency=low
-+
-+  * Wow, that was quick, a new upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  9 Mar 1998 22:08:08 -0800
-+
-+gtk+ (1:0.99.4-3) unstable; urgency=low
-+
-+  * Recompiled with --enable-xinput=xfree to enable Wacom pads
-+    and other physical input devices.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  9 Mar 1998 21:26:07 -0800
-+
-+gtk+ (1:0.99.4-2) unstable; urgency=MEDIUM
-+
-+  * Ack! The shlibs file makes things depend on libgtk1 (>= 0.99.4)
-+    rather than (>= 1:0.99.4)! Fixes bug #19134.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sat,  7 Mar 1998 23:57:33 -0800
-+
-+gtk+ (1:0.99.4-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Recompiled with new debhelper to remove du warnings.
-+  * Upstream source is named gtk+, not libgtk1. Changed source name.
-+  * Removed --disable-xim in hopes that xim is no longer broken.
-+  * Removed testgtk at the behest of the Gtk developers until I can
-+    come up with a better solution, probably related to:
-+  * the new libgtk-doc package! :) libgtk-doc contains the Gtk FAQ,
-+    the Gtk Tutorial, and the Gtk info files.
-+
-+ -- Ben Gertzfield <che@debian.org>  Tue,  3 Mar 1998 22:23:47 -0800
-+
-+libgtk1 (1:0.99.3-2) unstable; urgency=low
-+
-+  * Created manpage for testgtk program.
-+  * Fixed copyright mention to LGPL.gz to be just LGPL.
-+  * This fixes all known lintian errors.
-+
-+ -- Ben Gertzfield <che@debian.org>  Wed, 11 Feb 1998 14:07:17 -0800
-+
-+libgtk1 (1:0.99.3-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Include the testgtk binary in libgtk-dev.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sat, 24 Jan 1998 15:30:09 -0800
-+
-+libgtk1 (1:0.99.2-2) unstable; urgency=low
-+
-+  * Fixed shlibs file to specify version >=1:0.99.2.
-+  * Renamed debian/postinst.libgtk1 to debian/postinst, so debhelper
-+    would actually install it.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  5 Jan 1998 12:22:46 -0800
-+
-+libgtk1 (1:0.99.2-1) unstable; urgency=low
-+
-+  * New upstream version.
-+
-+ -- Ben Gertzfield <che@debian.org>  Sun,  4 Jan 1998 00:21:21 -0800
-+
-+libgtk1 (1:0.99.0-1) unstable; urgency=medium
-+
-+  * New upstream version with new numbering scheme, went to epoch :1
-+    correspondingly.
-+  * Hopefully fixed entry-field bug.
-+  * Converted to use debhelper.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 15 Dec 1997 12:02:25 -0800
-+
-+libgtk1 (971201-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Fixed copyright to say LGPL, not GPL. (bug #14867)
-+  * Re-added postinst ldconfig call. (bug #14213)
-+  * Info files should be correct now. (bugs #14773, #15143)
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon,  1 Dec 1997 16:41:50 -0800
-+
-+libgtk1 (971109-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Name is really 'GIMP Tool Kit', not 'General Tool Kit'.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 10 Nov 1997 16:15:27 -0800
-+
-+libgtk1 (970925-3) unstable; urgency=low
-+
-+  * Moved the include files to /usr/include/{gtk,gdk}.
-+  * Removed postinst/postrm ldconfig calls, fixes old gimp bug #13773.
-+
-+ -- Ben Gertzfield <che@debian.org>  Fri, 17 Oct 1997 17:06:10 -0700
-+
-+libgtk1 (970925-2) unstable; urgency=low
-+
-+  * Added the shlibs file.
-+  * Removed the postinst/postrm calls to ldconfig, fixes bug #13733.
-+
-+ -- Ben Gertzfield <che@debian.org>  Fri, 10 Oct 1997 17:55:39 -0700
-+
-+libgtk1 (970925-1) unstable; urgency=low
-+
-+  * New upstream version.
-+  * Split off source tree from gimp's source tree.
-+
-+ -- Ben Gertzfield <che@debian.org>  Mon, 29 Sep 1997 13:14:45 -0700
-+
-+
---- gtk+1.2-1.2.10.orig/debian/control
-+++ gtk+1.2-1.2.10/debian/control
-@@ -0,0 +1,79 @@
-+Source: gtk+1.2
-+Priority: optional
-+Section: libs
-+Maintainer: Akira TAGOH <tagoh@debian.org>
-+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Jordi Mallach <jordi@debian.org>, Marc 'HE' Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sebastien Bacher <seb128@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
-+Standards-Version: 3.5.10.0
-+Build-Depends: debhelper (>> 4.0.0), gettext, libx11-dev, libxext-dev, libxi-dev, libxmu-dev, x-dev, libglib1.2-dev (>= 1.2.9), autotools-dev
-+
-+Package: libgtk1.2
-+Architecture: any
-+Section: libs
-+Pre-Depends: dpkg (>= 1.6.8)
-+Depends: libgtk1.2-common (>= ${Source-Version}), ${shlibs:Depends}
-+Conflicts: libgtk-dev (<< 1:1.0.2)
-+Replaces: libgtk1.1.5, libgtk1.1.6, libgtk1.1.9, libgtk1.1.11, libgtk1.1.12, libgtk1.1.13, libgtk1.1.14, libgtk1.1.15, libgtk1.1.16
-+Description: The GIMP Toolkit set of widgets for X
-+ The GIMP Toolkit is a freely available set of widgets for X.
-+ GTK is easy to use, and has been implemented in such projects as
-+ The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
-+ desktop set of utilities for X, and gzilla, a GNU web-browser.
-+
-+Package: libgtk1.2-dev
-+Architecture: any
-+Section: libdevel
-+Pre-Depends: dpkg (>= 1.6.8)
-+Depends: libgtk1.2 (= ${Source-Version}), libglib1.2-dev, libx11-dev, libxext-dev, libxi-dev, pkg-config
-+Suggests: libgtk1.2-doc
-+Conflicts: libgtk1 (<< 1:1.0.4), libgtk-dev, libgtk1.1.5-dev, libgtk1.1.6-dev, libgtk1.1.7-dev, libgtk1.1.8-dev, libgtk1.1.9-dev, libgtk1.1.11-dev, libgtk1.1.12-dev, libgtk1.1.13-dev, libgtk1.1.14-dev, libgtk1.1.15-dev, libgtk1.1.16-dev, libgtk1.2 (<< 1.2.10-4)
-+Provides: libgtk-dev, libgtk1.1-dev
-+Replaces: libgtk-dev, libgtk1.1-dev, libgtk1.1.5-dev, libgtk1.1.6-dev, libgtk1.1.9-dev, libgtk1.1.11-dev, libgtk1.1.12-dev, libgtk1.1.13-dev, libgtk1.1.14-dev, libgtk1.1.16-dev, libgtk1.2 (<< 1.2.10-4)
-+Description: Development files for the GIMP Toolkit
-+ This package contains the header files and static libraries for the
-+ GIMP Toolkit set of widgets for X. 
-+ .
-+ Install this package if you wish to develop your own X programs using
-+ the GIMP Toolkit 1.2, or if you wish to compile your own plug-ins for
-+ The GIMP.
-+
-+Package: libgtk1.2-doc
-+Architecture: all
-+Section: doc
-+Pre-Depends: dpkg (>= 1.6.8)
-+Conflicts: libgtk-dev (<< 1:0.99.4), libgtk-doc, libgtk1.1-doc, libgtk1.1.5-doc, libgtk1.1.6-doc, libgtk1.1.7-doc, libgtk1.1.8-doc, libgtk1.1.9-doc, libgtk1.1.11-doc, libgtk1.1.12-doc, libgtk1.1.13-doc, libgtk1.1.14-doc, libgtk1.1.15-doc, libgtk1.1.16-doc
-+Replaces: libgtk-doc, libgtk1.1-doc, libgtk1.1.5-doc, libgtk1.1.6-doc, libgtk1.1.9-doc, libgtk1.1.11-doc, libgtk1.1.12-doc, libgtk1.1.13-doc, libgtk1.1.14-doc, libgtk1.1.15-doc, libgtk1.1.16-doc
-+Suggests: devhelp-book-gtk
-+Description: Documentation for the GIMP Toolkit
-+ This package contains lots of info-files, HTML docs, FAQs, and
-+ other handy documentation about the GIMP Toolkit set of widgets
-+ for X. 
-+ . 
-+ Install this package if you want to have lots of info about the
-+ GIMP toolkit when you're programming.
-+
-+Package: libgtk1.2-common
-+Architecture: all
-+Section: misc
-+Replaces: libgtk1.2 (<< 1.2.10-4)
-+Description: Common files for the GTK+ library
-+ The GIMP Toolkit is a freely available set of widgets for X.
-+ GTK is easy to use, and has been implemented in such projects as
-+ The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
-+ desktop set of utilities for X, and gzilla, a GNU web-browser.
-+ .
-+ This package contains the common files which the runtime libraries
-+ need.
-+
-+Package: libgtk1.2-dbg
-+Architecture: any
-+Section: libdevel
-+Priority: extra
-+Pre-Depends: dpkg (>= 1.6.8)
-+Depends: libgtk1.2 (= ${Source-Version})
-+Description: Debugging files for the GIMP Toolkit
-+ This package contains the debugging static libraries for the
-+ GIMP Toolkit set of widgets for X. 
-+ .
-+ Install this package if you wish to debug your own X programs using
-+ the GIMP Toolkit 1.2, or if you wish to debug your own plug-ins for
-+ The GIMP.
---- gtk+1.2-1.2.10.orig/acgtk.m4
-+++ gtk+1.2-1.2.10/acgtk.m4
-@@ -0,0 +1,336 @@
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995.
-+#
-+# Modified to never use included libintl. 
-+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-+#
-+#
-+# This file can be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+
-+# serial 5
-+
-+AC_DEFUN([AM_GTK_WITH_NLS],
-+  [AC_MSG_CHECKING([whether NLS is requested])
-+    dnl Default is enabled NLS
-+    AC_ARG_ENABLE(nls,
-+      [  --disable-nls           do not use Native Language Support],
-+      USE_NLS=$enableval, USE_NLS=yes)
-+    AC_MSG_RESULT($USE_NLS)
-+    AC_SUBST(USE_NLS)
-+
-+    USE_INCLUDED_LIBINTL=no
-+
-+    dnl If we use NLS figure out what method
-+    if test "$USE_NLS" = "yes"; then
-+#      AC_DEFINE(ENABLE_NLS)
-+#      AC_MSG_CHECKING([whether included gettext is requested])
-+#      AC_ARG_WITH(included-gettext,
-+#        [  --with-included-gettext use the GNU gettext library included here],
-+#        nls_cv_force_use_gnu_gettext=$withval,
-+#        nls_cv_force_use_gnu_gettext=no)
-+#      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-+      nls_cv_force_use_gnu_gettext="no"
-+
-+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-+        dnl User does not insist on using GNU NLS library.  Figure out what
-+        dnl to use.  If gettext or catgets are available (in this order) we
-+        dnl use this.  Else we have to fall back to GNU NLS library.
-+	dnl catgets is only used if permitted by option --with-catgets.
-+	nls_cv_header_intl=
-+	nls_cv_header_libgt=
-+	CATOBJEXT=NONE
-+
-+	AC_CHECK_HEADER(libintl.h,
-+	  [AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+	    [AC_TRY_LINK([#include <libintl.h>], [return (int) dgettext ("","")],
-+	       gt_cv_func_dgettext_libc=yes, gt_cv_func_dgettext_libc=no)])
-+
-+	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
-+	     AC_CHECK_LIB(intl, bindtextdomain,
-+	       [AC_CACHE_CHECK([for dgettext in libintl],
-+		 gt_cv_func_dgettext_libintl,
-+		 [AC_CHECK_LIB(intl, dgettext,
-+		  gt_cv_func_dgettext_libintl=yes,
-+		  gt_cv_func_dgettext_libintl=no)],
-+		 gt_cv_func_dgettext_libintl=no)])
-+	   fi
-+
-+           if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	     LIBS="$LIBS -lintl";
-+           fi
-+
-+	   if test "$gt_cv_func_dgettext_libc" = "yes" \
-+	      || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	      AC_DEFINE(HAVE_GETTEXT)
-+	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-+	      if test "$MSGFMT" != "no"; then
-+		AC_CHECK_FUNCS(dcgettext)
-+		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-+			       return _nl_msg_cat_cntr],
-+		  [CATOBJEXT=.gmo
-+		   DATADIRNAME=share],
-+		  [CATOBJEXT=.mo
-+		   DATADIRNAME=lib])
-+		INSTOBJEXT=.mo
-+	      fi
-+	    fi
-+
-+	    # Added by Martin Baulig 12/15/98 for libc5 systems
-+	    if test "$gt_cv_func_dgettext_libc" != "yes" \
-+	       && test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+	       INTLLIBS=-lintl
-+	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-+	    fi
-+	])
-+
-+        if test "$CATOBJEXT" = "NONE"; then
-+	  AC_MSG_CHECKING([whether catgets can be used])
-+	  AC_ARG_WITH(catgets,
-+	    [  --with-catgets          use catgets functions if available],
-+	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-+	  AC_MSG_RESULT($nls_cv_use_catgets)
-+
-+	  if test "$nls_cv_use_catgets" = "yes"; then
-+	    dnl No gettext in C library.  Try catgets next.
-+	    AC_CHECK_LIB(i, main)
-+	    AC_CHECK_FUNC(catgets,
-+	      [AC_DEFINE(HAVE_CATGETS)
-+	       INTLOBJS="\$(CATOBJS)"
-+	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-+#	       if test "$GENCAT" != "no"; then
-+#		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-+#		 if test "$GMSGFMT" = "no"; then
-+#		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-+#		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-+#		 fi
-+#		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+#		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+#		 USE_INCLUDED_LIBINTL=yes
-+#		 CATOBJEXT=.cat
-+#		 INSTOBJEXT=.cat
-+#		 DATADIRNAME=lib
-+#		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-+#		 INTLLIBS=$INTLDEPS
-+#		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-+#		 nls_cv_header_intl=intl/libintl.h
-+#		 nls_cv_header_libgt=intl/libgettext.h
-+#              fi
-+            ])
-+	  fi
-+        fi
-+
-+        if test "$CATOBJEXT" = "NONE"; then
-+	  dnl Neither gettext nor catgets in included in the C library.
-+	  dnl Fall back on GNU gettext library.
-+	  nls_cv_use_gnu_gettext=yes
-+        fi
-+      fi
-+
-+      if test "$nls_cv_use_gnu_gettext" != "yes"; then
-+        AC_DEFINE(ENABLE_NLS)
-+      else
-+         # Unset this variable since we use the non-zero value as a flag.
-+         CATOBJEXT=
-+#        dnl Mark actions used to generate GNU NLS library.
-+#        INTLOBJS="\$(GETTOBJS)"
-+#        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-+#        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+#        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+#        AC_SUBST(MSGFMT)
-+#	USE_INCLUDED_LIBINTL=yes
-+#        CATOBJEXT=.gmo
-+#        INSTOBJEXT=.mo
-+#        DATADIRNAME=share
-+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+#	INTLLIBS=$INTLDEPS
-+#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-+#        nls_cv_header_intl=intl/libintl.h
-+#        nls_cv_header_libgt=intl/libgettext.h
-+      fi
-+
-+      dnl Test whether we really found GNU xgettext.
-+      if test "$XGETTEXT" != ":"; then
-+	dnl If it is no GNU xgettext we define it as : so that the
-+	dnl Makefiles still can work.
-+	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-+	  : ;
-+	else
-+	  AC_MSG_RESULT(
-+	    [found xgettext program is not GNU xgettext; ignore it])
-+	  XGETTEXT=":"
-+	fi
-+      fi
-+
-+      # We need to process the po/ directory.
-+      POSUB=po
-+    else
-+      DATADIRNAME=share
-+      nls_cv_header_intl=intl/libintl.h
-+      nls_cv_header_libgt=intl/libgettext.h
-+    fi
-+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-+    AC_OUTPUT_COMMANDS(
-+     [case "$CONFIG_FILES" in *po/Makefile.in*)
-+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-+      esac])
-+
-+
-+#    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-+#    # because some of the sources are only built for this goal.
-+#    if test "$PACKAGE" = gettext; then
-+#      USE_NLS=yes
-+#      USE_INCLUDED_LIBINTL=yes
-+#    fi
-+
-+    dnl These rules are solely for the distribution goal.  While doing this
-+    dnl we only have to keep exactly one list of the available catalogs
-+    dnl in configure.in.
-+    for lang in $ALL_LINGUAS; do
-+      GMOFILES="$GMOFILES $lang.gmo"
-+      POFILES="$POFILES $lang.po"
-+    done
-+
-+    dnl Make all variables we use known to autoconf.
-+    AC_SUBST(USE_INCLUDED_LIBINTL)
-+    AC_SUBST(CATALOGS)
-+    AC_SUBST(CATOBJEXT)
-+    AC_SUBST(DATADIRNAME)
-+    AC_SUBST(GMOFILES)
-+    AC_SUBST(INSTOBJEXT)
-+    AC_SUBST(INTLDEPS)
-+    AC_SUBST(INTLLIBS)
-+    AC_SUBST(INTLOBJS)
-+    AC_SUBST(POFILES)
-+    AC_SUBST(POSUB)
-+  ])
-+
-+AC_DEFUN([AM_GTK_GNU_GETTEXT],
-+  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+   AC_REQUIRE([AC_PROG_CC])dnl
-+   AC_REQUIRE([AC_PROG_RANLIB])dnl
-+   AC_REQUIRE([AC_ISC_POSIX])dnl
-+   AC_REQUIRE([AC_HEADER_STDC])dnl
-+   AC_REQUIRE([AC_C_CONST])dnl
-+   AC_REQUIRE([AC_C_INLINE])dnl
-+   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-+   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-+   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-+   AC_REQUIRE([AC_FUNC_MMAP])dnl
-+
-+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-+unistd.h sys/param.h])
-+   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-+strdup __argz_count __argz_stringify __argz_next])
-+
-+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-+     AC_CHECK_FUNCS(stpcpy)
-+   fi
-+   if test "${ac_cv_func_stpcpy}" = "yes"; then
-+     AC_DEFINE(HAVE_STPCPY)
-+   fi
-+
-+   AM_LC_MESSAGES
-+   AM_GTK_WITH_NLS
-+
-+   if test "x$CATOBJEXT" != "x"; then
-+     if test "x$ALL_LINGUAS" = "x"; then
-+       LINGUAS=
-+     else
-+       AC_MSG_CHECKING(for catalogs to be installed)
-+       NEW_LINGUAS=
-+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-+         case "$ALL_LINGUAS" in
-+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-+         esac
-+       done
-+       LINGUAS=$NEW_LINGUAS
-+       AC_MSG_RESULT($LINGUAS)
-+     fi
-+
-+     dnl Construct list of names of catalog files to be constructed.
-+     if test -n "$LINGUAS"; then
-+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-+     fi
-+   fi
-+
-+   dnl The reference to <locale.h> in the installed <libintl.h> file
-+   dnl must be resolved because we cannot expect the users of this
-+   dnl to define HAVE_LOCALE_H.
-+   if test $ac_cv_header_locale_h = yes; then
-+     INCLUDE_LOCALE_H="#include <locale.h>"
-+   else
-+     INCLUDE_LOCALE_H="\
-+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-+   fi
-+   AC_SUBST(INCLUDE_LOCALE_H)
-+
-+   dnl Determine which catalog format we have (if any is needed)
-+   dnl For now we know about two different formats:
-+   dnl   Linux libc-5 and the normal X/Open format
-+   test -d intl || mkdir intl
-+   if test "$CATOBJEXT" = ".cat"; then
-+     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-+
-+     dnl Transform the SED scripts while copying because some dumb SEDs
-+     dnl cannot handle comments.
-+     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-+   fi
-+   dnl po2tbl.sed is always needed.
-+   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-+     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-+
-+   dnl In the intl/Makefile.in we have a special dependency which makes
-+   dnl only sense for gettext.  We comment this out for non-gettext
-+   dnl packages.
-+   if test "$PACKAGE" = "gettext"; then
-+     GT_NO="#NO#"
-+     GT_YES=
-+   else
-+     GT_NO=
-+     GT_YES="#YES#"
-+   fi
-+   AC_SUBST(GT_NO)
-+   AC_SUBST(GT_YES)
-+
-+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-+   dnl Try to locate is.
-+   MKINSTALLDIRS=
-+   if test -n "$ac_aux_dir"; then
-+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-+   fi
-+   if test -z "$MKINSTALLDIRS"; then
-+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+   fi
-+   AC_SUBST(MKINSTALLDIRS)
-+
-+   dnl *** For now the libtool support in intl/Makefile is not for real.
-+   l=
-+   AC_SUBST(l)
-+
-+   dnl Generate list of files to be processed by xgettext which will
-+   dnl be included in po/Makefile.
-+   test -d po || mkdir po
-+   if test "x$srcdir" != "x."; then
-+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-+       posrcprefix="$srcdir/"
-+     else
-+       posrcprefix="../$srcdir/"
-+     fi
-+   else
-+     posrcprefix="../"
-+   fi
-+   rm -f po/POTFILES
-+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-+	< $srcdir/po/POTFILES.in > po/POTFILES
-+  ])
diff --git a/source/l/gtk+/slack-desc b/source/l/gtk+/slack-desc
index 88cf14b6..09355203 100644
--- a/source/l/gtk+/slack-desc
+++ b/source/l/gtk+/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
author	Patrick J Volkerding <volkerdi@slackware.com>	2018-05-28 19:12:29 +0000
committer	Eric Hameleers <alien@slackware.com>	2018-05-31 23:39:35 +0200
commit	646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
tree	b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/l/gtk+
parent	d31c50870d0bee042ce660e445c9294a59a3a65b (diff)
download	current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz