r22583 - in /desktop/unstable/nautilus/debian: changelog control patches/01_manpage.patch patches/02_eel_libadd.patch patches/12_list-view_expand.patch patches/20_open-with_install.patch patches/90_relibtoolize.patch watch

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Mon Dec 14 20:02:05 UTC 2009


Author: pochu
Date: Mon Dec 14 20:02:04 2009
New Revision: 22583

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22583
Log:
* debian/watch:
  - Don't uupdate.
* New upstream bugfix release.
  - debian/patches/12_list-view_expand.patch,
    debian/patches/20_open-with_install.patch,
    debian/patches/90_relibtoolize.patch:
    + Refreshed.
* debian/patches/01_manpage.patch,
  debian/patches/02_eel_libadd.patch:
  - Forwarded, add headers.

Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/control
    desktop/unstable/nautilus/debian/patches/01_manpage.patch
    desktop/unstable/nautilus/debian/patches/02_eel_libadd.patch
    desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch
    desktop/unstable/nautilus/debian/patches/20_open-with_install.patch
    desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
    desktop/unstable/nautilus/debian/watch

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Mon Dec 14 20:02:04 2009
@@ -1,4 +1,4 @@
-nautilus (2.28.1-2) UNRELEASED; urgency=low
+nautilus (2.28.3-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * Drop n-c-b from Recommends.
@@ -6,8 +6,18 @@
   [ Emilio Pozuelo Monfort ]
   * debian/patches/20_open-with_install.patch:
     - Add description.
-
- -- Josselin Mouette <joss at debian.org>  Sun, 22 Nov 2009 23:55:41 +0100
+  * debian/watch:
+    - Don't uupdate.
+  * New upstream bugfix release.
+    - debian/patches/12_list-view_expand.patch,
+      debian/patches/20_open-with_install.patch,
+      debian/patches/90_relibtoolize.patch:
+      + Refreshed.
+  * debian/patches/01_manpage.patch,
+    debian/patches/02_eel_libadd.patch:
+    - Forwarded, add headers.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 14 Dec 2009 21:01:11 +0100
 
 nautilus (2.28.1-1) unstable; urgency=low
 

Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control [utf-8] (original)
+++ desktop/unstable/nautilus/debian/control [utf-8] Mon Dec 14 20:02:04 2009
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
                quilt,

Modified: desktop/unstable/nautilus/debian/patches/01_manpage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/01_manpage.patch?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/01_manpage.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/01_manpage.patch [utf-8] Mon Dec 14 20:02:04 2009
@@ -1,3 +1,7 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=604574
+
+Fix WHATIS entry
+
 Index: nautilus-2.24.1/docs/nautilus-connect-server.1
 ===================================================================
 --- nautilus-2.24.1.orig/docs/nautilus-connect-server.1	2008-11-24 00:03:41.626383939 +0100

Modified: desktop/unstable/nautilus/debian/patches/02_eel_libadd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/02_eel_libadd.patch?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/02_eel_libadd.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/02_eel_libadd.patch [utf-8] Mon Dec 14 20:02:04 2009
@@ -1,3 +1,7 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=604575
+
+Use LIBADD properly to avoid reordering arguments
+
 Index: nautilus-2.26.2/eel/Makefile.am
 ===================================================================
 --- nautilus-2.26.2.orig/eel/Makefile.am	2009-03-17 10:20:25.000000000 +0100

Modified: desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch [utf-8] Mon Dec 14 20:02:04 2009
@@ -1,9 +1,7 @@
 Revert upstream commits r12779 and r13045.
 We can do this because we fix GNOME #316087 in our GTK+ packages.
-Index: nautilus-2.28.0/src/file-manager/fm-list-view.c
-===================================================================
---- nautilus-2.28.0.orig/src/file-manager/fm-list-view.c	2009-09-18 12:22:36.000000000 +0200
-+++ nautilus-2.28.0/src/file-manager/fm-list-view.c	2009-09-23 20:15:37.769589637 +0200
+--- a/src/file-manager/fm-list-view.c
++++ b/src/file-manager/fm-list-view.c
 @@ -58,7 +58,6 @@
  #include <libnautilus-private/nautilus-view-factory.h>
  #include <libnautilus-private/nautilus-clipboard.h>
@@ -12,7 +10,7 @@
  
  struct FMListViewDetails {
  	GtkTreeView *tree_view;
-@@ -1421,7 +1420,7 @@ create_and_set_up_tree_view (FMListView 
+@@ -1423,7 +1422,7 @@
  
  	for (l = nautilus_columns; l != NULL; l = l->next) {
  		NautilusColumn *nautilus_column;
@@ -21,7 +19,7 @@
  		char *name;
  		char *label;
  		float xalign;
-@@ -1444,6 +1443,9 @@ create_and_set_up_tree_view (FMListView 
+@@ -1446,6 +1445,9 @@
  			view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
  			
  			view->details->file_name_column = gtk_tree_view_column_new ();
@@ -31,7 +29,7 @@
  			g_object_ref_sink (view->details->file_name_column);
  			view->details->file_name_column_num = column_num;
  			
-@@ -1464,7 +1466,11 @@ create_and_set_up_tree_view (FMListView 
+@@ -1466,7 +1468,11 @@
  							     "pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN,
  							     NULL);
  			

Modified: desktop/unstable/nautilus/debian/patches/20_open-with_install.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/20_open-with_install.patch?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/20_open-with_install.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/20_open-with_install.patch [utf-8] Mon Dec 14 20:02:04 2009
@@ -3,10 +3,8 @@
     synaptic to install them. Closes: #435022.
 
 
-Index: nautilus-2.26.2/libnautilus-private/nautilus-open-with-dialog.c
-===================================================================
---- nautilus-2.26.2.orig/libnautilus-private/nautilus-open-with-dialog.c	2009-02-10 18:49:53.000000000 +0100
-+++ nautilus-2.26.2/libnautilus-private/nautilus-open-with-dialog.c	2009-04-25 23:43:47.772028483 +0200
+--- a/libnautilus-private/nautilus-open-with-dialog.c
++++ b/libnautilus-private/nautilus-open-with-dialog.c
 @@ -32,6 +32,7 @@
  #include <eel/eel-stock-dialogs.h>
  
@@ -46,7 +44,7 @@
  
  	GtkWidget *open_label;
  
-@@ -59,6 +72,11 @@ struct _NautilusOpenWithDialogDetails {
+@@ -59,6 +72,11 @@
  	GSList	      *add_icon_paths;
  	gint	       add_items_idle_id;
  	gint	       add_icons_idle_id;
@@ -58,7 +56,7 @@
  };
  
  enum {
-@@ -71,6 +89,9 @@ enum {
+@@ -71,6 +89,9 @@
          NUM_COLUMNS
  };
  
@@ -68,7 +66,7 @@
  enum {
  	RESPONSE_OPEN,
  	RESPONSE_REMOVE
-@@ -99,6 +120,10 @@ nautilus_open_with_dialog_finalize (GObj
+@@ -99,6 +120,10 @@
  		g_source_remove (dialog->details->add_items_idle_id);
  	}
  
@@ -79,7 +77,7 @@
  	if (dialog->details->selected_app_info) {
  		g_object_unref (dialog->details->selected_app_info);
  	}
-@@ -111,6 +136,15 @@ nautilus_open_with_dialog_finalize (GObj
+@@ -111,6 +136,15 @@
  	G_OBJECT_CLASS (nautilus_open_with_dialog_parent_class)->finalize (object);
  }
  
@@ -95,7 +93,7 @@
  static void
  nautilus_open_with_dialog_destroy (GtkObject *object)
  {
-@@ -268,6 +302,56 @@ add_or_find_application (NautilusOpenWit
+@@ -268,6 +302,56 @@
  }
  
  static void
@@ -152,7 +150,7 @@
  emit_application_selected (NautilusOpenWithDialog *dialog,
  			   GAppInfo *application)
  {
-@@ -284,7 +368,10 @@ response_cb (NautilusOpenWithDialog *dia
+@@ -284,7 +368,10 @@
  
  	switch (response_id) {
  	case RESPONSE_OPEN:
@@ -164,7 +162,7 @@
  			application = add_or_find_application (dialog);
  
  			if (application) {
-@@ -297,6 +384,9 @@ response_cb (NautilusOpenWithDialog *dia
+@@ -297,6 +384,9 @@
  
  		break;
  	case RESPONSE_REMOVE:
@@ -174,7 +172,7 @@
  		if (dialog->details->selected_app_info != NULL) {
  			if (g_app_info_delete (dialog->details->selected_app_info)) {
  				GtkTreeModel *model;
-@@ -438,9 +528,9 @@ entry_changed_cb (GtkWidget *entry,
+@@ -438,9 +528,9 @@
  }
  
  static GdkPixbuf *
@@ -186,7 +184,7 @@
  	char *filename;
  
  	pixbuf = NULL;
-@@ -451,24 +541,43 @@ get_pixbuf_for_icon (GIcon *icon)
+@@ -451,24 +541,43 @@
  		}
  		g_free (filename);
  	} else if (G_IS_THEMED_ICON (icon)) {
@@ -244,7 +242,7 @@
  		}
  	}
  	return pixbuf;
-@@ -482,20 +591,32 @@ nautilus_open_with_dialog_add_icon_idle 
+@@ -482,20 +591,32 @@
  	GdkPixbuf    *pixbuf;
  	GIcon *icon;
  	gboolean      long_operation;
@@ -283,7 +281,7 @@
  					      &iter, path)) {
  			gtk_tree_path_free (path);
  			continue;
-@@ -503,17 +624,17 @@ nautilus_open_with_dialog_add_icon_idle 
+@@ -503,17 +624,17 @@
  		
  		gtk_tree_path_free (path);
  
@@ -304,7 +302,7 @@
  			g_object_unref (pixbuf);
  		}
  		
-@@ -589,6 +710,23 @@ nautilus_open_with_search_equal_func (Gt
+@@ -589,6 +710,23 @@
  	}
  }
  
@@ -328,7 +326,7 @@
  
  
  static gboolean
-@@ -671,13 +809,136 @@ nautilus_open_with_dialog_add_items_idle
+@@ -674,13 +812,136 @@
  	return FALSE;
  }
  
@@ -468,7 +466,7 @@
  		
  	if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
  		gtk_widget_set_sensitive (dialog->details->button, FALSE);
-@@ -686,30 +947,50 @@ program_list_selection_changed (GtkTreeS
+@@ -689,30 +950,50 @@
  					   	   FALSE);
  		return;
  	}
@@ -538,7 +536,7 @@
  }
  
  static void
-@@ -719,9 +1000,15 @@ program_list_selection_activated (GtkTre
+@@ -722,9 +1003,15 @@
  				  NautilusOpenWithDialog *dialog)
  {
  	GtkTreeSelection *selection;
@@ -555,7 +553,7 @@
  	program_list_selection_changed (selection, dialog);
  	
  	gtk_dialog_response (GTK_DIALOG (&dialog->parent), RESPONSE_OPEN);
-@@ -743,16 +1030,45 @@ expander_toggled (GtkWidget *expander, N
+@@ -746,16 +1033,45 @@
  }
  
  static void
@@ -602,7 +600,7 @@
  
  	dialog->details = g_new0 (NautilusOpenWithDialogDetails, 1);
  
-@@ -764,6 +1080,8 @@ nautilus_open_with_dialog_init (Nautilus
+@@ -767,6 +1083,8 @@
  
  	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
  
@@ -611,7 +609,7 @@
  	vbox = gtk_vbox_new (FALSE, 12);
  	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
  
-@@ -773,10 +1091,12 @@ nautilus_open_with_dialog_init (Nautilus
+@@ -776,10 +1094,12 @@
  	dialog->details->label = gtk_label_new ("");
  	gtk_misc_set_alignment (GTK_MISC (dialog->details->label), 0.0, 0.5);
  	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->label), TRUE);
@@ -625,7 +623,7 @@
  
  	scrolled_window = gtk_scrolled_window_new (NULL, NULL);
  	gtk_widget_set_size_request (scrolled_window, 400, 300);
-@@ -813,8 +1133,6 @@ nautilus_open_with_dialog_init (Nautilus
+@@ -816,8 +1136,6 @@
  						     (GSourceFunc) nautilus_open_with_dialog_add_items_idle,
  						      dialog, NULL);
  
@@ -634,7 +632,7 @@
  	gtk_widget_show_all (vbox);
  
  
-@@ -848,6 +1166,60 @@ nautilus_open_with_dialog_init (Nautilus
+@@ -851,6 +1169,60 @@
  			       		   RESPONSE_REMOVE,
  					   FALSE);
  
@@ -695,7 +693,7 @@
  	gtk_dialog_add_button (GTK_DIALOG (dialog),
  			       GTK_STOCK_CANCEL,
  			       GTK_RESPONSE_CANCEL);
-@@ -864,12 +1236,12 @@ nautilus_open_with_dialog_init (Nautilus
+@@ -867,12 +1239,12 @@
  	hbox = gtk_hbox_new (FALSE, 2);
  	gtk_widget_show (hbox);
  
@@ -713,7 +711,7 @@
  
  	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
  	gtk_widget_show (align);
-@@ -877,7 +1249,6 @@ nautilus_open_with_dialog_init (Nautilus
+@@ -880,7 +1252,6 @@
  	gtk_widget_show (dialog->details->button);
  	GTK_WIDGET_SET_FLAGS (dialog->details->button, GTK_CAN_DEFAULT);
  

Modified: desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/90_relibtoolize.patch [utf-8] Mon Dec 14 20:02:04 2009
@@ -6,18 +6,16 @@
 autoconf 
 rm -rf autom4te.cache config.h.in~
 
-Index: nautilus-2.28.1/aclocal.m4
-===================================================================
---- nautilus-2.28.1.orig/aclocal.m4	2009-10-20 13:17:52.000000000 +0200
-+++ nautilus-2.28.1/aclocal.m4	2009-10-24 15:18:08.341760215 +0200
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -13,1664 +13,1666 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
 -[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-+[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
  You have another version of autoconf.  It may work, but is not guaranteed to.
  If you have problems, you may need to regenerate the build system entirely.
  To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -3160,10 +3158,8 @@
  
  m4_include([m4/gtk-doc.m4])
  m4_include([m4/intltool.m4])
-Index: nautilus-2.28.1/config.guess
-===================================================================
---- nautilus-2.28.1.orig/config.guess	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/config.guess	2009-10-24 15:18:08.341760215 +0200
+--- a/config.guess
++++ b/config.guess
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -3177,7 +3173,7 @@
  
  # 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
-@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -170,7 +170,7 @@
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -3186,7 +3182,7 @@
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -656,7 +656,7 @@ EOF
+@@ -656,7 +656,7 @@
  	    # => hppa64-hp-hpux11.23
  
  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -3195,7 +3191,7 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -822,6 +822,9 @@ EOF
+@@ -822,6 +822,9 @@
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  	echo i${UNAME_MACHINE}-pc-mks
  	exit ;;
@@ -3205,7 +3201,7 @@
      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
-@@ -882,40 +885,17 @@ EOF
+@@ -882,40 +885,17 @@
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
@@ -3251,7 +3247,7 @@
  	#else
  	CPU=
  	#endif
-@@ -947,7 +927,7 @@ EOF
+@@ -947,7 +927,7 @@
  	  EV67)  UNAME_MACHINE=alphaev67 ;;
  	  EV68*) UNAME_MACHINE=alphaev68 ;;
          esac
@@ -3260,7 +3256,7 @@
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
  	exit ;;
-@@ -1001,14 +981,6 @@ EOF
+@@ -1001,14 +981,6 @@
  	  elf32-i386)
  		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
  		;;
@@ -3275,7 +3271,7 @@
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@ EOF
+@@ -1074,7 +1046,7 @@
      i*86:syllable:*:*)
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
@@ -3284,7 +3280,7 @@
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@ EOF
+@@ -1182,7 +1154,7 @@
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@ -3293,10 +3289,8 @@
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
-Index: nautilus-2.28.1/config.h.in
-===================================================================
---- nautilus-2.28.1.orig/config.h.in	2009-10-20 13:17:54.000000000 +0200
-+++ nautilus-2.28.1/config.h.in	2009-10-24 15:18:08.341760215 +0200
+--- a/config.h.in
++++ b/config.h.in
 @@ -160,6 +160,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
@@ -3307,22 +3301,22 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-Index: nautilus-2.28.1/configure
-===================================================================
---- nautilus-2.28.1.orig/configure	2009-10-20 13:17:54.000000000 +0200
-+++ nautilus-2.28.1/configure	2009-10-24 15:18:08.393758931 +0200
-@@ -1,20 +1,22 @@
+--- a/configure
++++ b/configure
+@@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for nautilus 2.28.1.
-+# Generated by GNU Autoconf 2.64 for nautilus 2.28.1.
+-# Generated by GNU Autoconf 2.63 for nautilus 2.28.3.
++# Generated by GNU Autoconf 2.65 for nautilus 2.28.3.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus>.
  #
++#
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
 +#
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
@@ -3340,7 +3334,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -22,23 +26,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -3369,7 +3363,7 @@
  as_nl='
  '
  export as_nl
-@@ -46,7 +40,13 @@ export as_nl
+@@ -46,7 +42,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -3384,7 +3378,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -57,7 +57,7 @@ else
+@@ -57,7 +59,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -3393,7 +3387,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; 
+@@ -80,13 +82,6 @@
    }
  fi
  
@@ -3407,7 +3401,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -96,15 +89,15 @@ fi
+@@ -96,15 +91,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -3426,7 +3420,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -116,12 +109,16 @@ if test "x$as_myself" = x; then
+@@ -116,12 +111,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -3447,7 +3441,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -133,330 +130,301 @@ export LC_ALL
+@@ -133,330 +132,301 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -4025,7 +4019,7 @@
    sed -n '
      p
      /[$]LINENO/=
-@@ -473,8 +441,7 @@ test \$exitcode = 0") || {
+@@ -473,8 +443,7 @@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -4035,7 +4029,7 @@
  
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +451,18 @@ test \$exitcode = 0") || {
+@@ -484,29 +453,18 @@
    exit
  }
  
@@ -4070,7 +4064,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+@@ -536,7 +494,7 @@
  rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
@@ -4079,7 +4073,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -555,10 +511,10 @@ else
+@@ -555,10 +513,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -4092,7 +4086,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -573,7 +529,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -573,7 +531,6 @@
  
  
  
@@ -4100,7 +4094,17 @@
  # Check that we are running under the correct shell.
  SHELL=${CONFIG_SHELL-/bin/sh}
  
-@@ -740,7 +695,6 @@ cross_compiling=no
+@@ -722,7 +679,8 @@
+ 
+ 
+ 
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -740,7 +698,6 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
@@ -4108,15 +4112,15 @@
  
  # Identity of this package.
  PACKAGE_NAME='nautilus'
-@@ -748,6 +702,7 @@ PACKAGE_TARNAME='nautilus'
- PACKAGE_VERSION='2.28.1'
- PACKAGE_STRING='nautilus 2.28.1'
+@@ -748,6 +705,7 @@
+ PACKAGE_VERSION='2.28.3'
+ PACKAGE_STRING='nautilus 2.28.3'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
 +PACKAGE_URL=''
  
  ac_unique_file="src"
  # Factoring default headers for most tests.
-@@ -1016,6 +971,7 @@ bindir
+@@ -1016,6 +974,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -4124,7 +4128,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1184,8 +1140,7 @@ do
+@@ -1184,8 +1143,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4134,7 +4138,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1211,8 +1166,7 @@ do
+@@ -1211,8 +1169,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4144,7 +4148,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1416,8 +1370,7 @@ do
+@@ -1416,8 +1373,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4154,7 +4158,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1433,8 +1386,7 @@ do
+@@ -1433,8 +1389,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4164,7 +4168,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1464,17 +1416,17 @@ do
+@@ -1464,17 +1419,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -4188,7 +4192,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1491,15 +1443,13 @@ done
+@@ -1491,15 +1446,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4206,7 +4210,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1522,8 +1472,7 @@ do
+@@ -1522,8 +1475,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -4216,7 +4220,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1553,11 +1502,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1553,11 +1505,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -4230,7 +4234,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1596,13 +1543,11 @@ else
+@@ -1596,13 +1546,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4246,12 +4250,45 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1846,21 +1791,378 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1720,9 +1668,9 @@
+                           optimize for fast installation [default=yes]
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --disable-nls           do not use Native Language Support
+-  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
+-  --enable-gtk-doc-html   build documentation in html format [default=yes]
+-  --enable-gtk-doc-pdf    build documentation in pdf format [default=no]
++  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
++  --enable-gtk-doc-html   build documentation in html format [[default=yes]]
++  --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
+   --enable-profiler       Enable profiler
+   --disable-xmp           build without xmp support
+   --disable-tracker       build without tracker support
+@@ -1733,8 +1681,8 @@
+   --disable-schemas-install
+                           Disable the schemas installation
+   --disable-update-mimedb disable the update-mime-database after install
+-                          default=no
+-  --enable-shave          use shave to make the build pretty [default=yes]
++                          [default=no]
++  --enable-shave          use shave to make the build pretty [[default=yes]]
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+@@ -1755,7 +1703,7 @@
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   LIBS        libraries to pass to the linker, e.g. -l<library>
+-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   PKG_CONFIG  path to pkg-config utility
+@@ -1846,21 +1794,378 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- nautilus configure 2.28.1
+ nautilus configure 2.28.3
 -generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -4300,7 +4337,7 @@
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_compile
 +
@@ -4342,7 +4379,7 @@
 +fi
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_run
 +
@@ -4379,7 +4416,7 @@
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_cpp
 +
@@ -4456,7 +4493,7 @@
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_link
 +
@@ -4623,13 +4660,13 @@
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by nautilus $as_me 2.28.1, which was
+ It was created by nautilus $as_me 2.28.3, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    $ $0 $@
  
-@@ -1896,8 +2198,8 @@ for as_dir in $PATH
+@@ -1896,8 +2201,8 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4640,7 +4677,7 @@
  IFS=$as_save_IFS
  
  } >&5
-@@ -1934,9 +2236,9 @@ do
+@@ -1934,9 +2239,9 @@
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
@@ -4652,7 +4689,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1952,13 +2254,13 @@ do
+@@ -1952,13 +2257,13 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -4669,7 +4706,7 @@
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
-@@ -1983,13 +2285,13 @@ _ASBOX
+@@ -1983,13 +2288,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -4685,7 +4722,7 @@
        esac ;;
      esac
    done
-@@ -2061,39 +2363,41 @@ _ASBOX
+@@ -2061,39 +2366,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -4732,25 +4769,33 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -2112,7 +2416,7 @@ for ac_site_file in "$ac_site_file1" "$a
+@@ -2111,8 +2418,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
+-  if test -r "$ac_site_file"; then
 -    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -2123,7 +2427,7 @@ if test -r "$cache_file"; then
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
+@@ -2120,10 +2427,10 @@
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
 -    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2131,7 +2435,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2131,7 +2438,7 @@
      esac
    fi
  else
@@ -4759,7 +4804,7 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -2146,11 +2450,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2146,11 +2453,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -4773,7 +4818,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2160,17 +2464,17 @@ $as_echo "$as_me: error: \`$ac_var' was 
+@@ -2160,17 +2467,17 @@
  	ac_old_val_w=`echo x $ac_old_val`
  	ac_new_val_w=`echo x $ac_new_val`
  	if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -4795,7 +4840,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2182,43 +2486,20 @@ $as_echo "$as_me:   current value: \`$ac
+@@ -2182,43 +2489,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -4846,7 +4891,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2238,24 +2519,16 @@ am__api_version='1.11'
+@@ -2238,24 +2522,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -4879,7 +4924,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2281,10 +2554,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2281,10 +2557,10 @@
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
@@ -4892,7 +4937,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2292,11 +2565,11 @@ for as_dir in $PATH
+@@ -2292,11 +2568,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4908,7 +4953,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2333,7 +2606,7 @@ case $as_dir/ in
+@@ -2333,7 +2609,7 @@
      ;;
  esac
  
@@ -4917,7 +4962,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2349,7 +2622,7 @@ fi
+@@ -2349,7 +2625,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -4926,7 +4971,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2360,7 +2633,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2360,7 +2636,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -4935,7 +4980,7 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
-@@ -2371,15 +2644,11 @@ am_lf='
+@@ -2371,15 +2647,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -4953,7 +4998,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2401,11 +2670,8 @@ if (
+@@ -2401,11 +2673,8 @@
        # 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".
@@ -4967,7 +5012,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2414,13 +2680,10 @@ then
+@@ -2414,13 +2683,10 @@
     # Ok.
     :
  else
@@ -4984,7 +5029,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2448,7 +2711,7 @@ if eval "$MISSING --run true"; then
+@@ -2448,7 +2714,7 @@
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -4993,7 +5038,7 @@
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
-@@ -2469,9 +2732,9 @@ if test "$cross_compiling" != no; then
+@@ -2469,9 +2735,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5005,7 +5050,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -2482,24 +2745,24 @@ for as_dir in $PATH
+@@ -2482,24 +2748,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5035,7 +5080,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2509,9 +2772,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2509,9 +2775,9 @@
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -5047,7 +5092,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -2522,24 +2785,24 @@ for as_dir in $PATH
+@@ -2522,24 +2788,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5077,7 +5122,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2548,7 +2811,7 @@ fi
+@@ -2548,7 +2814,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5086,7 +5131,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -2561,10 +2824,10 @@ fi
+@@ -2561,10 +2827,10 @@
  fi
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  
@@ -5099,7 +5144,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2572,7 +2835,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2572,7 +2838,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5108,7 +5153,7 @@
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2584,7 +2847,7 @@ do
+@@ -2584,11 +2850,12 @@
  	   esac
  	 done
         done
@@ -5117,7 +5162,16 @@
  IFS=$as_save_IFS
  
  fi
-@@ -2600,7 +2863,7 @@ fi
+ 
++  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -2596,11 +2863,10 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
@@ -5126,7 +5180,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2613,9 +2876,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2613,9 +2879,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -5138,7 +5192,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2626,24 +2889,24 @@ for as_dir in $PATH
+@@ -2626,24 +2892,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5168,7 +5222,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2651,11 +2914,11 @@ fi
+@@ -2651,11 +2917,11 @@
    test -n "$AWK" && break
  done
  
@@ -5182,7 +5236,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2673,11 +2936,11 @@ esac
+@@ -2673,11 +2939,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5196,7 +5250,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2697,9 +2960,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2697,9 +2963,7 @@
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -5207,7 +5261,7 @@
    fi
  fi
  
-@@ -2750,7 +3011,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
+@@ -2750,7 +3014,7 @@
  AMTAR=${AMTAR-"${am_missing_run}tar"}
  
  
@@ -5216,7 +5270,7 @@
  $as_echo_n "checking how to create a ustar tar archive... " >&6; }
  # Loop over all known methods to create a tar archive until one works.
  _am_tools='gnutar plaintar pax cpio none'
-@@ -2823,13 +3084,13 @@ do
+@@ -2823,13 +3087,13 @@
  done
  rm -rf conftest.dir
  
@@ -5232,7 +5286,7 @@
  $as_echo "$am_cv_prog_tar_ustar" >&6; }
  
  
-@@ -2837,16 +3098,16 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
+@@ -2837,16 +3101,16 @@
  
  
  
@@ -5252,7 +5306,7 @@
  $as_echo "$USE_MAINTAINER_MODE" >&6; }
     if test $USE_MAINTAINER_MODE = yes; then
    MAINTAINER_MODE_TRUE=
-@@ -2889,7 +3150,7 @@ am__doit:
+@@ -2889,7 +3153,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -5261,7 +5315,7 @@
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
-@@ -2917,12 +3178,12 @@ if test "$am__include" = "#"; then
+@@ -2917,12 +3181,12 @@
  fi
  
  
@@ -5276,7 +5330,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -2947,9 +3208,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2947,9 +3211,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -5288,7 +5342,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2960,24 +3221,24 @@ for as_dir in $PATH
+@@ -2960,24 +3224,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5318,7 +5372,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2987,9 +3248,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2987,9 +3251,9 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -5330,7 +5384,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3000,24 +3261,24 @@ for as_dir in $PATH
+@@ -3000,24 +3264,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5360,7 +5414,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3026,7 +3287,7 @@ fi
+@@ -3026,7 +3290,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5369,7 +5423,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3040,9 +3301,9 @@ if test -z "$CC"; then
+@@ -3040,9 +3304,9 @@
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -5381,7 +5435,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3053,24 +3314,24 @@ for as_dir in $PATH
+@@ -3053,24 +3317,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5411,7 +5465,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3080,9 +3341,9 @@ fi
+@@ -3080,9 +3344,9 @@
  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
@@ -5423,7 +5477,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3094,18 +3355,18 @@ for as_dir in $PATH
+@@ -3094,18 +3358,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5445,7 +5499,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3124,10 +3385,10 @@ fi
+@@ -3124,10 +3388,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -5458,7 +5512,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3139,9 +3400,9 @@ if test -z "$CC"; then
+@@ -3139,9 +3403,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5470,7 +5524,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3152,24 +3413,24 @@ for as_dir in $PATH
+@@ -3152,24 +3416,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5500,7 +5554,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3183,9 +3444,9 @@ if test -z "$CC"; then
+@@ -3183,9 +3447,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -5512,7 +5566,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3196,24 +3457,24 @@ for as_dir in $PATH
+@@ -3196,24 +3460,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5542,7 +5596,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3226,7 +3487,7 @@ done
+@@ -3226,7 +3490,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -5551,1947 +5605,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3237,73 +3498,55 @@ fi
- fi
- 
- 
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
- 
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler --version >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -V >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
- 
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--
-+#include <stdio.h>
- int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
-@@ -3320,17 +3563,17 @@ do
- done
- rm -f $ac_rmfiles
- 
--if { (ac_try="$ac_link_default"
-+if { { ac_try="$ac_link_default"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_link_default") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
- # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3347,7 +3590,7 @@ do
- 	# certainly right.
- 	break;;
-     *.* )
--        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- 	then :; else
- 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- 	fi
-@@ -3366,84 +3609,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
- else
-   ac_file=''
- fi
--
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
--if test -z "$ac_file"; then
-+if test -z "$ac_file"; then :
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C compiler cannot create executables
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--
- ac_exeext=$ac_cv_exeext
- 
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (case "(($ac_try" in
-+  { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
-     fi
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
- 
--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
--if { (ac_try="$ac_link"
-+if { { ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
- # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3458,32 +3692,24 @@ for ac_file in conftest.exe conftest con
-   esac
- done
- else
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
--if test "${ac_cv_objext+set}" = set; then
-+if test "${ac_cv_objext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3495,17 +3721,17 @@ main ()
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (ac_try="$ac_compile"
-+if { { ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_compile") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   for ac_file in conftest.o conftest.obj conftest.*; do
-   test -f "$ac_file" || continue;
-   case $ac_file in
-@@ -3518,31 +3744,23 @@ else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
- $as_echo "$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3556,37 +3774,16 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_compiler_gnu=no
-+  ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
-   GCC=yes
-@@ -3595,20 +3792,16 @@ else
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    ac_cv_prog_cc_g=no
-    CFLAGS="-g"
--   cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3619,35 +3812,11 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	CFLAGS=""
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3658,36 +3827,12 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
--	ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
- 	 CFLAGS="-g"
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3698,42 +3843,17 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_g=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -3750,18 +3870,14 @@ else
-     CFLAGS=
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
-@@ -3818,32 +3934,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
- 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-   CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+  if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_c89=$ac_arg
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext
-   test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -3854,17 +3947,19 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
-   xno)
--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
-+fi
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3874,9 +3969,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- depcc="$CC"   am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3984,7 +4079,7 @@ else
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-@@ -4005,14 +4100,14 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
- $as_echo_n "checking how to run the C preprocessor... " >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
- fi
- if test -z "$CPP"; then
--  if test "${ac_cv_prog_CPP+set}" = set; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CPP needs to be expanded
-@@ -4027,11 +4122,7 @@ do
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef __STDC__
- # include <limits.h>
-@@ -4040,78 +4131,34 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
- 		     Syntax error
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
-+if ac_fn_c_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
-+if $ac_preproc_ok; then :
-   break
- fi
- 
-@@ -4123,7 +4170,7 @@ fi
- else
-   ac_cv_prog_CPP=$CPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
- $as_echo "$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -4134,11 +4181,7 @@ do
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef __STDC__
- # include <limits.h>
-@@ -4147,87 +4190,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
- 		     Syntax error
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
-+if ac_fn_c_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
--  :
-+if $ac_preproc_ok; then :
-+
- else
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- 
- ac_ext=c
-@@ -4237,9 +4233,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then
-+if test "${ac_cv_path_GREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$GREP"; then
-@@ -4250,7 +4246,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in grep ggrep; do
-+    for ac_prog in grep ggrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4270,7 +4266,7 @@ case `"$ac_path_GREP" --version 2>&1` in
-     $as_echo 'GREP' >> "conftest.nl"
-     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_GREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_GREP="$ac_path_GREP"
-@@ -4285,26 +4281,24 @@ esac
-       $ac_path_GREP_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_GREP"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_GREP=$GREP
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
- $as_echo "$ac_cv_path_GREP" >&6; }
-  GREP="$ac_cv_path_GREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
- $as_echo_n "checking for egrep... " >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then
-+if test "${ac_cv_path_EGREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4318,7 +4312,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in egrep; do
-+    for ac_prog in egrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4338,7 +4332,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
-     $as_echo 'EGREP' >> "conftest.nl"
-     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4353,12 +4347,10 @@ esac
-       $ac_path_EGREP_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_EGREP"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_EGREP=$EGREP
-@@ -4366,21 +4358,17 @@ fi
- 
-    fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
- $as_echo "$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then
-+if test "${ac_cv_header_stdc+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -4395,48 +4383,23 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_header_stdc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_header_stdc=no
-+  ac_cv_header_stdc=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <string.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then
--  :
-+  $EGREP "memchr" >/dev/null 2>&1; then :
-+
- else
-   ac_cv_header_stdc=no
- fi
-@@ -4446,18 +4409,14 @@ fi
- 
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then
--  :
-+  $EGREP "free" >/dev/null 2>&1; then :
-+
- else
-   ac_cv_header_stdc=no
- fi
-@@ -4467,14 +4426,10 @@ fi
- 
- if test $ac_cv_header_stdc = yes; then
-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   :
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ctype.h>
- #include <stdlib.h>
-@@ -4501,118 +4456,34 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_run "$LINENO"; then :
- 
--( exit $ac_status )
--ac_cv_header_stdc=no
-+else
-+  ac_cv_header_stdc=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
- $as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
--_ACEOF
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
- 
- fi
- 
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- 		  inttypes.h stdint.h unistd.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -4622,19 +4493,14 @@ fi
- done
- 
- 
--
-- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
- $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
--if test "${ac_cv_c_bigendian+set}" = set; then
-+if test "${ac_cv_c_bigendian+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_c_bigendian=unknown
-     # See if we're dealing with a universal compiler.
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifndef __APPLE_CC__
- 	       not a universal capable compiler
-@@ -4642,46 +4508,34 @@ cat >>conftest.$ac_ext <<_ACEOF
- 	     typedef int dummy;
- 
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
- 	# Check for potential -arch flags.  It is not universal unless
--	# there are some -arch flags.  Note that *ppc* also matches
--	# ppc64.  This check is also rather less than ideal.
--	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
--	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
--	esac
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+	# there are at least two -arch flags with different values.
-+	ac_arch=
-+	ac_prev=
-+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-+	 if test -n "$ac_prev"; then
-+	   case $ac_word in
-+	     i?86 | x86_64 | ppc | ppc64)
-+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-+		 ac_arch=$ac_word
-+	       else
-+		 ac_cv_c_bigendian=universal
-+		 break
-+	       fi
-+	       ;;
-+	   esac
-+	   ac_prev=
-+	 elif test "x$ac_word" = "x-arch"; then
-+	   ac_prev=arch
-+	 fi
-+       done
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     if test $ac_cv_c_bigendian = unknown; then
-       # See if sys/param.h defines the BYTE_ORDER macro.
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- 	     #include <sys/param.h>
-@@ -4699,30 +4553,9 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   # It does; now see whether it defined to BIG_ENDIAN or not.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- 		#include <sys/param.h>
-@@ -4738,49 +4571,18 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_c_bigendian=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_c_bigendian=no
-+  ac_cv_c_bigendian=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
-     if test $ac_cv_c_bigendian = unknown; then
-       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <limits.h>
- 
-@@ -4795,30 +4597,9 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   # It does; now see whether it defined to _BIG_ENDIAN or not.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <limits.h>
- 
-@@ -4833,51 +4614,20 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_c_bigendian=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_c_bigendian=no
-+  ac_cv_c_bigendian=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
-     if test $ac_cv_c_bigendian = unknown; then
-       # Compile a test program.
--      if test "$cross_compiling" = yes; then
-+      if test "$cross_compiling" = yes; then :
-   # Try to guess by grepping values from an object file.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- short int ascii_mm[] =
- 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -4903,24 +4653,7 @@ return use_ascii (foo) == use_ebcdic (fo
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
- 	      ac_cv_c_bigendian=yes
- 	    fi
-@@ -4932,20 +4665,10 @@ $as_echo "$ac_try_echo") >&5
- 		ac_cv_c_bigendian=unknown
- 	      fi
- 	    fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- $ac_includes_default
- int
-@@ -4965,79 +4688,41 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   ac_cv_c_bigendian=no
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--ac_cv_c_bigendian=yes
-+  ac_cv_c_bigendian=yes
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
-     fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
- $as_echo "$ac_cv_c_bigendian" >&6; }
-  case $ac_cv_c_bigendian in #(
-    yes)
--     cat >>confdefs.h <<\_ACEOF
--#define WORDS_BIGENDIAN 1
--_ACEOF
-+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
- ;; #(
-    no)
-       ;; #(
-    universal)
- 
--cat >>confdefs.h <<\_ACEOF
--#define AC_APPLE_UNIVERSAL_BUILD 1
--_ACEOF
-+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
- 
-      ;; #(
-    *)
--     { { $as_echo "$as_me:$LINENO: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--$as_echo "$as_me: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
--   { (exit 1); exit 1; }; } ;;
-+     as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-  esac
- 
--{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
- $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
--if test "${ac_cv_c_const+set}" = set; then
-+if test "${ac_cv_c_const+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -5097,41 +4782,18 @@ main ()
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_c_const=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_c_const=no
-+  ac_cv_c_const=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
- $as_echo "$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define const /**/
--_ACEOF
-+$as_echo "#define const /**/" >>confdefs.h
- 
- fi
- 
-@@ -5143,9 +4805,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -5156,24 +4818,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5183,9 +4845,9 @@ if test -z "$ac_cv_prog_CC"; then
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -5196,24 +4858,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5222,7 +4884,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -5236,9 +4898,9 @@ if test -z "$CC"; then
-           if test -n "$ac_tool_prefix"; then
-     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -5249,24 +4911,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5276,9 +4938,9 @@ fi
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -5290,18 +4952,18 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- if test $ac_prog_rejected = yes; then
-@@ -5320,10 +4982,10 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5335,9 +4997,9 @@ if test -z "$CC"; then
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -5348,24 +5010,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5379,9 +5041,9 @@ if test -z "$CC"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -5392,24 +5054,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5422,7 +5084,7 @@ done
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -5433,62 +5095,42 @@ fi
+@@ -3237,57 +3501,37 @@
  fi
  
  
@@ -7554,17 +5668,259 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
  
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -3303,8 +3547,8 @@
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+@@ -3320,17 +3564,17 @@
+ done
+ rm -f $ac_rmfiles
+ 
+-if { (ac_try="$ac_link_default"
++if { { ac_try="$ac_link_default"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link_default") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
+   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+ # in a Makefile.  We should not override ac_cv_exeext if it was cached,
+@@ -3347,7 +3591,7 @@
+ 	# certainly right.
+ 	break;;
+     *.* )
+-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ 	then :; else
+ 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ 	fi
+@@ -3366,84 +3610,42 @@
+ else
+   ac_file=''
+ fi
+-
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+-if test -z "$ac_file"; then
+-  $as_echo "$as_me: failed program was:" >&5
++if test -z "$ac_file"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+ 
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
+-    fi
+-  fi
+-fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+-if { (ac_try="$ac_link"
++if { { ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+@@ -3458,32 +3660,83 @@
+   esac
+ done
+ else
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++  { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++  if { ac_try='./conftest$ac_cv_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++    fi
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then
++if test "${ac_cv_objext+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -7576,7 +5932,69 @@
  /* end confdefs.h.  */
  
  int
-@@ -5502,37 +5144,16 @@ main ()
+@@ -3495,17 +3748,17 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (ac_try="$ac_compile"
++if { { ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compile") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
+   for ac_file in conftest.o conftest.obj conftest.*; do
+   test -f "$ac_file" || continue;
+   case $ac_file in
+@@ -3518,31 +3771,23 @@
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+ $as_echo "$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -3556,37 +3801,16 @@
    return 0;
  }
  _ACEOF
@@ -7617,7 +6035,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -5541,20 +5162,16 @@ else
+@@ -3595,20 +3819,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -7641,7 +6059,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5565,35 +5182,11 @@ main ()
+@@ -3619,35 +3839,11 @@
    return 0;
  }
  _ACEOF
@@ -7680,7 +6098,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5604,36 +5197,12 @@ main ()
+@@ -3658,36 +3854,12 @@
    return 0;
  }
  _ACEOF
@@ -7721,7 +6139,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5644,42 +5213,17 @@ main ()
+@@ -3698,42 +3870,17 @@
    return 0;
  }
  _ACEOF
@@ -7766,7 +6184,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -5696,18 +5240,14 @@ else
+@@ -3750,18 +3897,14 @@
      CFLAGS=
    fi
  fi
@@ -7788,7 +6206,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -5764,32 +5304,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3818,32 +3961,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -7822,7 +6240,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -5800,17 +5317,19 @@ fi
+@@ -3854,17 +3974,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -7845,7 +6263,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -5820,9 +5339,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3874,9 +3996,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -7857,7 +6275,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5930,7 +5449,7 @@ else
+@@ -3984,7 +4106,7 @@
  fi
  
  fi
@@ -7866,7 +6284,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -5950,14 +5469,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -4005,14 +4127,14 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -7883,7 +6301,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -5972,11 +5491,7 @@ do
+@@ -4027,11 +4149,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -7896,7 +6314,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -5985,78 +5500,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4040,78 +4158,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7980,7 +6398,7 @@
    break
  fi
  
-@@ -6068,7 +5539,7 @@ fi
+@@ -4123,7 +4197,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -7989,7 +6407,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -6079,11 +5550,7 @@ do
+@@ -4134,11 +4208,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -8002,7 +6420,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -6092,87 +5559,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4147,87 +4217,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -8099,7 +6517,1689 @@
  fi
  
  ac_ext=c
-@@ -6181,115 +5601,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -4237,9 +4260,9 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then
++if test "${ac_cv_path_GREP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -4250,7 +4273,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in grep ggrep; do
++    for ac_prog in grep ggrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+@@ -4270,7 +4293,7 @@
+     $as_echo 'GREP' >> "conftest.nl"
+     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
+     if test $ac_count -gt ${ac_path_GREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_GREP="$ac_path_GREP"
+@@ -4285,26 +4308,24 @@
+       $ac_path_GREP_found && break 3
+     done
+   done
+-done
++  done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_GREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_GREP=$GREP
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+ $as_echo "$ac_cv_path_GREP" >&6; }
+  GREP="$ac_cv_path_GREP"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then
++if test "${ac_cv_path_EGREP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -4318,7 +4339,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in egrep; do
++    for ac_prog in egrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+@@ -4338,7 +4359,7 @@
+     $as_echo 'EGREP' >> "conftest.nl"
+     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
+     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_EGREP="$ac_path_EGREP"
+@@ -4353,12 +4374,10 @@
+       $ac_path_EGREP_found && break 3
+     done
+   done
+-done
++  done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_EGREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_EGREP=$EGREP
+@@ -4366,21 +4385,17 @@
+ 
+    fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+ $as_echo "$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then
++if test "${ac_cv_header_stdc+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -4395,48 +4410,23 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_header_stdc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_stdc=no
++  ac_cv_header_stdc=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <string.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then
+-  :
++  $EGREP "memchr" >/dev/null 2>&1; then :
++
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -4446,18 +4436,14 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdlib.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then
+-  :
++  $EGREP "free" >/dev/null 2>&1; then :
++
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -4467,14 +4453,10 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   :
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ctype.h>
+ #include <stdlib.h>
+@@ -4501,118 +4483,34 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_run "$LINENO"; then :
+ 
+-( exit $ac_status )
+-ac_cv_header_stdc=no
++else
++  ac_cv_header_stdc=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+ $as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ 
+ fi
+ 
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ 		  inttypes.h stdint.h unistd.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -4622,19 +4520,14 @@
+ done
+ 
+ 
+-
+- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+-if test "${ac_cv_c_bigendian+set}" = set; then
++if test "${ac_cv_c_bigendian+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_bigendian=unknown
+     # See if we're dealing with a universal compiler.
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifndef __APPLE_CC__
+ 	       not a universal capable compiler
+@@ -4642,46 +4535,34 @@
+ 	     typedef int dummy;
+ 
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
+ 	# Check for potential -arch flags.  It is not universal unless
+-	# there are some -arch flags.  Note that *ppc* also matches
+-	# ppc64.  This check is also rather less than ideal.
+-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+-	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+-	esac
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
++	# there are at least two -arch flags with different values.
++	ac_arch=
++	ac_prev=
++	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++	 if test -n "$ac_prev"; then
++	   case $ac_word in
++	     i?86 | x86_64 | ppc | ppc64)
++	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++		 ac_arch=$ac_word
++	       else
++		 ac_cv_c_bigendian=universal
++		 break
++	       fi
++	       ;;
++	   esac
++	   ac_prev=
++	 elif test "x$ac_word" = "x-arch"; then
++	   ac_prev=arch
++	 fi
++       done
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     if test $ac_cv_c_bigendian = unknown; then
+       # See if sys/param.h defines the BYTE_ORDER macro.
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ 	     #include <sys/param.h>
+@@ -4699,30 +4580,9 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ 		#include <sys/param.h>
+@@ -4738,49 +4598,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_c_bigendian=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_c_bigendian=no
++  ac_cv_c_bigendian=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     fi
+     if test $ac_cv_c_bigendian = unknown; then
+       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <limits.h>
+ 
+@@ -4795,30 +4624,9 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   # It does; now see whether it defined to _BIG_ENDIAN or not.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <limits.h>
+ 
+@@ -4833,51 +4641,20 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_c_bigendian=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_c_bigendian=no
++  ac_cv_c_bigendian=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     fi
+     if test $ac_cv_c_bigendian = unknown; then
+       # Compile a test program.
+-      if test "$cross_compiling" = yes; then
++      if test "$cross_compiling" = yes; then :
+   # Try to guess by grepping values from an object file.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ short int ascii_mm[] =
+ 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+@@ -4903,24 +4680,7 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ 	      ac_cv_c_bigendian=yes
+ 	    fi
+@@ -4932,20 +4692,10 @@
+ 		ac_cv_c_bigendian=unknown
+ 	      fi
+ 	    fi
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -4965,79 +4715,41 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_c_bigendian=no
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_c_bigendian=yes
++  ac_cv_c_bigendian=yes
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+     fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+ $as_echo "$ac_cv_c_bigendian" >&6; }
+  case $ac_cv_c_bigendian in #(
+    yes)
+-     cat >>confdefs.h <<\_ACEOF
+-#define WORDS_BIGENDIAN 1
+-_ACEOF
++     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+ ;; #(
+    no)
+       ;; #(
+    universal)
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define AC_APPLE_UNIVERSAL_BUILD 1
+-_ACEOF
++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+ 
+      ;; #(
+    *)
+-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-$as_echo "$as_me: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+-   { (exit 1); exit 1; }; } ;;
++     as_fn_error "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+  esac
+ 
+-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+-if test "${ac_cv_c_const+set}" = set; then
++if test "${ac_cv_c_const+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5097,41 +4809,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_c_const=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_c_const=no
++  ac_cv_c_const=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+ $as_echo "$ac_cv_c_const" >&6; }
+ if test $ac_cv_c_const = no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define const /**/
+-_ACEOF
++$as_echo "#define const /**/" >>confdefs.h
+ 
+ fi
+ 
+@@ -5143,9 +4832,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -5156,24 +4845,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5183,9 +4872,9 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -5196,24 +4885,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5222,7 +4911,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -5236,9 +4925,9 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -5249,24 +4938,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5276,9 +4965,9 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -5290,18 +4979,18 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+@@ -5320,10 +5009,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5335,9 +5024,9 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -5348,24 +5037,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5379,9 +5068,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -5392,24 +5081,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5422,7 +5111,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -5433,62 +5122,42 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5502,37 +5171,16 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_compiler_gnu=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_compiler_gnu=no
++  ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GCC=yes
+@@ -5541,20 +5189,16 @@
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    ac_cv_prog_cc_g=no
+    CFLAGS="-g"
+-   cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5565,35 +5209,11 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  CFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5604,36 +5224,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
+-	ac_c_werror_flag=$ac_save_c_werror_flag
++else
++  ac_c_werror_flag=$ac_save_c_werror_flag
+ 	 CFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5644,42 +5240,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -5696,18 +5267,14 @@
+     CFLAGS=
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -5764,32 +5331,9 @@
+ 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++  if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_c89=$ac_arg
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -5800,17 +5344,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+   xno)
+-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+ 
++fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -5820,9 +5366,9 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5930,7 +5476,7 @@
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+@@ -5950,14 +5496,14 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+ $as_echo_n "checking how to run the C preprocessor... " >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then
++  if test "${ac_cv_prog_CPP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -5972,11 +5518,7 @@
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -5985,78 +5527,34 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
++if $ac_preproc_ok; then :
+   break
+ fi
+ 
+@@ -6068,7 +5566,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+ $as_echo "$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -6079,11 +5577,7 @@
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -6092,87 +5586,40 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  :
++if $ac_preproc_ok; then :
++
+ else
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ 
+ ac_ext=c
+@@ -6181,115 +5628,23 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -8220,7 +8320,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -6307,17 +5635,17 @@ esac
+@@ -6307,17 +5662,17 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -8241,7 +8341,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
-@@ -6349,35 +5677,27 @@ fi
+@@ -6349,35 +5704,27 @@
  
  # Make sure we can run config.sub.
  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8284,7 +8384,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -6393,28 +5713,24 @@ IFS=$ac_save_IFS
+@@ -6393,28 +5740,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -8318,7 +8418,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -6437,9 +5753,9 @@ case $host in
+@@ -6437,9 +5780,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -8330,7 +8430,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AS"; then
-@@ -6450,24 +5766,24 @@ for as_dir in $PATH
+@@ -6450,24 +5793,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8360,7 +8460,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6477,9 +5793,9 @@ if test -z "$ac_cv_prog_AS"; then
+@@ -6477,9 +5820,9 @@
    ac_ct_AS=$AS
    # Extract the first word of "as", so it can be a program name with args.
  set dummy as; ac_word=$2
@@ -8372,7 +8472,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AS"; then
-@@ -6490,24 +5806,24 @@ for as_dir in $PATH
+@@ -6490,24 +5833,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8402,7 +8502,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6516,7 +5832,7 @@ fi
+@@ -6516,7 +5859,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -8411,7 +8511,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6529,9 +5845,9 @@ fi
+@@ -6529,9 +5872,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -8423,7 +8523,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DLLTOOL"; then
-@@ -6542,24 +5858,24 @@ for as_dir in $PATH
+@@ -6542,24 +5885,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8453,7 +8553,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6569,9 +5885,9 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+@@ -6569,9 +5912,9 @@
    ac_ct_DLLTOOL=$DLLTOOL
    # Extract the first word of "dlltool", so it can be a program name with args.
  set dummy dlltool; ac_word=$2
@@ -8465,7 +8565,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DLLTOOL"; then
-@@ -6582,24 +5898,24 @@ for as_dir in $PATH
+@@ -6582,24 +5925,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8495,7 +8595,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6608,7 +5924,7 @@ fi
+@@ -6608,7 +5951,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -8504,7 +8604,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6621,9 +5937,9 @@ fi
+@@ -6621,9 +5964,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -8516,7 +8616,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -6634,24 +5950,24 @@ for as_dir in $PATH
+@@ -6634,24 +5977,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8546,7 +8646,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6661,9 +5977,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -6661,9 +6004,9 @@
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -8558,7 +8658,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -6674,24 +5990,24 @@ for as_dir in $PATH
+@@ -6674,24 +6017,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8588,7 +8688,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6700,7 +6016,7 @@ fi
+@@ -6700,7 +6043,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -8597,7 +8697,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -6735,7 +6051,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -6735,14 +6078,14 @@
  
  case `pwd` in
    *\ * | *\	*)
@@ -8606,7 +8706,16 @@
  $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  esac
  
-@@ -6758,9 +6074,9 @@ macro_revision='1.3012'
+ 
+ 
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+ 
+ 
+ 
+@@ -6758,9 +6101,9 @@
  
  ltmain="$ac_aux_dir/ltmain.sh"
  
@@ -8618,7 +8727,7 @@
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6768,7 +6084,7 @@ else
+@@ -6768,7 +6111,7 @@
         ac_script="$ac_script$as_nl$ac_script"
       done
       echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8627,7 +8736,7 @@
       if test -z "$SED"; then
    ac_path_SED_found=false
    # Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6777,7 +6093,7 @@ for as_dir in $PATH
+@@ -6777,7 +6120,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8636,7 +8745,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6797,7 +6113,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -6797,7 +6140,7 @@
      $as_echo '' >> "conftest.nl"
      "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8645,7 +8754,7 @@
      if test $ac_count -gt ${ac_path_SED_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_SED="$ac_path_SED"
-@@ -6812,19 +6128,17 @@ esac
+@@ -6812,19 +6155,17 @@
        $ac_path_SED_found && break 3
      done
    done
@@ -8668,7 +8777,7 @@
  $as_echo "$ac_cv_path_SED" >&6; }
   SED="$ac_cv_path_SED"
    rm -f conftest.sed
-@@ -6842,9 +6156,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -6842,9 +6183,9 @@
  
  
  
@@ -8680,7 +8789,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6858,7 +6172,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -6858,7 +6199,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8689,7 +8798,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6878,7 +6192,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -6878,7 +6219,7 @@
      $as_echo 'FGREP' >> "conftest.nl"
      "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8698,7 +8807,7 @@
      if test $ac_count -gt ${ac_path_FGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6893,12 +6207,10 @@ esac
+@@ -6893,12 +6234,10 @@
        $ac_path_FGREP_found && break 3
      done
    done
@@ -8713,7 +8822,7 @@
    fi
  else
    ac_cv_path_FGREP=$FGREP
-@@ -6906,7 +6218,7 @@ fi
+@@ -6906,7 +6245,7 @@
  
     fi
  fi
@@ -8722,7 +8831,7 @@
  $as_echo "$ac_cv_path_FGREP" >&6; }
   FGREP="$ac_cv_path_FGREP"
  
-@@ -6932,7 +6244,7 @@ test -z "$GREP" && GREP=grep
+@@ -6932,7 +6271,7 @@
  
  
  # Check whether --with-gnu-ld was given.
@@ -8731,7 +8840,7 @@
    withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
-@@ -6941,7 +6253,7 @@ fi
+@@ -6941,7 +6280,7 @@
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
@@ -8740,7 +8849,7 @@
  $as_echo_n "checking for ld used by $CC... " >&6; }
    case $host in
    *-*-mingw*)
-@@ -6971,13 +6283,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6971,13 +6310,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -8757,7 +8866,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -7008,18 +6320,16 @@ fi
+@@ -7008,18 +6347,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -8781,7 +8890,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -7032,7 +6342,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -7032,7 +6369,7 @@
    ;;
  esac
  fi
@@ -8790,7 +8899,7 @@
  $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
-@@ -7044,9 +6354,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -7044,9 +6381,9 @@
  
  
  
@@ -8802,7 +8911,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -7093,7 +6403,7 @@ else
+@@ -7093,7 +6430,7 @@
    : ${lt_cv_path_NM=no}
  fi
  fi
@@ -8811,7 +8920,7 @@
  $as_echo "$lt_cv_path_NM" >&6; }
  if test "$lt_cv_path_NM" != "no"; then
    NM="$lt_cv_path_NM"
-@@ -7104,9 +6414,9 @@ else
+@@ -7104,9 +6441,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -8823,7 +8932,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
-@@ -7117,24 +6427,24 @@ for as_dir in $PATH
+@@ -7117,24 +6454,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8853,7 +8962,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7148,9 +6458,9 @@ if test -z "$DUMPBIN"; then
+@@ -7148,9 +6485,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -8865,7 +8974,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
-@@ -7161,24 +6471,24 @@ for as_dir in $PATH
+@@ -7161,24 +6498,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -8895,7 +9004,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7191,7 +6501,7 @@ done
+@@ -7191,7 +6528,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -8904,7 +9013,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7211,33 +6521,33 @@ test -z "$NM" && NM=nm
+@@ -7211,33 +6548,33 @@
  
  
  
@@ -8918,15 +9027,15 @@
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
 -  (eval echo "\"\$as_me:7221: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6531: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6558: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:7224: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6534: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6561: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:7227: output\"" >&5)
-+  (eval echo "\"\$as_me:6537: output\"" >&5)
++  (eval echo "\"\$as_me:6564: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
@@ -8946,7 +9055,7 @@
    $as_echo_n "(cached) " >&6
  else
      i=0
-@@ -7355,10 +6665,10 @@ else
+@@ -7355,10 +6692,10 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -8959,7 +9068,7 @@
  $as_echo "none" >&6; }
  fi
  max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -7372,7 +6682,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -7372,7 +6709,7 @@
  : ${MV="mv -f"}
  : ${RM="rm -f"}
  
@@ -8968,7 +9077,7 @@
  $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  # Try some XSI features
  xsi_shell=no
-@@ -7382,17 +6692,17 @@ xsi_shell=no
+@@ -7382,17 +6719,17 @@
      && eval 'test $(( 1 + 1 )) -eq 2 \
      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
    && xsi_shell=yes
@@ -8989,7 +9098,7 @@
  $as_echo "$lt_shell_append" >&6; }
  
  
-@@ -7427,14 +6737,14 @@ esac
+@@ -7427,14 +6764,14 @@
  
  
  
@@ -9007,7 +9116,7 @@
  $as_echo "$lt_cv_ld_reload_flag" >&6; }
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
-@@ -7463,9 +6773,9 @@ esac
+@@ -7463,9 +6800,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9019,7 +9128,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -7476,24 +6786,24 @@ for as_dir in $PATH
+@@ -7476,24 +6813,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9049,7 +9158,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7503,9 +6813,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -7503,9 +6840,9 @@
    ac_ct_OBJDUMP=$OBJDUMP
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
@@ -9061,7 +9170,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -7516,24 +6826,24 @@ for as_dir in $PATH
+@@ -7516,24 +6853,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9091,7 +9200,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7542,7 +6852,7 @@ fi
+@@ -7542,7 +6879,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9100,7 +9209,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7559,9 +6869,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -7559,9 +6896,9 @@
  
  
  
@@ -9112,7 +9221,12 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7680,7 +6990,7 @@ linux* | k*bsd*-gnu)
+@@ -7676,11 +7013,11 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -9121,7 +9235,7 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7755,7 +7065,7 @@ tpf*)
+@@ -7755,7 +7092,7 @@
  esac
  
  fi
@@ -9130,7 +9244,7 @@
  $as_echo "$lt_cv_deplibs_check_method" >&6; }
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7775,9 +7085,9 @@ test -z "$deplibs_check_method" && depli
+@@ -7775,9 +7112,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -9142,7 +9256,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
-@@ -7788,24 +7098,24 @@ for as_dir in $PATH
+@@ -7788,24 +7125,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9172,7 +9286,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7815,9 +7125,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -7815,9 +7152,9 @@
    ac_ct_AR=$AR
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
@@ -9184,7 +9298,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
-@@ -7828,24 +7138,24 @@ for as_dir in $PATH
+@@ -7828,24 +7165,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9214,7 +9328,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7854,7 +7164,7 @@ fi
+@@ -7854,7 +7191,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9223,7 +9337,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7880,9 +7190,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -7880,9 +7217,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9235,7 +9349,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -7893,24 +7203,24 @@ for as_dir in $PATH
+@@ -7893,24 +7230,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9265,7 +9379,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7920,9 +7230,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -7920,9 +7257,9 @@
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -9277,7 +9391,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -7933,24 +7243,24 @@ for as_dir in $PATH
+@@ -7933,24 +7270,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9307,7 +9421,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -7959,7 +7269,7 @@ fi
+@@ -7959,7 +7296,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9316,7 +9430,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -7979,9 +7289,9 @@ test -z "$STRIP" && STRIP=:
+@@ -7979,9 +7316,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -9328,7 +9442,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -7992,24 +7302,24 @@ for as_dir in $PATH
+@@ -7992,24 +7329,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9358,7 +9472,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8019,9 +7329,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -8019,9 +7356,9 @@
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
@@ -9370,7 +9484,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -8032,24 +7342,24 @@ for as_dir in $PATH
+@@ -8032,24 +7369,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9400,7 +9514,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8058,7 +7368,7 @@ fi
+@@ -8058,7 +7395,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9409,7 +9523,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8136,9 +7446,9 @@ compiler=$CC
+@@ -8136,9 +7473,9 @@
  
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9421,7 +9535,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -8254,18 +7564,18 @@ void nm_test_func(void){}
+@@ -8254,18 +7591,18 @@
  int main(){nm_test_var='a';nm_test_func();return(0);}
  _LT_EOF
  
@@ -9446,7 +9560,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -8318,11 +7628,11 @@ _LT_EOF
+@@ -8318,11 +7655,11 @@
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9461,7 +9575,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -8356,10 +7666,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -8356,10 +7693,10 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -9474,7 +9588,7 @@
  $as_echo "ok" >&6; }
  fi
  
-@@ -8385,7 +7695,7 @@ fi
+@@ -8385,7 +7722,7 @@
  
  
  # Check whether --enable-libtool-lock was given.
@@ -9483,7 +9597,7 @@
    enableval=$enable_libtool_lock;
  fi
  
-@@ -8397,11 +7707,11 @@ case $host in
+@@ -8397,11 +7734,11 @@
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -9498,13 +9612,13 @@
      case `/usr/bin/file conftest.$ac_objext` in
        *ELF-32*)
  	HPUX_IA64_MODE="32"
-@@ -8415,12 +7725,12 @@ ia64-*-hpux*)
+@@ -8415,12 +7752,12 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 8418 "configure"' > conftest.$ac_ext
 -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  echo '#line 7728 "configure"' > conftest.$ac_ext
++  echo '#line 7755 "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
@@ -9515,7 +9629,7 @@
      if test "$lt_cv_prog_gnu_ld" = yes; then
        case `/usr/bin/file conftest.$ac_objext` in
  	*32-bit*)
-@@ -8454,11 +7764,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -8454,11 +7791,11 @@
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -9530,7 +9644,7 @@
      case `/usr/bin/file conftest.o` in
        *32-bit*)
  	case $host in
-@@ -8507,9 +7817,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -8507,9 +7844,9 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -9542,7 +9656,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
-@@ -8518,11 +7828,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -8518,11 +7855,7 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -9555,7 +9669,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -8533,38 +7839,13 @@ main ()
+@@ -8533,38 +7866,13 @@
    return 0;
  }
  _ACEOF
@@ -9598,7 +9712,7 @@
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8572,7 +7853,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -8572,7 +7880,7 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -9607,7 +9721,7 @@
  $as_echo "$lt_cv_cc_needs_belf" >&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
-@@ -8582,11 +7863,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -8582,11 +7890,11 @@
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
@@ -9622,7 +9736,7 @@
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
-@@ -8612,9 +7893,9 @@ need_locks="$enable_libtool_lock"
+@@ -8612,9 +7920,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -9634,7 +9748,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
-@@ -8625,24 +7906,24 @@ for as_dir in $PATH
+@@ -8625,24 +7933,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9664,7 +9778,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8652,9 +7933,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -8652,9 +7960,9 @@
    ac_ct_DSYMUTIL=$DSYMUTIL
    # Extract the first word of "dsymutil", so it can be a program name with args.
  set dummy dsymutil; ac_word=$2
@@ -9676,7 +9790,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8665,24 +7946,24 @@ for as_dir in $PATH
+@@ -8665,24 +7973,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9706,7 +9820,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8691,7 +7972,7 @@ fi
+@@ -8691,7 +7999,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9715,7 +9829,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8704,9 +7985,9 @@ fi
+@@ -8704,9 +8012,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -9727,7 +9841,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
-@@ -8717,24 +7998,24 @@ for as_dir in $PATH
+@@ -8717,24 +8025,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9757,7 +9871,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8744,9 +8025,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -8744,9 +8052,9 @@
    ac_ct_NMEDIT=$NMEDIT
    # Extract the first word of "nmedit", so it can be a program name with args.
  set dummy nmedit; ac_word=$2
@@ -9769,7 +9883,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
-@@ -8757,24 +8038,24 @@ for as_dir in $PATH
+@@ -8757,24 +8065,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9799,7 +9913,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8783,7 +8064,7 @@ fi
+@@ -8783,7 +8091,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9808,7 +9922,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8796,9 +8077,9 @@ fi
+@@ -8796,9 +8104,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -9820,7 +9934,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
-@@ -8809,24 +8090,24 @@ for as_dir in $PATH
+@@ -8809,24 +8117,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9850,7 +9964,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8836,9 +8117,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -8836,9 +8144,9 @@
    ac_ct_LIPO=$LIPO
    # Extract the first word of "lipo", so it can be a program name with args.
  set dummy lipo; ac_word=$2
@@ -9862,7 +9976,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
-@@ -8849,24 +8130,24 @@ for as_dir in $PATH
+@@ -8849,24 +8157,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9892,7 +10006,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8875,7 +8156,7 @@ fi
+@@ -8875,7 +8183,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9901,7 +10015,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8888,9 +8169,9 @@ fi
+@@ -8888,9 +8196,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -9913,7 +10027,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
-@@ -8901,24 +8182,24 @@ for as_dir in $PATH
+@@ -8901,24 +8209,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9943,7 +10057,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8928,9 +8209,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -8928,9 +8236,9 @@
    ac_ct_OTOOL=$OTOOL
    # Extract the first word of "otool", so it can be a program name with args.
  set dummy otool; ac_word=$2
@@ -9955,7 +10069,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
-@@ -8941,24 +8222,24 @@ for as_dir in $PATH
+@@ -8941,24 +8249,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -9985,7 +10099,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -8967,7 +8248,7 @@ fi
+@@ -8967,7 +8275,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -9994,7 +10108,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -8980,9 +8261,9 @@ fi
+@@ -8980,9 +8288,9 @@
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10006,7 +10120,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
-@@ -8993,24 +8274,24 @@ for as_dir in $PATH
+@@ -8993,24 +8301,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10036,7 +10150,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9020,9 +8301,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -9020,9 +8328,9 @@
    ac_ct_OTOOL64=$OTOOL64
    # Extract the first word of "otool64", so it can be a program name with args.
  set dummy otool64; ac_word=$2
@@ -10048,7 +10162,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
-@@ -9033,24 +8314,24 @@ for as_dir in $PATH
+@@ -9033,24 +8341,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10078,7 +10192,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9059,7 +8340,7 @@ fi
+@@ -9059,7 +8367,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -10087,7 +10201,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -9095,9 +8376,9 @@ fi
+@@ -9095,9 +8403,9 @@
  
  
  
@@ -10099,7 +10213,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
-@@ -9122,22 +8403,18 @@ else
+@@ -9122,22 +8430,18 @@
  	rm -f conftest.*
        fi
  fi
@@ -10126,7 +10240,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -9148,42 +8425,17 @@ main ()
+@@ -9148,42 +8452,17 @@
    return 0;
  }
  _ACEOF
@@ -10174,7 +10288,7 @@
  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
      case $host_os in
      rhapsody* | darwin1.[012])
-@@ -9220,62 +8472,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -9220,62 +8499,13 @@
      ;;
    esac
  
@@ -10242,7 +10356,7 @@
  _ACEOF
  
  fi
-@@ -9293,7 +8496,7 @@ done
+@@ -9293,7 +8523,7 @@
  
  
              # Check whether --enable-shared was given.
@@ -10251,7 +10365,7 @@
    enableval=$enable_shared; p=${PACKAGE-default}
      case $enableval in
      yes) enable_shared=yes ;;
-@@ -9326,7 +8529,7 @@ fi
+@@ -9326,7 +8556,7 @@
  
  
  # Check whether --with-pic was given.
@@ -10260,7 +10374,7 @@
    withval=$with_pic; pic_mode="$withval"
  else
    pic_mode=default
-@@ -9342,7 +8545,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -9342,7 +8572,7 @@
  
  
    # Check whether --enable-fast-install was given.
@@ -10269,7 +10383,7 @@
    enableval=$enable_fast_install; p=${PACKAGE-default}
      case $enableval in
      yes) enable_fast_install=yes ;;
-@@ -9423,9 +8626,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -9423,9 +8653,9 @@
     setopt NO_GLOB_SUBST
  fi
  
@@ -10281,7 +10395,7 @@
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
-@@ -9438,7 +8641,7 @@ else
+@@ -9438,7 +8668,7 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -10290,7 +10404,7 @@
  $as_echo "$lt_cv_objdir" >&6; }
  objdir=$lt_cv_objdir
  
-@@ -9531,9 +8734,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -9531,9 +8761,9 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10302,7 +10416,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -9584,10 +8787,10 @@ fi
+@@ -9584,10 +8814,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -10315,7 +10429,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9597,9 +8800,9 @@ fi
+@@ -9597,9 +8827,9 @@
  
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
@@ -10327,7 +10441,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -9650,10 +8853,10 @@ fi
+@@ -9650,10 +8880,10 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -10340,7 +10454,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -9734,9 +8937,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -9734,9 +8964,9 @@
  if test "$GCC" = yes; then
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
@@ -10352,21 +10466,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9752,11 +8955,11 @@ else
+@@ -9752,11 +8982,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9755: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8958: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8985: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9759: \$? = $ac_status" >&5
-+   echo "$as_me:8962: \$? = $ac_status" >&5
++   echo "$as_me:8989: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9769,7 +8972,7 @@ else
+@@ -9769,7 +8999,7 @@
     $RM conftest*
  
  fi
@@ -10375,7 +10489,7 @@
  $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9789,7 +8992,7 @@ fi
+@@ -9789,7 +9019,7 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -10384,7 +10498,16 @@
  $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
    if test "$GCC" = yes; then
-@@ -10061,7 +9264,7 @@ case $host_os in
+@@ -9921,7 +9151,7 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -10061,7 +9291,7 @@
      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
      ;;
  esac
@@ -10393,7 +10516,7 @@
  $as_echo "$lt_prog_compiler_pic" >&6; }
  
  
-@@ -10073,9 +9276,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -10073,9 +9303,9 @@
  # Check to make sure the PIC flag actually works.
  #
  if test -n "$lt_prog_compiler_pic"; then
@@ -10405,21 +10528,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
-@@ -10091,11 +9294,11 @@ else
+@@ -10091,11 +9321,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10094: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9297: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9324: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:10098: \$? = $ac_status" >&5
-+   echo "$as_me:9301: \$? = $ac_status" >&5
++   echo "$as_me:9328: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -10108,7 +9311,7 @@ else
+@@ -10108,7 +9338,7 @@
     $RM conftest*
  
  fi
@@ -10428,7 +10551,7 @@
  $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10132,9 +9335,9 @@ fi
+@@ -10132,9 +9362,9 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -10440,7 +10563,7 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
-@@ -10160,7 +9363,7 @@ else
+@@ -10160,7 +9390,7 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -10449,7 +10572,7 @@
  $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10175,9 +9378,9 @@ fi
+@@ -10175,9 +9405,9 @@
  
  
  
@@ -10461,21 +10584,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -10196,11 +9399,11 @@ else
+@@ -10196,11 +9426,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10199: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9402: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9429: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:10203: \$? = $ac_status" >&5
-+   echo "$as_me:9406: \$? = $ac_status" >&5
++   echo "$as_me:9433: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -10222,7 +9425,7 @@ else
+@@ -10222,7 +9452,7 @@
     $RM conftest*
  
  fi
@@ -10484,7 +10607,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -10230,9 +9433,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10230,9 +9460,9 @@
  
  
  
@@ -10496,21 +10619,21 @@
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o=no
-@@ -10251,11 +9454,11 @@ else
+@@ -10251,11 +9481,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:10254: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9457: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9484: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:10258: \$? = $ac_status" >&5
-+   echo "$as_me:9461: \$? = $ac_status" >&5
++   echo "$as_me:9488: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -10277,7 +9480,7 @@ else
+@@ -10277,7 +9507,7 @@
     $RM conftest*
  
  fi
@@ -10519,7 +10642,7 @@
  $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
  
-@@ -10286,7 +9489,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10286,7 +9516,7 @@
  hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
@@ -10528,7 +10651,7 @@
  $as_echo_n "checking if we can lock with hard links... " >&6; }
    hard_links=yes
    $RM conftest*
-@@ -10294,10 +9497,10 @@ $as_echo_n "checking if we can lock with
+@@ -10294,10 +9524,10 @@
    touch conftest.a
    ln conftest.a conftest.b 2>&5 || hard_links=no
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -10541,7 +10664,7 @@
  $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
      need_locks=warn
    fi
-@@ -10310,7 +9513,7 @@ fi
+@@ -10310,7 +9540,7 @@
  
  
  
@@ -10550,7 +10673,7 @@
  $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
    runpath_var=
-@@ -10370,6 +9573,9 @@ $as_echo_n "checking whether the $compil
+@@ -10370,6 +9600,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -10560,7 +10683,24 @@
    esac
  
    ld_shlibs=yes
-@@ -10552,7 +9758,7 @@ _LT_EOF
+@@ -10391,6 +9624,7 @@
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
+       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -10482,7 +9716,7 @@
+       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -10552,7 +9786,7 @@
        fi
        ;;
  
@@ -10569,7 +10709,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -10727,6 +9933,7 @@ _LT_EOF
+@@ -10727,6 +9961,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -10577,7 +10717,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -10752,11 +9959,7 @@ _LT_EOF
+@@ -10752,11 +9987,7 @@
  	allow_undefined_flag='-berok'
          # Determine the default libpath from the value encoded in an
          # empty executable.
@@ -10590,7 +10730,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10767,27 +9970,7 @@ main ()
+@@ -10767,27 +9998,7 @@
    return 0;
  }
  _ACEOF
@@ -10619,7 +10759,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10801,16 +9984,9 @@ aix_libpath=`dump -H conftest$ac_exeext 
+@@ -10801,16 +10012,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -10638,7 +10778,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10823,11 +9999,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10823,11 +10027,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
@@ -10651,7 +10791,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -10838,27 +10010,7 @@ main ()
+@@ -10838,27 +10038,7 @@
    return 0;
  }
  _ACEOF
@@ -10680,7 +10820,7 @@
  
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -10872,16 +10024,9 @@ aix_libpath=`dump -H conftest$ac_exeext 
+@@ -10872,16 +10052,9 @@
  if test -z "$aix_libpath"; then
    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  fi
@@ -10699,7 +10839,7 @@
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11093,42 +10238,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11093,42 +10266,16 @@
  	# implicitly export all symbols.
          save_LDFLAGS="$LDFLAGS"
          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -10747,7 +10887,7 @@
          LDFLAGS="$save_LDFLAGS"
        else
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11141,7 +10260,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11141,7 +10288,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -10756,7 +10896,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11384,7 +10503,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11384,7 +10531,7 @@
      fi
    fi
  
@@ -10765,7 +10905,7 @@
  $as_echo "$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
-@@ -11421,16 +10540,16 @@ x|xyes)
+@@ -11421,16 +10568,16 @@
        # 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.
@@ -10786,7 +10926,7 @@
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -11444,11 +10563,11 @@ $as_echo_n "checking whether -lc should 
+@@ -11444,11 +10591,11 @@
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
@@ -10801,7 +10941,7 @@
          then
  	  archive_cmds_need_lc=no
          else
-@@ -11459,7 +10578,7 @@ $as_echo_n "checking whether -lc should 
+@@ -11459,7 +10606,7 @@
          cat conftest.err 1>&5
        fi
        $RM conftest*
@@ -10810,7 +10950,7 @@
  $as_echo "$archive_cmds_need_lc" >&6; }
        ;;
      esac
-@@ -11623,7 +10742,7 @@ esac
+@@ -11623,7 +10770,7 @@
  
  
  
@@ -10819,7 +10959,16 @@
  $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
  if test "$GCC" = yes; then
-@@ -12045,11 +11164,7 @@ linux* | k*bsd*-gnu)
+@@ -12031,7 +11178,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -12045,11 +11192,7 @@
    save_libdir=$libdir
    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
         LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -10832,7 +10981,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -12060,41 +11175,13 @@ main ()
+@@ -12060,41 +11203,13 @@
    return 0;
  }
  _ACEOF
@@ -10878,7 +11027,7 @@
    LDFLAGS=$save_LDFLAGS
    libdir=$save_libdir
  
-@@ -12103,13 +11190,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12103,13 +11218,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -10893,7 +11042,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12121,6 +11205,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12121,6 +11233,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -10912,7 +11061,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -12309,7 +11405,7 @@ uts4*)
+@@ -12309,7 +11433,7 @@
    dynamic_linker=no
    ;;
  esac
@@ -10921,7 +11070,7 @@
  $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
-@@ -12411,7 +11507,7 @@ fi
+@@ -12411,7 +11535,7 @@
  
  
  
@@ -10930,7 +11079,7 @@
  $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12436,7 +11532,7 @@ else
+@@ -12436,7 +11560,7 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -10939,7 +11088,7 @@
  $as_echo "$hardcode_action" >&6; }
  
  if test "$hardcode_action" = relink ||
-@@ -12481,18 +11577,14 @@ else
+@@ -12481,18 +11605,14 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -10961,7 +11110,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12510,43 +11602,18 @@ return dlopen ();
+@@ -12510,43 +11630,18 @@
    return 0;
  }
  _ACEOF
@@ -11011,21 +11160,31 @@
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
-@@ -12559,106 +11626,18 @@ fi
+@@ -12559,33 +11654,19 @@
      ;;
  
    *)
 -    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
 -$as_echo_n "checking for shl_load... " >&6; }
 -if test "${ac_cv_func_shl_load+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
++  lt_cv_dlopen="shl_load"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
++$as_echo_n "checking for shl_load in -ldld... " >&6; }
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
@@ -11042,14 +11201,13 @@
 -#endif
 -
 -#undef shl_load
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char shl_load ();
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -12594,13 +11675,6 @@
+ extern "C"
+ #endif
+ char shl_load ();
 -/* 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.  */
@@ -11057,73 +11215,10 @@
 -choke me
 -#endif
 -
--int
--main ()
--{
--return shl_load ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_func_shl_load=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_shl_load=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-   lt_cv_dlopen="shl_load"
- else
--  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
- $as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -12676,145 +11655,32 @@ return shl_load ();
+ int
+ main ()
+ {
+@@ -12609,56 +11683,32 @@
    return 0;
  }
  _ACEOF
@@ -11148,14 +11243,102 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
+-  ac_cv_func_shl_load=yes
 +if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dld_shl_load=yes
++  ac_cv_lib_dld_shl_load=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-	ac_cv_func_shl_load=no
++  ac_cv_lib_dld_shl_load=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
+-  lt_cv_dlopen="shl_load"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-$as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
++  lt_cv_dlopen="dlopen"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-ldl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12667,81 +11717,38 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shl_load ();
++char dlopen ();
+ int
+ main ()
+ {
+-return shl_load ();
++return dlopen ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_dld_shl_load=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dl_dlopen=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -	ac_cv_lib_dld_shl_load=no
-+  ac_cv_lib_dld_shl_load=no
++  ac_cv_lib_dl_dlopen=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -11166,23 +11349,31 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
- $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
 -  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
 -$as_echo_n "checking for dlopen... " >&6; }
 -if test "${ac_cv_func_dlopen+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
++$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
@@ -11199,6 +11390,78 @@
 -#endif
 -
 -#undef dlopen
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -12750,13 +11757,6 @@
+ extern "C"
+ #endif
+ char dlopen ();
+-/* 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
+-#endif
+-
+ int
+ main ()
+ {
+@@ -12765,192 +11765,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_dlopen=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_dlopen=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-$as_echo "$ac_cv_func_dlopen" >&6; }
+-if test "x$ac_cv_func_dlopen" = x""yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -11207,13 +11470,6 @@
 -extern "C"
 -#endif
 -char dlopen ();
--/* 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
--#endif
--
 -int
 -main ()
 -{
@@ -11243,114 +11499,53 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_func_dlopen=yes
+-  ac_cv_lib_dl_dlopen=yes
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_func_dlopen=no
+-	ac_cv_lib_dl_dlopen=no
 -fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
 -fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--$as_echo "$ac_cv_func_dlopen" >&6; }
--if test "x$ac_cv_func_dlopen" = x""yes; then
-+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen"
- else
--  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -12832,57 +11698,28 @@ return dlopen ();
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dl_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dl_dlopen=no
-+  ac_cv_lib_dl_dlopen=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
--  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
- $as_echo_n "checking for dlopen in -lsvld... " >&6; }
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
 -_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -12900,57 +11737,28 @@ return dlopen ();
-   return 0;
- }
- _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -11414,7 +11609,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -12968,43 +11776,18 @@ return dld_link ();
+@@ -12968,43 +11804,18 @@
    return 0;
  }
  _ACEOF
@@ -11464,7 +11659,7 @@
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
-@@ -13043,9 +11826,9 @@ fi
+@@ -13043,9 +11854,9 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -11476,16 +11671,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -13054,7 +11837,7 @@ else
+@@ -13054,7 +11865,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 13057 "configure"
-+#line 11840 "configure"
++#line 11868 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13113,11 +11896,11 @@ int main ()
+@@ -13113,11 +11924,11 @@
    return status;
  }
  _LT_EOF
@@ -11500,7 +11695,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -13134,14 +11917,14 @@ rm -fr conftest*
+@@ -13134,14 +11945,14 @@
  
  
  fi
@@ -11518,16 +11713,16 @@
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -13150,7 +11933,7 @@ else
+@@ -13150,7 +11961,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 13153 "configure"
-+#line 11936 "configure"
++#line 11964 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13209,11 +11992,11 @@ int main ()
+@@ -13209,11 +12020,11 @@
    return status;
  }
  _LT_EOF
@@ -11542,7 +11737,7 @@
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -13230,7 +12013,7 @@ rm -fr conftest*
+@@ -13230,7 +12041,7 @@
  
  
  fi
@@ -11551,7 +11746,7 @@
  $as_echo "$lt_cv_dlopen_self_static" >&6; }
      fi
  
-@@ -13269,12 +12052,12 @@ fi
+@@ -13269,12 +12080,12 @@
  
  striplib=
  old_striplib=
@@ -11566,7 +11761,7 @@
  $as_echo "yes" >&6; }
  else
  # FIXME - insert some real tests, host_os isn't really good enough
-@@ -13283,15 +12066,15 @@ else
+@@ -13283,15 +12094,15 @@
      if test -n "$STRIP" ; then
        striplib="$STRIP -x"
        old_striplib="$STRIP -S"
@@ -11585,7 +11780,7 @@
  $as_echo "no" >&6; }
      ;;
    esac
-@@ -13309,12 +12092,12 @@ fi
+@@ -13309,12 +12120,12 @@
  
  
    # Report which library types will actually be built
@@ -11601,7 +11796,7 @@
  $as_echo_n "checking whether to build shared libraries... " >&6; }
    test "$can_build_shared" = "no" && enable_shared=no
  
-@@ -13335,14 +12118,14 @@ $as_echo_n "checking whether to build sh
+@@ -13335,14 +12146,14 @@
      fi
      ;;
    esac
@@ -11619,7 +11814,7 @@
  $as_echo "$enable_static" >&6; }
  
  
-@@ -13379,9 +12162,9 @@ CC="$lt_save_CC"
+@@ -13379,9 +12190,9 @@
  
  # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -11631,7 +11826,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -13394,14 +12177,14 @@ for as_dir in $PATH
+@@ -13394,14 +12205,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11649,7 +11844,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -13410,10 +12193,10 @@ esac
+@@ -13410,10 +12221,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -11662,7 +11857,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -13425,9 +12208,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != 
+@@ -13425,9 +12236,9 @@
  	if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -11674,7 +11869,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -13440,14 +12223,14 @@ for as_dir in $PATH
+@@ -13440,14 +12251,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11692,7 +11887,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13455,10 +12238,10 @@ esac
+@@ -13455,10 +12266,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -11705,7 +11900,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -13468,9 +12251,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -13468,9 +12279,9 @@
    ac_pt_PKG_CONFIG=$PKG_CONFIG
    # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -11717,7 +11912,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $ac_pt_PKG_CONFIG in
-@@ -13483,14 +12266,14 @@ for as_dir in $PATH
+@@ -13483,14 +12294,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11735,7 +11930,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -13498,10 +12281,10 @@ esac
+@@ -13498,10 +12309,10 @@
  fi
  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
  if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11748,7 +11943,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -13510,7 +12293,7 @@ fi
+@@ -13510,7 +12321,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -11757,7 +11952,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -13523,13 +12306,13 @@ fi
+@@ -13523,13 +12334,13 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -11774,7 +11969,7 @@
  $as_echo "no" >&6; }
  		PKG_CONFIG=""
  	fi
-@@ -13537,14 +12320,15 @@ $as_echo "no" >&6; }
+@@ -13537,14 +12348,15 @@
  fi
  
  pkg_failed=no
@@ -11796,7 +11991,7 @@
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
  	gthread-2.0
-@@ -13556,7 +12340,7 @@ if test -n "$ALL_CFLAGS"; then
+@@ -13556,7 +12368,7 @@
  	gail			>= 0.16
  	unique-1.0
  	dbus-glib-1
@@ -11805,7 +12000,7 @@
    ($PKG_CONFIG --exists --print-errors "
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
-@@ -13571,8 +12355,8 @@ if test -n "$ALL_CFLAGS"; then
+@@ -13571,8 +12383,8 @@
  	dbus-glib-1
  ") 2>&5
    ac_status=$?
@@ -11816,7 +12011,7 @@
    pkg_cv_ALL_CFLAGS=`$PKG_CONFIG --cflags "
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
-@@ -13589,14 +12373,16 @@ if test -n "$ALL_CFLAGS"; then
+@@ -13589,14 +12401,16 @@
  else
    pkg_failed=yes
  fi
@@ -11840,7 +12035,7 @@
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
  	gthread-2.0
-@@ -13608,7 +12394,7 @@ if test -n "$ALL_LIBS"; then
+@@ -13608,7 +12422,7 @@
  	gail			>= 0.16
  	unique-1.0
  	dbus-glib-1
@@ -11849,7 +12044,7 @@
    ($PKG_CONFIG --exists --print-errors "
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
-@@ -13623,8 +12409,8 @@ if test -n "$ALL_LIBS"; then
+@@ -13623,8 +12437,8 @@
  	dbus-glib-1
  ") 2>&5
    ac_status=$?
@@ -11860,7 +12055,7 @@
    pkg_cv_ALL_LIBS=`$PKG_CONFIG --libs "
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
-@@ -13641,8 +12427,9 @@ if test -n "$ALL_LIBS"; then
+@@ -13641,8 +12455,9 @@
  else
    pkg_failed=yes
  fi
@@ -11872,7 +12067,7 @@
  fi
  
  
-@@ -13655,7 +12442,7 @@ else
+@@ -13655,7 +12470,7 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -11881,7 +12076,7 @@
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
  	gthread-2.0
-@@ -13667,9 +12454,9 @@ fi
+@@ -13667,9 +12482,9 @@
  	gail			>= 0.16
  	unique-1.0
  	dbus-glib-1
@@ -11893,7 +12088,7 @@
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
  	gthread-2.0
-@@ -13681,35 +12468,12 @@ fi
+@@ -13681,35 +12496,12 @@
  	gail			>= 0.16
  	unique-1.0
  	dbus-glib-1
@@ -11931,7 +12126,7 @@
  	glib-2.0		>= 2.21.3
  	gnome-desktop-2.0	>= 2.25.5
  	gthread-2.0
-@@ -13731,22 +12495,11 @@ installed software in a non-standard pre
+@@ -13731,22 +12523,11 @@
  Alternatively, you may set the environment variables ALL_CFLAGS
  and ALL_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -11957,7 +12152,7 @@
  is in your PATH or set the PKG_CONFIG environment variable to the full
  path to pkg-config.
  
-@@ -13755,12 +12508,11 @@ and ALL_LIBS to avoid the need to call p
+@@ -13755,12 +12536,11 @@
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11972,7 +12167,7 @@
  $as_echo "yes" >&6; }
  	:
  fi
-@@ -13774,151 +12526,12 @@ _ACEOF
+@@ -13774,151 +12554,12 @@
  
  
  
@@ -12129,7 +12324,7 @@
  _ACEOF
  
  fi
-@@ -13926,16 +12539,12 @@ fi
+@@ -13926,16 +12567,12 @@
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -12149,7 +12344,7 @@
  /* end confdefs.h.  */
  #include <locale.h>
  int
-@@ -13946,46 +12555,19 @@ return LC_MESSAGES
+@@ -13946,46 +12583,19 @@
    return 0;
  }
  _ACEOF
@@ -12202,7 +12397,7 @@
  
      fi
    fi
-@@ -13998,155 +12580,20 @@ _ACEOF
+@@ -13998,155 +12608,20 @@
      XGETTEXT=:
      INTLLIBS=
  
@@ -12363,7 +12558,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -14159,54 +12606,25 @@ return !ngettext ("","", 1)
+@@ -14159,54 +12634,25 @@
    return 0;
  }
  _ACEOF
@@ -12426,7 +12621,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -14219,167 +12637,48 @@ return !dgettext ("","")
+@@ -14219,141 +12665,26 @@
    return 0;
  }
  _ACEOF
@@ -12485,42 +12680,27 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+        for ac_func in bind_textdomain_codeset
-+do :
-+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
-+done
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+      fi
- 
+-
 -#undef $ac_func
-+      #
-+      # If we don't have everything we want, check in libintl
-+      #
-+      if test "$gt_cv_func_dgettext_libc" != "yes" \
-+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
-+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
- 
+-
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -12583,22 +12763,20 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++        for ac_func in bind_textdomain_codeset
++do :
++  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--      fi
--
--      #
--      # If we don't have everything we want, check in libintl
--      #
--      if test "$gt_cv_func_dgettext_libc" != "yes" \
--	 || test "$gt_cv_func_ngettext_libc" != "yes" \
--         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
--
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+ 
+ fi
+@@ -14368,18 +12699,14 @@
+ 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+ 
 -        { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
  $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
@@ -12617,7 +12795,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -14397,55 +12696,26 @@ return bindtextdomain ();
+@@ -14397,55 +12724,26 @@
    return 0;
  }
  _ACEOF
@@ -12682,7 +12860,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -14463,55 +12733,26 @@ return ngettext ();
+@@ -14463,55 +12761,26 @@
    return 0;
  }
  _ACEOF
@@ -12747,7 +12925,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -14529,43 +12770,18 @@ return dgettext ();
+@@ -14529,43 +12798,18 @@
    return 0;
  }
  _ACEOF
@@ -12797,7 +12975,7 @@
    gt_cv_func_dgettext_libintl=yes
  fi
  
-@@ -14575,22 +12791,18 @@ fi
+@@ -14575,22 +12819,18 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -12825,7 +13003,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -14608,55 +12820,26 @@ return ngettext ();
+@@ -14608,55 +12848,26 @@
    return 0;
  }
  _ACEOF
@@ -12890,7 +13068,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -14674,43 +12857,18 @@ return dcgettext ();
+@@ -14674,43 +12885,18 @@
    return 0;
  }
  _ACEOF
@@ -12940,7 +13118,7 @@
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
  else
-@@ -14732,102 +12890,12 @@ fi
+@@ -14732,108 +12918,18 @@
            glib_save_LIBS="$LIBS"
            LIBS="$LIBS -lintl $libintl_extra_libs"
            unset ac_cv_func_bind_textdomain_codeset
@@ -12955,7 +13133,13 @@
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++          for ac_func in bind_textdomain_codeset
++do :
++  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -12967,13 +13151,15 @@
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++fi
++done
+ 
 -#undef $ac_func
 -
 -/* Override any GCC internal prototype to avoid an error.
@@ -13038,17 +13224,19 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+          for ac_func in bind_textdomain_codeset
-+do :
-+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
- 
- fi
-@@ -14857,15 +12925,13 @@ done
+-_ACEOF
+-
+-fi
+-done
+-
+-          LIBS="$glib_save_LIBS"
++          LIBS="$glib_save_LIBS"
+ 
+           if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+             gt_cv_func_dgettext_libc=no
+@@ -14857,15 +12953,13 @@
  
        if test "$gt_cv_have_gettext" = "yes"; then
  
@@ -13067,7 +13255,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$MSGFMT" in
-@@ -14890,118 +12956,28 @@ esac
+@@ -14890,118 +12984,28 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -13194,7 +13382,7 @@
  $as_echo_n "checking if msgfmt accepts -c... " >&6; }
  	  cat >conftest.foo <<_ACEOF
  
-@@ -15016,14 +12992,14 @@ msgstr ""
+@@ -15016,14 +13020,14 @@
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -13214,7 +13402,7 @@
  $as_echo "no" >&6; }
  echo "$as_me: failed input was:" >&5
  sed 's/^/| /' conftest.foo >&5
-@@ -15031,9 +13007,9 @@ fi
+@@ -15031,9 +13035,9 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -13226,7 +13414,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -15046,14 +13022,14 @@ for as_dir in $PATH
+@@ -15046,14 +13050,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13244,7 +13432,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15062,19 +13038,19 @@ esac
+@@ -15062,19 +13066,19 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -13268,7 +13456,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -15099,18 +13075,14 @@ esac
+@@ -15099,18 +13103,14 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -13290,7 +13478,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -15122,121 +13094,14 @@ extern int _nl_msg_cat_cntr;
+@@ -15122,121 +13122,14 @@
    return 0;
  }
  _ACEOF
@@ -13416,7 +13604,7 @@
    CATOBJEXT=.gmo
                 DATADIRNAME=share
  else
-@@ -15251,10 +13116,8 @@ fi
+@@ -15251,10 +13144,8 @@
  	    ;;
  	    esac
  fi
@@ -13429,7 +13617,7 @@
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
  	else
-@@ -15268,9 +13131,7 @@ fi
+@@ -15268,9 +13159,7 @@
  
      if test "$gt_cv_have_gettext" = "yes" ; then
  
@@ -13440,7 +13628,7 @@
  
      fi
  
-@@ -15278,7 +13139,7 @@ _ACEOF
+@@ -15278,7 +13167,7 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -13449,7 +13637,7 @@
  $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
          XGETTEXT=":"
        fi
-@@ -15311,7 +13172,7 @@ $as_echo "found xgettext program is not 
+@@ -15311,7 +13200,7 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -13458,7 +13646,7 @@
  $as_echo_n "checking for catalogs to be installed... " >&6; }
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
-@@ -15336,7 +13197,7 @@ $as_echo_n "checking for catalogs to be 
+@@ -15336,7 +13225,7 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -13467,7 +13655,7 @@
  $as_echo "$LINGUAS" >&6; }
       fi
  
-@@ -15390,16 +13251,16 @@ _ACEOF
+@@ -15390,16 +13279,16 @@
  
  
  
@@ -13487,7 +13675,7 @@
  $as_echo "$USE_NLS" >&6; }
  
  
-@@ -15407,35 +13268,31 @@ $as_echo "$USE_NLS" >&6; }
+@@ -15407,35 +13296,31 @@
  
  case "$am__api_version" in
      1.01234)
@@ -13529,7 +13717,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_UPDATE in
-@@ -15448,14 +13305,14 @@ for as_dir in $PATH
+@@ -15448,14 +13333,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13547,7 +13735,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -15463,19 +13320,19 @@ esac
+@@ -15463,19 +13348,19 @@
  fi
  INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
  if test -n "$INTLTOOL_UPDATE"; then
@@ -13571,7 +13759,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_MERGE in
-@@ -15488,14 +13345,14 @@ for as_dir in $PATH
+@@ -15488,14 +13373,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13589,7 +13777,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -15503,19 +13360,19 @@ esac
+@@ -15503,19 +13388,19 @@
  fi
  INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
  if test -n "$INTLTOOL_MERGE"; then
@@ -13613,7 +13801,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_EXTRACT in
-@@ -15528,14 +13385,14 @@ for as_dir in $PATH
+@@ -15528,14 +13413,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13631,7 +13819,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -15543,18 +13400,16 @@ esac
+@@ -15543,18 +13428,16 @@
  fi
  INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
  if test -n "$INTLTOOL_EXTRACT"; then
@@ -13653,7 +13841,7 @@
  fi
  
    INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -15676,9 +13531,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -15676,9 +13559,9 @@
  # Check the gettext tools to make sure they are GNU
  # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -13665,7 +13853,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XGETTEXT in
-@@ -15691,14 +13546,14 @@ for as_dir in $PATH
+@@ -15691,14 +13574,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13683,7 +13871,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -15706,19 +13561,19 @@ esac
+@@ -15706,19 +13589,19 @@
  fi
  XGETTEXT=$ac_cv_path_XGETTEXT
  if test -n "$XGETTEXT"; then
@@ -13707,7 +13895,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGMERGE in
-@@ -15731,14 +13586,14 @@ for as_dir in $PATH
+@@ -15731,14 +13614,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13725,7 +13913,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -15746,19 +13601,19 @@ esac
+@@ -15746,19 +13629,19 @@
  fi
  MSGMERGE=$ac_cv_path_MSGMERGE
  if test -n "$MSGMERGE"; then
@@ -13749,7 +13937,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGFMT in
-@@ -15771,14 +13626,14 @@ for as_dir in $PATH
+@@ -15771,14 +13654,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13767,7 +13955,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -15786,19 +13641,19 @@ esac
+@@ -15786,19 +13669,19 @@
  fi
  MSGFMT=$ac_cv_path_MSGFMT
  if test -n "$MSGFMT"; then
@@ -13791,7 +13979,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -15811,14 +13666,14 @@ for as_dir in $PATH
+@@ -15811,14 +13694,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13809,7 +13997,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -15827,33 +13682,29 @@ esac
+@@ -15827,33 +13710,29 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -13849,7 +14037,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_PERL in
-@@ -15866,14 +13717,14 @@ for as_dir in $PATH
+@@ -15866,14 +13745,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -13867,7 +14055,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -15881,41 +13732,35 @@ esac
+@@ -15881,41 +13760,35 @@
  fi
  INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
  if test -n "$INTLTOOL_PERL"; then
@@ -13918,7 +14106,7 @@
     fi
  fi
  
-@@ -15925,11 +13770,7 @@ fi
+@@ -15925,11 +13798,7 @@
  # Set DATADIRNAME correctly if it is not set yet
  # (copied from glib-gettext.m4)
  if test -z "$DATADIRNAME"; then
@@ -13931,7 +14119,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -15941,120 +13782,13 @@ extern int _nl_msg_cat_cntr;
+@@ -15941,136 +13810,27 @@
    return 0;
  }
  _ACEOF
@@ -13969,7 +14157,10 @@
 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
 -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++  DATADIRNAME=share
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -13979,7 +14170,9 @@
 -/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
++  DATADIRNAME=lib
++fi
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char bind_textdomain_codeset (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -14051,25 +14244,35 @@
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
 -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
-   DATADIRNAME=share
- else
-   DATADIRNAME=lib
-@@ -16066,10 +13800,8 @@ fi
-     ;;
-     esac
- fi
+-  DATADIRNAME=share
+-else
+-  DATADIRNAME=lib
+-fi
+-
+-    ;;
+-    *)
+-    DATADIRNAME=lib
+-    ;;
+-    esac
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-fi
++    ;;
++    *)
++    DATADIRNAME=lib
++    ;;
++    esac
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
- fi
- 
- 
-@@ -16082,9 +13814,9 @@ fi
++fi
+ 
+ 
+ 
+@@ -16082,9 +13842,9 @@
  
      # Extract the first word of "gtkdoc-check", so it can be a program name with args.
  set dummy gtkdoc-check; ac_word=$2
@@ -14081,7 +14284,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_CHECK in
-@@ -16097,14 +13829,14 @@ for as_dir in $PATH
+@@ -16097,14 +13857,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14099,7 +14302,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -16112,10 +13844,10 @@ esac
+@@ -16112,10 +13872,10 @@
  fi
  GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
  if test -n "$GTKDOC_CHECK"; then
@@ -14112,7 +14315,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -16124,9 +13856,9 @@ fi
+@@ -16124,9 +13884,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -14124,7 +14327,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_REBASE in
-@@ -16139,14 +13871,14 @@ for as_dir in $PATH
+@@ -16139,14 +13899,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14142,7 +14345,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -16154,10 +13886,10 @@ esac
+@@ -16154,10 +13914,10 @@
  fi
  GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
  if test -n "$GTKDOC_REBASE"; then
@@ -14155,7 +14358,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -16168,9 +13900,9 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBAS
+@@ -16168,9 +13928,9 @@
  
    # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
  set dummy gtkdoc-mkpdf; ac_word=$2
@@ -14167,7 +14370,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GTKDOC_MKPDF in
-@@ -16183,14 +13915,14 @@ for as_dir in $PATH
+@@ -16183,14 +13943,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14185,7 +14388,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -16198,10 +13930,10 @@ esac
+@@ -16198,10 +13958,10 @@
  fi
  GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
  if test -n "$GTKDOC_MKPDF"; then
@@ -14198,7 +14401,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -16209,7 +13941,7 @@ fi
+@@ -16209,7 +13969,7 @@
  
  
  # Check whether --with-html-dir was given.
@@ -14207,7 +14410,7 @@
    withval=$with_html_dir;
  else
    with_html_dir='${datadir}/gtk-doc/html'
-@@ -16219,7 +13951,7 @@ fi
+@@ -16219,7 +13979,7 @@
  
  
      # Check whether --enable-gtk-doc was given.
@@ -14216,7 +14419,7 @@
    enableval=$enable_gtk_doc;
  else
    enable_gtk_doc=no
-@@ -16228,33 +13960,31 @@ fi
+@@ -16228,33 +13988,31 @@
  
    if test x$enable_gtk_doc = xyes; then
      if test -n "$PKG_CONFIG" && \
@@ -14258,7 +14461,7 @@
    enableval=$enable_gtk_doc_pdf;
  else
    enable_gtk_doc_pdf=no
-@@ -16311,12 +14041,10 @@ fi
+@@ -16311,12 +14069,10 @@
  
  ENABLE_PROFILER=
  # Check whether --enable-profiler was given.
@@ -14273,7 +14476,7 @@
  
  fi
  
-@@ -16344,9 +14072,9 @@ for ac_prog in perl5 perl
+@@ -16344,9 +14100,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -14285,7 +14488,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$PERL"; then
-@@ -16357,24 +14085,24 @@ for as_dir in $PATH
+@@ -16357,24 +14113,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14315,7 +14518,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -16384,9 +14112,9 @@ done
+@@ -16384,9 +14140,9 @@
  
  # Extract the first word of "glib-genmarshal", so it can be a program name with args.
  set dummy glib-genmarshal; ac_word=$2
@@ -14327,7 +14530,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GLIB_GENMARSHAL in
-@@ -16399,14 +14127,14 @@ for as_dir in $PATH
+@@ -16399,14 +14155,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -14345,7 +14548,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -16414,289 +14142,59 @@ esac
+@@ -16414,162 +14170,22 @@
  fi
  GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
  if test -n "$GLIB_GENMARSHAL"; then
@@ -14390,14 +14593,7 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -14420,15 +14616,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_header_compiler=no
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -$as_echo "$ac_header_compiler" >&6; }
-+done
- 
+-
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -14439,13 +14634,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+for ac_func in mallopt
-+do :
-+  ac_fn_c_check_func "$LINENO" "mallopt" "ac_cv_func_mallopt"
-+if test "x$ac_cv_func_mallopt" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_MALLOPT 1
- _ACEOF
+-_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14467,15 +14656,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -  ac_header_preproc=no
- fi
-+done
- 
+-fi
+-
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
- 
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -14505,12 +14693,7 @@
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
-+
-+x_libs="`$PKG_CONFIG --libs pangox`"
-+case x_libs in
-+  *-lX11*) pango_omitted_x_deps=no ;;
-+  *)       pango_omitted_x_deps=yes ;;
- esac
+-esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -14522,21 +14705,25 @@
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
- 
+-
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--for ac_func in mallopt
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -16578,102 +14194,12 @@
+ 
+ done
+ 
+-
+ for ac_func in mallopt
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -14629,25 +14816,17 @@
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++do :
++  ac_fn_c_check_func "$LINENO" "mallopt" "ac_cv_func_mallopt"
++if test "x$ac_cv_func_mallopt" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--
--
--x_libs="`$PKG_CONFIG --libs pangox`"
--case x_libs in
--  *-lX11*) pango_omitted_x_deps=no ;;
--  *)       pango_omitted_x_deps=yes ;;
--esac
--
--x_cflags="`$PKG_CONFIG --cflags pangox`"
--x_extra_libs=
-+x_cflags="`$PKG_CONFIG --cflags pangox`"
-+x_extra_libs=
++#define HAVE_MALLOPT 1
+ _ACEOF
+ 
+ fi
+@@ -16691,12 +14217,12 @@
+ x_extra_libs=
  
  if test $pango_omitted_x_deps = yes ; then
 -  { $as_echo "$as_me:$LINENO: checking for X" >&5
@@ -14661,7 +14840,7 @@
    withval=$with_x;
  fi
  
-@@ -16706,10 +14204,8 @@ if test "x$with_x" = xno; then
+@@ -16706,10 +14232,8 @@
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
@@ -14674,7 +14853,7 @@
    $as_echo_n "(cached) " >&6
  else
    # One or both of the vars are not set, and there is no cached value.
-@@ -16757,21 +14253,25 @@ fi
+@@ -16757,21 +14281,25 @@
  # Check X11 before X11Rn because it is often a symlink to the current release.
  ac_x_header_dirs='
  /usr/X11/include
@@ -14700,7 +14879,7 @@
  /usr/local/include/X11R6
  /usr/local/include/X11R5
  /usr/local/include/X11R4
-@@ -16793,37 +14293,14 @@ ac_x_header_dirs='
+@@ -16793,37 +14321,14 @@
  if test "$ac_x_includes" = no; then
    # Guess where to find include files, by looking for Xlib.h.
    # First, try using that file with no special directory specified.
@@ -14740,7 +14919,7 @@
    for ac_dir in $ac_x_header_dirs; do
    if test -r "$ac_dir/X11/Xlib.h"; then
      ac_x_includes=$ac_dir
-@@ -16831,7 +14308,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16831,7 +14336,6 @@
    fi
  done
  fi
@@ -14748,7 +14927,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  
-@@ -16841,11 +14317,7 @@ if test "$ac_x_libraries" = no; then
+@@ -16841,11 +14345,7 @@
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
    LIBS="-lX11 $LIBS"
@@ -14761,7 +14940,7 @@
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  int
-@@ -16856,35 +14328,12 @@ XrmInitialize ()
+@@ -16856,35 +14356,12 @@
    return 0;
  }
  _ACEOF
@@ -14799,7 +14978,7 @@
  for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
  do
    # Don't even attempt the hair of trying to link an X program!
-@@ -16896,10 +14345,8 @@ do
+@@ -16896,10 +14373,8 @@
    done
  done
  fi
@@ -14812,7 +14991,7 @@
  fi # $ac_x_libraries = no
  
  case $ac_x_includes,$ac_x_libraries in #(
-@@ -16920,7 +14367,7 @@ fi
+@@ -16920,7 +14395,7 @@
  fi # $with_x != no
  
  if test "$have_x" != yes; then
@@ -14821,7 +15000,7 @@
  $as_echo "$have_x" >&6; }
    no_x=yes
  else
-@@ -16931,16 +14378,14 @@ else
+@@ -16931,16 +14406,14 @@
    ac_cv_have_x="have_x=yes\
  	ac_x_includes='$x_includes'\
  	ac_x_libraries='$x_libraries'"
@@ -14840,7 +15019,7 @@
  
    X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
  else
-@@ -16953,16 +14398,12 @@ else
+@@ -16953,16 +14426,12 @@
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
@@ -14859,7 +15038,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -16973,40 +14414,13 @@ main ()
+@@ -16973,40 +14442,13 @@
    return 0;
  }
  _ACEOF
@@ -14904,7 +15083,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -17017,46 +14431,19 @@ main ()
+@@ -17017,46 +14459,19 @@
    return 0;
  }
  _ACEOF
@@ -14958,7 +15137,7 @@
      ac_c_werror_flag=$ac_xsave_c_werror_flag
      LIBS=$ac_xsave_LIBS
    fi
-@@ -17072,11 +14459,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17072,11 +14487,7 @@
      # libraries were built with DECnet support.  And Karl Berry says
      # the Alpha needs dnet_stub (dnet does not exist).
      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -14971,7 +15150,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17094,44 +14477,17 @@ return XOpenDisplay ();
+@@ -17094,44 +14505,17 @@
    return 0;
  }
  _ACEOF
@@ -14997,13 +15176,13 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  :
--else
++if ac_fn_c_try_link "$LINENO"; then :
++
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_link "$LINENO"; then :
- 
+-
 -	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
@@ -15021,7 +15200,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17149,59 +14505,30 @@ return dnet_ntoa ();
+@@ -17149,59 +14533,30 @@
    return 0;
  }
  _ACEOF
@@ -15090,7 +15269,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17219,52 +14546,25 @@ return dnet_ntoa ();
+@@ -17219,52 +14574,25 @@
    return 0;
  }
  _ACEOF
@@ -15151,7 +15330,7 @@
      LIBS="$ac_xsave_LIBS"
  
      # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -17275,105 +14575,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17275,105 +14603,20 @@
      # on Irix 5.2, according to T.E. Dickey.
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -15169,7 +15348,9 @@
 -/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define gethostbyname innocuous_gethostbyname
--
++    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char gethostbyname (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -15196,9 +15377,7 @@
 -#if defined __stub_gethostbyname || defined __stub___gethostbyname
 -choke me
 -#endif
-+    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
- 
+-
 -int
 -main ()
 -{
@@ -15234,15 +15413,15 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_func_gethostbyname=no
--fi
--
+ fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
 -$as_echo "$ac_cv_func_gethostbyname" >&6; }
- 
+-
      if test $ac_cv_func_gethostbyname = no; then
 -      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
@@ -15262,7 +15441,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17391,59 +14606,30 @@ return gethostbyname ();
+@@ -17391,59 +14634,30 @@
    return 0;
  }
  _ACEOF
@@ -15331,7 +15510,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17461,43 +14647,18 @@ return gethostbyname ();
+@@ -17461,43 +14675,18 @@
    return 0;
  }
  _ACEOF
@@ -15381,7 +15560,7 @@
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
-@@ -17511,105 +14672,20 @@ fi
+@@ -17511,105 +14700,20 @@
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -15426,7 +15605,9 @@
 -#if defined __stub_connect || defined __stub___connect
 -choke me
 -#endif
--
++    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+ 
 -int
 -main ()
 -{
@@ -15462,17 +15643,15 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_func_connect=no
--fi
-+    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
+ fi
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
 -$as_echo "$ac_cv_func_connect" >&6; }
- 
+-
      if test $ac_cv_func_connect = no; then
 -      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
@@ -15492,7 +15671,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17627,148 +14703,38 @@ return connect ();
+@@ -17627,148 +14731,38 @@
    return 0;
  }
  _ACEOF
@@ -15559,9 +15738,7 @@
 -/* Define remove to an innocuous variant, in case <limits.h> declares remove.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define remove innocuous_remove
-+    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-+if test "x$ac_cv_func_remove" = x""yes; then :
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char remove (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -15622,17 +15799,19 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+ 
 -	ac_cv_func_remove=no
--fi
--
+ fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
 -$as_echo "$ac_cv_func_remove" >&6; }
- 
+-
      if test $ac_cv_func_remove = no; then
 -      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
@@ -15652,10 +15831,11 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17785,149 +14751,39 @@ return remove ();
+@@ -17784,150 +14778,40 @@
+ return remove ();
    ;
    return 0;
- }
+-}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -15772,6 +15952,7 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_func_shmat=yes
++}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_posix_remove=yes
@@ -15785,22 +15966,22 @@
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
 +$as_echo "$ac_cv_lib_posix_remove" >&6; }
 +if test "x$ac_cv_lib_posix_remove" = x""yes; then :
 +  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
++fi
++
 +    fi
 +
 +    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 +    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
 +if test "x$ac_cv_func_shmat" = x""yes; then :
-+
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
 -$as_echo "$ac_cv_func_shmat" >&6; }
@@ -15824,7 +16005,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -17945,43 +14801,18 @@ return shmat ();
+@@ -17945,43 +14829,18 @@
    return 0;
  }
  _ACEOF
@@ -15874,7 +16055,7 @@
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
-@@ -17997,18 +14828,14 @@ fi
+@@ -17997,18 +14856,14 @@
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
@@ -15896,7 +16077,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18026,43 +14853,18 @@ return IceConnectionNumber ();
+@@ -18026,43 +14881,18 @@
    return 0;
  }
  _ACEOF
@@ -15946,7 +16127,7 @@
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
-@@ -18072,9 +14874,7 @@ fi
+@@ -18072,9 +14902,7 @@
  
  
    if test x$no_x = xyes ; then
@@ -15957,7 +16138,7 @@
    fi
  
    x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-@@ -18090,18 +14890,14 @@ x_libs_for_checks=$x_libs
+@@ -18090,18 +14918,14 @@
  #  esac
  #done
  
@@ -15979,7 +16160,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -18119,48 +14915,21 @@ return XOpenDisplay ();
+@@ -18119,48 +14943,21 @@
    return 0;
  }
  _ACEOF
@@ -16035,7 +16216,7 @@
  fi
  
  
-@@ -18177,40 +14946,44 @@ fi
+@@ -18177,40 +14974,44 @@
  
  
  pkg_failed=no
@@ -16099,7 +16280,7 @@
  fi
  
  
-@@ -18223,52 +14996,56 @@ else
+@@ -18223,52 +15024,56 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16178,7 +16359,7 @@
  fi
  
  
-@@ -18281,14 +15058,14 @@ else
+@@ -18281,14 +15086,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16196,7 +16377,7 @@
  $as_echo "no" >&6; }
                   if false; then
    HAVE_EXIF_TRUE=
-@@ -18310,7 +15087,7 @@ fi
+@@ -18310,7 +15115,7 @@
  else
  	EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
  	EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16205,7 +16386,7 @@
  $as_echo "yes" >&6; }
  
  				     if true; then
-@@ -18322,9 +15099,7 @@ else
+@@ -18322,9 +15127,7 @@
  fi
  
  
@@ -16216,7 +16397,7 @@
  
  
  fi
-@@ -18333,40 +15108,44 @@ elif test $pkg_failed = untried; then
+@@ -18333,40 +15136,44 @@
  
  
  pkg_failed=no
@@ -16280,7 +16461,7 @@
  fi
  
  
-@@ -18379,14 +15158,14 @@ else
+@@ -18379,14 +15186,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16298,7 +16479,7 @@
  $as_echo "no" >&6; }
                   if false; then
    HAVE_EXIF_TRUE=
-@@ -18408,7 +15187,7 @@ fi
+@@ -18408,7 +15215,7 @@
  else
  	EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
  	EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16307,7 +16488,7 @@
  $as_echo "yes" >&6; }
  
  				     if true; then
-@@ -18420,9 +15199,7 @@ else
+@@ -18420,9 +15227,7 @@
  fi
  
  
@@ -16318,7 +16499,7 @@
  
  
  fi
-@@ -18430,7 +15207,7 @@ fi
+@@ -18430,7 +15235,7 @@
  else
  	EXIF_CFLAGS=$pkg_cv_EXIF_CFLAGS
  	EXIF_LIBS=$pkg_cv_EXIF_LIBS
@@ -16327,7 +16508,7 @@
  $as_echo "yes" >&6; }
  
  		   if true; then
-@@ -18442,9 +15219,7 @@ else
+@@ -18442,9 +15247,7 @@
  fi
  
  
@@ -16338,7 +16519,7 @@
  
  
  fi
-@@ -18464,7 +15239,7 @@ fi
+@@ -18464,7 +15267,7 @@
  
  
  # Check whether --enable-xmp was given.
@@ -16347,7 +16528,7 @@
    enableval=$enable_xmp;
  fi
  
-@@ -18472,40 +15247,44 @@ msg_xmp=no
+@@ -18472,40 +15275,44 @@
  if test "x$enable_xmp" != "xno"; then
  
  pkg_failed=no
@@ -16411,7 +16592,7 @@
  fi
  
  
-@@ -18518,14 +15297,14 @@ else
+@@ -18518,14 +15325,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16429,7 +16610,7 @@
  $as_echo "no" >&6; }
                   if false; then
    HAVE_EXEMPI_TRUE=
-@@ -18547,7 +15326,7 @@ fi
+@@ -18547,7 +15354,7 @@
  else
  	EXEMPI_CFLAGS=$pkg_cv_EXEMPI_CFLAGS
  	EXEMPI_LIBS=$pkg_cv_EXEMPI_LIBS
@@ -16438,7 +16619,7 @@
  $as_echo "yes" >&6; }
  
  		  	   if true; then
-@@ -18559,9 +15338,7 @@ else
+@@ -18559,9 +15366,7 @@
  fi
  
  
@@ -16449,7 +16630,7 @@
  
  
                            msg_xmp=yes
-@@ -18569,40 +15346,44 @@ fi
+@@ -18569,40 +15374,44 @@
  
  
  pkg_failed=no
@@ -16513,7 +16694,7 @@
  fi
  
  
-@@ -18615,14 +15396,14 @@ else
+@@ -18615,14 +15424,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16531,7 +16712,7 @@
  $as_echo "no" >&6; }
                  true
  elif test $pkg_failed = untried; then
-@@ -18630,12 +15411,10 @@ elif test $pkg_failed = untried; then
+@@ -18630,12 +15439,10 @@
  else
  	EXEMPI_NEW_API_CFLAGS=$pkg_cv_EXEMPI_NEW_API_CFLAGS
  	EXEMPI_NEW_API_LIBS=$pkg_cv_EXEMPI_NEW_API_LIBS
@@ -16546,7 +16727,7 @@
  
  fi
  
-@@ -18655,7 +15434,7 @@ fi
+@@ -18655,7 +15462,7 @@
  
  
  # Check whether --enable-tracker was given.
@@ -16555,7 +16736,7 @@
    enableval=$enable_tracker;
  fi
  
-@@ -18663,40 +15442,44 @@ msg_tracker=no
+@@ -18663,40 +15470,44 @@
  if test "x$enable_tracker" != "xno"; then
  
  pkg_failed=no
@@ -16619,7 +16800,7 @@
  fi
  
  
-@@ -18709,52 +15492,56 @@ else
+@@ -18709,52 +15520,56 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16698,7 +16879,7 @@
  fi
  
  
-@@ -18767,14 +15554,14 @@ else
+@@ -18767,14 +15582,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16716,7 +16897,7 @@
  $as_echo "no" >&6; }
                   if false; then
    HAVE_TRACKER_TRUE=
-@@ -18796,7 +15583,7 @@ fi
+@@ -18796,7 +15611,7 @@
  else
  	TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
  	TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -16725,7 +16906,7 @@
  $as_echo "yes" >&6; }
  
  	                                     if true; then
-@@ -18808,9 +15595,7 @@ else
+@@ -18808,9 +15623,7 @@
  fi
  
  
@@ -16736,7 +16917,7 @@
  
  
  		                            msg_tracker=yes
-@@ -18820,40 +15605,44 @@ elif test $pkg_failed = untried; then
+@@ -18820,40 +15633,44 @@
  
  
  pkg_failed=no
@@ -16800,7 +16981,7 @@
  fi
  
  
-@@ -18866,14 +15655,14 @@ else
+@@ -18866,14 +15683,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16818,7 +16999,7 @@
  $as_echo "no" >&6; }
                   if false; then
    HAVE_TRACKER_TRUE=
-@@ -18895,7 +15684,7 @@ fi
+@@ -18895,7 +15712,7 @@
  else
  	TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
  	TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -16827,7 +17008,7 @@
  $as_echo "yes" >&6; }
  
  	                                     if true; then
-@@ -18907,9 +15696,7 @@ else
+@@ -18907,9 +15724,7 @@
  fi
  
  
@@ -16838,7 +17019,7 @@
  
  
  		                            msg_tracker=yes
-@@ -18918,7 +15705,7 @@ fi
+@@ -18918,7 +15733,7 @@
  else
  	TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
  	TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -16847,7 +17028,7 @@
  $as_echo "yes" >&6; }
  
  	                   if true; then
-@@ -18930,14 +15717,10 @@ else
+@@ -18930,14 +15745,10 @@
  fi
  
  
@@ -16864,7 +17045,7 @@
  
  
                            msg_tracker=yes
-@@ -18959,7 +15742,7 @@ fi
+@@ -18959,7 +15770,7 @@
  
  
  # Check whether --enable-beagle was given.
@@ -16873,7 +17054,7 @@
    enableval=$enable_beagle;
  fi
  
-@@ -18974,40 +15757,44 @@ if test "x$enable_beagle" != "xno"; then
+@@ -18974,40 +15785,44 @@
  
  
  pkg_failed=no
@@ -16937,7 +17118,7 @@
  fi
  
  
-@@ -19020,14 +15807,14 @@ else
+@@ -19020,14 +15835,14 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -16955,11 +17136,10 @@
  $as_echo "no" >&6; }
                   if false; then
    HAVE_BEAGLE_TRUE=
-@@ -19042,263 +15829,89 @@ elif test $pkg_failed = untried; then
-   HAVE_BEAGLE_TRUE=
+@@ -19043,262 +15858,88 @@
    HAVE_BEAGLE_FALSE='#'
  else
--  HAVE_BEAGLE_TRUE='#'
+   HAVE_BEAGLE_TRUE='#'
 -  HAVE_BEAGLE_FALSE=
 -fi
 -
@@ -17105,7 +17285,6 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
-+  HAVE_BEAGLE_TRUE='#'
 +  HAVE_BEAGLE_FALSE=
 +fi
 +
@@ -17283,7 +17462,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -19323,59 +15936,30 @@ for ac_lib in '' selinux; do
+@@ -19323,59 +15964,30 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -17352,7 +17531,7 @@
  
          SELINUX_LIBS="-lselinux"
          msg_selinux=yes
-@@ -19393,12 +15977,10 @@ fi
+@@ -19393,12 +16005,10 @@
  
  
  # Check whether --enable-empty_view was given.
@@ -17367,7 +17546,7 @@
  
  fi
  
-@@ -19415,7 +15997,7 @@ fi
+@@ -19415,7 +16025,7 @@
  
  
  # Check whether --enable-packagekit was given.
@@ -17376,7 +17555,7 @@
    enableval=$enable_packagekit;
  fi
  
-@@ -19423,16 +16005,14 @@ msg_packagekit=no
+@@ -19423,16 +16033,14 @@
  if test "x$enable_packagekit" != "xno"; then
  	msg_packagekit=yes
  
@@ -17395,7 +17574,7 @@
    enableval=$enable_more_warnings; set_more_warnings="$enableval"
  else
  
-@@ -19445,10 +16025,10 @@ fi
+@@ -19445,10 +16053,10 @@
  
  fi
  
@@ -17408,7 +17587,7 @@
  $as_echo "yes" >&6; }
  	WARNING_CFLAGS="\
  	-Wall \
-@@ -19460,13 +16040,9 @@ $as_echo "yes" >&6; }
+@@ -19460,13 +16068,9 @@
  	for option in -Wstrict-aliasing=0 -Wno-pointer-sign; do
  		SAVE_CFLAGS="$CFLAGS"
  		CFLAGS="$CFLAGS $option"
@@ -17424,7 +17603,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -19477,37 +16053,16 @@ main ()
+@@ -19477,37 +16081,16 @@
    return 0;
  }
  _ACEOF
@@ -17465,7 +17644,7 @@
  $as_echo "$has_option" >&6; }
  		CFLAGS="$SAVE_CFLAGS"
  		unset has_option
-@@ -19515,26 +16070,19 @@ $as_echo "$has_option" >&6; }
+@@ -19515,26 +16098,19 @@
  	done
  	unset option
  else
@@ -17498,7 +17677,7 @@
  /* end confdefs.h.  */
  #include <time.h>
                  int main ()
-@@ -19549,65 +16097,32 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -19549,65 +16125,32 @@
                  }
  
  _ACEOF
@@ -17571,7 +17750,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -19625,228 +16140,62 @@ return XRenderFindFormat ();
+@@ -19625,228 +16168,62 @@
    return 0;
  }
  _ACEOF
@@ -17845,7 +18024,7 @@
  _ACEOF
  
  fi
-@@ -19857,9 +16206,9 @@ done
+@@ -19857,9 +16234,9 @@
  
  # Extract the first word of "gconftool-2", so it can be a program name with args.
  set dummy gconftool-2; ac_word=$2
@@ -17857,7 +18036,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GCONFTOOL in
-@@ -19872,14 +16221,14 @@ for as_dir in $PATH
+@@ -19872,14 +16249,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -17875,7 +18054,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -19888,19 +16237,17 @@ esac
+@@ -19888,19 +16265,17 @@
  fi
  GCONFTOOL=$ac_cv_path_GCONFTOOL
  if test -n "$GCONFTOOL"; then
@@ -17898,7 +18077,7 @@
  fi
  
  
-@@ -19912,13 +16259,13 @@ fi
+@@ -19912,13 +16287,13 @@
  
  
  # Check whether --with-gconf-source was given.
@@ -17914,7 +18093,7 @@
  $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
  
    if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -19927,22 +16274,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -19927,22 +16302,20 @@
  
  
  # Check whether --with-gconf-schema-file-dir was given.
@@ -17941,7 +18120,7 @@
        esac
  fi
  
-@@ -19959,9 +16304,9 @@ fi
+@@ -19959,9 +16332,9 @@
  
  # Extract the first word of "update-mime-database", so it can be a program name with args.
  set dummy update-mime-database; ac_word=$2
@@ -17953,7 +18132,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $UPDATE_MIME_DATABASE in
-@@ -19974,14 +16319,14 @@ for as_dir in $PATH
+@@ -19974,14 +16347,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -17971,7 +18150,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no"
-@@ -19990,17 +16335,17 @@ esac
+@@ -19990,17 +16363,17 @@
  fi
  UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE
  if test -n "$UPDATE_MIME_DATABASE"; then
@@ -17992,7 +18171,7 @@
    enableval=$enable_update_mimedb;
  else
    enable_update_mimedb=yes
-@@ -20018,7 +16363,7 @@ fi
+@@ -20018,7 +16391,7 @@
  
  
    # Check whether --enable-shave was given.
@@ -18001,7 +18180,7 @@
    enableval=$enable_shave;
  else
    enable_shave=yes
-@@ -20038,9 +16383,9 @@ fi
+@@ -20038,9 +16411,9 @@
  
          # Extract the first word of "sed", so it can be a program name with args.
  set dummy sed; ac_word=$2
@@ -18013,7 +18192,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$SED"; then
-@@ -20051,14 +16396,14 @@ for as_dir in $PATH
+@@ -20051,14 +16424,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -18031,7 +18210,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"
-@@ -20066,10 +16411,10 @@ fi
+@@ -20066,10 +16439,10 @@
  fi
  SED=$ac_cv_prog_SED
  if test -n "$SED"; then
@@ -18044,7 +18223,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -20134,13 +16479,13 @@ _ACEOF
+@@ -20134,13 +16507,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -18060,7 +18239,7 @@
        esac ;;
      esac
    done
-@@ -20148,8 +16493,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20148,8 +16521,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -18071,7 +18250,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -20172,11 +16517,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -20172,11 +16545,11 @@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -18085,7 +18264,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -20196,8 +16541,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -20196,8 +16569,8 @@
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
@@ -18096,7 +18275,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -20213,277 +16558,167 @@ else
+@@ -20213,277 +16586,167 @@
  fi
  
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18451,7 +18630,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -20493,17 +16728,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -20493,17 +16756,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -18477,7 +18656,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -20511,23 +16747,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -20511,23 +16775,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -18506,7 +18685,7 @@
  as_nl='
  '
  export as_nl
-@@ -20535,7 +16763,13 @@ export as_nl
+@@ -20535,7 +16791,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -18521,7 +18700,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -20546,7 +16780,7 @@ else
+@@ -20546,7 +16808,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -18530,7 +18709,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -20569,13 +16803,6 @@ if test "${PATH_SEPARATOR+set}" != set; 
+@@ -20569,13 +16831,6 @@
    }
  fi
  
@@ -18544,7 +18723,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -20585,15 +16812,15 @@ fi
+@@ -20585,15 +16840,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -18563,7 +18742,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -20605,12 +16832,16 @@ if test "x$as_myself" = x; then
+@@ -20605,12 +16860,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -18584,7 +18763,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -20622,7 +16853,89 @@ export LC_ALL
+@@ -20622,7 +16881,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -18675,7 +18854,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -20636,8 +16949,12 @@ else
+@@ -20636,8 +16977,12 @@
    as_basename=false
  fi
  
@@ -18689,7 +18868,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -20657,76 +16974,25 @@ $as_echo X/"$0" |
+@@ -20657,76 +17002,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -18777,7 +18956,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -20755,8 +17021,56 @@ fi
+@@ -20755,8 +17049,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -18835,7 +19014,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -20775,10 +17089,10 @@ else
+@@ -20775,10 +17117,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -18848,7 +19027,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -20793,13 +17107,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -20793,13 +17135,19 @@
  
  
  exec 6>&1
@@ -18864,13 +19043,13 @@
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by nautilus $as_me 2.28.1, which was
+ This file was extended by nautilus $as_me 2.28.3, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -20831,10 +17151,11 @@ _ACEOF
+@@ -20831,13 +17179,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -18885,7 +19064,11 @@
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-@@ -20856,16 +17177,16 @@ $config_headers
++      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -20856,16 +17206,17 @@
  Configuration commands:
  $config_commands
  
@@ -18894,18 +19077,29 @@
  
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- nautilus config.status 2.28.1
+ nautilus config.status 2.28.3
 -configured by $0, generated by GNU Autoconf 2.63,
-+configured by $0, generated by GNU Autoconf 2.64,
-   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
  
 -Copyright (C) 2008 Free Software Foundation, Inc.
 +Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -20908,20 +17229,19 @@ do
+@@ -20901,6 +17252,8 @@
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+@@ -20908,20 +17261,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -18930,7 +19124,7 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -20929,11 +17249,10 @@ Try \`$0 --help' for more information." 
+@@ -20929,11 +17281,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -18945,7 +19139,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -21277,9 +17596,7 @@ do
+@@ -21277,9 +17628,7 @@
      "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
@@ -18956,7 +19150,7 @@
    esac
  done
  
-@@ -21306,7 +17623,7 @@ $debug ||
+@@ -21306,7 +17655,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -18965,7 +19159,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -21317,11 +17634,7 @@ $debug ||
+@@ -21317,11 +17666,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -18978,7 +19172,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -21329,10 +17642,16 @@ $debug ||
+@@ -21329,10 +17674,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -18997,7 +19191,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -21346,24 +17665,18 @@ _ACEOF
+@@ -21346,24 +17697,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -19025,7 +19219,25 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -21452,9 +17765,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -21385,7 +17730,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -21399,7 +17744,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -21452,9 +17797,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -19036,7 +19248,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -21495,9 +17806,7 @@ for ac_last_try in false false :; do
+@@ -21495,9 +17838,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -19047,7 +19259,7 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -21582,9 +17891,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -21582,9 +17923,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -19058,7 +19270,7 @@
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -21597,9 +17904,7 @@ do
+@@ -21597,9 +17936,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -19069,7 +19281,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -21627,12 +17932,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -21627,12 +17964,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -19084,7 +19296,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -21643,7 +17946,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -21643,7 +17978,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -19093,7 +19305,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -21656,9 +17959,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -21656,9 +17991,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -19104,7 +19316,7 @@
      esac
      ;;
    esac
-@@ -21686,47 +17987,7 @@ $as_echo X"$ac_file" |
+@@ -21686,47 +18019,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -19153,7 +19365,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -21783,7 +18044,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -21783,7 +18076,6 @@
  # If the template does not know about datarootdir, expand it.
  # FIXME: This hack should be removed a few years after 2.60.
  ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -19161,7 +19373,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -21793,12 +18053,11 @@ ac_sed_dataroot='
+@@ -21793,12 +18085,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -19176,7 +19388,7 @@
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -21808,7 +18067,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -21808,7 +18099,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -19185,7 +19397,7 @@
  esac
  _ACEOF
  
-@@ -21837,14 +18096,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -21837,14 +18128,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -19202,7 +19414,7 @@
  which seems to be undefined.  Please make sure it is defined." >&5
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -21854,9 +18111,7 @@ which seems to be undefined.  Please mak
+@@ -21854,9 +18143,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -19213,7 +19425,7 @@
   ;;
    :H)
    #
-@@ -21867,25 +18122,19 @@ $as_echo "$as_me: error: could not creat
+@@ -21867,25 +18154,19 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -19243,7 +19455,7 @@
    fi
  # Compute "$ac_file"'s index in $config_headers.
  _am_arg="$ac_file"
-@@ -21923,7 +18172,7 @@ $as_echo X"$_am_arg" |
+@@ -21923,7 +18204,7 @@
  	  s/.*/./; q'`/stamp-h$_am_stamp_count
   ;;
  
@@ -19252,7 +19464,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -22018,47 +18267,7 @@ $as_echo X"$file" |
+@@ -22018,47 +18299,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -19301,7 +19513,7 @@
        # echo "creating $dirpart/$file"
        echo '# dummy' > "$dirpart/$file"
      done
-@@ -22711,9 +18920,7 @@ _LT_EOF
+@@ -22711,9 +18952,7 @@
        esac ;;
      "po/stamp-it":C)
      if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -19312,7 +19524,7 @@
      fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
-@@ -22736,15 +18943,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -22736,15 +18975,12 @@
  done # for ac_tag
  
  
@@ -19330,7 +19542,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -22765,10 +18969,10 @@ if test "$no_create" != yes; then
+@@ -22765,10 +19001,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
@@ -19343,11 +19555,9 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-Index: nautilus-2.28.1/cut-n-paste-code/libegg/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/cut-n-paste-code/libegg/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/cut-n-paste-code/libegg/Makefile.in	2009-10-24 15:18:08.393758931 +0200
-@@ -188,6 +188,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/cut-n-paste-code/libegg/Makefile.in
++++ b/cut-n-paste-code/libegg/Makefile.in
+@@ -188,6 +188,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19355,11 +19565,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/cut-n-paste-code/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/cut-n-paste-code/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/cut-n-paste-code/Makefile.in	2009-10-24 15:18:08.393758931 +0200
-@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/cut-n-paste-code/Makefile.in
++++ b/cut-n-paste-code/Makefile.in
+@@ -199,6 +199,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19367,11 +19575,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/data/icons/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/data/icons/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/data/icons/Makefile.in	2009-10-24 15:18:08.393758931 +0200
-@@ -161,6 +161,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/data/icons/Makefile.in
++++ b/data/icons/Makefile.in
+@@ -161,6 +161,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19379,11 +19585,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/data/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/data/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/data/Makefile.in	2009-10-24 15:18:33.389760741 +0200
-@@ -235,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -235,6 +235,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19391,11 +19595,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/data/patterns/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/data/patterns/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/data/patterns/Makefile.in	2009-10-24 15:18:08.397762931 +0200
-@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/data/patterns/Makefile.in
++++ b/data/patterns/Makefile.in
+@@ -183,6 +183,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19403,11 +19605,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/docs/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/docs/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/docs/Makefile.in	2009-10-24 15:18:08.397762931 +0200
-@@ -224,6 +224,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -224,6 +224,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19415,11 +19615,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/docs/reference/libnautilus-extension/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/docs/reference/libnautilus-extension/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/docs/reference/libnautilus-extension/Makefile.in	2009-10-24 15:18:08.397762931 +0200
-@@ -166,6 +166,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/docs/reference/libnautilus-extension/Makefile.in
++++ b/docs/reference/libnautilus-extension/Makefile.in
+@@ -166,6 +166,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19427,7 +19625,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -329,10 +330,10 @@ GTKDOC_LIBS = \
+@@ -329,10 +330,10 @@
  	$(NULL)
  
  @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -19441,7 +19639,42 @@
  @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -573,9 +574,9 @@ $(REPORT_FILES): sgml-build.stamp
+@@ -351,9 +352,7 @@
+ 	$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
+ 	version.xml.in
+ DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+-	pdf-build.stamp \
+-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+-	$(srcdir)/pdf.stamp
++	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+ 
+ SCANOBJ_FILES = \
+ 	$(DOC_MODULE).args 	 \
+@@ -368,10 +367,6 @@
+ 	$(DOC_MODULE)-unused.txt
+ 
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP = 
+- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
+- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP = 
+- at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -567,10 +562,10 @@
+ 	uninstall-local
+ 
+ 
+- at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
++ at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
+ @ENABLE_GTK_DOC_FALSE at all-local:
+ 
+-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
++docs: html-build.stamp
+ 
+ $(REPORT_FILES): sgml-build.stamp
+ 
+@@ -579,9 +574,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -19453,7 +19686,7 @@
  	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
  	else \
  	    cd $(srcdir) ; \
-@@ -583,7 +584,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
+@@ -589,7 +584,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -19462,7 +19695,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -593,23 +594,23 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) 
+@@ -599,23 +594,23 @@
  tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
  	@echo 'gtk-doc: Rebuilding template files'
  	@-chmod -R u+w $(srcdir)
@@ -19492,7 +19725,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -619,18 +620,18 @@ sgml.stamp: sgml-build.stamp
+@@ -625,37 +620,18 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -19506,19 +19739,47 @@
  	if test "$(?)" = "0"; then \
  	  mkhtml_options=--path="$(srcdir)"; \
 -	fi; \
+-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 +	fi
- 	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
--	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 +	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
  	@echo 'gtk-doc: Fixing cross-references'
 -	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 -	@touch html-build.stamp
+-
+-#### pdf ####
+-
+-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+-	@echo 'gtk-doc: Building PDF'
+-	@-chmod -R u+w $(srcdir)
+-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+-	@mkpdf_imgdirs=""; \
+-	if test "x$(HTML_IMAGES)" != "x"; then \
+-	  for img in $(HTML_IMAGES); do \
+-	    part=`dirname $$img`; \
+-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+-	    if test $$? != 0; then \
+-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+-	    fi; \
+-	  done; \
+-	fi; \
+-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+-	@touch pdf-build.stamp
 +	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 +	touch html-build.stamp
  
  ##############
  
-@@ -647,7 +648,7 @@ maintainer-clean-local: clean
+@@ -665,14 +641,14 @@
+ 
+ distclean-local:
+ 	cd $(srcdir) && \
+-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
++	  rm -rf xml $(REPORT_FILES) \
+ 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ 
+ maintainer-clean-local: clean
  	cd $(srcdir) && rm -rf xml html
  
  install-data-local:
@@ -19527,7 +19788,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -667,11 +668,12 @@ install-data-local:
+@@ -692,11 +668,12 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -19542,7 +19803,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -688,13 +690,16 @@ uninstall-local:
+@@ -713,14 +690,16 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -19551,6 +19812,7 @@
  	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 +	-cp $(srcdir)/xml/*.xml $(distdir)/xml
  	cp $(srcdir)/html/* $(distdir)/html
+-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
  	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
  	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
  	cd $(distdir) && rm -f $(DISTCLEANFILES)
@@ -19560,11 +19822,9 @@
  
  .PHONY : dist-hook-local docs
  
-Index: nautilus-2.28.1/docs/reference/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/docs/reference/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/docs/reference/Makefile.in	2009-10-24 15:18:08.397762931 +0200
-@@ -199,6 +199,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/docs/reference/Makefile.in
++++ b/docs/reference/Makefile.in
+@@ -199,6 +199,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19572,11 +19832,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/eel/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/eel/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/eel/Makefile.in	2009-10-24 15:18:08.397762931 +0200
-@@ -52,7 +52,9 @@ CONFIG_HEADER = $(top_builddir)/config.h
+--- a/eel/Makefile.in
++++ b/eel/Makefile.in
+@@ -52,7 +52,9 @@
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -19587,7 +19845,7 @@
  am__objects_1 =
  am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \
  	eel-art-extensions.lo eel-art-gtk-extensions.lo \
-@@ -208,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -208,6 +210,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19595,7 +19853,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -308,6 +311,9 @@ INCLUDES = \
+@@ -308,6 +311,9 @@
  
  libeel_2_la_LDFLAGS = \
  	-no-undefined				\
@@ -19605,11 +19863,9 @@
  	$(CORE_LIBS)				\
  	$(RENDER_LIBS)				\
  	$(X_LIBS)				\
-Index: nautilus-2.28.1/icons/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/icons/Makefile.in	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/icons/Makefile.in	2009-10-24 15:18:08.397762931 +0200
-@@ -183,6 +183,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/icons/Makefile.in
++++ b/icons/Makefile.in
+@@ -183,6 +183,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19617,11 +19873,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/INSTALL
-===================================================================
---- nautilus-2.28.1.orig/INSTALL	2009-05-23 20:14:13.000000000 +0200
-+++ nautilus-2.28.1/INSTALL	2009-10-24 15:18:08.401761554 +0200
-@@ -2,15 +2,15 @@ Installation Instructions
+--- a/INSTALL
++++ b/INSTALL
+@@ -2,15 +2,15 @@
  *************************
  
  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -19640,7 +19894,7 @@
  configure, build, and install this package.  The following
  more-detailed instructions are generic; see the `README' file for
  instructions specific to this package.
-@@ -73,9 +73,9 @@ The simplest way to compile this package
+@@ -73,9 +73,9 @@
  Compilers and Options
  =====================
  
@@ -19653,7 +19907,7 @@
  
     You can give `configure' initial values for configuration parameters
  by setting variables in the command line or in the environment.  Here
-@@ -88,7 +88,7 @@ is an example:
+@@ -88,7 +88,7 @@
  Compiling For Multiple Architectures
  ====================================
  
@@ -19662,7 +19916,7 @@
  same time, by placing the object files for each architecture in their
  own directory.  To do this, you can use GNU `make'.  `cd' to the
  directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@ architecture at a time in the source cod
+@@ -100,10 +100,24 @@
  installed the package for one architecture, use `make distclean' before
  reconfiguring for another architecture.
  
@@ -19688,7 +19942,7 @@
  `/usr/local/bin', include files under `/usr/local/include', etc.  You
  can specify an installation prefix other than `/usr/local' by giving
  `configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
+@@ -126,7 +140,7 @@
  Optional Features
  =================
  
@@ -19697,7 +19951,7 @@
  `configure', where FEATURE indicates an optional part of the package.
  They may also pay attention to `--with-PACKAGE' options, where PACKAGE
  is something like `gnu-as' or `x' (for the X Window System).  The
-@@ -138,14 +152,46 @@ find the X include and library files aut
+@@ -138,14 +152,46 @@
  you can use the `configure' options `--x-includes=DIR' and
  `--x-libraries=DIR' to specify their locations.
  
@@ -19749,7 +20003,7 @@
  `--build=TYPE' option.  TYPE can either be a short name for the system
  type, such as `sun4', or a canonical name which has the form:
  
-@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical nam
+@@ -153,7 +199,8 @@
  
  where SYSTEM can have one of these forms:
  
@@ -19759,7 +20013,7 @@
  
     See the file `config.sub' for the possible values of each field.  If
  `config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
+@@ -171,9 +218,9 @@
  Sharing Defaults
  ================
  
@@ -19772,7 +20026,7 @@
  `configure' looks for `PREFIX/share/config.site' if it exists, then
  `PREFIX/etc/config.site' if it exists.  Or, you can set the
  `CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +229,7 @@ A warning: not all `configure' scripts l
+@@ -182,7 +229,7 @@
  Defining Variables
  ==================
  
@@ -19781,7 +20035,7 @@
  environment passed to `configure'.  However, some packages may run
  configure again during the build, and the customized values of these
  variables may be lost.  In order to avoid this problem, you should set
-@@ -201,11 +248,19 @@ an Autoconf bug.  Until the bug is fixed
+@@ -201,11 +248,19 @@
  `configure' Invocation
  ======================
  
@@ -19803,7 +20057,7 @@
  
  `--version'
  `-V'
-@@ -232,6 +287,16 @@ an Autoconf bug.  Until the bug is fixed
+@@ -232,6 +287,16 @@
       Look for the package's source code in directory DIR.  Usually
       `configure' can determine that directory automatically.
  
@@ -19820,11 +20074,9 @@
  `configure' also accepts some other, not widely useful, options.  Run
  `configure --help' for more details.
  
-Index: nautilus-2.28.1/libnautilus-extension/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/libnautilus-extension/Makefile.in	2009-10-20 13:17:56.000000000 +0200
-+++ nautilus-2.28.1/libnautilus-extension/Makefile.in	2009-10-24 15:18:08.401761554 +0200
-@@ -222,6 +222,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/libnautilus-extension/Makefile.in
++++ b/libnautilus-extension/Makefile.in
+@@ -222,6 +222,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19832,11 +20084,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/libnautilus-private/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/libnautilus-private/Makefile.in	2009-10-20 13:17:56.000000000 +0200
-+++ nautilus-2.28.1/libnautilus-private/Makefile.in	2009-10-24 15:18:08.401761554 +0200
-@@ -341,6 +341,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/libnautilus-private/Makefile.in
++++ b/libnautilus-private/Makefile.in
+@@ -341,6 +341,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19844,29 +20094,38 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/ltmain.sh
-===================================================================
---- nautilus-2.28.1.orig/ltmain.sh	2009-10-20 13:17:50.000000000 +0200
-+++ nautilus-2.28.1/ltmain.sh	2009-10-24 15:18:08.405767510 +0200
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+ 
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
  #       linker:		$LD (gnu? $with_gnu_ld)
 -#       $progname:		(GNU libtool) 2.2.6
-+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
++#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
  #       automake:		$automake_version
  #       autoconf:		$autoconf_version
  #
-@@ -73,7 +73,7 @@
+@@ -73,9 +73,9 @@
  
  PROGRAM=ltmain.sh
  PACKAGE=libtool
 -VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION="2.2.6b Debian-2.2.6b-2"
  TIMESTAMP=""
- package_revision=1.3012
- 
-@@ -5033,7 +5033,10 @@ func_mode_link ()
+-package_revision=1.3012
++package_revision=1.3017
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -5033,7 +5033,10 @@
  	case $pass in
  	dlopen) libs="$dlfiles" ;;
  	dlpreopen) libs="$dlprefiles" ;;
@@ -19878,7 +20137,7 @@
  	esac
        fi
        if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@ func_mode_link ()
+@@ -5344,19 +5347,19 @@
  	    # 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"
@@ -19908,7 +20167,7 @@
  	  continue
  	fi # $pass = conv
  
-@@ -5893,6 +5896,7 @@ func_mode_link ()
+@@ -5893,6 +5896,7 @@
  	  if test "$link_all_deplibs" != no; then
  	    # Add the search paths of all dependency libraries
  	    for deplib in $dependency_libs; do
@@ -19916,7 +20175,7 @@
  	      case $deplib in
  	      -L*) path="$deplib" ;;
  	      *.la)
-@@ -6206,6 +6210,9 @@ func_mode_link ()
+@@ -6206,6 +6210,9 @@
  	    revision="$number_minor"
  	    lt_irix_increment=no
  	    ;;
@@ -19926,11 +20185,9 @@
  	  esac
  	  ;;
  	no)
-Index: nautilus-2.28.1/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/Makefile.in	2009-10-20 13:17:56.000000000 +0200
-+++ nautilus-2.28.1/Makefile.in	2009-10-24 15:18:08.405767510 +0200
-@@ -216,6 +216,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -216,6 +216,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19938,11 +20195,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/src/file-manager/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/src/file-manager/Makefile.in	2009-10-20 13:17:56.000000000 +0200
-+++ nautilus-2.28.1/src/file-manager/Makefile.in	2009-10-24 15:18:08.405767510 +0200
-@@ -223,6 +223,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/src/file-manager/Makefile.in
++++ b/src/file-manager/Makefile.in
+@@ -223,6 +223,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19950,11 +20205,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/src/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/src/Makefile.in	2009-10-20 13:17:56.000000000 +0200
-+++ nautilus-2.28.1/src/Makefile.in	2009-10-24 15:18:08.409760755 +0200
-@@ -342,6 +342,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -342,6 +342,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19962,11 +20215,9 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/test/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/test/Makefile.in	2009-10-20 13:17:56.000000000 +0200
-+++ nautilus-2.28.1/test/Makefile.in	2009-10-24 15:18:08.409760755 +0200
-@@ -271,6 +271,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -271,6 +271,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19974,10 +20225,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/gtk-doc.make
-===================================================================
---- nautilus-2.28.1.orig/gtk-doc.make	2009-10-20 13:17:50.000000000 +0200
-+++ nautilus-2.28.1/gtk-doc.make	2009-10-24 15:18:08.409760755 +0200
+--- a/gtk-doc.make
++++ b/gtk-doc.make
 @@ -5,13 +5,13 @@
  ####################################
  
@@ -19995,7 +20244,44 @@
  endif
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -62,9 +62,9 @@ $(REPORT_FILES): sgml-build.stamp
+@@ -31,9 +31,7 @@
+ 	$(DOC_MODULE)-overrides.txt
+ 
+ DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+-	pdf-build.stamp \
+-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+-	$(srcdir)/pdf.stamp
++	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+ 
+ SCANOBJ_FILES = 		 \
+ 	$(DOC_MODULE).args 	 \
+@@ -50,23 +48,12 @@
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+ 
+ if ENABLE_GTK_DOC
+-if GTK_DOC_BUILD_HTML
+-HTML_BUILD_STAMP=html-build.stamp
+-else
+-HTML_BUILD_STAMP=
+-endif
+-if GTK_DOC_BUILD_PDF
+-PDF_BUILD_STAMP=pdf-build.stamp
+-else
+-PDF_BUILD_STAMP=
+-endif
+-
+-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
++all-local: html-build.stamp
+ else
+ all-local:
+ endif
+ 
+-docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
++docs: html-build.stamp
+ 
+ $(REPORT_FILES): sgml-build.stamp
+ 
+@@ -75,9 +62,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -20007,7 +20293,7 @@
  	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
  	else \
  	    cd $(srcdir) ; \
-@@ -72,7 +72,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
+@@ -85,7 +72,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -20016,7 +20302,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -82,23 +82,24 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) 
+@@ -95,23 +82,24 @@
  tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
  	@echo 'gtk-doc: Rebuilding template files'
  	@-chmod -R u+w $(srcdir)
@@ -20047,7 +20333,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -108,18 +109,18 @@ sgml.stamp: sgml-build.stamp
+@@ -121,37 +109,18 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -20061,19 +20347,47 @@
  	if test "$(?)" = "0"; then \
  	  mkhtml_options=--path="$(srcdir)"; \
 -	fi; \
+-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 +	fi
- 	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
--	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 +	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
  	@echo 'gtk-doc: Fixing cross-references'
 -	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 -	@touch html-build.stamp
+-
+-#### pdf ####
+-
+-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+-	@echo 'gtk-doc: Building PDF'
+-	@-chmod -R u+w $(srcdir)
+-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
+-	@mkpdf_imgdirs=""; \
+-	if test "x$(HTML_IMAGES)" != "x"; then \
+-	  for img in $(HTML_IMAGES); do \
+-	    part=`dirname $$img`; \
+-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+-	    if test $$? != 0; then \
+-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+-	    fi; \
+-	  done; \
+-	fi; \
+-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+-	@touch pdf-build.stamp
 +	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 +	touch html-build.stamp
  
  ##############
  
-@@ -136,7 +137,7 @@ maintainer-clean-local: clean
+@@ -161,14 +130,14 @@
+ 
+ distclean-local:
+ 	cd $(srcdir) && \
+-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
++	  rm -rf xml $(REPORT_FILES) \
+ 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ 
+ maintainer-clean-local: clean
  	cd $(srcdir) && rm -rf xml html
  
  install-data-local:
@@ -20082,7 +20396,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -156,11 +157,12 @@ install-data-local:
+@@ -188,11 +157,12 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -20097,7 +20411,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -180,12 +182,15 @@ endif
+@@ -212,13 +182,15 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -20106,6 +20420,7 @@
  	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 +	-cp $(srcdir)/xml/*.xml $(distdir)/xml
  	cp $(srcdir)/html/* $(distdir)/html
+-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
  	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
  	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
  	cd $(distdir) && rm -f $(DISTCLEANFILES)
@@ -20114,10 +20429,8 @@
 +	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
  
  .PHONY : dist-hook-local docs
-Index: nautilus-2.28.1/config.sub
-===================================================================
---- nautilus-2.28.1.orig/config.sub	2009-10-20 13:17:55.000000000 +0200
-+++ nautilus-2.28.1/config.sub	2009-10-24 15:18:08.409760755 +0200
+--- a/config.sub
++++ b/config.sub
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -20131,7 +20444,7 @@
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@ case $os in
+@@ -153,6 +153,9 @@
  		os=
  		basic_machine=$1
  		;;
@@ -20141,7 +20454,7 @@
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -467,6 +470,10 @@ case $basic_machine in
+@@ -467,6 +470,10 @@
  		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
  		os=-linux
  		;;
@@ -20152,7 +20465,7 @@
  	c90)
  		basic_machine=c90-cray
  		os=-unicos
-@@ -1260,7 +1267,7 @@ case $os in
+@@ -1260,7 +1267,7 @@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -20161,7 +20474,7 @@
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
  	      | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@ case $basic_machine in
+@@ -1613,7 +1620,7 @@
  			-sunos*)
  				vendor=sun
  				;;
@@ -20170,11 +20483,9 @@
  				vendor=ibm
  				;;
  			-beos*)
-Index: nautilus-2.28.1/m4/Makefile.in
-===================================================================
---- nautilus-2.28.1.orig/m4/Makefile.in	2009-10-20 13:17:56.000000000 +0200
-+++ nautilus-2.28.1/m4/Makefile.in	2009-10-24 15:18:08.409760755 +0200
-@@ -160,6 +160,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- a/m4/Makefile.in
++++ b/m4/Makefile.in
+@@ -160,6 +160,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20182,11 +20493,18 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PANGO_REQUIRED = @PANGO_REQUIRED@
  PATH_SEPARATOR = @PATH_SEPARATOR@
-Index: nautilus-2.28.1/m4/libtool.m4
-===================================================================
---- nautilus-2.28.1.orig/m4/libtool.m4	2009-10-20 13:17:50.000000000 +0200
-+++ nautilus-2.28.1/m4/libtool.m4	2009-10-24 15:18:08.413765733 +0200
-@@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu)
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2445,7 +2445,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2470,13 +2470,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -20201,7 +20519,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2488,6 +2485,18 @@ linux* | k*bsd*-gnu)
+@@ -2488,6 +2485,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -20220,7 +20538,12 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -3079,7 +3088,7 @@ linux* | k*bsd*-gnu)
+@@ -3075,11 +3084,11 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -20229,7 +20552,16 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
+@@ -3696,7 +3705,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -3760,7 +3769,7 @@
  	    ;;
  	esac
  	;;
@@ -20238,7 +20570,16 @@
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [
+@@ -3980,7 +3989,7 @@
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -4185,6 +4194,9 @@
    cygwin* | mingw* | cegcc*)
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -20248,7 +20589,7 @@
    *)
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
+@@ -4249,6 +4261,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -20258,7 +20599,24 @@
    esac
  
    _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4431,7 +4446,7 @@ _LT_EOF
+@@ -4270,6 +4285,7 @@
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
+       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4361,7 +4377,7 @@
+       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -4431,7 +4447,7 @@
        fi
        ;;
  
@@ -20267,7 +20625,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -4606,6 +4621,7 @@ _LT_EOF
+@@ -4606,6 +4622,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -20275,7 +20633,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -4844,7 +4860,7 @@ _LT_EOF
+@@ -4844,7 +4861,7 @@
        _LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -20284,3 +20642,35 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
+@@ -5844,7 +5861,7 @@
+         _LT_TAGVAR(inherit_rpath, $1)=yes
+         ;;
+ 
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+         case $cc_basename in
+           KCC*)
+ 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+--- a/m4/ltversion.m4
++++ b/m4/ltversion.m4
+@@ -9,15 +9,15 @@
+ 
+ # Generated from ltversion.in.
+ 
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+ 
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+ 
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])

Modified: desktop/unstable/nautilus/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/watch?rev=22583&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/watch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/watch [utf-8] Mon Dec 14 20:02:04 2009
@@ -1,4 +1,3 @@
 version=2
 http://ftp.gnome.org/pub/GNOME/sources/nautilus/([\d\.]+)[02468]/ \
-        nautilus-(.*)\.tar\.gz \
-        debian uupdate
+        nautilus-(.*)\.tar\.gz




More information about the pkg-gnome-commits mailing list