r12082 - in /desktop/experimental/gtk+2.0/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Mon Jul 23 20:21:27 UTC 2007
Author: lool
Date: Mon Jul 23 20:21:27 2007
New Revision: 12082
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12082
Log:
* New upstream development release, with API additions.
- Bump up shlibs to >= 2.11.6.
- Refresh patches 006_proper-directfb-modules,
015_default-fallback-icon-theme, 040_filechooser_single-click.
- Update patches 009_gtk-export-filechooser, 033_treeview_resizing,
070_mandatory-relibtoolize.
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch
desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch
desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Mon Jul 23 20:21:27 2007
@@ -1,4 +1,4 @@
-gtk+2.0 (2.11.5-2) UNRELEASED; urgency=low
+gtk+2.0 (2.11.6-1) experimental; urgency=low
[ Loic Minier ]
* Don't run the directfb testsuite on kfreebsd as it hangs; proposed patch
@@ -17,8 +17,14 @@
* Call dh_shlibdeps separately for the udeb and add a
-l/usr/lib/libcairo-directfb/lib/ flag to ensure libcairo-directfb2 is
found.
-
- -- Loic Minier <lool at dooz.org> Wed, 18 Jul 2007 11:00:05 +0100
+ * New upstream development release, with API additions.
+ - Bump up shlibs to >= 2.11.6.
+ - Refresh patches 006_proper-directfb-modules,
+ 015_default-fallback-icon-theme, 040_filechooser_single-click.
+ - Update patches 009_gtk-export-filechooser, 033_treeview_resizing,
+ 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool at dooz.org> Mon, 23 Jul 2007 22:05:34 +0200
gtk+2.0 (2.11.5-1) experimental; urgency=low
Modified: desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/006_proper-directfb-modules.patch?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/006_proper-directfb-modules.patch Mon Jul 23 20:21:27 2007
@@ -1,10 +1,8 @@
GNOME #447118; related to Debian #381081
-Index: gtk+2.0-2.11.5/configure.in
-===================================================================
---- gtk+2.0-2.11.5.orig/configure.in 2007-07-03 11:34:03.000000000 +0200
-+++ gtk+2.0-2.11.5/configure.in 2007-07-03 11:34:32.000000000 +0200
-@@ -1411,8 +1411,18 @@
+--- gtk+2.0-2.11.6.orig/configure.in 2007-07-23 21:59:10.000000000 +0200
++++ gtk+2.0-2.11.6/configure.in 2007-07-23 21:59:13.000000000 +0200
+@@ -1404,8 +1404,18 @@
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
AC_MSG_RESULT(found)
@@ -25,7 +23,7 @@
else
AC_MSG_ERROR([
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -1464,7 +1474,7 @@
+@@ -1457,7 +1467,7 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
Modified: desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/009_gtk-export-filechooser.patch?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch Mon Jul 23 20:21:27 2007
@@ -26,10 +26,10 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: gtk+2.0-2.11.3/gtk/Makefile.am
+Index: gtk+2.0-2.11.6/gtk/Makefile.am
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/Makefile.am 2007-06-15 22:35:02.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/Makefile.am 2007-06-16 14:25:16.000000000 +0200
+--- gtk+2.0-2.11.6.orig/gtk/Makefile.am 2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/Makefile.am 2007-07-23 13:02:14.000000000 +0200
@@ -33,6 +33,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@@ -62,10 +62,10 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-Index: gtk+2.0-2.11.3/gtk/gtk.symbols
+Index: gtk+2.0-2.11.6/gtk/gtk.symbols
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtk.symbols 2007-06-15 21:00:00.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtk.symbols 2007-06-16 14:25:16.000000000 +0200
+--- gtk+2.0-2.11.6.orig/gtk/gtk.symbols 2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtk.symbols 2007-07-23 13:02:14.000000000 +0200
@@ -1416,6 +1416,12 @@
#endif
#endif
@@ -79,10 +79,10 @@
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST
-Index: gtk+2.0-2.11.3/gtk/gtkfilechooserprivate.h
+Index: gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtkfilechooserprivate.h 2007-06-15 20:07:36.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtkfilechooserprivate.h 2007-06-16 14:25:16.000000000 +0200
+--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserprivate.h 2007-07-20 22:12:28.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h 2007-07-23 13:02:14.000000000 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@@ -98,10 +98,10 @@
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
-Index: gtk+2.0-2.11.3/gtk/gtkfilechooserutils.c
+Index: gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtkfilechooserutils.c 2007-06-15 20:07:37.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtkfilechooserutils.c 2007-06-16 14:25:16.000000000 +0200
+--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.c 2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c 2007-07-23 13:02:14.000000000 +0200
@@ -119,6 +119,22 @@
"do-overwrite-confirmation");
}
@@ -132,10 +132,10 @@
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
-Index: gtk+2.0-2.11.3/gtk/gtkfilechooserutils.h
+Index: gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtkfilechooserutils.h 2007-06-15 20:07:37.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtkfilechooserutils.h 2007-06-16 14:25:16.000000000 +0200
+--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.h 2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h 2007-07-23 13:02:14.000000000 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@@ -161,10 +161,10 @@
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
-Index: gtk+2.0-2.11.3/gtk/gtkfilesystemmodel.h
+Index: gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtkfilesystemmodel.h 2007-06-15 20:07:36.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtkfilesystemmodel.h 2007-06-16 14:25:16.000000000 +0200
+--- gtk+2.0-2.11.6.orig/gtk/gtkfilesystemmodel.h 2007-07-20 22:12:28.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h 2007-07-23 13:02:14.000000000 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@@ -176,15 +176,15 @@
#include <glib-object.h>
#include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h>
-Index: gtk+2.0-2.11.3/tests/autotestfilechooser.c
+Index: gtk+2.0-2.11.6/tests/autotestfilechooser.c
===================================================================
---- gtk+2.0-2.11.3.orig/tests/autotestfilechooser.c 2007-06-15 20:07:48.000000000 +0200
-+++ gtk+2.0-2.11.3/tests/autotestfilechooser.c 2007-06-16 14:25:16.000000000 +0200
+--- gtk+2.0-2.11.6.orig/tests/autotestfilechooser.c 2007-07-20 22:13:57.000000000 +0200
++++ gtk+2.0-2.11.6/tests/autotestfilechooser.c 2007-07-23 13:02:32.000000000 +0200
@@ -30,6 +30,7 @@
*/
#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
+ #undef GTK_DISABLE_DEPRECATED
#include <config.h>
- #include <string.h>
Modified: desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/015_default-fallback-icon-theme.patch?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch Mon Jul 23 20:21:27 2007
@@ -1,8 +1,6 @@
-Index: gtk+2.0-2.11.2/gtk/gtksettings.c
-===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtksettings.c 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtksettings.c 2007-06-13 11:07:39.000000000 +0200
-@@ -289,7 +289,7 @@
+--- gtk+2.0-2.11.6.orig/gtk/gtksettings.c 2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtksettings.c 2007-07-23 22:00:25.000000000 +0200
+@@ -290,7 +290,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),
Modified: desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/033_treeview_resizing.patch?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/033_treeview_resizing.patch Mon Jul 23 20:21:27 2007
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.11.3/gtk/gtktreeviewcolumn.c
+Index: gtk+2.0-2.11.6/gtk/gtktreeviewcolumn.c
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtktreeviewcolumn.c 2007-06-15 20:07:36.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtktreeviewcolumn.c 2007-06-16 14:25:57.000000000 +0200
+--- gtk+2.0-2.11.6.orig/gtk/gtktreeviewcolumn.c 2007-07-20 22:12:28.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtktreeviewcolumn.c 2007-07-23 13:04:14.000000000 +0200
@@ -2142,6 +2142,7 @@
tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view))
@@ -10,11 +10,11 @@
gtk_widget_queue_resize (tree_column->tree_view);
}
-Index: gtk+2.0-2.11.3/gtk/gtktreeview.c
+Index: gtk+2.0-2.11.6/gtk/gtktreeview.c
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtktreeview.c 2007-06-15 22:49:32.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtktreeview.c 2007-06-16 14:25:57.000000000 +0200
-@@ -2142,18 +2142,20 @@
+--- gtk+2.0-2.11.6.orig/gtk/gtktreeview.c 2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtktreeview.c 2007-07-23 13:04:14.000000000 +0200
+@@ -2162,18 +2162,20 @@
/* GtkWidget::size_allocate helper */
static void
@@ -37,7 +37,7 @@
tree_view = GTK_TREE_VIEW (widget);
-@@ -2188,12 +2190,38 @@
+@@ -2208,12 +2210,38 @@
number_of_expand_columns++;
}
@@ -77,7 +77,7 @@
for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next);
list = (rtl ? list->prev : list->next))
-@@ -2248,6 +2276,10 @@
+@@ -2268,6 +2296,10 @@
{
column->width += extra;
}
@@ -88,7 +88,7 @@
g_object_notify (G_OBJECT (column), "width");
-@@ -2282,13 +2314,13 @@
+@@ -2302,13 +2334,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@@ -105,7 +105,7 @@
tmp_list = tree_view->priv->children;
while (tmp_list)
-@@ -2375,7 +2407,7 @@
+@@ -2395,7 +2427,7 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@@ -114,7 +114,7 @@
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
-@@ -2786,7 +2818,7 @@
+@@ -2806,7 +2838,7 @@
gtk_grab_add (widget);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@@ -123,7 +123,7 @@
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
-@@ -3495,6 +3527,8 @@
+@@ -3515,6 +3547,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@@ -132,7 +132,7 @@
gtk_widget_queue_resize (widget);
}
-@@ -11297,7 +11331,7 @@
+@@ -11317,7 +11351,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -141,18 +141,18 @@
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
-Index: gtk+2.0-2.11.3/gtk/gtktreeprivate.h
+Index: gtk+2.0-2.11.6/gtk/gtktreeprivate.h
===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtktreeprivate.h 2007-06-15 20:07:36.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtktreeprivate.h 2007-06-16 14:25:57.000000000 +0200
-@@ -264,6 +264,10 @@
-
+--- gtk+2.0-2.11.6.orig/gtk/gtktreeprivate.h 2007-07-20 22:12:29.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtktreeprivate.h 2007-07-23 13:04:59.000000000 +0200
+@@ -265,6 +265,10 @@
gboolean tree_lines_enabled;
GdkGC *tree_line_gc;
-+
+
+ gint last_extra_space;
+ gint last_extra_space_per_column;
+ gint last_number_of_expand_columns;
++
+ gint tooltip_column;
};
- #ifdef __GNUC__
Modified: desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/040_filechooser_single-click.patch?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/040_filechooser_single-click.patch Mon Jul 23 20:21:27 2007
@@ -1,11 +1,9 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
-Index: gtk+2.0-2.11.5/gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk+2.0-2.11.5.orig/gtk/gtkfilechooserdefault.c 2007-07-02 17:04:00.000000000 +0200
-+++ gtk+2.0-2.11.5/gtk/gtkfilechooserdefault.c 2007-07-03 11:34:58.000000000 +0200
-@@ -389,10 +389,6 @@
+--- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserdefault.c 2007-07-20 22:12:28.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkfilechooserdefault.c 2007-07-23 22:01:15.000000000 +0200
+@@ -390,10 +390,6 @@
static void filter_combo_changed (GtkComboBox *combo_box,
GtkFileChooserDefault *impl);
@@ -16,7 +14,7 @@
static gboolean shortcuts_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
-@@ -3638,8 +3634,22 @@
+@@ -3639,8 +3635,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
{
@@ -39,7 +37,7 @@
}
static gboolean
-@@ -3919,9 +3929,6 @@
+@@ -3920,9 +3930,6 @@
g_signal_connect (selection, "changed",
G_CALLBACK (shortcuts_selection_changed_cb), impl);
@@ -49,7 +47,7 @@
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
-@@ -8520,25 +8527,6 @@
+@@ -8601,25 +8608,6 @@
gtk_file_path_free (path);
return retval;
}
@@ -75,7 +73,7 @@
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
/* The focus is on a dialog's action area button, *and* the widget that
-@@ -10329,25 +10317,6 @@
+@@ -10471,25 +10459,6 @@
}
}
Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Mon Jul 23 20:21:27 2007
@@ -6,9 +6,9 @@
rm -rf autom4te.cache
exclude config.guess and sub with diff -urN -x config.guess -x config.sub
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/Makefile.in gtk+2.0-2.11.5/Makefile.in
---- gtk+2.0-2.11.5.orig/Makefile.in 2007-07-02 21:28:57.000000000 +0200
-+++ gtk+2.0-2.11.5/Makefile.in 2007-07-03 11:36:32.000000000 +0200
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/Makefile.in gtk+2.0-2.11.6/Makefile.in
+--- gtk+2.0-2.11.6.orig/Makefile.in 2007-07-20 22:21:30.000000000 +0200
++++ gtk+2.0-2.11.6/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -18,7 +18,15 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -327,7 +329,10 @@ sharedstatedir = @sharedstatedir@
+@@ -245,6 +247,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -327,7 +330,10 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -30,7 +38,14 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-@@ -484,7 +489,8 @@ DIST_COMMON = README $(srcdir)/Makefile.
+@@ -478,13 +484,14 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
+ acinclude.m4 aclocal.m4 compile config.guess config.h.in \
+- config.h.win32.in config.sub configure.in depcomp \
++ config.h.win32.in config.sub configure configure.in depcomp \
+ gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \
+ gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \
gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \
gtk+-unix-print-2.0.pc.in gtk-zip.sh.in install-sh ltmain.sh \
missing mkinstalldirs
@@ -40,7 +55,7 @@
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -736,7 +742,7 @@ distdir: $(DISTFILES)
+@@ -736,7 +743,7 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
@@ -49,19 +64,292 @@
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/aclocal.m4 gtk+2.0-2.11.5/aclocal.m4
---- gtk+2.0-2.11.5.orig/aclocal.m4 2007-07-02 19:40:18.000000000 +0200
-+++ gtk+2.0-2.11.5/aclocal.m4 2007-07-03 11:36:27.000000000 +0200
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/aclocal.m4 gtk+2.0-2.11.6/aclocal.m4
+--- gtk+2.0-2.11.6.orig/aclocal.m4 2007-07-20 22:21:07.000000000 +0200
++++ gtk+2.0-2.11.6/aclocal.m4 2007-07-23 22:02:53.000000000 +0200
@@ -941,7 +941,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
-+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -2325,18 +2325,6 @@ freebsd1*)
+@@ -1104,7 +1104,7 @@ test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
+@@ -1191,8 +1191,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+ # Check for compiler boilerplate output or warnings with
+ # the simple compiler test code.
+ AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -1204,8 +1205,9 @@ $rm conftest*
+ # Check for linker boilerplate output or warnings with
+ # the simple link test code.
+ AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -1221,12 +1223,20 @@ $rm conftest*
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+
+@@ -1457,13 +1467,17 @@ ia64-*-hpux*)
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+@@ -1480,6 +1494,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+ ;;
+ *64-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+@@ -1551,7 +1568,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -1592,11 +1609,12 @@ fi
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -1710,24 +1728,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+ fi
+ ;;
+ *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+- new_result=`expr "X$teststring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- teststring=$teststring$teststring
+- done
+- teststring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+ ])
+@@ -1954,7 +1975,8 @@ fi
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -1962,7 +1984,7 @@ AC_CACHE_CHECK([if $compiler supports -c
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -2102,6 +2124,7 @@ else
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+@@ -2119,7 +2142,8 @@ fi
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -2133,20 +2157,58 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
+ if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -2303,12 +2365,8 @@ darwin* | rhapsody*)
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -2325,18 +2383,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -80,7 +368,25 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -2492,7 +2480,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -2374,7 +2420,7 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -2437,7 +2483,7 @@ hpux9* | hpux10* | hpux11*)
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[[3-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -2492,7 +2538,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -89,7 +395,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2506,27 +2494,10 @@ linux*)
+@@ -2506,27 +2552,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -112,13 +418,14 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2538,7 +2509,7 @@ linux*)
+@@ -2538,7 +2567,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -127,7 +434,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2547,7 +2518,7 @@ knetbsd*-gnu)
+@@ -2547,7 +2576,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -136,7 +443,73 @@
;;
netbsd*)
-@@ -3255,7 +3226,7 @@ darwin* | rhapsody*)
+@@ -2631,6 +2660,10 @@ osf3* | osf4* | osf5*)
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -2736,7 +2769,8 @@ fi
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [include additional configurations @<:@automatic@:>@])],
+ [tagnames="$withval"])
+@@ -2997,7 +3031,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
+
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -3060,7 +3094,7 @@ fi
+
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -3207,7 +3241,7 @@ esac
+ # how to check for library dependencies
+ # -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -3246,16 +3280,22 @@ cygwin*)
+
+ mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ else
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -145,7 +518,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -3309,11 +3280,11 @@ irix5* | irix6* | nonstopux*)
+@@ -3293,7 +3333,7 @@ hpux10.20* | hpux11*)
+ esac
+ ;;
+
+-interix3*)
++interix[[3-9]]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
+@@ -3309,11 +3349,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -159,7 +541,75 @@
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
-@@ -4061,7 +4032,7 @@ case $host_os in
+@@ -3343,6 +3383,10 @@ osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3395,7 +3439,7 @@ AC_DEFUN([AC_PROG_NM],
+ lt_cv_path_NM="$NM"
+ else
+ lt_nm_to_check="${ac_tool_prefix}nm"
+- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+@@ -3611,10 +3655,10 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+ _LT_AC_SYS_COMPILER
+
+@@ -3716,10 +3760,10 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -3865,7 +3909,7 @@ case $host_os in
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -4024,10 +4068,10 @@ case $host_os in
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -4061,7 +4105,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -168,7 +618,27 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -4220,7 +4191,7 @@ case $host_os in
+@@ -4110,9 +4154,7 @@ case $host_os in
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- ;;
++ hppa*64*|ia64*) ;;
+ *)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+@@ -4180,7 +4222,7 @@ case $host_os in
+ ;;
+ esac
+ ;;
+- interix3*)
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -4220,7 +4262,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -177,7 +647,37 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -4322,7 +4293,7 @@ case $host_os in
+@@ -4300,6 +4342,29 @@ case $host_os in
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
+@@ -4322,7 +4387,7 @@ case $host_os in
;;
esac
;;
@@ -186,7 +686,202 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -5587,7 +5558,7 @@ hpux*) # Its linker distinguishes data f
+@@ -4338,16 +4403,20 @@ case $host_os in
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+- output_verbose_link_cmd='echo'
+ ;;
+ osf3*)
+ case $cc_basename in
+@@ -4509,15 +4578,10 @@ case $host_os in
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker. We must also pass each convience library through
+- # to the system linker between allextract/defaultextract.
+- # The C++ compiler will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -4564,6 +4628,12 @@ case $host_os in
+ fi
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
+@@ -4807,7 +4877,7 @@ $rm -f confest.$objext
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+-interix3*)
++interix[[3-9]]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_AC_TAGVAR(predep_objects,$1)=
+@@ -4815,13 +4885,46 @@ interix3*)
+ _LT_AC_TAGVAR(postdeps,$1)=
+ ;;
+
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
+ solaris*)
+ case $cc_basename in
+ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
+ ;;
+ esac
+ ;;
+@@ -4870,10 +4973,17 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -4952,10 +5062,10 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -5008,7 +5118,7 @@ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -5097,6 +5207,7 @@ if test -f "$ltmain"; then
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+@@ -5143,7 +5254,7 @@ ifelse([$1], [],
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -5468,7 +5579,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -5551,6 +5662,7 @@ fi
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -5587,7 +5699,7 @@ hpux*) # Its linker distinguishes data f
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -195,7 +890,33 @@
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -5860,7 +5831,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5777,12 +5889,14 @@ AC_MSG_CHECKING([for $compiler option to
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+@@ -5794,7 +5908,7 @@ AC_MSG_CHECKING([for $compiler option to
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+- interix3*)
++ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -5860,7 +5974,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -204,7 +925,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -5903,7 +5874,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5903,7 +6017,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -213,7 +934,22 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -5946,7 +5917,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5930,6 +6044,14 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
+ ;;
+@@ -5946,7 +6068,7 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -222,7 +958,43 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6157,7 +6128,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6050,13 +6172,15 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+
+@@ -6066,7 +6190,7 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
+- interix3*)
++ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -6124,7 +6248,7 @@ AC_MSG_CHECKING([for $compiler option to
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -6157,7 +6281,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -231,28 +1003,111 @@
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -6298,6 +6269,9 @@ ifelse([$1],[CXX],[
+@@ -6176,6 +6300,22 @@ AC_MSG_CHECKING([for $compiler option to
+ # All Alpha code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -6185,6 +6325,10 @@ AC_MSG_CHECKING([for $compiler option to
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++
+ solaris*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -6279,7 +6423,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler s
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -6296,7 +6441,10 @@ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
cygwin* | mingw*)
- _LT_AC_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'
- ;;
+- _LT_AC_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'
++ _LT_AC_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'
++ ;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -6468,7 +6442,7 @@ EOF
+@@ -6435,7 +6583,7 @@ EOF
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -6453,7 +6601,7 @@ EOF
+ fi
+ ;;
+
+- interix3*)
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -6468,7 +6616,7 @@ EOF
_LT_AC_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'
;;
- linux*)
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6494,12 +6468,13 @@ EOF
+@@ -6486,20 +6634,30 @@ EOF
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
@@ -265,7 +1120,47 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6829,7 +6804,7 @@ _LT_EOF
+@@ -6532,7 +6690,7 @@ EOF
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+@@ -6651,7 +6809,7 @@ _LT_EOF
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -6744,7 +6902,7 @@ _LT_EOF
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+@@ -6786,10 +6944,10 @@ _LT_EOF
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -6829,7 +6987,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -274,7 +1169,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6931,7 +6906,7 @@ _LT_EOF
+@@ -6931,7 +7089,7 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -283,7 +1178,152 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -7650,7 +7625,8 @@ installed software in a non-standard pre
+@@ -6951,24 +7109,28 @@ _LT_EOF
+ ;;
+
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+@@ -7027,17 +7189,16 @@ _LT_EOF
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- *)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -7094,7 +7255,7 @@ _LT_EOF
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -7169,7 +7330,7 @@ x|xyes)
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+@@ -7272,6 +7433,30 @@ AC_DEFUN([LT_AC_PROG_RC],
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ # NOTE: This macro has been submitted for inclusion into #
+ # GNU Autoconf as AC_PROG_SED. When it is available in #
+ # a released version of Autoconf we should remove this #
+@@ -7292,12 +7477,13 @@ do
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -7330,6 +7516,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+
+@@ -7650,7 +7837,8 @@ installed software in a non-standard pre
_PKG_TEXT
])],
@@ -293,7 +1333,7 @@
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
-@@ -7659,7 +7635,7 @@ path to pkg-config.
+@@ -7659,7 +7847,7 @@ path to pkg-config.
_PKG_TEXT
@@ -302,7 +1342,16 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -8323,22 +8299,22 @@ AC_DEFUN([GTK_DOC_CHECK],
+@@ -7879,7 +8067,7 @@ glib_DEFUN([GLIB_WITH_NLS],
+ AC_CHECK_FUNCS(dcgettext)
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
+- GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+ msgid ""
+ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -8323,22 +8511,22 @@ AC_DEFUN([GTK_DOC_CHECK],
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
dnl for overriding the documentation installation directory
@@ -333,7 +1382,7 @@
fi
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
have_gtk_doc=yes
-@@ -8350,9 +8326,9 @@ ifelse([$1],[],,
+@@ -8350,9 +8538,9 @@ ifelse([$1],[],,
if test "$have_gtk_doc" = yes; then
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
@@ -345,7 +1394,7 @@
have_gtk_doc=no
fi
fi
-@@ -8362,7 +8338,7 @@ ifelse([$1],[],,
+@@ -8362,7 +8550,7 @@ ifelse([$1],[],,
fi
fi
@@ -355,14 +1404,14 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
])
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/configure gtk+2.0-2.11.5/configure
---- gtk+2.0-2.11.5.orig/configure 2007-07-02 19:40:30.000000000 +0200
-+++ gtk+2.0-2.11.5/configure 2007-07-03 11:36:32.000000000 +0200
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/configure gtk+2.0-2.11.6/configure
+--- gtk+2.0-2.11.6.orig/configure 2007-07-20 22:21:42.000000000 +0200
++++ gtk+2.0-2.11.6/configure 2007-07-23 22:02:58.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gtk+ 2.11.5.
-+# Generated by GNU Autoconf 2.61 for gtk+ 2.11.5.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.11.6.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.11.6.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -546,7 +1595,15 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -1051,6 +1068,7 @@ target_alias
+@@ -858,6 +875,7 @@ HAVE_CXX_TRUE
+ HAVE_CXX_FALSE
+ HAVE_OBJC_TRUE
+ HAVE_OBJC_FALSE
++SED
+ GREP
+ EGREP
+ LN_S
+@@ -1051,6 +1069,7 @@ target_alias
CC
CFLAGS
LDFLAGS
@@ -554,7 +1611,7 @@
CPPFLAGS
CXX
CXXFLAGS
-@@ -1168,10 +1186,10 @@ do
+@@ -1168,10 +1187,10 @@ do
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -567,7 +1624,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1187,10 +1205,10 @@ do
+@@ -1187,10 +1206,10 @@ do
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -580,7 +1637,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1384,19 +1402,19 @@ do
+@@ -1384,19 +1403,19 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -604,7 +1661,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1671,7 +1689,7 @@ Optional Features:
+@@ -1671,7 +1690,7 @@ Optional Features:
--disable-modules disable dynamic module loading
--enable-test-print-backend
build test print backend
@@ -613,7 +1670,7 @@
--enable-man regenerate man pages from Docbook [default=no]
Optional Packages:
-@@ -1698,6 +1716,7 @@ Some influential environment variables:
+@@ -1698,6 +1717,7 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -621,25 +1678,25 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
-@@ -1778,7 +1797,7 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1778,7 +1798,7 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.11.5
+ gtk+ configure 2.11.6
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1792,7 +1811,7 @@ This file contains any messages produced
+@@ -1792,7 +1812,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.11.5, which was
+ It was created by gtk+ $as_me 2.11.6, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2218,7 +2237,7 @@ case $as_dir/ in
+@@ -2218,7 +2238,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -648,7 +1705,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2352,7 +2371,7 @@ do
+@@ -2352,7 +2372,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -657,7 +1714,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2481,7 +2500,7 @@ do
+@@ -2481,7 +2501,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -666,7 +1723,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2521,7 +2540,7 @@ do
+@@ -2521,7 +2541,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -675,7 +1732,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2762,7 +2781,7 @@ do
+@@ -2762,7 +2782,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -684,7 +1741,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2802,7 +2821,7 @@ do
+@@ -2802,7 +2822,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -693,7 +1750,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2859,7 +2878,7 @@ do
+@@ -2859,7 +2879,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -702,7 +1759,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2900,7 +2919,7 @@ do
+@@ -2900,7 +2920,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -711,7 +1768,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2958,7 +2977,7 @@ do
+@@ -2958,7 +2978,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -720,7 +1777,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3002,7 +3021,7 @@ do
+@@ -3002,7 +3022,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -729,7 +1786,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3143,7 +3162,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3143,7 +3163,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -738,7 +1795,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3171,6 +3190,12 @@ done
+@@ -3171,6 +3191,12 @@ done
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -751,7 +1808,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3182,8 +3207,6 @@ See \`config.log' for more details." >&2
+@@ -3182,8 +3208,6 @@ See \`config.log' for more details." >&2
fi
ac_exeext=$ac_cv_exeext
@@ -760,7 +1817,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3361,27 +3384,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3361,27 +3385,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -792,7 +1849,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3436,27 +3442,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3436,27 +3443,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -824,7 +1881,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3491,27 +3480,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3491,27 +3481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -856,7 +1913,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3547,27 +3519,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3547,27 +3520,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -888,7 +1945,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3683,27 +3638,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3683,27 +3639,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -920,7 +1977,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3933,6 +3871,16 @@ fi
+@@ -3933,6 +3872,16 @@ fi
@@ -937,7 +1994,7 @@
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -3951,7 +3899,7 @@ do
+@@ -3951,7 +3900,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -946,7 +2003,7 @@
ac_cv_prog_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4012,7 +3960,7 @@ do
+@@ -4012,7 +3961,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -955,7 +2012,7 @@
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4056,7 +4004,7 @@ do
+@@ -4056,7 +4005,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -964,7 +2021,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4169,27 +4117,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4169,27 +4118,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -996,7 +2053,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4244,27 +4175,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4244,27 +4176,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1028,7 +2085,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4299,27 +4213,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4299,27 +4214,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1060,7 +2117,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4355,27 +4252,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4355,27 +4253,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1092,7 +2149,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4547,27 +4427,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4547,27 +4428,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1124,7 +2181,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -4618,27 +4481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4618,27 +4482,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1156,7 +2213,30 @@
OBJC=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4807,7 +4653,7 @@ do
+@@ -4743,12 +4590,13 @@ do
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -4783,6 +4631,7 @@ done
+ fi
+
+ SED=$lt_cv_path_SED
++
+ { echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6; }
+
+@@ -4807,7 +4656,7 @@ 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"
@@ -1165,7 +2245,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
-@@ -4889,7 +4735,7 @@ do
+@@ -4889,7 +4738,7 @@ 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"
@@ -1174,7 +2254,36 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
-@@ -5195,7 +5041,7 @@ darwin* | rhapsody*)
+@@ -5144,8 +4993,8 @@ else
+ echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5186,16 +5035,22 @@ cygwin*)
+
+ mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ else
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1183,7 +2292,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -5249,11 +5095,11 @@ irix5* | irix6* | nonstopux*)
+@@ -5233,7 +5088,7 @@ hpux10.20* | hpux11*)
+ esac
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
+@@ -5249,11 +5104,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -1197,16 +2315,57 @@
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
-@@ -5370,7 +5216,7 @@ ia64-*-hpux*)
+@@ -5283,6 +5138,10 @@ osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -5370,7 +5229,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5373 "configure"' > conftest.$ac_ext
-+ echo '#line 5219 "configure"' > conftest.$ac_ext
++ echo '#line 5232 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5494,27 +5340,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5405,7 +5264,8 @@ ia64-*-hpux*)
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -5416,6 +5276,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+@@ -5432,6 +5295,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+ ;;
+ *64-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+@@ -5494,27 +5360,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1239,7 +2398,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5523,7 +5353,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5523,7 +5373,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_cc_needs_belf=no
fi
@@ -1248,7 +2407,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5577,7 +5407,7 @@ do
+@@ -5577,7 +5427,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1257,7 +2416,7 @@
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5617,7 +5447,7 @@ do
+@@ -5617,7 +5467,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1266,7 +2425,7 @@
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5673,7 +5503,7 @@ do
+@@ -5673,7 +5523,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1275,7 +2434,7 @@
ac_cv_prog_AS="${ac_tool_prefix}as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5713,7 +5543,7 @@ do
+@@ -5713,7 +5563,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1284,7 +2443,7 @@
ac_cv_prog_ac_ct_AS="as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5769,7 +5599,7 @@ do
+@@ -5769,7 +5619,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1293,7 +2452,7 @@
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5809,7 +5639,7 @@ do
+@@ -5809,7 +5659,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1302,7 +2461,7 @@
ac_cv_prog_ac_ct_OBJDUMP="objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5907,17 +5737,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5907,17 +5757,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1324,7 +2483,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5951,17 +5774,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5951,17 +5794,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1346,7 +2505,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6026,17 +5842,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6026,17 +5862,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1368,7 +2527,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6070,17 +5879,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6070,17 +5899,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1390,7 +2549,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6151,27 +5953,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6151,27 +5973,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1422,7 +2581,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6347,27 +6132,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6347,27 +6152,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1454,7 +2613,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -6430,27 +6198,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6430,27 +6218,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1486,7 +2645,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6486,17 +6237,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6486,17 +6257,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1508,7 +2667,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6613,17 +6357,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6613,17 +6377,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1530,7 +2689,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6657,17 +6394,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6657,17 +6414,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1552,7 +2711,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6732,17 +6462,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6732,17 +6482,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1574,7 +2733,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6776,17 +6499,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6776,17 +6519,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1596,7 +2755,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6826,7 +6542,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
+@@ -6826,7 +6562,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -1605,7 +2764,7 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -6844,7 +6560,7 @@ do
+@@ -6844,7 +6580,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1614,7 +2773,7 @@
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6870,7 +6586,7 @@ fi
+@@ -6870,7 +6606,7 @@ fi
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -1623,7 +2782,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -6888,7 +6604,7 @@ do
+@@ -6888,7 +6624,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1632,7 +2791,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6995,27 +6711,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6995,27 +6731,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1664,7 +2823,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7058,27 +6757,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7058,27 +6777,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1696,7 +2855,60 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7276,7 +6958,7 @@ hpux*) # Its linker distinguishes data f
+@@ -7205,24 +6907,27 @@ else
+ fi
+ ;;
+ *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+- new_result=`expr "X$teststring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- teststring=$teststring$teststring
+- done
+- teststring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+
+@@ -7239,6 +6944,7 @@ fi
+
+
+
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+@@ -7276,7 +6982,7 @@ hpux*) # Its linker distinguishes data f
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -1705,7 +2917,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -7533,7 +7215,7 @@ do
+@@ -7533,7 +7239,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1714,7 +2926,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7573,7 +7255,7 @@ do
+@@ -7573,7 +7279,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1723,7 +2935,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7629,7 +7311,7 @@ do
+@@ -7629,7 +7335,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1732,7 +2944,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7669,7 +7351,7 @@ do
+@@ -7669,7 +7375,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1741,7 +2953,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7725,7 +7407,7 @@ do
+@@ -7725,7 +7431,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1750,7 +2962,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7765,7 +7447,7 @@ do
+@@ -7765,7 +7471,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1759,21 +2971,104 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8082,11 +7764,11 @@ else
+@@ -7827,7 +7533,7 @@ test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
+@@ -8027,10 +7733,10 @@ objext=o
+ objext=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+
+ # If no C compiler was specified, use CC.
+@@ -8045,13 +7751,13 @@ compiler=$CC
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -8071,7 +7777,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8082,11 +7788,11 @@ else
-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:8085: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7767: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7791: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8089: \$? = $ac_status" >&5
-+ echo "$as_me:7771: \$? = $ac_status" >&5
++ echo "$as_me:7795: \$? = $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.
-@@ -8244,7 +7926,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -8137,13 +7843,15 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ ;;
+
+@@ -8153,7 +7861,7 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -8211,7 +7919,7 @@ echo $ECHO_N "checking for $compiler opt
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -8244,7 +7952,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-Bstatic'
;;
@@ -1782,46 +3077,144 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -8350,11 +8032,11 @@ else
+@@ -8263,6 +7971,22 @@ echo $ECHO_N "checking for $compiler opt
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -8272,6 +7996,10 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+@@ -8339,7 +8067,7 @@ if test "${lt_prog_compiler_pic_works+se
+ else
+ lt_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8350,11 +8078,11 @@ else
-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:8353: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8035: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8081: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8357: \$? = $ac_status" >&5
-+ echo "$as_me:8039: \$? = $ac_status" >&5
++ echo "$as_me:8085: \$? = $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.
-@@ -8454,11 +8136,11 @@ else
+@@ -8403,7 +8131,7 @@ else
+ lt_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -8443,7 +8171,7 @@ else
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -8454,11 +8182,11 @@ else
-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:8457: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8139: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8185: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8461: \$? = $ac_status" >&5
-+ echo "$as_me:8143: \$? = $ac_status" >&5
++ echo "$as_me:8189: \$? = $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
-@@ -8683,7 +8365,7 @@ EOF
+@@ -8650,7 +8378,7 @@ EOF
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -8668,7 +8396,7 @@ EOF
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+@@ -8683,7 +8411,7 @@ EOF
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'
;;
- linux*)
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8709,12 +8391,13 @@ EOF
+@@ -8701,20 +8429,30 @@ EOF
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
@@ -1834,7 +3227,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8934,27 +8617,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -8866,7 +8604,7 @@ _LT_EOF
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+@@ -8934,33 +8672,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1859,15 +3261,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -8968,7 +8635,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8968,7 +8697,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -1876,7 +3296,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9009,27 +8676,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -9009,33 +8738,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1901,15 +3321,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -9043,7 +8694,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9043,7 +8763,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -1918,7 +3356,29 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9174,7 +8825,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9089,7 +8809,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes=yes
+ ;;
+@@ -9131,10 +8851,10 @@ if test -z "$aix_libpath"; then aix_libp
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -9174,7 +8894,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1927,7 +3387,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -9276,7 +8927,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9276,7 +8996,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs=yes
;;
@@ -1936,7 +3396,173 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9766,18 +9417,6 @@ freebsd1*)
+@@ -9296,24 +9016,28 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+
+ openbsd*)
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- ;;
+- *)
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs=no
+ fi
+ ;;
+
+@@ -9372,17 +9096,16 @@ if test -z "$aix_libpath"; then aix_libp
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+@@ -9439,7 +9162,7 @@ if test -z "$aix_libpath"; then aix_libp
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+@@ -9516,7 +9239,7 @@ x|xyes)
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -9574,17 +9297,55 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
+ if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[lt_foo]++; }
++ if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -9744,12 +9505,8 @@ darwin* | rhapsody*)
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -9766,18 +9523,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -1955,7 +3581,25 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -9933,7 +9572,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -9815,7 +9560,7 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -9878,7 +9623,7 @@ hpux9* | hpux10* | hpux11*)
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -9933,7 +9678,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -1964,7 +3608,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9947,31 +9586,10 @@ linux*)
+@@ -9947,31 +9692,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -1991,13 +3635,14 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9983,7 +9601,7 @@ linux*)
+@@ -9983,7 +9707,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2006,7 +3651,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9992,7 +9610,7 @@ knetbsd*-gnu)
+@@ -9992,7 +9716,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2015,7 +3660,26 @@
;;
netbsd*)
-@@ -10312,27 +9930,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10076,6 +9800,10 @@ osf3* | osf4* | osf5*)
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -10229,6 +9957,7 @@ else
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else
+@@ -10312,27 +10041,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2048,7 +3712,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10341,7 +9943,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10341,7 +10054,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
@@ -2057,7 +3721,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10423,27 +10025,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10423,27 +10136,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2090,7 +3754,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10452,7 +10038,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10452,7 +10149,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shl_load=no
fi
@@ -2099,7 +3763,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10502,27 +10088,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10502,27 +10199,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2132,7 +3796,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10531,7 +10101,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10531,7 +10212,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_shl_load=no
fi
@@ -2141,7 +3805,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10603,27 +10173,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10603,27 +10284,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2174,7 +3838,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10632,7 +10186,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10632,7 +10297,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlopen=no
fi
@@ -2183,7 +3847,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10682,27 +10236,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10682,27 +10347,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2216,7 +3880,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10711,7 +10249,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10711,7 +10360,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
@@ -2225,7 +3889,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10762,27 +10300,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10762,27 +10411,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2258,7 +3922,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10791,7 +10313,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10791,7 +10424,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_svld_dlopen=no
fi
@@ -2267,7 +3931,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10842,27 +10364,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -10842,27 +10475,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2300,7 +3964,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10871,7 +10377,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -10871,7 +10488,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_dld_link=no
fi
@@ -2309,25 +3973,89 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10927,7 +10433,7 @@ else
+@@ -10927,7 +10544,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10930 "configure"
-+#line 10436 "configure"
++#line 10547 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11027,7 +10533,7 @@ else
+@@ -11027,7 +10644,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11030 "configure"
-+#line 10536 "configure"
++#line 10647 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12114,27 +11620,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11225,6 +10842,7 @@ if test -f "$ltmain"; then
+ module_cmds \
+ module_expsym_cmds \
+ lt_cv_prog_compiler_c_o \
++ fix_srcfile_path \
+ exclude_expsyms \
+ include_expsyms; do
+
+@@ -11269,7 +10887,7 @@ echo "$as_me: creating $ofile" >&6;}
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -11593,7 +11211,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+@@ -11762,10 +11380,10 @@ objext=o
+ objext_CXX=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -11781,13 +11399,13 @@ compiler=$CC
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -12046,7 +11664,7 @@ case $host_os in
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_CXX=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_CXX=unsupported
+@@ -12114,33 +11732,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2352,15 +4080,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -12148,7 +11638,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12148,7 +11757,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2369,7 +4115,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12190,27 +11680,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -12190,33 +11799,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2394,15 +4140,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -12224,7 +11698,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12224,7 +11824,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2411,7 +4175,20 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12372,7 +11846,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12335,10 +11935,10 @@ if test -z "$aix_libpath"; then aix_libp
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -12372,7 +11972,7 @@ if test -z "$aix_libpath"; then aix_libp
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -2420,7 +4197,27 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12531,7 +12005,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12421,9 +12021,7 @@ if test -z "$aix_libpath"; then aix_libp
+ hardcode_libdir_separator_CXX=:
+
+ case $host_cpu in
+- hppa*64*|ia64*)
+- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+- ;;
++ hppa*64*|ia64*) ;;
+ *)
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ ;;
+@@ -12491,7 +12089,7 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+ esac
+ ;;
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+@@ -12531,7 +12129,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -2429,7 +4226,37 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12633,7 +12107,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12611,6 +12209,29 @@ if test -z "$aix_libpath"; then aix_libp
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ no_undefined_flag_CXX=' -zdefs'
++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ hardcode_libdir_flag_spec_CXX='-R$libdir'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
+@@ -12633,7 +12254,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -2438,7 +4265,152 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13200,7 +12674,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12649,16 +12270,20 @@ if test -z "$aix_libpath"; then aix_libp
+ ld_shlibs_CXX=no
+ ;;
+ openbsd*)
+- hardcode_direct_CXX=yes
+- hardcode_shlibpath_var_CXX=no
+- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+- export_dynamic_flag_spec_CXX='${wl}-E'
+- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_CXX=yes
++ hardcode_shlibpath_var_CXX=no
++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ export_dynamic_flag_spec_CXX='${wl}-E'
++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ ld_shlibs_CXX=no
+ fi
+- output_verbose_link_cmd='echo'
+ ;;
+ osf3*)
+ case $cc_basename in
+@@ -12820,15 +12445,10 @@ if test -z "$aix_libpath"; then aix_libp
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker. We must also pass each convience library through
+- # to the system linker between allextract/defaultextract.
+- # The C++ compiler will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ link_all_deplibs_CXX=yes
+@@ -12875,6 +12495,12 @@ if test -z "$aix_libpath"; then aix_libp
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[0-5] | solaris2.[0-5].*) ;;
++ *)
++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
+@@ -13066,7 +12692,7 @@ $rm -f confest.$objext
+
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+-interix3*)
++interix[3-9]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ predep_objects_CXX=
+@@ -13074,13 +12700,46 @@ interix3*)
+ postdeps_CXX=
+ ;;
+
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ postdeps_CXX='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
+ solaris*)
+ case $cc_basename in
+ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+- postdeps_CXX='-lCstd -lCrun'
++ if test "$solaris_use_stlport4" != yes; then
++ postdeps_CXX='-library=Cstd -library=Crun'
++ fi
+ ;;
+ esac
+ ;;
+@@ -13117,12 +12776,14 @@ echo $ECHO_N "checking for $compiler opt
+ # like `-m68040'.
+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+@@ -13134,7 +12795,7 @@ echo $ECHO_N "checking for $compiler opt
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -13200,7 +12861,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -2447,7 +4419,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13243,7 +12717,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13243,7 +12904,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -2456,7 +4428,22 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13286,7 +12760,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13270,6 +12931,14 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_static_CXX='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ lt_prog_compiler_pic_CXX='-KPIC'
++ lt_prog_compiler_static_CXX='-Bstatic'
++ lt_prog_compiler_wl_CXX='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
+ ;;
+@@ -13286,7 +12955,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -2465,45 +4452,119 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13395,11 +12869,11 @@ else
+@@ -13384,7 +13053,7 @@ if test "${lt_prog_compiler_pic_works_CX
+ else
+ lt_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -13395,11 +13064,11 @@ else
-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:13398: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12872: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13067: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13402: \$? = $ac_status" >&5
-+ echo "$as_me:12876: \$? = $ac_status" >&5
++ echo "$as_me:13071: \$? = $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.
-@@ -13499,11 +12973,11 @@ else
+@@ -13448,7 +13117,7 @@ else
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -13488,7 +13157,7 @@ else
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -13499,11 +13168,11 @@ else
-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:13502: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12976: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13171: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13506: \$? = $ac_status" >&5
-+ echo "$as_me:12980: \$? = $ac_status" >&5
++ echo "$as_me:13175: \$? = $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
-@@ -13571,6 +13045,9 @@ echo $ECHO_N "checking whether the $comp
+@@ -13569,7 +13238,10 @@ echo $ECHO_N "checking whether the $comp
+ export_symbols_cmds_CXX="$ltdll_cmds"
+ ;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$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'
- ;;
+- export_symbols_cmds_CXX='$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'
++ export_symbols_cmds_CXX='$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'
++ ;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
-+ ;;
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -13600,7 +13272,7 @@ x|xyes)
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -13658,20 +13330,7 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -13828,12 +13487,7 @@ darwin* | rhapsody*)
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13850,18 +13327,6 @@ freebsd1*)
+
+@@ -13850,18 +13504,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -2522,7 +4583,25 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14017,7 +13482,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -13899,7 +13541,7 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -13962,7 +13604,7 @@ hpux9* | hpux10* | hpux11*)
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14017,7 +13659,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -2531,7 +4610,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14031,31 +13496,10 @@ linux*)
+@@ -14031,31 +13673,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -2558,13 +4637,14 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14067,7 +13511,7 @@ linux*)
+@@ -14067,7 +13688,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2573,7 +4653,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14076,7 +13520,7 @@ knetbsd*-gnu)
+@@ -14076,7 +13697,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2582,7 +4662,107 @@
;;
netbsd*)
-@@ -14984,7 +14428,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14160,6 +13781,10 @@ osf3* | osf4* | osf5*)
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -14354,6 +13979,7 @@ if test -f "$ltmain"; then
+ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ lt_cv_prog_compiler_c_o_CXX \
++ fix_srcfile_path_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
+
+@@ -14674,7 +14300,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -14765,10 +14391,17 @@ objext=o
+ objext_F77=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -14784,13 +14417,13 @@ compiler=$CC
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -14877,13 +14510,15 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+ ;;
+
+@@ -14893,7 +14528,7 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_pic_F77='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -14951,7 +14586,7 @@ echo $ECHO_N "checking for $compiler opt
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+@@ -14984,7 +14619,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -2591,46 +4771,144 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15090,11 +14534,11 @@ else
+@@ -15003,6 +14638,22 @@ echo $ECHO_N "checking for $compiler opt
+ # All Alpha code is PIC.
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic_F77='-KPIC'
++ lt_prog_compiler_static_F77='-Bstatic'
++ lt_prog_compiler_wl_F77='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic_F77='-KPIC'
++ lt_prog_compiler_static_F77='-Bstatic'
++ lt_prog_compiler_wl_F77=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -15012,6 +14663,10 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static_F77='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -15079,7 +14734,7 @@ if test "${lt_prog_compiler_pic_works_F7
+ else
+ lt_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -15090,11 +14745,11 @@ else
-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:15093: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14537: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14748: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15097: \$? = $ac_status" >&5
-+ echo "$as_me:14541: \$? = $ac_status" >&5
++ echo "$as_me:14752: \$? = $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.
-@@ -15194,11 +14638,11 @@ else
+@@ -15143,7 +14798,7 @@ else
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -15183,7 +14838,7 @@ else
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -15194,11 +14849,11 @@ else
-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:15197: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14641: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14852: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15201: \$? = $ac_status" >&5
-+ echo "$as_me:14645: \$? = $ac_status" >&5
++ echo "$as_me:14856: \$? = $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
-@@ -15423,7 +14867,7 @@ EOF
+@@ -15390,7 +15045,7 @@ EOF
+ allow_undefined_flag_F77=unsupported
+ always_export_symbols_F77=no
+ enable_shared_with_static_runtimes_F77=yes
+- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -15408,7 +15063,7 @@ EOF
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+@@ -15423,7 +15078,7 @@ EOF
archive_expsym_cmds_F77='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'
;;
- linux*)
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15449,12 +14893,13 @@ EOF
+@@ -15441,20 +15096,30 @@ EOF
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
@@ -2643,7 +4921,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15664,27 +15109,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -15606,7 +15271,7 @@ _LT_EOF
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_F77=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_F77=unsupported
+@@ -15664,33 +15329,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2668,15 +4955,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -15698,7 +15127,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15698,7 +15354,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2685,7 +4990,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15729,27 +15158,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -15729,33 +15385,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2710,15 +5015,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -15763,7 +15176,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15763,7 +15410,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2727,7 +5050,29 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15894,7 +15307,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15809,7 +15456,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds_F77='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_F77=yes
+ ;;
+@@ -15851,10 +15498,10 @@ if test -z "$aix_libpath"; then aix_libp
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -15894,7 +15541,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2736,7 +5081,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -15996,7 +15409,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15996,7 +15643,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_F77=yes
;;
@@ -2745,7 +5090,134 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16486,18 +15899,6 @@ freebsd1*)
+@@ -16016,24 +15663,28 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+
+ openbsd*)
+- hardcode_direct_F77=yes
+- hardcode_shlibpath_var_F77=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_F77='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_F77=yes
++ hardcode_shlibpath_var_F77=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_F77='-R$libdir'
++ ;;
++ *)
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_F77='-R$libdir'
+- ;;
+- *)
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_F77=no
+ fi
+ ;;
+
+@@ -16092,17 +15743,16 @@ if test -z "$aix_libpath"; then aix_libp
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs_F77=yes
+ ;;
+@@ -16159,7 +15809,7 @@ if test -z "$aix_libpath"; then aix_libp
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_F77='${wl}-z,text'
+ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
+@@ -16236,7 +15886,7 @@ x|xyes)
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -16294,20 +15944,7 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -16464,12 +16101,7 @@ darwin* | rhapsody*)
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -16486,18 +16118,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -2764,7 +5236,25 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -16653,7 +16054,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -16535,7 +16155,7 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -16598,7 +16218,7 @@ hpux9* | hpux10* | hpux11*)
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -16653,7 +16273,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -2773,7 +5263,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16667,31 +16068,10 @@ linux*)
+@@ -16667,31 +16287,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -2800,13 +5290,14 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16703,7 +16083,7 @@ linux*)
+@@ -16703,7 +16302,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2815,7 +5306,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16712,7 +16092,7 @@ knetbsd*-gnu)
+@@ -16712,7 +16311,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2824,21 +5315,123 @@
;;
netbsd*)
-@@ -17445,11 +16825,11 @@ else
+@@ -16796,6 +16395,10 @@ osf3* | osf4* | osf5*)
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -16990,6 +16593,7 @@ if test -f "$ltmain"; then
+ module_cmds_F77 \
+ module_expsym_cmds_F77 \
+ lt_cv_prog_compiler_c_o_F77 \
++ fix_srcfile_path_F77 \
+ exclude_expsyms_F77 \
+ include_expsyms_F77; do
+
+@@ -17310,7 +16914,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_F77
+@@ -17368,10 +16972,10 @@ objext=o
+ objext_GCJ=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -17387,13 +16991,13 @@ compiler=$CC
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -17434,7 +17038,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17445,11 +17049,11 @@ else
-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:17448: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17052: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17452: \$? = $ac_status" >&5
-+ echo "$as_me:16832: \$? = $ac_status" >&5
++ echo "$as_me:17056: \$? = $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.
-@@ -17607,7 +16987,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17500,13 +17104,15 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+ ;;
+
+@@ -17516,7 +17122,7 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_pic_GCJ='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -17574,7 +17180,7 @@ echo $ECHO_N "checking for $compiler opt
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+@@ -17607,7 +17213,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -2847,46 +5440,144 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17713,11 +17093,11 @@ else
+@@ -17626,6 +17232,22 @@ echo $ECHO_N "checking for $compiler opt
+ # All Alpha code is PIC.
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ lt_prog_compiler_wl_GCJ=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -17635,6 +17257,10 @@ echo $ECHO_N "checking for $compiler opt
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static_GCJ='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -17702,7 +17328,7 @@ if test "${lt_prog_compiler_pic_works_GC
+ else
+ lt_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17713,11 +17339,11 @@ else
-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:17716: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17096: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17342: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17720: \$? = $ac_status" >&5
-+ echo "$as_me:17100: \$? = $ac_status" >&5
++ echo "$as_me:17346: \$? = $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.
-@@ -17817,11 +17197,11 @@ else
+@@ -17766,7 +17392,7 @@ else
+ lt_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -17806,7 +17432,7 @@ else
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -17817,11 +17443,11 @@ else
-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:17820: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17200: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17446: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17824: \$? = $ac_status" >&5
-+ echo "$as_me:17204: \$? = $ac_status" >&5
++ echo "$as_me:17450: \$? = $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
-@@ -18046,7 +17426,7 @@ EOF
+@@ -18013,7 +17639,7 @@ EOF
+ allow_undefined_flag_GCJ=unsupported
+ always_export_symbols_GCJ=no
+ enable_shared_with_static_runtimes_GCJ=yes
+- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -18031,7 +17657,7 @@ EOF
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+@@ -18046,7 +17672,7 @@ EOF
archive_expsym_cmds_GCJ='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'
;;
- linux*)
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18072,12 +17452,13 @@ EOF
+@@ -18064,20 +17690,30 @@ EOF
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
@@ -2899,7 +5590,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18297,27 +17678,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -18229,7 +17865,7 @@ _LT_EOF
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_GCJ=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_GCJ=unsupported
+@@ -18297,33 +17933,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2924,15 +5624,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -18331,7 +17696,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18331,7 +17958,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2941,7 +5659,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18372,27 +17737,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -18372,33 +17999,24 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2966,15 +5684,33 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -18406,7 +17755,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18406,7 +18024,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -2983,7 +5719,29 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18537,7 +17886,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18452,7 +18070,7 @@ if test -z "$aix_libpath"; then aix_libp
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds_GCJ='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_GCJ=yes
+ ;;
+@@ -18494,10 +18112,10 @@ if test -z "$aix_libpath"; then aix_libp
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -18537,7 +18155,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2992,7 +5750,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -18639,7 +17988,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18639,7 +18257,7 @@ if test -z "$aix_libpath"; then aix_libp
link_all_deplibs_GCJ=yes
;;
@@ -3001,7 +5759,134 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19129,18 +18478,6 @@ freebsd1*)
+@@ -18659,24 +18277,28 @@ if test -z "$aix_libpath"; then aix_libp
+ ;;
+
+ openbsd*)
+- hardcode_direct_GCJ=yes
+- hardcode_shlibpath_var_GCJ=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_GCJ='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_GCJ=yes
++ hardcode_shlibpath_var_GCJ=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_GCJ='-R$libdir'
++ ;;
++ *)
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_GCJ='-R$libdir'
+- ;;
+- *)
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+@@ -18735,17 +18357,16 @@ if test -z "$aix_libpath"; then aix_libp
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs_GCJ=yes
+ ;;
+@@ -18802,7 +18423,7 @@ if test -z "$aix_libpath"; then aix_libp
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_GCJ='${wl}-z,text'
+ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+@@ -18879,7 +18500,7 @@ x|xyes)
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -18937,20 +18558,7 @@ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -19107,12 +18715,7 @@ darwin* | rhapsody*)
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -19129,18 +18732,6 @@ freebsd1*)
dynamic_linker=no
;;
@@ -3020,7 +5905,25 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19296,7 +18633,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -19178,7 +18769,7 @@ freebsd* | dragonfly*)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -19241,7 +18832,7 @@ hpux9* | hpux10* | hpux11*)
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -19296,7 +18887,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -3029,7 +5932,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19310,31 +18647,10 @@ linux*)
+@@ -19310,31 +18901,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
@@ -3056,13 +5959,14 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19346,7 +18662,7 @@ linux*)
+@@ -19346,7 +18916,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3071,7 +5975,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19355,7 +18671,7 @@ knetbsd*-gnu)
+@@ -19355,7 +18925,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -3080,7 +5984,77 @@
;;
netbsd*)
-@@ -20588,27 +19904,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -19439,6 +19009,10 @@ osf3* | osf4* | osf5*)
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -19633,6 +19207,7 @@ if test -f "$ltmain"; then
+ module_cmds_GCJ \
+ module_expsym_cmds_GCJ \
+ lt_cv_prog_compiler_c_o_GCJ \
++ fix_srcfile_path_GCJ \
+ exclude_expsyms_GCJ \
+ include_expsyms_GCJ; do
+
+@@ -19953,7 +19528,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_GCJ
+@@ -20010,7 +19585,7 @@ objext=o
+ objext_RC=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -20029,13 +19604,13 @@ compiler=$CC
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -20113,6 +19688,7 @@ if test -f "$ltmain"; then
+ module_cmds_RC \
+ module_expsym_cmds_RC \
+ lt_cv_prog_compiler_c_o_RC \
++ fix_srcfile_path_RC \
+ exclude_expsyms_RC \
+ include_expsyms_RC; do
+
+@@ -20433,7 +20009,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_RC
+@@ -20588,27 +20164,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3112,7 +6086,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -20632,27 +19931,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20632,27 +20191,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3144,7 +6118,7 @@
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
-@@ -20680,7 +19962,6 @@ if test "${ac_cv_sys_file_offset_bits+se
+@@ -20680,7 +20222,6 @@ if test "${ac_cv_sys_file_offset_bits+se
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
@@ -3152,7 +6126,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20717,28 +19998,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20717,28 +20258,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3186,7 +6160,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20784,27 +20048,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20784,27 +20308,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3218,7 +6192,7 @@
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
-@@ -20814,26 +20061,28 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20814,26 +20321,28 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3253,7 +6227,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20870,28 +20119,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20870,28 +20379,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3287,7 +6261,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20937,27 +20169,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20937,27 +20429,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3319,7 +6293,7 @@
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
-@@ -20967,19 +20182,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -20967,19 +20442,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3346,7 +6320,7 @@
fi
-@@ -21008,7 +20226,7 @@ do
+@@ -21008,7 +20486,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3355,7 +6329,7 @@
ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21129,7 +20347,7 @@ do
+@@ -21129,7 +20607,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3364,7 +6338,7 @@
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21169,7 +20387,7 @@ do
+@@ -21169,7 +20647,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3373,7 +6347,7 @@
ac_cv_prog_ac_ct_WINDRES="windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21229,7 +20447,7 @@ do
+@@ -21229,7 +20707,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3382,7 +6356,7 @@
ac_cv_prog_ms_librarian="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21461,27 +20679,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -21461,27 +20939,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3415,7 +6389,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -21490,7 +20692,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -21490,7 +20952,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -3424,7 +6398,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -21590,27 +20792,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -21590,27 +21052,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3456,7 +6430,7 @@
am_cv_prog_cc_stdc="$ac_arg"; break
else
echo "$as_me: failed program was:" >&5
-@@ -21673,7 +20858,7 @@ case $as_dir/ in
+@@ -21673,7 +21118,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3465,7 +6439,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -21837,7 +21022,7 @@ do
+@@ -21837,7 +21282,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3474,7 +6448,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21880,7 +21065,7 @@ do
+@@ -21880,7 +21325,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3483,7 +6457,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22026,7 +21211,7 @@ Alternatively, you may set the environme
+@@ -22026,7 +21471,7 @@ Alternatively, you may set the environme
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3492,7 +6466,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22036,7 +21221,7 @@ Alternatively, you may set the environme
+@@ -22036,7 +21481,7 @@ Alternatively, you may set the environme
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3501,7 +6475,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22122,7 +21307,7 @@ do
+@@ -22122,7 +21567,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3510,7 +6484,7 @@
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22165,7 +21350,7 @@ do
+@@ -22165,7 +21610,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3519,7 +6493,7 @@
ac_cv_prog_INDENT="indent"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22265,27 +21450,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22265,27 +21710,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3552,7 +6526,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22294,7 +21463,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22294,7 +21723,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -3561,7 +6535,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22375,27 +21544,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22375,27 +21804,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3594,7 +6568,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22404,7 +21557,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22404,7 +21817,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -3603,7 +6577,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22453,27 +21606,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22453,27 +21866,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3636,7 +6610,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22482,7 +21619,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22482,7 +21879,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3645,7 +6619,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22528,27 +21665,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22528,27 +21925,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3678,7 +6652,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22557,7 +21678,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22557,7 +21938,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3687,7 +6661,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22603,27 +21724,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22603,27 +21984,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3720,7 +6694,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22632,7 +21737,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22632,7 +21997,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3729,7 +6703,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22678,27 +21783,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22678,27 +22043,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3762,7 +6736,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22707,7 +21796,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22707,7 +22056,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3771,7 +6745,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22753,27 +21842,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22753,27 +22102,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3804,7 +6778,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22782,7 +21855,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22782,7 +22115,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gtk_ok=no
fi
@@ -3813,7 +6787,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22840,27 +21913,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22840,27 +22173,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3845,7 +6819,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22896,17 +21952,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22896,17 +22212,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3867,7 +6841,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23004,27 +22053,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23004,27 +22313,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3900,7 +6874,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23033,7 +22066,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23033,7 +22326,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
am_cv_val_LC_MESSAGES=no
fi
@@ -3909,7 +6883,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -23089,27 +22122,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23089,27 +22382,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3941,7 +6915,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23145,17 +22161,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23145,17 +22421,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3963,7 +6937,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23251,27 +22260,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23251,27 +22520,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3996,7 +6970,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23280,7 +22273,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23280,7 +22533,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_ngettext_libc=no
fi
@@ -4005,7 +6979,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23323,27 +22316,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23323,27 +22576,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4038,7 +7012,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23352,7 +22329,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23352,7 +22589,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_dgettext_libc=no
fi
@@ -4047,7 +7021,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23428,27 +22405,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23428,27 +22665,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4080,7 +7054,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23457,7 +22418,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23457,7 +22678,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4089,7 +7063,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23522,27 +22483,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23522,27 +22743,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4122,7 +7096,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23551,7 +22496,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23551,7 +22756,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -4131,7 +7105,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23600,27 +22545,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23600,27 +22805,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4164,7 +7138,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23629,7 +22558,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23629,7 +22818,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
@@ -4173,7 +7147,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23678,27 +22607,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23678,27 +22867,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4206,7 +7180,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23707,7 +22620,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23707,7 +22880,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dgettext=no
fi
@@ -4215,7 +7189,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23769,27 +22682,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23769,27 +22942,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4248,7 +7222,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23798,7 +22695,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23798,7 +22955,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
@@ -4257,7 +7231,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23847,27 +22744,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23847,27 +23004,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4290,7 +7264,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23876,7 +22757,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23876,7 +23017,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dcgettext=no
fi
@@ -4299,7 +7273,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23971,27 +22852,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23971,27 +23112,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4332,7 +7306,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -24000,7 +22865,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24000,7 +23125,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4341,7 +7315,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24147,27 +23012,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24147,27 +23272,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4374,7 +7348,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -24176,7 +23025,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24176,7 +23285,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4383,7 +7357,18 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24237,7 +23086,7 @@ do
+@@ -24206,8 +23315,8 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+
+ _ACEOF
+-if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
+- (msgfmt -c -o /dev/null conftest.foo) 2>&5
++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+@@ -24237,7 +23346,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4392,7 +7377,7 @@
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -24325,27 +23174,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24325,27 +23434,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4425,7 +7410,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -24417,27 +23250,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24417,27 +23510,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4458,7 +7443,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24446,7 +23263,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24446,7 +23523,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -4467,7 +7452,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -24467,7 +23284,7 @@ fi
+@@ -24467,7 +23544,7 @@ fi
esac
fi
@@ -4476,7 +7461,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -24775,27 +23592,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24775,27 +23852,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4508,7 +7493,7 @@
{ echo "$as_me:$LINENO: result: none needed" >&5
echo "${ECHO_T}none needed" >&6; }
else
-@@ -24832,27 +23632,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24832,27 +23892,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4540,7 +7525,7 @@
{ echo "$as_me:$LINENO: result: -posix" >&5
echo "${ECHO_T}-posix" >&6; }
else
-@@ -24926,7 +23709,7 @@ do
+@@ -24926,7 +23969,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4549,7 +7534,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -24969,7 +23752,7 @@ do
+@@ -24969,7 +24012,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4558,7 +7543,7 @@
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -25238,27 +24021,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25238,27 +24281,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4591,7 +7576,7 @@
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -25276,7 +24043,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25276,7 +24303,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
@@ -4600,7 +7585,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -25380,27 +24147,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25380,27 +24407,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4633,7 +7618,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25409,7 +24160,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25409,7 +24420,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -4642,7 +7627,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25464,27 +24215,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25464,27 +24475,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4674,7 +7659,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25520,17 +24254,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25520,17 +24514,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4696,7 +7681,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25636,27 +24363,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25636,27 +24623,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4728,7 +7713,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25692,17 +24402,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25692,17 +24662,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4750,7 +7735,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25808,27 +24511,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25808,27 +24771,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4782,7 +7767,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25864,17 +24550,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25864,17 +24810,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4804,7 +7789,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25980,27 +24659,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25980,27 +24919,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4836,7 +7821,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26036,17 +24698,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26036,17 +24958,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4858,7 +7843,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26146,27 +24801,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26146,27 +25061,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4890,7 +7875,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26231,27 +24869,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26231,27 +25129,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4922,7 +7907,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26406,10 +25027,10 @@ main ()
+@@ -26406,10 +25287,10 @@ main ()
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -4936,7 +7921,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -26418,11 +25039,11 @@ main ()
+@@ -26418,11 +25299,11 @@ main ()
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -4952,7 +7937,7 @@
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
-@@ -26449,7 +25070,7 @@ main ()
+@@ -26449,7 +25330,7 @@ main ()
const int foo = 10;
if (!foo) return 0;
}
@@ -4961,7 +7946,7 @@
#endif
;
-@@ -26469,27 +25090,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26469,27 +25350,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4993,7 +7978,7 @@
ac_cv_c_const=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26547,27 +25151,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26547,27 +25411,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5025,7 +8010,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -26626,27 +25213,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26626,27 +25473,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5057,7 +8042,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26682,17 +25252,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26682,17 +25512,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5079,7 +8064,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26823,27 +25386,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26823,27 +25646,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5112,7 +8097,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26852,7 +25399,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26852,7 +25659,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5121,7 +8106,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26909,21 +25456,21 @@ $ac_includes_default
+@@ -26909,21 +25716,21 @@ $ac_includes_default
#include <fcntl.h>
#include <sys/mman.h>
@@ -5147,7 +8132,7 @@
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
-@@ -27120,27 +25667,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27120,27 +25927,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5180,7 +8165,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27149,7 +25680,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27149,7 +25940,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5189,7 +8174,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27230,27 +25761,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27230,27 +26021,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5222,7 +8207,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27259,7 +25774,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27259,7 +26034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5231,7 +8216,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27343,27 +25858,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27343,27 +26118,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5263,7 +8248,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27432,17 +25930,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27432,17 +26190,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5285,7 +8270,7 @@
gdk_wchar_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27485,17 +25976,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27485,17 +26236,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5307,7 +8292,7 @@
gdk_wctype_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27580,27 +26064,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27580,27 +26324,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5340,7 +8325,7 @@
ac_cv_func_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27609,7 +26077,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27609,7 +26337,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_iswalnum=no
fi
@@ -5349,7 +8334,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
-@@ -27659,27 +26127,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27659,27 +26387,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5382,7 +8367,7 @@
ac_cv_lib_w_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27688,7 +26140,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27688,7 +26400,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_w_iswalnum=no
fi
@@ -5391,7 +8376,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27747,27 +26199,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27747,27 +26459,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5424,7 +8409,7 @@
gdk_working_wctype=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27776,7 +26212,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27776,7 +26472,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gdk_working_wctype=no
fi
@@ -5433,7 +8418,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$oLIBS"
-@@ -27815,17 +26251,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27815,17 +26511,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5455,7 +8440,7 @@
gtk_uxtheme_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27885,27 +26314,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27885,27 +26574,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5487,7 +8472,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27941,17 +26353,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -27941,17 +26613,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5509,7 +8494,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28082,27 +26487,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28082,27 +26747,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5542,7 +8527,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -28111,7 +26500,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28111,7 +26760,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -5551,7 +8536,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -28259,27 +26648,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28259,27 +26908,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5584,7 +8569,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28288,7 +26661,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28288,7 +26921,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
fi
@@ -5593,7 +8578,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28329,27 +26702,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28329,27 +26962,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5625,7 +8610,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28385,17 +26741,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28385,17 +27001,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5647,7 +8632,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28500,27 +26849,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28500,27 +27109,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5680,7 +8665,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28529,7 +26862,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28529,7 +27122,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tiff_TIFFWriteScanline=no
fi
@@ -5689,7 +8674,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28570,27 +26903,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28570,27 +27163,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5721,7 +8706,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28626,17 +26942,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28626,17 +27202,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5743,7 +8728,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28741,27 +27050,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28741,27 +27310,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5776,7 +8761,7 @@
ac_cv_lib_tiff34_TIFFFlushData=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28770,7 +27063,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28770,7 +27323,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tiff34_TIFFFlushData=no
fi
@@ -5785,7 +8770,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28811,27 +27104,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28811,27 +27364,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5817,7 +8802,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28867,17 +27143,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -28867,17 +27403,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5839,7 +8824,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29005,27 +27274,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29005,27 +27534,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5872,7 +8857,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29034,7 +27287,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -29034,7 +27547,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
fi
@@ -5881,7 +8866,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29075,17 +27328,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29075,17 +27588,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5903,7 +8888,7 @@
jpeg_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29141,27 +27387,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29141,27 +27647,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5936,7 +8921,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29170,7 +27400,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -29170,7 +27660,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_jpeg_jpeg_simple_progression=no
fi
@@ -5945,7 +8930,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29259,27 +27489,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29259,27 +27749,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5978,7 +8963,7 @@
ac_cv_lib_png_png_read_info=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29288,7 +27502,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -29288,7 +27762,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_png_png_read_info=no
fi
@@ -5987,7 +8972,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29329,27 +27543,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29329,27 +27803,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6019,7 +9004,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29385,17 +27582,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29385,17 +27842,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6041,7 +9026,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29492,27 +27682,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29492,27 +27942,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6073,7 +9058,7 @@
png_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29805,27 +27978,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29805,27 +28238,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6105,7 +9090,7 @@
ac_cv_header_sys_wait_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29882,27 +28038,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -29882,27 +28298,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6137,7 +9122,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -30005,27 +28144,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30005,27 +28404,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6169,7 +9154,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30061,17 +28183,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30061,17 +28443,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6191,7 +9176,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30167,27 +28282,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30167,27 +28542,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6223,7 +9208,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30223,17 +28321,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30223,17 +28581,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6245,7 +9230,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30343,27 +28434,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30343,27 +28694,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6278,7 +9263,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30372,7 +28447,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -30372,7 +28707,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_mlib_mlib_ImageSetStruct=no
fi
@@ -6287,7 +9272,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30437,27 +28512,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30437,27 +28772,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6320,7 +9305,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30466,7 +28525,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -30466,7 +28785,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
fi
@@ -6329,7 +9314,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30603,7 +28662,7 @@ do
+@@ -30603,7 +28922,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6338,7 +9323,7 @@
ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30644,7 +28703,7 @@ do
+@@ -30644,7 +28963,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6347,7 +9332,7 @@
ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -30874,17 +28933,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30867,17 +29186,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6369,7 +9354,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -30907,7 +28959,7 @@ if test "$ac_x_libraries" = no; then
+@@ -30900,7 +29212,7 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -6378,7 +9363,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30936,27 +28988,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -30929,27 +29241,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6411,7 +9396,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -30969,7 +29005,7 @@ for ac_dir in `echo "$ac_x_includes $ac_
+@@ -30962,7 +29258,7 @@ for ac_dir in `echo "$ac_x_includes $ac_
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -6420,7 +9405,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -30977,7 +29013,7 @@ do
+@@ -30970,7 +29266,7 @@ do
done
fi
@@ -6429,7 +9414,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -31032,12 +29068,12 @@ else
+@@ -31025,12 +29321,12 @@ else
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 . . . .
@@ -6447,7 +9432,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -31065,44 +29101,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31058,44 +29354,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6501,7 +9486,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -31130,48 +29142,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31123,48 +29395,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6567,7 +9552,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -31220,27 +29214,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31213,27 +29467,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6600,7 +9585,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -31288,27 +29266,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31281,27 +29519,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6633,7 +9618,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31317,7 +29279,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31310,7 +29532,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -6642,7 +9627,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31370,27 +29332,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31363,27 +29585,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6675,7 +9660,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31399,7 +29345,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31392,7 +29598,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -6684,7 +9669,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31412,7 +29358,7 @@ fi
+@@ -31405,7 +29611,7 @@ fi
fi
fi
@@ -6693,7 +9678,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -31487,27 +29433,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31480,27 +29686,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6726,7 +9711,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31516,7 +29446,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31509,7 +29699,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_gethostbyname=no
fi
@@ -6735,7 +9720,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -31565,27 +29495,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31558,27 +29748,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6768,7 +9753,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31594,7 +29508,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31587,7 +29761,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -6777,7 +9762,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31647,27 +29561,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31640,27 +29814,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6810,7 +9795,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31676,7 +29574,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31669,7 +29827,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -6819,7 +9804,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31759,27 +29657,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31752,27 +29910,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6852,7 +9837,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31788,7 +29670,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31781,7 +29923,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_connect=no
fi
@@ -6861,7 +9846,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -31837,27 +29719,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31830,27 +29972,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6894,7 +9879,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31866,7 +29732,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31859,7 +29985,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_socket_connect=no
fi
@@ -6903,7 +9888,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31942,27 +29808,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -31935,27 +30061,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6936,7 +9921,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31971,7 +29821,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -31964,7 +30074,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_remove=no
fi
@@ -6945,7 +9930,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -32020,27 +29870,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32013,27 +30123,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6978,7 +9963,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32049,7 +29883,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32042,7 +30136,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_posix_remove=no
fi
@@ -6987,7 +9972,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32125,27 +29959,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32118,27 +30212,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7020,7 +10005,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32154,7 +29972,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32147,7 +30225,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shmat=no
fi
@@ -7029,7 +10014,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -32203,27 +30021,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32196,27 +30274,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7062,7 +10047,7 @@
ac_cv_lib_ipc_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32232,7 +30034,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32225,7 +30287,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ipc_shmat=no
fi
@@ -7071,7 +10056,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32296,27 +30098,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32289,27 +30351,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7104,7 +10089,7 @@
ac_cv_lib_ICE_IceConnectionNumber=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32325,7 +30111,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32318,7 +30364,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ICE_IceConnectionNumber=no
fi
@@ -7113,18 +10098,10 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -32416,39 +30202,23 @@ return XOpenDisplay ();
- }
- _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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
+@@ -32417,31 +30463,15 @@ esac
+ eval "echo \"\$as_me:$LINENO: $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
@@ -7142,15 +10119,12 @@
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
@@ -7164,7 +10138,7 @@
ac_cv_func_XOpenDisplay=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32457,7 +30227,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32450,7 +30480,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XOpenDisplay=no
fi
@@ -7173,7 +10147,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5
-@@ -32533,27 +30303,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32526,27 +30556,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7206,7 +10180,7 @@
ac_cv_func_XextFindDisplay=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32562,7 +30316,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32555,7 +30569,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XextFindDisplay=no
fi
@@ -7215,7 +10189,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5
-@@ -32638,27 +30392,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32631,27 +30645,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7248,7 +10222,7 @@
ac_cv_func_XRenderQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32667,7 +30405,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32660,7 +30658,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XRenderQueryExtension=no
fi
@@ -7257,7 +10231,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5
-@@ -32713,27 +30451,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32706,27 +30704,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7289,7 +10263,7 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
else
-@@ -32769,27 +30490,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32762,27 +30743,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7321,7 +10295,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-@@ -32883,27 +30587,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32876,27 +30840,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7354,7 +10328,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -32912,7 +30600,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -32905,7 +30853,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
@@ -7363,7 +10337,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -32996,27 +30684,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -32989,27 +30937,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7396,7 +10370,7 @@
ac_cv_func_XAddConnectionWatch=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33025,7 +30697,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33018,7 +30950,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XAddConnectionWatch=no
fi
@@ -7405,7 +10379,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5
-@@ -33126,27 +30798,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33119,27 +31051,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7438,7 +10412,7 @@
ac_cv_func_XkbQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33155,7 +30811,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33148,7 +31064,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XkbQueryExtension=no
fi
@@ -7447,7 +10421,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
-@@ -33237,27 +30893,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33230,27 +31146,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7480,7 +10454,7 @@
ac_cv_func_XShapeCombineMask=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33266,7 +30906,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33259,7 +31159,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XShapeCombineMask=no
fi
@@ -7489,7 +10463,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5
-@@ -33346,27 +30986,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33339,27 +31239,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7522,7 +10496,7 @@
ac_cv_func_XSyncQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33375,7 +30999,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33368,7 +31252,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XSyncQueryExtension=no
fi
@@ -7531,7 +10505,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
-@@ -33409,27 +31033,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33402,27 +31286,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7563,7 +10537,7 @@
ac_cv_header_X11_extensions_sync_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33525,27 +31132,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33518,27 +31385,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7596,7 +10570,7 @@
ac_cv_func_XShmAttach=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33554,7 +31145,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33547,7 +31398,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XShmAttach=no
fi
@@ -7605,7 +10579,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5
-@@ -33605,27 +31196,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33598,27 +31449,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7638,7 +10612,7 @@
ac_cv_lib_XextSam_XShmAttach=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33634,7 +31209,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -33627,7 +31462,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_XextSam_XShmAttach=no
fi
@@ -7647,7 +10621,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -33688,27 +31263,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33681,27 +31516,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7679,7 +10653,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33744,17 +31302,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33737,17 +31555,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7701,7 +10675,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33852,27 +31403,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33845,27 +31656,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7733,7 +10707,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33908,17 +31442,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -33901,17 +31695,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7755,7 +10729,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34028,27 +31555,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34021,27 +31808,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7787,7 +10761,7 @@
have_xshm=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34145,27 +31655,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34138,27 +31908,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7820,7 +10794,7 @@
ac_cv_func_XineramaGetInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34174,7 +31668,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34167,7 +31921,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_XineramaGetInfo=no
fi
@@ -7829,7 +10803,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5
-@@ -34208,27 +31702,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34201,27 +31955,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7861,7 +10835,7 @@
ac_cv_header_X11_extensions_xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34319,27 +31796,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34312,27 +32049,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7894,7 +10868,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34348,7 +31809,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34341,7 +32062,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xinerama_XineramaQueryExtension=no
fi
@@ -7903,7 +10877,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34383,27 +31844,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34376,27 +32097,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7935,7 +10909,7 @@
ac_cv_header_X11_extensions_Xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34535,27 +31979,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34528,27 +32232,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7968,7 +10942,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34564,7 +31992,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34557,7 +32245,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -7977,7 +10951,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34599,27 +32027,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34592,27 +32280,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8009,7 +10983,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34832,8 +32243,18 @@ echo $ECHO_N "checking for DirectFB... $
+@@ -34825,8 +32496,18 @@ echo $ECHO_N "checking for DirectFB... $
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
{ echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6; }
@@ -8030,7 +11004,7 @@
else
{ { echo "$as_me:$LINENO: error:
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -34942,27 +32363,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -34935,27 +32616,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8063,7 +11037,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34977,7 +32382,7 @@ echo "$as_me: error:
+@@ -34970,7 +32635,7 @@ echo "$as_me: error:
{ (exit 1); exit 1; }; }
fi
@@ -8072,7 +11046,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34985,7 +32390,7 @@ fi
+@@ -34978,7 +32643,7 @@ fi
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@@ -8081,7 +11055,7 @@
if test "x$gdktarget" = "xx11"; then
GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
fi
-@@ -35073,27 +32478,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35066,27 +32731,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8114,7 +11088,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -35108,7 +32497,7 @@ echo "$as_me: error:
+@@ -35101,7 +32750,7 @@ echo "$as_me: error:
{ (exit 1); exit 1; }; }
fi
@@ -8123,7 +11097,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -35164,7 +32553,7 @@ do
+@@ -35167,7 +32816,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8132,7 +11106,7 @@
ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35256,27 +32645,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35259,27 +32908,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8164,7 +11138,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35312,17 +32684,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35315,17 +32947,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8186,7 +11160,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35425,27 +32790,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35428,27 +33053,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8218,7 +11192,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35481,17 +32829,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -35484,17 +33092,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8240,7 +11214,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35650,7 +32991,7 @@ do
+@@ -35653,7 +33254,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8249,7 +11223,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35735,7 +33076,7 @@ do
+@@ -35738,7 +33339,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8258,7 +11232,7 @@
ac_cv_prog_DB2HTML="true"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35795,7 +33136,7 @@ do
+@@ -35798,7 +33399,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8267,7 +11241,7 @@
ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35864,7 +33205,7 @@ do
+@@ -35867,7 +33468,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8276,7 +11250,7 @@
ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -36065,6 +33406,13 @@ echo "$as_me: error: conditional \"am__f
+@@ -36068,6 +33669,13 @@ echo "$as_me: error: conditional \"am__f
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8290,7 +11264,7 @@
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -36439,7 +33787,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -36442,7 +34050,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
@@ -8300,7 +11274,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -36448,10 +33797,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -36451,10 +34060,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -8317,7 +11291,7 @@
# PATH needs CR
-@@ -36675,19 +34027,28 @@ else
+@@ -36678,19 +34290,28 @@ else
as_mkdir_p=false
fi
@@ -8357,16 +11331,16 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -36703,7 +34064,7 @@ exec 6>&1
+@@ -36706,7 +34327,7 @@ exec 6>&1
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.11.5, which was
+ This file was extended by gtk+ $as_me 2.11.6, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -36732,7 +34093,7 @@ current configuration.
+@@ -36735,7 +34356,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -8375,16 +11349,16 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -36756,7 +34117,7 @@ _ACEOF
+@@ -36759,7 +34380,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gtk+ config.status 2.11.5
+ gtk+ config.status 2.11.6
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -37122,9 +34483,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+@@ -37125,9 +34746,9 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
@@ -8396,7 +11370,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37166,6 +34527,8 @@ _ACEOF
+@@ -37169,6 +34790,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -8405,28 +11379,39 @@
CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-@@ -37261,8 +34624,6 @@ INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_de
+@@ -37176,6 +34799,7 @@ HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim
+ HAVE_CXX_FALSE!$HAVE_CXX_FALSE$ac_delim
+ HAVE_OBJC_TRUE!$HAVE_OBJC_TRUE$ac_delim
+ HAVE_OBJC_FALSE!$HAVE_OBJC_FALSE$ac_delim
++SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+ LN_S!$LN_S$ac_delim
+@@ -37263,9 +34887,6 @@ INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_
+ INCLUDE_ANI_TRUE!$INCLUDE_ANI_TRUE$ac_delim
INCLUDE_ANI_FALSE!$INCLUDE_ANI_FALSE$ac_delim
INCLUDE_JPEG_TRUE!$INCLUDE_JPEG_TRUE$ac_delim
- INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
+-INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
-INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim
-INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37304,6 +34665,8 @@ _ACEOF
+@@ -37307,6 +34928,9 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
++INCLUDE_JPEG_FALSE!$INCLUDE_JPEG_FALSE$ac_delim
+INCLUDE_PNM_TRUE!$INCLUDE_PNM_TRUE$ac_delim
+INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim
INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim
INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim
-@@ -37399,10 +34762,9 @@ XMLCATALOG!$XMLCATALOG$ac_delim
+@@ -37401,11 +35025,9 @@ XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_de
+ XMLCATALOG!$XMLCATALOG$ac_delim
ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim
ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
+-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -8435,17 +11420,18 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -37438,6 +34800,50 @@ CEOF$ac_eof
+@@ -37441,6 +35063,51 @@ CEOF$ac_eof
_ACEOF
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -8486,7 +11472,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -37681,7 +35087,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
+@@ -37684,7 +35351,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
@@ -8495,9 +11481,9 @@
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/contrib/Makefile.in gtk+2.0-2.11.5/contrib/Makefile.in
---- gtk+2.0-2.11.5.orig/contrib/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/contrib/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/contrib/Makefile.in gtk+2.0-2.11.6/contrib/Makefile.in
+--- gtk+2.0-2.11.6.orig/contrib/Makefile.in 2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/contrib/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8507,9 +11493,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.5/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.11.5.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -245,6 +247,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.6/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.11.6.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/contrib/gdk-pixbuf-xlib/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8519,9 +11513,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/demos/Makefile.in gtk+2.0-2.11.5/demos/Makefile.in
---- gtk+2.0-2.11.5.orig/demos/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/demos/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/demos/Makefile.in gtk+2.0-2.11.6/demos/Makefile.in
+--- gtk+2.0-2.11.6.orig/demos/Makefile.in 2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/demos/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -90,6 +90,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8531,9 +11533,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.5/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.11.5.orig/demos/gtk-demo/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/demos/gtk-demo/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -245,6 +247,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.6/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.11.6.orig/demos/gtk-demo/Makefile.in 2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/demos/gtk-demo/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8543,9 +11553,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/Makefile.in gtk+2.0-2.11.5/docs/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/Makefile.in gtk+2.0-2.11.6/docs/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/Makefile.in 2007-07-20 22:21:31.000000000 +0200
++++ gtk+2.0-2.11.6/docs/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8555,9 +11573,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/faq/Makefile.in gtk+2.0-2.11.5/docs/faq/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/faq/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/faq/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/faq/Makefile.in gtk+2.0-2.11.6/docs/faq/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/faq/Makefile.in 2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/faq/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8567,9 +11593,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/Makefile.in gtk+2.0-2.11.5/docs/reference/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/reference/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/reference/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/Makefile.in gtk+2.0-2.11.6/docs/reference/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/reference/Makefile.in 2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/Makefile.in 2007-07-23 22:02:59.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8579,9 +11613,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.5/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/reference/gdk/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/reference/gdk/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.6/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/reference/gdk/Makefile.in 2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/gdk/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8591,9 +11633,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.5/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-07-02 21:28:58.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/reference/gdk-pixbuf/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -250,6 +252,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.6/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/gdk-pixbuf/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8603,9 +11653,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.5/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/reference/gtk/Makefile.in 2007-07-02 21:28:59.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/reference/gtk/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -250,6 +252,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.6/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/reference/gtk/Makefile.in 2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/reference/gtk/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -95,6 +95,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8615,9 +11673,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/tools/Makefile.in gtk+2.0-2.11.5/docs/tools/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/tools/Makefile.in 2007-07-02 21:28:59.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/tools/Makefile.in 2007-07-03 11:36:33.000000000 +0200
+@@ -250,6 +252,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/tools/Makefile.in gtk+2.0-2.11.6/docs/tools/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/tools/Makefile.in 2007-07-20 22:21:32.000000000 +0200
++++ gtk+2.0-2.11.6/docs/tools/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8627,9 +11693,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.5/docs/tutorial/Makefile.in
---- gtk+2.0-2.11.5.orig/docs/tutorial/Makefile.in 2007-07-02 21:28:59.000000000 +0200
-+++ gtk+2.0-2.11.5/docs/tutorial/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.6/docs/tutorial/Makefile.in
+--- gtk+2.0-2.11.6.orig/docs/tutorial/Makefile.in 2007-07-20 22:21:33.000000000 +0200
++++ gtk+2.0-2.11.6/docs/tutorial/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8639,9 +11713,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/Makefile.in gtk+2.0-2.11.5/gdk/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk/Makefile.in 2007-07-02 21:28:59.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/Makefile.in gtk+2.0-2.11.6/gdk/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk/Makefile.in 2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8651,9 +11733,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.5/gdk/directfb/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk/directfb/Makefile.in 2007-07-02 21:29:00.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk/directfb/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.6/gdk/directfb/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk/directfb/Makefile.in 2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/directfb/Makefile.in 2007-07-23 22:03:01.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8663,9 +11753,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.5/gdk/quartz/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk/quartz/Makefile.in 2007-07-02 21:29:00.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk/quartz/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.6/gdk/quartz/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk/quartz/Makefile.in 2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/quartz/Makefile.in 2007-07-23 22:03:01.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8675,9 +11773,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/win32/Makefile.in gtk+2.0-2.11.5/gdk/win32/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk/win32/Makefile.in 2007-07-02 21:29:00.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk/win32/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/win32/Makefile.in gtk+2.0-2.11.6/gdk/win32/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk/win32/Makefile.in 2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/win32/Makefile.in 2007-07-23 22:03:01.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8687,9 +11793,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.5/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk/win32/rc/Makefile.in 2007-07-02 21:29:00.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk/win32/rc/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.6/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk/win32/rc/Makefile.in 2007-07-20 22:21:34.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/win32/rc/Makefile.in 2007-07-23 22:03:01.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8699,9 +11813,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk/x11/Makefile.in gtk+2.0-2.11.5/gdk/x11/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk/x11/Makefile.in 2007-07-02 21:29:00.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk/x11/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk/x11/Makefile.in gtk+2.0-2.11.6/gdk/x11/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk/x11/Makefile.in 2007-07-20 22:21:35.000000000 +0200
++++ gtk+2.0-2.11.6/gdk/x11/Makefile.in 2007-07-23 22:03:01.000000000 +0200
@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8711,9 +11833,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.5/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk-pixbuf/Makefile.in 2007-07-02 21:28:59.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk-pixbuf/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -246,6 +248,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.6/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk-pixbuf/Makefile.in 2007-07-20 22:21:33.000000000 +0200
++++ gtk+2.0-2.11.6/gdk-pixbuf/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8723,9 +11853,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.5/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.11.5.orig/gdk-pixbuf/pixops/Makefile.in 2007-07-02 21:28:59.000000000 +0200
-+++ gtk+2.0-2.11.5/gdk-pixbuf/pixops/Makefile.in 2007-07-03 11:36:34.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.6/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.11.6.orig/gdk-pixbuf/pixops/Makefile.in 2007-07-20 22:21:33.000000000 +0200
++++ gtk+2.0-2.11.6/gdk-pixbuf/pixops/Makefile.in 2007-07-23 22:03:00.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8735,9 +11873,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gtk/Makefile.in gtk+2.0-2.11.5/gtk/Makefile.in
---- gtk+2.0-2.11.5.orig/gtk/Makefile.in 2007-07-02 21:46:17.000000000 +0200
-+++ gtk+2.0-2.11.5/gtk/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gtk/Makefile.in gtk+2.0-2.11.6/gtk/Makefile.in
+--- gtk+2.0-2.11.6.orig/gtk/Makefile.in 2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/Makefile.in 2007-07-23 22:03:01.000000000 +0200
@@ -113,6 +113,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8747,7 +11893,15 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -376,6 +378,8 @@ INCLUDES = \
+@@ -268,6 +270,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -376,6 +379,8 @@ INCLUDES = \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@@ -8756,7 +11910,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -631,7 +635,10 @@ gtk_public_h_sources = \
+@@ -631,7 +636,10 @@ gtk_public_h_sources = \
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -8768,7 +11922,7 @@
# GTK+ header files that don't get installed
-@@ -647,10 +654,7 @@ gtk_private_h_sources = \
+@@ -647,10 +655,7 @@ gtk_private_h_sources = \
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -8779,9 +11933,9 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.5/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.11.5.orig/gtk/theme-bits/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/gtk/theme-bits/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.6/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.11.6.orig/gtk/theme-bits/Makefile.in 2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/theme-bits/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8791,9 +11945,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.5/gtk/xdgmime/Makefile.in
---- gtk+2.0-2.11.5.orig/gtk/xdgmime/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/gtk/xdgmime/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.6/gtk/xdgmime/Makefile.in
+--- gtk+2.0-2.11.6.orig/gtk/xdgmime/Makefile.in 2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/xdgmime/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8803,19 +11965,231 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/ltmain.sh gtk+2.0-2.11.5/ltmain.sh
---- gtk+2.0-2.11.5.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.5/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
-@@ -43,7 +43,7 @@ EXIT_FAILURE=1
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/ltmain.sh gtk+2.0-2.11.6/ltmain.sh
+--- gtk+2.0-2.11.6.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.11.6/ltmain.sh 2007-07-11 23:11:42.000000000 +0200
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007 Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.22
-+VERSION="1.5.22 Debian 1.5.22-4"
- TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
- # See if we are running on zsh, and set the options which allow our
-@@ -2082,7 +2082,10 @@ EOF
+-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++VERSION="1.5.24 Debian 1.5.24-1"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+
+-# See if we are running on zsh, and set the options which allow our
+-# commands through without removal of \ escapes.
+-if test -n "${ZSH_VERSION+set}" ; then
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
+
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+@@ -105,12 +113,14 @@ esac
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+- save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ $lt_var=C
++ export $lt_var
++ fi"
++done
+
+ # Make sure IFS has a sensible default
+ lt_nl='
+@@ -136,6 +146,8 @@ duplicate_deps=no
+ preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+
+ #####################################
+ # Shell function definitions:
+@@ -196,7 +208,13 @@ func_win32_libid ()
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++ $SED -n -e '1,100{
++ / I /{
++ s,.*,import,
++ p
++ q
++ }
++ }'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+@@ -327,7 +345,17 @@ func_extract_archives ()
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+- my_xdir="$my_gentop/$my_xlib"
++ my_xlib_u=$my_xlib
++ while :; do
++ case " $extracted_archives " in
++ *" $my_xlib_u "*)
++ extracted_serial=`expr $extracted_serial + 1`
++ my_xlib_u=lt$extracted_serial-$my_xlib ;;
++ *) break ;;
++ esac
++ done
++ extracted_archives="$extracted_archives $my_xlib_u"
++ my_xdir="$my_gentop/$my_xlib_u"
+
+ $show "${rm}r $my_xdir"
+ $run ${rm}r "$my_xdir"
+@@ -454,11 +482,12 @@ do
+ ;;
+
+ --version)
+- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- $echo
+- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
+- $echo "This is free software; see the source for copying conditions. There is NO"
+- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++ echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions. There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ exit $?
+ ;;
+
+@@ -755,9 +784,10 @@ if test -z "$show_help"; then
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+- *.f90) xform=f90 ;;
++ *.[fF][09]?) xform=[fF][09]. ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
++ *.obj) xform=obj ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -1138,8 +1168,9 @@ EOF
+ for arg
+ do
+ case $arg in
+- -all-static | -static)
+- if test "X$arg" = "X-all-static"; then
++ -all-static | -static | -static-libtool-libs)
++ case $arg in
++ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+@@ -1147,12 +1178,20 @@ EOF
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+- else
++ ;;
++ -static)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=built
+- fi
++ ;;
++ -static-libtool-libs)
++ if test -z "$pic_flag" && test -n "$link_static_flag"; then
++ dlopen_self=$dlopen_self_static
++ fi
++ prefer_static_libs=yes
++ ;;
++ esac
+ build_libtool_libs=no
+ build_old_libs=yes
+ break
+@@ -1600,7 +1639,7 @@ EOF
+ continue
+ ;;
+
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+@@ -1620,10 +1659,11 @@ EOF
+ # -m* pass through architecture-specific compiler args for GCC
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+- # -pg pass through profiling flag for GCC
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
+ # @file GCC response files
+- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+- -t[45]*|-txscale*|@*)
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+@@ -1651,9 +1691,9 @@ EOF
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ # The PATH hackery in wrapper scripts is required on Windows
+- # in order for the loader to find any dlls it needs.
++ # and Darwin in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+@@ -1712,7 +1752,7 @@ EOF
+ continue
+ ;;
+
+- -static)
++ -static | -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+@@ -2082,7 +2122,10 @@ EOF
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -8827,21 +12201,337 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -3201,6 +3204,11 @@ EOF
+@@ -2094,7 +2137,7 @@ EOF
+ lib=
+ found=no
+ case $deplib in
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+@@ -2490,7 +2533,9 @@ EOF
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
++ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+@@ -3186,7 +3231,7 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|none)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+@@ -3197,9 +3242,15 @@ EOF
+ age="0"
+ ;;
+ irix|nonstopux)
+- current=`expr $number_major + $number_minor - 1`
++ current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_minor"
- ;;
++ lt_irix_increment=no
++ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
-+ ;;
+ ;;
esac
;;
- no)
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/m4macros/Makefile.in gtk+2.0-2.11.5/m4macros/Makefile.in
---- gtk+2.0-2.11.5.orig/m4macros/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/m4macros/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -3258,7 +3309,8 @@ EOF
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+@@ -3272,8 +3324,11 @@ EOF
+ ;;
+
+ irix | nonstopux)
+- major=`expr $current - $age + 1`
+-
++ if test "X$lt_irix_increment" = "Xno"; then
++ major=`expr $current - $age`
++ else
++ major=`expr $current - $age + 1`
++ fi
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+@@ -3410,11 +3465,11 @@ EOF
+ fi
+
+ # Eliminate all temporary directories.
+- for path in $notinst_path; do
+- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+- done
++ #for path in $notinst_path; do
++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -3515,13 +3570,12 @@ EOF
+ int main() { return 0; }
+ EOF
+ $rm conftest
+- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test "$name" != "" && test "$name" -ne "0"; then
++ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+@@ -3560,9 +3614,7 @@ EOF
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+- $LTCC $LTCFLAGS -o conftest conftest.c $i
+- # Did it work?
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+@@ -3594,7 +3646,7 @@ EOF
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+- $echo "*** make it link in! You will probably need to install it or some"
++ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+@@ -3880,7 +3932,10 @@ EOF
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++ case $archive_cmds in
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++ esac
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+@@ -4239,12 +4294,14 @@ EOF
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+- # -Wl from whole_archive_flag_spec
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+ generated="$generated $gentop"
+@@ -4692,16 +4749,16 @@ static const void *lt_preloaded_setup()
+ case $host in
+ *cygwin* | *mingw* )
+ if test -f "$output_objdir/${outputname}.def" ; then
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ else
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ fi
+ ;;
+ * )
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ ;;
+ esac
+ ;;
+@@ -4716,13 +4773,13 @@ static const void *lt_preloaded_setup()
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ fi
+
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+@@ -4809,7 +4866,7 @@ static const void *lt_preloaded_setup()
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -4846,7 +4903,7 @@ static const void *lt_preloaded_setup()
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ fi
+
+ # Quote $echo for shipping.
+@@ -5253,6 +5310,20 @@ EOF
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+@@ -5395,7 +5466,7 @@ else
+ ;;
+ esac
+ $echo >> $output "\
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++ \$echo \"\$0: cannot exec \$program \$*\"
+ exit $EXIT_FAILURE
+ fi
+ else
+@@ -5581,7 +5652,7 @@ fi\
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+@@ -5926,9 +5997,9 @@ relink_command=\"$relink_command\""
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -6137,7 +6208,7 @@ relink_command=\"$relink_command\""
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -6348,8 +6419,10 @@ relink_command=\"$relink_command\""
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit $EXIT_FAILURE
++ if test ! -f "$dir/$dlname"; then
++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++ exit $EXIT_FAILURE
++ fi
+ fi
+ ;;
+
+@@ -6413,12 +6486,12 @@ relink_command=\"$relink_command\""
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ do
++ eval "if test \"\${save_$lt_var+set}\" = set; then
++ $lt_var=\$save_$lt_var; export $lt_var
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+@@ -6775,9 +6848,9 @@ The following components of LINK-COMMAND
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+- try to export only the symbols listed in SYMFILE
++ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+- try to export only the symbols matching REGEX
++ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+@@ -6791,9 +6864,11 @@ The following components of LINK-COMMAND
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+- -static do not do any dynamic linking of libtool libraries
++ -static do not do any dynamic linking of uninstalled libtool libraries
++ -static-libtool-libs
++ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+- specify library version info [each variable defaults to 0]
++ specify library version info [each variable defaults to 0]
+
+ All other options (arguments beginning with \`-') are ignored.
+
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/m4macros/Makefile.in gtk+2.0-2.11.6/m4macros/Makefile.in
+--- gtk+2.0-2.11.6.orig/m4macros/Makefile.in 2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/m4macros/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8851,9 +12541,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/Makefile.in gtk+2.0-2.11.5/modules/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/Makefile.in gtk+2.0-2.11.6/modules/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/Makefile.in 2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/modules/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8863,9 +12561,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/Makefile.in gtk+2.0-2.11.5/modules/engines/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/engines/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/engines/Makefile.in 2007-07-03 11:36:35.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/Makefile.in gtk+2.0-2.11.6/modules/engines/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/engines/Makefile.in 2007-07-20 22:21:36.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8875,9 +12581,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.5/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/engines/ms-windows/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.6/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Makefile.in 2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8887,9 +12601,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8899,9 +12621,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8911,9 +12641,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.5/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/engines/pixbuf/Makefile.in 2007-07-02 21:29:01.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/engines/pixbuf/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.6/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/engines/pixbuf/Makefile.in 2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/engines/pixbuf/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8923,9 +12661,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/input/Makefile.in gtk+2.0-2.11.5/modules/input/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/input/Makefile.in 2007-07-02 21:29:02.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/input/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/input/Makefile.in gtk+2.0-2.11.6/modules/input/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/input/Makefile.in 2007-07-20 22:21:37.000000000 +0200
++++ gtk+2.0-2.11.6/modules/input/Makefile.in 2007-07-23 22:03:02.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8935,7 +12681,15 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -428,9 +430,10 @@ im_multipress_la_LIBADD = $(LDADDS)
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -428,9 +431,10 @@ im_multipress_la_LIBADD = $(LDADDS)
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
@@ -8947,7 +12701,7 @@
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
-@@ -983,7 +986,18 @@ uninstall-local:
+@@ -983,7 +987,18 @@ uninstall-local:
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -8967,9 +12721,9 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.5/modules/printbackends/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/printbackends/Makefile.in 2007-07-02 21:29:02.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/printbackends/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.6/modules/printbackends/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/printbackends/Makefile.in 2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/Makefile.in 2007-07-23 22:03:03.000000000 +0200
@@ -91,6 +91,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8979,9 +12733,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.5/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/printbackends/cups/Makefile.in 2007-07-02 21:29:02.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/printbackends/cups/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -246,6 +248,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.6/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/printbackends/cups/Makefile.in 2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/cups/Makefile.in 2007-07-23 22:03:03.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8991,9 +12753,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.5/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/printbackends/file/Makefile.in 2007-07-02 21:29:02.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/printbackends/file/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.6/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/printbackends/file/Makefile.in 2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/file/Makefile.in 2007-07-23 22:03:03.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -9003,9 +12773,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.5/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/printbackends/lpr/Makefile.in 2007-07-02 21:29:02.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/printbackends/lpr/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.6/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/printbackends/lpr/Makefile.in 2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/lpr/Makefile.in 2007-07-23 22:03:03.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -9015,9 +12793,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.5/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.11.5.orig/modules/printbackends/test/Makefile.in 2007-07-02 21:29:02.000000000 +0200
-+++ gtk+2.0-2.11.5/modules/printbackends/test/Makefile.in 2007-07-03 11:36:36.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.6/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.11.6.orig/modules/printbackends/test/Makefile.in 2007-07-20 22:21:38.000000000 +0200
++++ gtk+2.0-2.11.6/modules/printbackends/test/Makefile.in 2007-07-23 22:03:03.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -9027,9 +12813,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/perf/Makefile.in gtk+2.0-2.11.5/perf/Makefile.in
---- gtk+2.0-2.11.5.orig/perf/Makefile.in 2007-07-02 21:29:02.000000000 +0200
-+++ gtk+2.0-2.11.5/perf/Makefile.in 2007-07-03 11:36:37.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/perf/Makefile.in gtk+2.0-2.11.6/perf/Makefile.in
+--- gtk+2.0-2.11.6.orig/perf/Makefile.in 2007-07-20 22:21:39.000000000 +0200
++++ gtk+2.0-2.11.6/perf/Makefile.in 2007-07-23 22:03:03.000000000 +0200
@@ -89,6 +89,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -9039,9 +12833,17 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -uprN -x config.guess -x config.sub gtk+2.0-2.11.5.orig/tests/Makefile.in gtk+2.0-2.11.5/tests/Makefile.in
---- gtk+2.0-2.11.5.orig/tests/Makefile.in 2007-07-02 21:29:03.000000000 +0200
-+++ gtk+2.0-2.11.5/tests/Makefile.in 2007-07-03 11:36:37.000000000 +0200
+@@ -244,6 +246,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -uprN -urN -x config.guess -x config.sub gtk+2.0-2.11.6.orig/tests/Makefile.in gtk+2.0-2.11.6/tests/Makefile.in
+--- gtk+2.0-2.11.6.orig/tests/Makefile.in 2007-07-20 22:21:39.000000000 +0200
++++ gtk+2.0-2.11.6/tests/Makefile.in 2007-07-23 22:03:03.000000000 +0200
@@ -92,6 +92,8 @@ ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_F
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -9051,3 +12853,11 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+@@ -247,6 +249,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ REBUILD_PNGS = @REBUILD_PNGS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=12082&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Mon Jul 23 20:21:27 2007
@@ -48,7 +48,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.11.5
+SHVER := 2.11.6
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
More information about the pkg-gnome-commits
mailing list