r11546 - in /desktop/experimental/gtk+2.0/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sat Jun 16 13:05:24 UTC 2007
Author: lool
Date: Sat Jun 16 13:05:24 2007
New Revision: 11546
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11546
Log:
* New upstream development release, with API additions; the new API may
still change incompatibly.
- Bump shlibs to >= 2.11.3.
- Refresh patches 006_proper-directfb-modules,
008_implicit_pointer_conversion_gdkgc_directfb,
009_gtk-export-filechooser, 030_gtkentry_password-char-circle,
033_treeview_resizing, 040_filechooser_single-click, and 041_ia32-libs
to apply cleanly.
- Update relibtoolizing patch, 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/008_implicit_pointer_conversion_gdkgc_directfb.patch
desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
desktop/experimental/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.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/041_ia32-libs.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=11546&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Sat Jun 16 13:05:24 2007
@@ -1,4 +1,4 @@
-gtk+2.0 (2.11.2-2) UNRELEASED; urgency=low
+gtk+2.0 (2.11.3-1) UNRELEASED; urgency=low
[ Josselin Mouette ]
* 040_filechooser_single-click.patch: fix the patch to apply cleanly
@@ -7,8 +7,17 @@
[ Loic Minier ]
* Pass -mminimal-toc in CFLAGS for ppc64 support; thanks Andreas Jochens;
closes: #386815.
-
- -- Loic Minier <lool at dooz.org> Thu, 14 Jun 2007 22:42:06 +0200
+ * New upstream development release, with API additions; the new API may
+ still change incompatibly.
+ - Bump shlibs to >= 2.11.3.
+ - Refresh patches 006_proper-directfb-modules,
+ 008_implicit_pointer_conversion_gdkgc_directfb,
+ 009_gtk-export-filechooser, 030_gtkentry_password-char-circle,
+ 033_treeview_resizing, 040_filechooser_single-click, and 041_ia32-libs
+ to apply cleanly.
+ - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+
+ -- Loic Minier <lool at dooz.org> Sat, 16 Jun 2007 14:31:53 +0200
gtk+2.0 (2.11.2-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=11546&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 Sat Jun 16 13:05:24 2007
@@ -1,10 +1,10 @@
GNOME #447118; related to Debian #381081
-Index: gtk+2.0-2.11.2/configure.in
+Index: gtk+2.0-2.11.3/configure.in
===================================================================
---- gtk+2.0-2.11.2.orig/configure.in 2007-06-13 16:27:47.000000000 +0200
-+++ gtk+2.0-2.11.2/configure.in 2007-06-13 16:27:57.000000000 +0200
-@@ -1420,8 +1420,18 @@
+--- gtk+2.0-2.11.3.orig/configure.in 2007-06-16 14:24:41.000000000 +0200
++++ gtk+2.0-2.11.3/configure.in 2007-06-16 14:24:46.000000000 +0200
+@@ -1392,8 +1392,18 @@
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
AC_MSG_RESULT(found)
@@ -25,7 +25,7 @@
else
AC_MSG_ERROR([
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -1473,7 +1483,7 @@
+@@ -1445,7 +1455,7 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
Modified: desktop/experimental/gtk+2.0/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch?rev=11546&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch Sat Jun 16 13:05:24 2007
@@ -1,11 +1,11 @@
GNOME #447163; Debian 381082
-Index: gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c
+Index: gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c
===================================================================
---- gtk+2.0-2.10.10.orig/gdk/directfb/gdkgc-directfb.c 2007-03-12 15:06:51.000000000 +0100
-+++ gtk+2.0-2.10.10/gdk/directfb/gdkgc-directfb.c 2007-03-13 14:10:26.000000000 +0100
-@@ -31,6 +31,7 @@
- */
+--- gtk+2.0-2.11.3.orig/gdk/directfb/gdkgc-directfb.c 2007-06-15 20:08:17.000000000 +0200
++++ gtk+2.0-2.11.3/gdk/directfb/gdkgc-directfb.c 2007-06-16 14:25:00.000000000 +0200
+@@ -33,6 +33,7 @@
+ #undef GDK_DISABLE_DEPRECATED
#include <config.h>
+#undef GDK_DISABLE_DEPRECATED
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=11546&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 Sat Jun 16 13:05:24 2007
@@ -26,10 +26,10 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: gtk+2.0-2.11.2/gtk/Makefile.am
+Index: gtk+2.0-2.11.3/gtk/Makefile.am
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/Makefile.am 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/Makefile.am 2007-06-13 11:07:26.000000000 +0200
+--- 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
@@ -33,6 +33,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@@ -39,7 +39,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -333,7 +335,10 @@
+@@ -335,7 +337,10 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -51,7 +51,7 @@
# GTK+ header files that don't get installed
gtk_private_h_sources = \
-@@ -347,10 +352,7 @@
+@@ -350,10 +355,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -62,11 +62,11 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-Index: gtk+2.0-2.11.2/gtk/gtk.symbols
+Index: gtk+2.0-2.11.3/gtk/gtk.symbols
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtk.symbols 2007-06-06 14:59:53.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtk.symbols 2007-06-13 11:07:26.000000000 +0200
-@@ -1380,6 +1380,12 @@
+--- 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
+@@ -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.2/gtk/gtkfilechooserprivate.h
+Index: gtk+2.0-2.11.3/gtk/gtkfilechooserprivate.h
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtkfilechooserprivate.h 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtkfilechooserprivate.h 2007-06-13 11:07:26.000000000 +0200
+--- 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
@@ -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.2/gtk/gtkfilechooserutils.c
+Index: gtk+2.0-2.11.3/gtk/gtkfilechooserutils.c
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtkfilechooserutils.c 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtkfilechooserutils.c 2007-06-13 11:07:26.000000000 +0200
+--- 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
@@ -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.2/gtk/gtkfilechooserutils.h
+Index: gtk+2.0-2.11.3/gtk/gtkfilechooserutils.h
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtkfilechooserutils.h 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtkfilechooserutils.h 2007-06-13 11:07:26.000000000 +0200
+--- 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
@@ -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.2/gtk/gtkfilesystemmodel.h
+Index: gtk+2.0-2.11.3/gtk/gtkfilesystemmodel.h
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtkfilesystemmodel.h 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtkfilesystemmodel.h 2007-06-13 11:07:26.000000000 +0200
+--- 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
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@@ -176,10 +176,10 @@
#include <glib-object.h>
#include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h>
-Index: gtk+2.0-2.11.2/tests/autotestfilechooser.c
+Index: gtk+2.0-2.11.3/tests/autotestfilechooser.c
===================================================================
---- gtk+2.0-2.11.2.orig/tests/autotestfilechooser.c 2007-06-06 13:43:15.000000000 +0200
-+++ gtk+2.0-2.11.2/tests/autotestfilechooser.c 2007-06-13 11:07:26.000000000 +0200
+--- 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
@@ -30,6 +30,7 @@
*/
Modified: desktop/experimental/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/030_gtkentry_password-char-circle.patch?rev=11546&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.patch Sat Jun 16 13:05:24 2007
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.11.2/gtk/gtkentry.c
+Index: gtk+2.0-2.11.3/gtk/gtkentry.c
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtkentry.c 2007-06-06 13:43:09.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtkentry.c 2007-06-13 11:37:03.000000000 +0200
+--- gtk+2.0-2.11.3.orig/gtk/gtkentry.c 2007-06-15 20:07:37.000000000 +0200
++++ gtk+2.0-2.11.3/gtk/gtkentry.c 2007-06-16 14:25:47.000000000 +0200
@@ -537,7 +537,7 @@
g_param_spec_unichar ("invisible-char",
P_("Invisible character"),
@@ -20,7 +20,7 @@
entry->dnd_position = -1;
entry->width_chars = -1;
entry->is_cell_renderer = FALSE;
-@@ -4495,9 +4495,9 @@
+@@ -4550,9 +4550,9 @@
* gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to
* show the user how many characters have been typed. The default
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=11546&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 Sat Jun 16 13:05:24 2007
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.11.2/gtk/gtktreeviewcolumn.c
+Index: gtk+2.0-2.11.3/gtk/gtktreeviewcolumn.c
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtktreeviewcolumn.c 2007-06-06 14:59:53.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtktreeviewcolumn.c 2007-06-13 11:38:51.000000000 +0200
-@@ -2129,6 +2129,7 @@
+--- 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
+@@ -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.2/gtk/gtktreeview.c
+Index: gtk+2.0-2.11.3/gtk/gtktreeview.c
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtktreeview.c 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtktreeview.c 2007-06-13 11:38:51.000000000 +0200
-@@ -2105,18 +2105,20 @@
+--- 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 @@
/* GtkWidget::size_allocate helper */
static void
@@ -37,7 +37,7 @@
tree_view = GTK_TREE_VIEW (widget);
-@@ -2151,12 +2153,38 @@
+@@ -2188,12 +2190,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))
-@@ -2211,6 +2239,10 @@
+@@ -2248,6 +2276,10 @@
{
column->width += extra;
}
@@ -88,7 +88,7 @@
g_object_notify (G_OBJECT (column), "width");
-@@ -2245,13 +2277,13 @@
+@@ -2282,13 +2314,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@@ -105,7 +105,7 @@
tmp_list = tree_view->priv->children;
while (tmp_list)
-@@ -2338,7 +2370,7 @@
+@@ -2375,7 +2407,7 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@@ -114,7 +114,7 @@
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
-@@ -2749,7 +2781,7 @@
+@@ -2786,7 +2818,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");
-@@ -3458,6 +3490,8 @@
+@@ -3495,6 +3527,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@@ -132,7 +132,7 @@
gtk_widget_queue_resize (widget);
}
-@@ -11253,7 +11287,7 @@
+@@ -11297,7 +11331,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -141,10 +141,10 @@
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
-Index: gtk+2.0-2.11.2/gtk/gtktreeprivate.h
+Index: gtk+2.0-2.11.3/gtk/gtktreeprivate.h
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtktreeprivate.h 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtktreeprivate.h 2007-06-13 11:38:51.000000000 +0200
+--- 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 @@
gboolean tree_lines_enabled;
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=11546&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 Sat Jun 16 13:05:24 2007
@@ -1,10 +1,10 @@
Debian #405296; GNOME #148828; permit single click in filechooser instead of
requiring double-click.
-Index: gtk+-2.11.2/gtk/gtkfilechooserdefault.c
+Index: gtk+2.0-2.11.3/gtk/gtkfilechooserdefault.c
===================================================================
---- gtk+-2.11.2.orig/gtk/gtkfilechooserdefault.c 2007-06-06 13:43:08.000000000 +0200
-+++ gtk+-2.11.2/gtk/gtkfilechooserdefault.c 2007-06-14 02:10:53.595381229 +0200
+--- gtk+2.0-2.11.3.orig/gtk/gtkfilechooserdefault.c 2007-06-15 20:07:36.000000000 +0200
++++ gtk+2.0-2.11.3/gtk/gtkfilechooserdefault.c 2007-06-16 14:26:14.000000000 +0200
@@ -389,10 +389,6 @@
static void filter_combo_changed (GtkComboBox *combo_box,
@@ -16,7 +16,7 @@
static gboolean shortcuts_key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
-@@ -3624,8 +3620,22 @@
+@@ -3639,8 +3635,22 @@
shortcuts_selection_changed_cb (GtkTreeSelection *selection,
GtkFileChooserDefault *impl)
{
@@ -39,7 +39,7 @@
}
static gboolean
-@@ -3905,9 +3915,6 @@
+@@ -3920,9 +3930,6 @@
g_signal_connect (selection, "changed",
G_CALLBACK (shortcuts_selection_changed_cb), impl);
@@ -49,7 +49,7 @@
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl);
-@@ -8506,25 +8513,6 @@
+@@ -8521,25 +8528,6 @@
gtk_file_path_free (path);
return retval;
}
@@ -75,7 +75,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
-@@ -10312,25 +10300,6 @@
+@@ -10330,25 +10318,6 @@
}
}
Modified: desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/041_ia32-libs.patch?rev=11546&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch Sat Jun 16 13:05:24 2007
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
+Index: gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
---- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:44:25.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:44:41.000000000 +0200
+--- gtk+2.0-2.11.3.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:25:47.000000000 +0200
++++ gtk+2.0-2.11.3/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-16 14:26:24.000000000 +0200
@@ -280,8 +280,20 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
@@ -25,11 +25,11 @@
return result;
}
-Index: gtk+2.0-2.11.2/gtk/gtkrc.c
+Index: gtk+2.0-2.11.3/gtk/gtkrc.c
===================================================================
---- gtk+2.0-2.11.2.orig/gtk/gtkrc.c 2007-06-06 13:43:09.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/gtkrc.c 2007-06-13 11:44:41.000000000 +0200
-@@ -449,7 +449,20 @@
+--- gtk+2.0-2.11.3.orig/gtk/gtkrc.c 2007-06-15 20:07:37.000000000 +0200
++++ gtk+2.0-2.11.3/gtk/gtkrc.c 2007-06-16 14:26:24.000000000 +0200
+@@ -450,7 +450,20 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
@@ -51,7 +51,7 @@
}
return result;
-@@ -521,7 +534,21 @@
+@@ -522,7 +535,21 @@
else
{
const gchar *home;
@@ -74,7 +74,7 @@
gtk_rc_add_default_file (str);
g_free (str);
-@@ -529,7 +556,21 @@
+@@ -530,7 +557,21 @@
home = g_get_home_dir ();
if (home)
{
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=11546&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 Sat Jun 16 13:05:24 2007
@@ -6,11 +6,10 @@
rm -rf autom4te.cache
exclude config.guess and sub with diff -urN -x config.guess -x config.sub
-Index: gtk+2.0-2.11.2/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/Makefile.in 2007-06-06 15:03:36.000000000 +0200
-+++ gtk+2.0-2.11.2/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -92,6 +92,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/Makefile.in gtk+2.0-2.11.3.new/Makefile.in
+--- gtk+2.0-2.11.3.orig/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/Makefile.in 2007-06-16 14:30:15.000000000 +0200
+@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -19,7 +18,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -327,7 +329,10 @@
+@@ -323,7 +325,10 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -31,7 +30,7 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-@@ -484,7 +489,8 @@
+@@ -480,7 +485,8 @@
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
@@ -41,7 +40,7 @@
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -736,7 +742,7 @@
+@@ -732,7 +738,7 @@
|| exit 1; \
fi; \
done
@@ -50,10 +49,9 @@
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
-Index: gtk+2.0-2.11.2/aclocal.m4
-===================================================================
---- gtk+2.0-2.11.2.orig/aclocal.m4 2007-06-06 15:03:33.000000000 +0200
-+++ gtk+2.0-2.11.2/aclocal.m4 2007-06-13 16:33:27.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/aclocal.m4 gtk+2.0-2.11.3.new/aclocal.m4
+--- gtk+2.0-2.11.3.orig/aclocal.m4 2007-06-15 20:26:16.000000000 +0200
++++ gtk+2.0-2.11.3.new/aclocal.m4 2007-06-16 14:30:10.000000000 +0200
@@ -941,7 +941,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -348,15 +346,14 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
])
-Index: gtk+2.0-2.11.2/configure
-===================================================================
---- gtk+2.0-2.11.2.orig/configure 2007-06-06 15:03:38.000000000 +0200
-+++ gtk+2.0-2.11.2/configure 2007-06-13 16:35:00.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/configure gtk+2.0-2.11.3.new/configure
+--- gtk+2.0-2.11.3.orig/configure 2007-06-15 20:26:27.000000000 +0200
++++ gtk+2.0-2.11.3.new/configure 2007-06-16 14:30:15.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.2.
-+# Generated by GNU Autoconf 2.61 for gtk+ 2.11.2.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.11.3.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.11.3.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -540,7 +537,7 @@
GREP
EGREP
LN_S
-@@ -1051,6 +1068,7 @@
+@@ -1047,6 +1064,7 @@
CC
CFLAGS
LDFLAGS
@@ -548,7 +545,7 @@
CPPFLAGS
CPP
CXX
-@@ -1168,10 +1186,10 @@
+@@ -1164,10 +1182,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -561,7 +558,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1187,10 +1205,10 @@
+@@ -1183,10 +1201,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -574,7 +571,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1384,19 +1402,19 @@
+@@ -1380,19 +1398,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -598,7 +595,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1673,7 +1691,7 @@
+@@ -1667,7 +1685,7 @@
--disable-modules disable dynamic module loading
--enable-test-print-backend
build test print backend
@@ -607,7 +604,7 @@
--enable-man regenerate man pages from Docbook [default=no]
Optional Packages:
-@@ -1700,6 +1718,7 @@
+@@ -1694,6 +1712,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -615,25 +612,25 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
-@@ -1780,7 +1799,7 @@
+@@ -1774,7 +1793,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.11.2
+ gtk+ configure 2.11.3
-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.
-@@ -1794,7 +1813,7 @@
+@@ -1788,7 +1807,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.11.2, which was
+ It was created by gtk+ $as_me 2.11.3, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2220,7 +2239,7 @@
+@@ -2214,7 +2233,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -642,7 +639,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.
-@@ -2354,7 +2373,7 @@
+@@ -2348,7 +2367,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -651,7 +648,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2483,7 +2502,7 @@
+@@ -2477,7 +2496,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -660,7 +657,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2523,7 +2542,7 @@
+@@ -2517,7 +2536,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -669,7 +666,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2764,7 +2783,7 @@
+@@ -2758,7 +2777,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -678,7 +675,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2804,7 +2823,7 @@
+@@ -2798,7 +2817,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -687,7 +684,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2861,7 +2880,7 @@
+@@ -2855,7 +2874,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -696,7 +693,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2902,7 +2921,7 @@
+@@ -2896,7 +2915,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -705,7 +702,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2960,7 +2979,7 @@
+@@ -2954,7 +2973,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -714,7 +711,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
-@@ -3004,7 +3023,7 @@
+@@ -2998,7 +3017,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -723,7 +720,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -3145,7 +3164,7 @@
+@@ -3139,7 +3158,7 @@
# 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.
@@ -732,7 +729,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3173,6 +3192,12 @@
+@@ -3167,6 +3186,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -745,7 +742,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3184,8 +3209,6 @@
+@@ -3178,8 +3203,6 @@
fi
ac_exeext=$ac_cv_exeext
@@ -754,7 +751,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3363,27 +3386,10 @@
+@@ -3357,27 +3380,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -786,7 +783,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3438,27 +3444,10 @@
+@@ -3432,27 +3438,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -818,7 +815,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3493,27 +3482,10 @@
+@@ -3487,27 +3476,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -850,7 +847,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3549,27 +3521,10 @@
+@@ -3543,27 +3515,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -882,7 +879,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3685,27 +3640,10 @@
+@@ -3679,27 +3634,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -914,7 +911,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3935,6 +3873,16 @@
+@@ -3929,6 +3867,16 @@
@@ -931,7 +928,7 @@
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
{ echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5
-@@ -4076,7 +4024,7 @@
+@@ -4070,7 +4018,7 @@
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"
@@ -940,7 +937,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
-@@ -4158,7 +4106,7 @@
+@@ -4152,7 +4100,7 @@
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"
@@ -949,7 +946,7 @@
# 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
-@@ -4464,7 +4412,7 @@
+@@ -4458,7 +4406,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -958,7 +955,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -4518,11 +4466,11 @@
+@@ -4512,11 +4460,11 @@
;;
# This must be Linux ELF.
@@ -972,16 +969,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -4639,7 +4587,7 @@
+@@ -4633,7 +4581,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 4642 "configure"' > conftest.$ac_ext
-+ echo '#line 4590 "configure"' > conftest.$ac_ext
+- echo '#line 4636 "configure"' > conftest.$ac_ext
++ echo '#line 4584 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -4763,27 +4711,11 @@
+@@ -4757,27 +4705,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1014,7 +1011,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4792,7 +4724,7 @@
+@@ -4786,7 +4718,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -1023,7 +1020,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4846,7 +4778,7 @@
+@@ -4840,7 +4772,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1032,7 +1029,7 @@
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4886,7 +4818,7 @@
+@@ -4880,7 +4812,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1041,7 +1038,7 @@
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4942,7 +4874,7 @@
+@@ -4936,7 +4868,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1050,7 +1047,7 @@
ac_cv_prog_AS="${ac_tool_prefix}as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -4982,7 +4914,7 @@
+@@ -4976,7 +4908,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1059,7 +1056,7 @@
ac_cv_prog_ac_ct_AS="as"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5038,7 +4970,7 @@
+@@ -5032,7 +4964,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1068,7 +1065,7 @@
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5078,7 +5010,7 @@
+@@ -5072,7 +5004,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1077,7 +1074,7 @@
ac_cv_prog_ac_ct_OBJDUMP="objdump"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -5176,17 +5108,10 @@
+@@ -5170,17 +5102,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1099,7 +1096,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5220,17 +5145,10 @@
+@@ -5214,17 +5139,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1121,7 +1118,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5295,17 +5213,10 @@
+@@ -5289,17 +5207,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1143,7 +1140,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5339,17 +5250,10 @@
+@@ -5333,17 +5244,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1165,7 +1162,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5420,27 +5324,10 @@
+@@ -5414,27 +5318,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1197,7 +1194,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5616,27 +5503,10 @@
+@@ -5610,27 +5497,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1229,7 +1226,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -5699,27 +5569,10 @@
+@@ -5693,27 +5563,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1261,7 +1258,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5755,17 +5608,10 @@
+@@ -5749,17 +5602,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1283,7 +1280,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5857,7 +5703,7 @@
+@@ -5851,7 +5697,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1292,7 +1289,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
-@@ -5901,7 +5747,7 @@
+@@ -5895,7 +5741,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1301,7 +1298,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6014,27 +5860,10 @@
+@@ -6008,27 +5854,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1333,7 +1330,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6089,27 +5918,10 @@
+@@ -6083,27 +5912,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1365,7 +1362,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6144,27 +5956,10 @@
+@@ -6138,27 +5950,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1397,7 +1394,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6200,27 +5995,10 @@
+@@ -6194,27 +5989,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1429,7 +1426,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6416,17 +6194,10 @@
+@@ -6410,17 +6188,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1451,7 +1448,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6460,17 +6231,10 @@
+@@ -6454,17 +6225,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1473,7 +1470,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6535,17 +6299,10 @@
+@@ -6529,17 +6293,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1495,7 +1492,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6579,17 +6336,10 @@
+@@ -6573,17 +6330,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1517,7 +1514,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6630,7 +6380,7 @@
+@@ -6624,7 +6374,7 @@
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
@@ -1526,7 +1523,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
-@@ -6648,7 +6398,7 @@
+@@ -6642,7 +6392,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1535,7 +1532,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
-@@ -6674,7 +6424,7 @@
+@@ -6668,7 +6418,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -1544,7 +1541,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
-@@ -6692,7 +6442,7 @@
+@@ -6686,7 +6436,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1553,7 +1550,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6799,27 +6549,10 @@
+@@ -6793,27 +6543,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1585,7 +1582,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6862,27 +6595,10 @@
+@@ -6856,27 +6589,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1617,7 +1614,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7080,7 +6796,7 @@
+@@ -7074,7 +6790,7 @@
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'"
;;
@@ -1626,7 +1623,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'"
-@@ -7337,7 +7053,7 @@
+@@ -7331,7 +7047,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1635,7 +1632,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7377,7 +7093,7 @@
+@@ -7371,7 +7087,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1644,7 +1641,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7433,7 +7149,7 @@
+@@ -7427,7 +7143,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1653,7 +1650,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7473,7 +7189,7 @@
+@@ -7467,7 +7183,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1662,7 +1659,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7529,7 +7245,7 @@
+@@ -7523,7 +7239,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1671,7 +1668,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7569,7 +7285,7 @@
+@@ -7563,7 +7279,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1680,21 +1677,21 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7886,11 +7602,11 @@
+@@ -7880,11 +7596,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7889: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7605: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7883: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7599: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7893: \$? = $ac_status" >&5
-+ echo "$as_me:7609: \$? = $ac_status" >&5
+- echo "$as_me:7887: \$? = $ac_status" >&5
++ echo "$as_me:7603: \$? = $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.
-@@ -8048,7 +7764,7 @@
+@@ -8042,7 +7758,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -1703,35 +1700,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -8154,11 +7870,11 @@
+@@ -8148,11 +7864,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8157: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7873: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8151: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7867: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8161: \$? = $ac_status" >&5
-+ echo "$as_me:7877: \$? = $ac_status" >&5
+- echo "$as_me:8155: \$? = $ac_status" >&5
++ echo "$as_me:7871: \$? = $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.
-@@ -8258,11 +7974,11 @@
+@@ -8252,11 +7968,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8261: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7977: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8255: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7971: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8265: \$? = $ac_status" >&5
-+ echo "$as_me:7981: \$? = $ac_status" >&5
+- echo "$as_me:8259: \$? = $ac_status" >&5
++ echo "$as_me:7975: \$? = $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
-@@ -8487,7 +8203,7 @@
+@@ -8481,7 +8197,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -1740,7 +1737,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8513,12 +8229,13 @@
+@@ -8507,12 +8223,13 @@
$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'
fi
@@ -1755,7 +1752,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8738,27 +8455,11 @@
+@@ -8732,27 +8449,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1788,7 +1785,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -8772,7 +8473,7 @@
+@@ -8766,7 +8467,7 @@
fi
@@ -1797,7 +1794,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8813,27 +8514,11 @@
+@@ -8807,27 +8508,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1830,7 +1827,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -8847,7 +8532,7 @@
+@@ -8841,7 +8526,7 @@
fi
@@ -1839,7 +1836,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8978,7 +8663,7 @@
+@@ -8972,7 +8657,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1848,7 +1845,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -9080,7 +8765,7 @@
+@@ -9074,7 +8759,7 @@
link_all_deplibs=yes
;;
@@ -1857,7 +1854,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9570,18 +9255,6 @@
+@@ -9564,18 +9249,6 @@
dynamic_linker=no
;;
@@ -1876,7 +1873,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -9737,7 +9410,7 @@
+@@ -9731,7 +9404,7 @@
;;
# This must be Linux ELF.
@@ -1885,7 +1882,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9751,31 +9424,10 @@
+@@ -9745,31 +9418,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -1893,7 +1890,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 9758 "configure"' > conftest.$ac_ext
+- echo '#line 9752 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -1918,7 +1915,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9787,7 +9439,7 @@
+@@ -9781,7 +9433,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1927,7 +1924,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9796,7 +9448,7 @@
+@@ -9790,7 +9442,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -1936,7 +1933,7 @@
;;
netbsd*)
-@@ -10116,27 +9768,11 @@
+@@ -10110,27 +9762,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1969,7 +1966,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10145,7 +9781,7 @@
+@@ -10139,7 +9775,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -1978,7 +1975,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10227,27 +9863,11 @@
+@@ -10221,27 +9857,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2011,7 +2008,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10256,7 +9876,7 @@
+@@ -10250,7 +9870,7 @@
ac_cv_func_shl_load=no
fi
@@ -2020,7 +2017,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10306,27 +9926,11 @@
+@@ -10300,27 +9920,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2053,7 +2050,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10335,7 +9939,7 @@
+@@ -10329,7 +9933,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -2062,7 +2059,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10407,27 +10011,11 @@
+@@ -10401,27 +10005,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2095,7 +2092,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10436,7 +10024,7 @@
+@@ -10430,7 +10018,7 @@
ac_cv_func_dlopen=no
fi
@@ -2104,7 +2101,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10486,27 +10074,11 @@
+@@ -10480,27 +10068,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2137,7 +2134,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10515,7 +10087,7 @@
+@@ -10509,7 +10081,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -2146,7 +2143,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10566,27 +10138,11 @@
+@@ -10560,27 +10132,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2179,7 +2176,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10595,7 +10151,7 @@
+@@ -10589,7 +10145,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -2188,7 +2185,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10646,27 +10202,11 @@
+@@ -10640,27 +10196,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2221,7 +2218,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10675,7 +10215,7 @@
+@@ -10669,7 +10209,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -2230,25 +2227,25 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10731,7 +10271,7 @@
+@@ -10725,7 +10265,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10734 "configure"
-+#line 10274 "configure"
+-#line 10728 "configure"
++#line 10268 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10831,7 +10371,7 @@
+@@ -10825,7 +10365,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10834 "configure"
-+#line 10374 "configure"
+-#line 10828 "configure"
++#line 10368 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11918,27 +11458,11 @@
+@@ -11912,27 +11452,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2281,7 +2278,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -11952,7 +11476,7 @@
+@@ -11946,7 +11470,7 @@
fi
@@ -2290,7 +2287,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -11994,27 +11518,11 @@
+@@ -11988,27 +11512,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2323,7 +2320,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -12028,7 +11536,7 @@
+@@ -12022,7 +11530,7 @@
fi
@@ -2332,7 +2329,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12176,7 +11684,7 @@
+@@ -12170,7 +11678,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -2341,7 +2338,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12335,7 +11843,7 @@
+@@ -12329,7 +11837,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -2350,7 +2347,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12437,7 +11945,7 @@
+@@ -12431,7 +11939,7 @@
;;
esac
;;
@@ -2359,7 +2356,7 @@
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=
-@@ -13004,7 +12512,7 @@
+@@ -12998,7 +12506,7 @@
;;
esac
;;
@@ -2368,7 +2365,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13047,7 +12555,7 @@
+@@ -13041,7 +12549,7 @@
;;
esac
;;
@@ -2377,7 +2374,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13090,7 +12598,7 @@
+@@ -13084,7 +12592,7 @@
;;
esac
;;
@@ -2386,35 +2383,35 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13199,11 +12707,11 @@
+@@ -13193,11 +12701,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13202: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12710: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13196: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12704: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13206: \$? = $ac_status" >&5
-+ echo "$as_me:12714: \$? = $ac_status" >&5
+- echo "$as_me:13200: \$? = $ac_status" >&5
++ echo "$as_me:12708: \$? = $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.
-@@ -13303,11 +12811,11 @@
+@@ -13297,11 +12805,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13306: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12814: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13300: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12808: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13310: \$? = $ac_status" >&5
-+ echo "$as_me:12818: \$? = $ac_status" >&5
+- echo "$as_me:13304: \$? = $ac_status" >&5
++ echo "$as_me:12812: \$? = $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
-@@ -13375,6 +12883,9 @@
+@@ -13369,6 +12877,9 @@
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'
;;
@@ -2424,7 +2421,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -13654,18 +13165,6 @@
+@@ -13648,18 +13159,6 @@
dynamic_linker=no
;;
@@ -2443,7 +2440,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13821,7 +13320,7 @@
+@@ -13815,7 +13314,7 @@
;;
# This must be Linux ELF.
@@ -2452,7 +2449,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13835,31 +13334,10 @@
+@@ -13829,31 +13328,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -2460,7 +2457,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 13842 "configure"' > conftest.$ac_ext
+- echo '#line 13836 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2485,7 +2482,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -13871,7 +13349,7 @@
+@@ -13865,7 +13343,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2494,7 +2491,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13880,7 +13358,7 @@
+@@ -13874,7 +13352,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2503,7 +2500,7 @@
;;
netbsd*)
-@@ -14788,7 +14266,7 @@
+@@ -14782,7 +14260,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -2512,35 +2509,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -14894,11 +14372,11 @@
+@@ -14888,11 +14366,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14897: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14375: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14891: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14369: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14901: \$? = $ac_status" >&5
-+ echo "$as_me:14379: \$? = $ac_status" >&5
+- echo "$as_me:14895: \$? = $ac_status" >&5
++ echo "$as_me:14373: \$? = $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.
-@@ -14998,11 +14476,11 @@
+@@ -14992,11 +14470,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15001: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14479: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14995: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14473: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15005: \$? = $ac_status" >&5
-+ echo "$as_me:14483: \$? = $ac_status" >&5
+- echo "$as_me:14999: \$? = $ac_status" >&5
++ echo "$as_me:14477: \$? = $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
-@@ -15227,7 +14705,7 @@
+@@ -15221,7 +14699,7 @@
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'
;;
@@ -2549,7 +2546,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15253,12 +14731,13 @@
+@@ -15247,12 +14725,13 @@
$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'
fi
@@ -2564,7 +2561,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15468,27 +14947,11 @@
+@@ -15462,27 +14941,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2597,7 +2594,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -15502,7 +14965,7 @@
+@@ -15496,7 +14959,7 @@
fi
@@ -2606,7 +2603,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15533,27 +14996,11 @@
+@@ -15527,27 +14990,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2639,7 +2636,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -15567,7 +15014,7 @@
+@@ -15561,7 +15008,7 @@
fi
@@ -2648,7 +2645,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15698,7 +15145,7 @@
+@@ -15692,7 +15139,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2657,7 +2654,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -15800,7 +15247,7 @@
+@@ -15794,7 +15241,7 @@
link_all_deplibs_F77=yes
;;
@@ -2666,7 +2663,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16290,18 +15737,6 @@
+@@ -16284,18 +15731,6 @@
dynamic_linker=no
;;
@@ -2685,7 +2682,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -16457,7 +15892,7 @@
+@@ -16451,7 +15886,7 @@
;;
# This must be Linux ELF.
@@ -2694,7 +2691,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16471,31 +15906,10 @@
+@@ -16465,31 +15900,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -2702,7 +2699,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 16478 "configure"' > conftest.$ac_ext
+- echo '#line 16472 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2727,7 +2724,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16507,7 +15921,7 @@
+@@ -16501,7 +15915,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2736,7 +2733,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16516,7 +15930,7 @@
+@@ -16510,7 +15924,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2745,21 +2742,21 @@
;;
netbsd*)
-@@ -17249,11 +16663,11 @@
+@@ -17243,11 +16657,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17252: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16666: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17246: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16660: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17256: \$? = $ac_status" >&5
-+ echo "$as_me:16670: \$? = $ac_status" >&5
+- echo "$as_me:17250: \$? = $ac_status" >&5
++ echo "$as_me:16664: \$? = $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.
-@@ -17411,7 +16825,7 @@
+@@ -17405,7 +16819,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -2768,35 +2765,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17517,11 +16931,11 @@
+@@ -17511,11 +16925,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16934: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17514: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16928: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17524: \$? = $ac_status" >&5
-+ echo "$as_me:16938: \$? = $ac_status" >&5
+- echo "$as_me:17518: \$? = $ac_status" >&5
++ echo "$as_me:16932: \$? = $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.
-@@ -17621,11 +17035,11 @@
+@@ -17615,11 +17029,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17624: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17038: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17618: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17032: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17628: \$? = $ac_status" >&5
-+ echo "$as_me:17042: \$? = $ac_status" >&5
+- echo "$as_me:17622: \$? = $ac_status" >&5
++ echo "$as_me:17036: \$? = $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
-@@ -17850,7 +17264,7 @@
+@@ -17844,7 +17258,7 @@
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'
;;
@@ -2805,7 +2802,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17876,12 +17290,13 @@
+@@ -17870,12 +17284,13 @@
$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'
fi
@@ -2820,7 +2817,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18101,27 +17516,11 @@
+@@ -18095,27 +17510,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2853,7 +2850,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -18135,7 +17534,7 @@
+@@ -18129,7 +17528,7 @@
fi
@@ -2862,7 +2859,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18176,27 +17575,11 @@
+@@ -18170,27 +17569,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2895,7 +2892,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -18210,7 +17593,7 @@
+@@ -18204,7 +17587,7 @@
fi
@@ -2904,7 +2901,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18341,7 +17724,7 @@
+@@ -18335,7 +17718,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2913,7 +2910,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -18443,7 +17826,7 @@
+@@ -18437,7 +17820,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -2922,7 +2919,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -18933,18 +18316,6 @@
+@@ -18927,18 +18310,6 @@
dynamic_linker=no
;;
@@ -2941,7 +2938,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19100,7 +18471,7 @@
+@@ -19094,7 +18465,7 @@
;;
# This must be Linux ELF.
@@ -2950,7 +2947,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19114,31 +18485,10 @@
+@@ -19108,31 +18479,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -2958,7 +2955,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 19121 "configure"' > conftest.$ac_ext
+- echo '#line 19115 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2983,7 +2980,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19150,7 +18500,7 @@
+@@ -19144,7 +18494,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2992,7 +2989,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19159,7 +18509,7 @@
+@@ -19153,7 +18503,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -3001,7 +2998,7 @@
;;
netbsd*)
-@@ -20392,27 +19742,10 @@
+@@ -20386,27 +19736,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3033,7 +3030,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -20436,27 +19769,10 @@
+@@ -20430,27 +19763,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3065,7 +3062,7 @@
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
-@@ -20484,7 +19800,6 @@
+@@ -20478,7 +19794,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
@@ -3073,7 +3070,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20521,28 +19836,11 @@
+@@ -20515,28 +19830,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3107,7 +3104,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20588,27 +19886,10 @@
+@@ -20582,27 +19880,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3139,7 +3136,7 @@
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
-@@ -20618,26 +19899,28 @@
+@@ -20612,26 +19893,28 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3174,7 +3171,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20674,28 +19957,11 @@
+@@ -20668,28 +19951,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3208,7 +3205,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20741,27 +20007,10 @@
+@@ -20735,27 +20001,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3240,7 +3237,7 @@
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
-@@ -20771,19 +20020,22 @@
+@@ -20765,19 +20014,22 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3267,7 +3264,7 @@
fi
-@@ -20812,7 +20064,7 @@
+@@ -20806,7 +20058,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3276,7 +3273,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
-@@ -20933,7 +20185,7 @@
+@@ -20927,7 +20179,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3285,7 +3282,7 @@
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -20973,7 +20225,7 @@
+@@ -20967,7 +20219,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3294,7 +3291,7 @@
ac_cv_prog_ac_ct_WINDRES="windres"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21033,7 +20285,7 @@
+@@ -21027,7 +20279,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3303,7 +3300,7 @@
ac_cv_prog_ms_librarian="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21281,27 +20533,11 @@
+@@ -21259,27 +20511,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3336,7 +3333,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -21310,7 +20546,7 @@
+@@ -21288,7 +20524,7 @@
fi
@@ -3345,7 +3342,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -21410,27 +20646,10 @@
+@@ -21388,27 +20624,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3377,7 +3374,7 @@
am_cv_prog_cc_stdc="$ac_arg"; break
else
echo "$as_me: failed program was:" >&5
-@@ -21493,7 +20712,7 @@
+@@ -21471,7 +20690,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3386,7 +3383,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.
-@@ -21657,7 +20876,7 @@
+@@ -21635,7 +20854,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3395,7 +3392,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
-@@ -21700,7 +20919,7 @@
+@@ -21678,7 +20897,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3404,7 +3401,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
-@@ -21942,7 +21161,7 @@
+@@ -21920,7 +21139,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3413,7 +3410,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
-@@ -21985,7 +21204,7 @@
+@@ -21963,7 +21182,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3422,7 +3419,7 @@
ac_cv_prog_INDENT="indent"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22085,27 +21304,11 @@
+@@ -22063,27 +21282,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3455,7 +3452,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22114,7 +21317,7 @@
+@@ -22092,7 +21295,7 @@
eval "$as_ac_var=no"
fi
@@ -3464,7 +3461,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22163,27 +21366,11 @@
+@@ -22141,27 +21344,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3497,7 +3494,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22192,7 +21379,7 @@
+@@ -22170,7 +21357,7 @@
gtk_ok=no
fi
@@ -3506,7 +3503,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22238,27 +21425,11 @@
+@@ -22216,27 +21403,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3539,7 +3536,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22267,7 +21438,7 @@
+@@ -22245,7 +21416,7 @@
gtk_ok=no
fi
@@ -3548,7 +3545,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22313,27 +21484,11 @@
+@@ -22291,27 +21462,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3581,7 +3578,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22342,7 +21497,7 @@
+@@ -22320,7 +21475,7 @@
gtk_ok=no
fi
@@ -3590,7 +3587,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22388,27 +21543,11 @@
+@@ -22366,27 +21521,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3623,7 +3620,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22417,7 +21556,7 @@
+@@ -22395,7 +21534,7 @@
gtk_ok=no
fi
@@ -3632,7 +3629,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22463,27 +21602,11 @@
+@@ -22441,27 +21580,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3665,7 +3662,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22492,7 +21615,7 @@
+@@ -22470,7 +21593,7 @@
gtk_ok=no
fi
@@ -3674,7 +3671,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22550,27 +21673,10 @@
+@@ -22528,27 +21651,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3706,7 +3703,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22606,17 +21712,10 @@
+@@ -22584,17 +21690,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3728,7 +3725,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22714,27 +21813,11 @@
+@@ -22692,27 +21791,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3761,7 +3758,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22743,7 +21826,7 @@
+@@ -22721,7 +21804,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -3770,7 +3767,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -22799,27 +21882,10 @@
+@@ -22777,27 +21860,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3802,7 +3799,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22855,17 +21921,10 @@
+@@ -22833,17 +21899,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3824,7 +3821,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22961,27 +22020,11 @@
+@@ -22939,27 +21998,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3857,7 +3854,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22990,7 +22033,7 @@
+@@ -22968,7 +22011,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -3866,7 +3863,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23033,27 +22076,11 @@
+@@ -23011,27 +22054,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3899,7 +3896,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23062,7 +22089,7 @@
+@@ -23040,7 +22067,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -3908,7 +3905,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23138,27 +22165,11 @@
+@@ -23116,27 +22143,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3941,7 +3938,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23167,7 +22178,7 @@
+@@ -23145,7 +22156,7 @@
eval "$as_ac_var=no"
fi
@@ -3950,7 +3947,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23232,27 +22243,11 @@
+@@ -23210,27 +22221,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3983,7 +3980,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23261,7 +22256,7 @@
+@@ -23239,7 +22234,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -3992,7 +3989,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23310,27 +22305,11 @@
+@@ -23288,27 +22283,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4025,7 +4022,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23339,7 +22318,7 @@
+@@ -23317,7 +22296,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -4034,7 +4031,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23388,27 +22367,11 @@
+@@ -23366,27 +22345,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4067,7 +4064,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23417,7 +22380,7 @@
+@@ -23395,7 +22358,7 @@
ac_cv_lib_intl_dgettext=no
fi
@@ -4076,7 +4073,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23479,27 +22442,11 @@
+@@ -23457,27 +22420,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4109,7 +4106,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23508,7 +22455,7 @@
+@@ -23486,7 +22433,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -4118,7 +4115,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23557,27 +22504,11 @@
+@@ -23535,27 +22482,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4151,7 +4148,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23586,7 +22517,7 @@
+@@ -23564,7 +22495,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -4160,7 +4157,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23681,27 +22612,11 @@
+@@ -23659,27 +22590,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4193,7 +4190,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23710,7 +22625,7 @@
+@@ -23688,7 +22603,7 @@
eval "$as_ac_var=no"
fi
@@ -4202,7 +4199,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23857,27 +22772,11 @@
+@@ -23835,27 +22750,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4235,7 +4232,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23886,7 +22785,7 @@
+@@ -23864,7 +22763,7 @@
eval "$as_ac_var=no"
fi
@@ -4244,7 +4241,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23947,7 +22846,7 @@
+@@ -23925,7 +22824,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4253,7 +4250,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
-@@ -24035,27 +22934,11 @@
+@@ -24013,27 +22912,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4286,7 +4283,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -24127,27 +23010,11 @@
+@@ -24105,27 +22988,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4319,7 +4316,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24156,7 +23023,7 @@
+@@ -24134,7 +23001,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -4328,7 +4325,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -24177,7 +23044,7 @@
+@@ -24155,7 +23022,7 @@
esac
fi
@@ -4337,7 +4334,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -24485,27 +23352,10 @@
+@@ -24463,27 +23330,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4369,7 +4366,7 @@
{ echo "$as_me:$LINENO: result: none needed" >&5
echo "${ECHO_T}none needed" >&6; }
else
-@@ -24542,27 +23392,10 @@
+@@ -24520,27 +23370,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4401,7 +4398,7 @@
{ echo "$as_me:$LINENO: result: -posix" >&5
echo "${ECHO_T}-posix" >&6; }
else
-@@ -24636,7 +23469,7 @@
+@@ -24614,7 +23447,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4410,7 +4407,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
-@@ -24679,7 +23512,7 @@
+@@ -24657,7 +23490,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4419,7 +4416,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
-@@ -24948,27 +23781,11 @@
+@@ -24926,27 +23759,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4452,7 +4449,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"
-@@ -24986,7 +23803,7 @@
+@@ -24964,7 +23781,7 @@
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
@@ -4461,7 +4458,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -25090,27 +23907,11 @@
+@@ -25068,27 +23885,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4494,7 +4491,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25119,7 +23920,7 @@
+@@ -25097,7 +23898,7 @@
eval "$as_ac_var=no"
fi
@@ -4503,7 +4500,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25174,27 +23975,10 @@
+@@ -25152,27 +23953,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4535,7 +4532,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25230,17 +24014,10 @@
+@@ -25208,17 +23992,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4557,7 +4554,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25346,27 +24123,10 @@
+@@ -25324,27 +24101,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4589,7 +4586,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25402,17 +24162,10 @@
+@@ -25380,17 +24140,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4611,7 +4608,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25518,27 +24271,10 @@
+@@ -25496,27 +24249,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4643,7 +4640,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25574,17 +24310,10 @@
+@@ -25552,17 +24288,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4665,7 +4662,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25690,27 +24419,10 @@
+@@ -25668,27 +24397,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4697,7 +4694,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25746,17 +24458,10 @@
+@@ -25724,17 +24436,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4719,7 +4716,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25856,27 +24561,10 @@
+@@ -25834,27 +24539,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4751,7 +4748,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25941,27 +24629,10 @@
+@@ -25919,27 +24607,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4783,7 +4780,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26116,10 +24787,10 @@
+@@ -26094,10 +24765,10 @@
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -4797,7 +4794,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -26128,11 +24799,11 @@
+@@ -26106,11 +24777,11 @@
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -4813,7 +4810,7 @@
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
-@@ -26159,7 +24830,7 @@
+@@ -26137,7 +24808,7 @@
const int foo = 10;
if (!foo) return 0;
}
@@ -4822,7 +4819,7 @@
#endif
;
-@@ -26179,27 +24850,10 @@
+@@ -26157,27 +24828,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4854,7 +4851,7 @@
ac_cv_c_const=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26257,27 +24911,10 @@
+@@ -26235,27 +24889,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4886,7 +4883,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -26336,27 +24973,10 @@
+@@ -26314,27 +24951,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4918,7 +4915,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26392,17 +25012,10 @@
+@@ -26370,17 +24990,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4940,7 +4937,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26533,27 +25146,11 @@
+@@ -26511,27 +25124,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4973,7 +4970,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26562,7 +25159,7 @@
+@@ -26540,7 +25137,7 @@
eval "$as_ac_var=no"
fi
@@ -4982,7 +4979,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26619,21 +25216,21 @@
+@@ -26597,21 +25194,21 @@
#include <fcntl.h>
#include <sys/mman.h>
@@ -5008,7 +5005,7 @@
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
-@@ -26830,27 +25427,11 @@
+@@ -26808,27 +25405,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5041,7 +5038,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26859,7 +25440,7 @@
+@@ -26837,7 +25418,7 @@
eval "$as_ac_var=no"
fi
@@ -5050,7 +5047,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26940,27 +25521,11 @@
+@@ -26918,27 +25499,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5083,7 +5080,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26969,7 +25534,7 @@
+@@ -26947,7 +25512,7 @@
eval "$as_ac_var=no"
fi
@@ -5092,7 +5089,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27053,27 +25618,10 @@
+@@ -27031,27 +25596,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5124,7 +5121,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27142,17 +25690,10 @@
+@@ -27120,17 +25668,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5146,7 +5143,7 @@
gdk_wchar_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27195,17 +25736,10 @@
+@@ -27173,17 +25714,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5168,7 +5165,7 @@
gdk_wctype_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27290,27 +25824,11 @@
+@@ -27268,27 +25802,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5201,7 +5198,7 @@
ac_cv_func_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27319,7 +25837,7 @@
+@@ -27297,7 +25815,7 @@
ac_cv_func_iswalnum=no
fi
@@ -5210,7 +5207,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
-@@ -27369,27 +25887,11 @@
+@@ -27347,27 +25865,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5243,7 +5240,7 @@
ac_cv_lib_w_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27398,7 +25900,7 @@
+@@ -27376,7 +25878,7 @@
ac_cv_lib_w_iswalnum=no
fi
@@ -5252,7 +5249,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27457,27 +25959,11 @@
+@@ -27435,27 +25937,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5285,7 +5282,7 @@
gdk_working_wctype=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27486,7 +25972,7 @@
+@@ -27464,7 +25950,7 @@
gdk_working_wctype=no
fi
@@ -5294,7 +5291,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$oLIBS"
-@@ -27525,17 +26011,10 @@
+@@ -27503,17 +25989,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5316,7 +5313,7 @@
gtk_uxtheme_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27595,27 +26074,10 @@
+@@ -27573,27 +26052,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5348,7 +5345,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27651,17 +26113,10 @@
+@@ -27629,17 +26091,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5370,7 +5367,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27792,27 +26247,11 @@
+@@ -27770,27 +26225,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5403,7 +5400,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27821,7 +26260,7 @@
+@@ -27799,7 +26238,7 @@
eval "$as_ac_var=no"
fi
@@ -5412,7 +5409,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27969,27 +26408,11 @@
+@@ -27947,27 +26386,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5445,7 +5442,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27998,7 +26421,7 @@
+@@ -27976,7 +26399,7 @@
ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
fi
@@ -5454,7 +5451,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28039,27 +26462,10 @@
+@@ -28017,27 +26440,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5486,7 +5483,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28095,17 +26501,10 @@
+@@ -28073,17 +26479,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5508,7 +5505,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28210,27 +26609,11 @@
+@@ -28188,27 +26587,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5541,7 +5538,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28239,7 +26622,7 @@
+@@ -28217,7 +26600,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=no
fi
@@ -5550,7 +5547,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28280,27 +26663,10 @@
+@@ -28258,27 +26641,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5582,7 +5579,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28336,17 +26702,10 @@
+@@ -28314,17 +26680,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5604,7 +5601,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28451,27 +26810,11 @@
+@@ -28429,27 +26788,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5637,7 +5634,7 @@
ac_cv_lib_tiff34_TIFFFlushData=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28480,7 +26823,7 @@
+@@ -28458,7 +26801,7 @@
ac_cv_lib_tiff34_TIFFFlushData=no
fi
@@ -5646,7 +5643,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28521,27 +26864,10 @@
+@@ -28499,27 +26842,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5678,7 +5675,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28577,17 +26903,10 @@
+@@ -28555,17 +26881,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5700,7 +5697,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28715,27 +27034,11 @@
+@@ -28693,27 +27012,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5733,7 +5730,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28744,7 +27047,7 @@
+@@ -28722,7 +27025,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
fi
@@ -5742,7 +5739,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28785,17 +27088,10 @@
+@@ -28763,17 +27066,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5764,7 +5761,7 @@
jpeg_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28851,27 +27147,11 @@
+@@ -28829,27 +27125,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5797,7 +5794,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28880,7 +27160,7 @@
+@@ -28858,7 +27138,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=no
fi
@@ -5806,7 +5803,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28969,27 +27249,11 @@
+@@ -28947,27 +27227,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5839,7 +5836,7 @@
ac_cv_lib_png_png_read_info=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28998,7 +27262,7 @@
+@@ -28976,7 +27240,7 @@
ac_cv_lib_png_png_read_info=no
fi
@@ -5848,7 +5845,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -29039,27 +27303,10 @@
+@@ -29017,27 +27281,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5880,7 +5877,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29095,17 +27342,10 @@
+@@ -29073,17 +27320,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5902,7 +5899,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29202,27 +27442,10 @@
+@@ -29180,27 +27420,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5934,7 +5931,7 @@
png_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29515,27 +27738,10 @@
+@@ -29493,27 +27716,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5966,7 +5963,7 @@
ac_cv_header_sys_wait_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29592,27 +27798,10 @@
+@@ -29570,27 +27776,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5998,7 +5995,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -29715,27 +27904,10 @@
+@@ -29693,27 +27882,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6030,7 +6027,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29771,17 +27943,10 @@
+@@ -29749,17 +27921,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6052,7 +6049,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29877,27 +28042,10 @@
+@@ -29855,27 +28020,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6084,7 +6081,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29933,17 +28081,10 @@
+@@ -29911,17 +28059,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6106,7 +6103,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30053,27 +28194,11 @@
+@@ -30031,27 +28172,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6139,7 +6136,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30082,7 +28207,7 @@
+@@ -30060,7 +28185,7 @@
ac_cv_lib_mlib_mlib_ImageSetStruct=no
fi
@@ -6148,7 +6145,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30147,27 +28272,11 @@
+@@ -30125,27 +28250,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6181,7 +6178,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30176,7 +28285,7 @@
+@@ -30154,7 +28263,7 @@
ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no
fi
@@ -6190,7 +6187,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30313,7 +28422,7 @@
+@@ -30291,7 +28400,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6199,7 +6196,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
-@@ -30354,7 +28463,7 @@
+@@ -30332,7 +28441,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6208,7 +6205,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
-@@ -30584,17 +28693,10 @@
+@@ -30562,17 +28671,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6230,7 +6227,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -30617,7 +28719,7 @@
+@@ -30595,7 +28697,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -6239,7 +6236,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30646,27 +28748,11 @@
+@@ -30624,27 +28726,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6272,7 +6269,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -30679,7 +28765,7 @@
+@@ -30657,7 +28743,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -6281,7 +6278,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -30687,7 +28773,7 @@
+@@ -30665,7 +28751,7 @@
done
fi
@@ -6290,7 +6287,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -30742,12 +28828,12 @@
+@@ -30720,12 +28806,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -6308,7 +6305,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -30775,44 +28861,20 @@
+@@ -30753,44 +28839,20 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6362,7 +6359,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -30840,48 +28902,30 @@
+@@ -30818,48 +28880,30 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6428,7 +6425,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -30930,27 +28974,11 @@
+@@ -30908,27 +28952,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6461,7 +6458,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -30998,27 +29026,11 @@
+@@ -30976,27 +29004,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6494,7 +6491,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31027,7 +29039,7 @@
+@@ -31005,7 +29017,7 @@
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -6503,7 +6500,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31080,27 +29092,11 @@
+@@ -31058,27 +29070,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6536,7 +6533,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31109,7 +29105,7 @@
+@@ -31087,7 +29083,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -6545,7 +6542,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31122,7 +29118,7 @@
+@@ -31100,7 +29096,7 @@
fi
fi
@@ -6554,7 +6551,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -31197,27 +29193,11 @@
+@@ -31175,27 +29171,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6587,7 +6584,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31226,7 +29206,7 @@
+@@ -31204,7 +29184,7 @@
ac_cv_func_gethostbyname=no
fi
@@ -6596,7 +6593,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -31275,27 +29255,11 @@
+@@ -31253,27 +29233,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6629,7 +6626,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31304,7 +29268,7 @@
+@@ -31282,7 +29246,7 @@
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -6638,7 +6635,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31357,27 +29321,11 @@
+@@ -31335,27 +29299,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6671,7 +6668,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31386,7 +29334,7 @@
+@@ -31364,7 +29312,7 @@
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -6680,7 +6677,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31469,27 +29417,11 @@
+@@ -31447,27 +29395,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6713,7 +6710,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31498,7 +29430,7 @@
+@@ -31476,7 +29408,7 @@
ac_cv_func_connect=no
fi
@@ -6722,7 +6719,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -31547,27 +29479,11 @@
+@@ -31525,27 +29457,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6755,7 +6752,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31576,7 +29492,7 @@
+@@ -31554,7 +29470,7 @@
ac_cv_lib_socket_connect=no
fi
@@ -6764,7 +6761,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31652,27 +29568,11 @@
+@@ -31630,27 +29546,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6797,7 +6794,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31681,7 +29581,7 @@
+@@ -31659,7 +29559,7 @@
ac_cv_func_remove=no
fi
@@ -6806,7 +6803,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -31730,27 +29630,11 @@
+@@ -31708,27 +29608,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6839,7 +6836,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31759,7 +29643,7 @@
+@@ -31737,7 +29621,7 @@
ac_cv_lib_posix_remove=no
fi
@@ -6848,7 +6845,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31835,27 +29719,11 @@
+@@ -31813,27 +29697,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6881,7 +6878,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31864,7 +29732,7 @@
+@@ -31842,7 +29710,7 @@
ac_cv_func_shmat=no
fi
@@ -6890,94 +6887,17 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -31913,27 +29781,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_lib_ipc_shmat=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -31942,7 +29794,7 @@
- ac_cv_lib_ipc_shmat=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -32006,27 +29858,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_lib_ICE_IceConnectionNumber=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32035,7 +29871,7 @@
- ac_cv_lib_ICE_IceConnectionNumber=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
-@@ -32126,39 +29962,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -31872,46 +29740,30 @@
+ char shmat ();
+ int
+ main ()
+-{
+-return shmat ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7003,6 +6923,13 @@
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
++{
++return shmat ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7022,485 +6949,11 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_func_XOpenDisplay=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32167,7 +29987,7 @@
- ac_cv_func_XOpenDisplay=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5
-@@ -32243,27 +30063,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_func_XextFindDisplay=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32272,7 +30076,7 @@
- ac_cv_func_XextFindDisplay=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5
-@@ -32348,27 +30152,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_func_XRenderQueryExtension=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32377,7 +30165,7 @@
- ac_cv_func_XRenderQueryExtension=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5
-@@ -32423,27 +30211,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- else
-@@ -32479,27 +30250,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-
-@@ -32593,27 +30347,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- eval "$as_ac_var=yes"
- else
- echo "$as_me: failed program was:" >&5
-@@ -32622,7 +30360,7 @@
- eval "$as_ac_var=no"
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -32706,27 +30444,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_func_XAddConnectionWatch=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32735,7 +30457,7 @@
- ac_cv_func_XAddConnectionWatch=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5
-@@ -32836,27 +30558,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_func_XkbQueryExtension=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32865,7 +30571,7 @@
- ac_cv_func_XkbQueryExtension=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
-@@ -32947,27 +30653,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_func_XShapeCombineMask=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -32976,7 +30666,7 @@
- ac_cv_func_XShapeCombineMask=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5
-@@ -33056,27 +30746,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_func_XSyncQueryExtension=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33085,7 +30759,7 @@
- ac_cv_func_XSyncQueryExtension=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
-@@ -33119,27 +30793,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
- ac_cv_header_X11_extensions_sync_h=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33235,27 +30892,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_func_XShmAttach=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33264,7 +30905,7 @@
- ac_cv_func_XShmAttach=no
- fi
-
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5
-@@ -33315,27 +30956,11 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (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
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ (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
- ac_cv_lib_XextSam_XShmAttach=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -33344,7 +30969,7 @@
- ac_cv_lib_XextSam_XShmAttach=no
+ ac_cv_lib_ipc_shmat=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -31920,7 +29772,7 @@
+ ac_cv_lib_ipc_shmat=no
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -7508,7 +6961,565 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -33398,27 +31023,10 @@
+@@ -31984,27 +29836,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32013,7 +29849,7 @@
+ ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -32116,27 +29952,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XOpenDisplay=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32145,7 +29965,7 @@
+ ac_cv_func_XOpenDisplay=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5
+@@ -32221,27 +30041,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XextFindDisplay=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32250,7 +30054,7 @@
+ ac_cv_func_XextFindDisplay=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5
+@@ -32326,27 +30130,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XRenderQueryExtension=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32355,7 +30143,7 @@
+ ac_cv_func_XRenderQueryExtension=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5
+@@ -32401,27 +30189,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ else
+@@ -32457,27 +30228,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+
+@@ -32571,27 +30325,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32600,7 +30338,7 @@
+ eval "$as_ac_var=no"
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -32684,27 +30422,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XAddConnectionWatch=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32713,7 +30435,7 @@
+ ac_cv_func_XAddConnectionWatch=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5
+@@ -32814,27 +30536,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XkbQueryExtension=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32843,7 +30549,7 @@
+ ac_cv_func_XkbQueryExtension=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5
+@@ -32925,27 +30631,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XShapeCombineMask=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -32954,7 +30644,7 @@
+ ac_cv_func_XShapeCombineMask=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5
+@@ -33034,27 +30724,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XSyncQueryExtension=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33063,7 +30737,7 @@
+ ac_cv_func_XSyncQueryExtension=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5
+@@ -33097,27 +30771,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_header_X11_extensions_sync_h=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33213,27 +30870,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_func_XShmAttach=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33242,7 +30883,7 @@
+ ac_cv_func_XShmAttach=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5
+@@ -33293,27 +30934,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (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
+ ac_cv_lib_XextSam_XShmAttach=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -33322,7 +30947,7 @@
+ ac_cv_lib_XextSam_XShmAttach=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -33376,27 +31001,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7540,7 +7551,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33454,17 +31062,10 @@
+@@ -33432,17 +31040,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7562,7 +7573,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33562,27 +31163,10 @@
+@@ -33540,27 +31141,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7594,7 +7605,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33618,17 +31202,10 @@
+@@ -33596,17 +31180,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7616,7 +7627,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33738,27 +31315,10 @@
+@@ -33716,27 +31293,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7648,7 +7659,7 @@
have_xshm=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33855,27 +31415,11 @@
+@@ -33833,27 +31393,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7681,7 +7692,7 @@
ac_cv_func_XineramaGetInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33884,7 +31428,7 @@
+@@ -33862,7 +31406,7 @@
ac_cv_func_XineramaGetInfo=no
fi
@@ -7690,7 +7701,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5
-@@ -33918,27 +31462,10 @@
+@@ -33896,27 +31440,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7722,7 +7733,7 @@
ac_cv_header_X11_extensions_xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34029,27 +31556,11 @@
+@@ -34007,27 +31534,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7755,7 +7766,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34058,7 +31569,7 @@
+@@ -34036,7 +31547,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=no
fi
@@ -7764,7 +7775,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34093,27 +31604,10 @@
+@@ -34071,27 +31582,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7796,7 +7807,7 @@
ac_cv_header_X11_extensions_Xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34245,27 +31739,11 @@
+@@ -34223,27 +31717,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7829,7 +7840,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34274,7 +31752,7 @@
+@@ -34252,7 +31730,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -7838,7 +7849,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -34309,27 +31787,10 @@
+@@ -34287,27 +31765,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7870,7 +7881,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34611,8 +32072,18 @@
+@@ -34520,8 +31981,18 @@
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; }
@@ -7891,7 +7902,7 @@
else
{ { echo "$as_me:$LINENO: error:
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend
-@@ -34721,27 +32192,11 @@
+@@ -34630,27 +32101,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7924,7 +7935,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34756,7 +32211,7 @@
+@@ -34665,7 +32120,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -7933,7 +7944,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34764,7 +32219,7 @@
+@@ -34673,7 +32128,7 @@
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
@@ -7942,7 +7953,7 @@
if test "x$gdktarget" = "xx11"; then
GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
fi
-@@ -34852,27 +32307,11 @@
+@@ -34761,27 +32216,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7975,7 +7986,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34887,7 +32326,7 @@
+@@ -34796,7 +32235,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -7984,7 +7995,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34943,7 +32382,7 @@
+@@ -34852,7 +32291,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7993,7 +8004,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
-@@ -35035,27 +32474,10 @@
+@@ -34944,27 +32383,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8025,7 +8036,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35091,17 +32513,10 @@
+@@ -35000,17 +32422,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8047,7 +8058,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35204,27 +32619,10 @@
+@@ -35113,27 +32528,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8079,7 +8090,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35260,17 +32658,10 @@
+@@ -35169,17 +32567,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8101,7 +8112,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -35429,7 +32820,7 @@
+@@ -35338,7 +32729,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8110,7 +8121,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
-@@ -35514,7 +32905,7 @@
+@@ -35423,7 +32814,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8119,7 +8130,7 @@
ac_cv_prog_DB2HTML="true"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -35574,7 +32965,7 @@
+@@ -35483,7 +32874,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8128,7 +8139,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
-@@ -35643,7 +33034,7 @@
+@@ -35552,7 +32943,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8137,7 +8148,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
-@@ -35844,6 +33235,13 @@
+@@ -35753,6 +33144,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8151,7 +8162,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
-@@ -36239,7 +33637,8 @@
+@@ -36113,7 +33511,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -8161,7 +8172,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -36248,10 +33647,13 @@
+@@ -36122,10 +33521,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -8178,7 +8189,7 @@
# PATH needs CR
-@@ -36475,19 +33877,28 @@
+@@ -36349,19 +33751,28 @@
as_mkdir_p=false
fi
@@ -8218,16 +8229,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'"
-@@ -36503,7 +33914,7 @@
+@@ -36377,7 +33788,7 @@
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.11.2, which was
+ This file was extended by gtk+ $as_me 2.11.3, 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
-@@ -36532,7 +33943,7 @@
+@@ -36406,7 +33817,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -8236,16 +8247,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
-@@ -36556,7 +33967,7 @@
+@@ -36430,7 +33841,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gtk+ config.status 2.11.2
+ gtk+ config.status 2.11.3
-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.
-@@ -36927,9 +34338,9 @@
+@@ -36796,9 +34207,9 @@
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
@@ -8257,7 +8268,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -36971,6 +34382,8 @@
+@@ -36840,6 +34251,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -8266,7 +8277,7 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
-@@ -37066,8 +34479,6 @@
+@@ -36935,8 +34348,6 @@
INCLUDE_PNM_FALSE!$INCLUDE_PNM_FALSE$ac_delim
INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim
INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim
@@ -8275,7 +8286,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -37109,6 +34520,8 @@
+@@ -36978,6 +34389,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -8284,83 +8295,19 @@
INCLUDE_XPM_TRUE!$INCLUDE_XPM_TRUE$ac_delim
INCLUDE_XPM_FALSE!$INCLUDE_XPM_FALSE$ac_delim
INCLUDE_XBM_TRUE!$INCLUDE_XBM_TRUE$ac_delim
-@@ -37204,10 +34617,9 @@
- ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim
- ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
+@@ -37072,7 +34485,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -37243,6 +34655,50 @@
- _ACEOF
-
-
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -37486,7 +34942,7 @@
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- s&@INSTALL@&$ac_INSTALL&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-Index: gtk+2.0-2.11.2/contrib/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/contrib/Makefile.in 2007-06-06 15:05:36.000000000 +0200
-+++ gtk+2.0-2.11.2/contrib/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -92,6 +92,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/contrib/Makefile.in gtk+2.0-2.11.3.new/contrib/Makefile.in
+--- gtk+2.0-2.11.3.orig/contrib/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/contrib/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -90,6 +90,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8369,10 +8316,201 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/contrib/gdk-pixbuf-xlib/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-06 15:05:37.000000000 +0200
-+++ gtk+2.0-2.11.2/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-13 16:33:27.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.11.3.new/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.11.3.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/demos/Makefile.in gtk+2.0-2.11.3.new/demos/Makefile.in
+--- gtk+2.0-2.11.3.orig/demos/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/demos/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -90,6 +90,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.11.3.new/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.11.3.orig/demos/gtk-demo/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/demos/gtk-demo/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/Makefile.in gtk+2.0-2.11.3.new/docs/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/faq/Makefile.in gtk+2.0-2.11.3.new/docs/faq/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/faq/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/faq/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/Makefile.in gtk+2.0-2.11.3.new/docs/reference/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/reference/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/reference/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.11.3.new/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/reference/gdk/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/reference/gdk/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.11.3.new/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-06-15 20:26:22.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/reference/gdk-pixbuf/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.11.3.new/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/reference/gtk/Makefile.in 2007-06-15 22:40:03.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/reference/gtk/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -95,6 +95,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/tools/Makefile.in gtk+2.0-2.11.3.new/docs/tools/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/tools/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/tools/Makefile.in 2007-06-16 14:30:16.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/docs/tutorial/Makefile.in gtk+2.0-2.11.3.new/docs/tutorial/Makefile.in
+--- gtk+2.0-2.11.3.orig/docs/tutorial/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/docs/tutorial/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/Makefile.in gtk+2.0-2.11.3.new/gdk/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/directfb/Makefile.in gtk+2.0-2.11.3.new/gdk/directfb/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk/directfb/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk/directfb/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/quartz/Makefile.in gtk+2.0-2.11.3.new/gdk/quartz/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk/quartz/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk/quartz/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/win32/Makefile.in gtk+2.0-2.11.3.new/gdk/win32/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk/win32/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk/win32/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.11.3.new/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk/win32/rc/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk/win32/rc/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk/x11/Makefile.in gtk+2.0-2.11.3.new/gdk/x11/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk/x11/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk/x11/Makefile.in 2007-06-16 14:30:18.000000000 +0200
@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8382,11 +8520,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/demos/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/demos/Makefile.in 2007-06-06 15:05:28.000000000 +0200
-+++ gtk+2.0-2.11.2/demos/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -92,6 +92,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.11.3.new/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk-pixbuf/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk-pixbuf/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8395,11 +8532,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/demos/gtk-demo/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/demos/gtk-demo/Makefile.in 2007-06-06 15:05:30.000000000 +0200
-+++ gtk+2.0-2.11.2/demos/gtk-demo/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.11.3.new/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.11.3.orig/gdk-pixbuf/pixops/Makefile.in 2007-06-15 20:26:23.000000000 +0200
++++ gtk+2.0-2.11.3.new/gdk-pixbuf/pixops/Makefile.in 2007-06-16 14:30:17.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8408,11 +8544,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/Makefile.in 2007-06-06 15:05:38.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gtk/Makefile.in gtk+2.0-2.11.3.new/gtk/Makefile.in
+--- gtk+2.0-2.11.3.orig/gtk/Makefile.in 2007-06-15 23:17:49.000000000 +0200
++++ gtk+2.0-2.11.3.new/gtk/Makefile.in 2007-06-16 14:30:18.000000000 +0200
+@@ -111,6 +111,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8421,228 +8556,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/faq/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/faq/Makefile.in 2007-06-06 15:05:48.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/faq/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/reference/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/reference/Makefile.in 2007-06-06 15:05:52.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/reference/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/reference/gdk/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/reference/gdk/Makefile.in 2007-06-06 15:05:54.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/reference/gdk/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -97,6 +97,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/reference/gdk-pixbuf/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-06-06 15:05:53.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/reference/gdk-pixbuf/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -97,6 +97,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/reference/gtk/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/reference/gtk/Makefile.in 2007-06-06 15:05:57.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/reference/gtk/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -97,6 +97,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/tools/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/tools/Makefile.in 2007-06-06 15:06:03.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/tools/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/docs/tutorial/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/docs/tutorial/Makefile.in 2007-06-06 15:05:40.000000000 +0200
-+++ gtk+2.0-2.11.2/docs/tutorial/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk/Makefile.in 2007-06-06 15:04:35.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk/directfb/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk/directfb/Makefile.in 2007-06-06 15:04:47.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk/directfb/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk/linux-fb/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk/linux-fb/Makefile.in 2007-06-06 15:04:39.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk/linux-fb/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -92,6 +92,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk/quartz/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk/quartz/Makefile.in 2007-06-06 15:04:45.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk/quartz/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk/win32/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk/win32/Makefile.in 2007-06-06 15:04:40.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk/win32/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk/win32/rc/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk/win32/rc/Makefile.in 2007-06-06 15:04:42.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk/win32/rc/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk/x11/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk/x11/Makefile.in 2007-06-06 15:04:43.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk/x11/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -93,6 +93,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk-pixbuf/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk-pixbuf/Makefile.in 2007-06-06 15:04:31.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk-pixbuf/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gdk-pixbuf/pixops/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gdk-pixbuf/pixops/Makefile.in 2007-06-06 15:04:34.000000000 +0200
-+++ gtk+2.0-2.11.2/gdk-pixbuf/pixops/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gtk/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gtk/Makefile.in 2007-06-06 15:04:49.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -113,6 +113,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -374,6 +376,8 @@
+@@ -370,6 +372,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@@ -8651,7 +8565,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -627,7 +631,10 @@
+@@ -625,7 +629,10 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -8663,7 +8577,7 @@
# GTK+ header files that don't get installed
-@@ -642,10 +649,7 @@
+@@ -641,10 +648,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -8674,11 +8588,10 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-Index: gtk+2.0-2.11.2/gtk/theme-bits/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gtk/theme-bits/Makefile.in 2007-06-06 15:05:11.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/theme-bits/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.11.3.new/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.11.3.orig/gtk/theme-bits/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/gtk/theme-bits/Makefile.in 2007-06-16 14:30:18.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8687,11 +8600,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/gtk/xdgmime/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/gtk/xdgmime/Makefile.in 2007-06-06 15:05:12.000000000 +0200
-+++ gtk+2.0-2.11.2/gtk/xdgmime/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.11.3.new/gtk/xdgmime/Makefile.in
+--- gtk+2.0-2.11.3.orig/gtk/xdgmime/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/gtk/xdgmime/Makefile.in 2007-06-16 14:30:18.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8700,10 +8612,9 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/ltmain.sh
-===================================================================
---- gtk+2.0-2.11.2.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.11.2/ltmain.sh 2007-06-13 16:33:27.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/ltmain.sh gtk+2.0-2.11.3.new/ltmain.sh
+--- gtk+2.0-2.11.3.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
++++ gtk+2.0-2.11.3.new/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -8737,11 +8648,10 @@
esac
;;
no)
-Index: gtk+2.0-2.11.2/m4macros/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/m4macros/Makefile.in 2007-06-06 15:06:04.000000000 +0200
-+++ gtk+2.0-2.11.2/m4macros/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/m4macros/Makefile.in gtk+2.0-2.11.3.new/m4macros/Makefile.in
+--- gtk+2.0-2.11.3.orig/m4macros/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/m4macros/Makefile.in 2007-06-16 14:30:18.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8750,11 +8660,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/Makefile.in 2007-06-06 15:05:13.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/Makefile.in gtk+2.0-2.11.3.new/modules/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/Makefile.in 2007-06-16 14:30:18.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8763,11 +8672,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/engines/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/engines/Makefile.in 2007-06-06 15:05:16.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/engines/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/Makefile.in gtk+2.0-2.11.3.new/modules/engines/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/engines/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/engines/Makefile.in 2007-06-16 14:30:18.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8776,11 +8684,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/engines/ms-windows/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/engines/ms-windows/Makefile.in 2007-06-06 15:05:17.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/engines/ms-windows/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.11.3.new/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/engines/ms-windows/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8789,11 +8696,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/engines/ms-windows/Theme/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-06-06 15:05:18.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/engines/ms-windows/Theme/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-06-15 20:26:24.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8802,11 +8708,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-06 15:05:20.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8815,11 +8720,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/engines/pixbuf/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/engines/pixbuf/Makefile.in 2007-06-06 15:05:21.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/engines/pixbuf/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.11.3.new/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/engines/pixbuf/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/engines/pixbuf/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8828,11 +8732,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/input/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/input/Makefile.in 2007-06-06 15:05:15.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/input/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/input/Makefile.in gtk+2.0-2.11.3.new/modules/input/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/input/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/input/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8841,7 +8744,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -428,9 +430,10 @@
+@@ -424,9 +426,10 @@
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
@@ -8853,7 +8756,7 @@
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
-@@ -983,7 +986,18 @@
+@@ -979,7 +982,18 @@
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -8873,23 +8776,9 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-Index: gtk+2.0-2.11.2/modules/printbackends/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/printbackends/Makefile.in 2007-06-06 15:05:22.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/printbackends/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -93,6 +93,8 @@
- ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
- ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
- ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
-+ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
-+ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/printbackends/cups/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/printbackends/cups/Makefile.in 2007-06-06 15:05:23.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/printbackends/cups/Makefile.in 2007-06-13 16:33:27.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/printbackends/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/printbackends/Makefile.in 2007-06-16 14:30:19.000000000 +0200
@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8899,11 +8788,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/printbackends/file/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/printbackends/file/Makefile.in 2007-06-06 15:05:24.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/printbackends/file/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/printbackends/cups/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/printbackends/cups/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8912,11 +8800,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/printbackends/lpr/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/printbackends/lpr/Makefile.in 2007-06-06 15:05:26.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/printbackends/lpr/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/printbackends/file/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/printbackends/file/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8925,11 +8812,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/modules/printbackends/test/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/modules/printbackends/test/Makefile.in 2007-06-06 15:05:27.000000000 +0200
-+++ gtk+2.0-2.11.2/modules/printbackends/test/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/printbackends/lpr/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/printbackends/lpr/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8938,11 +8824,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/perf/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/perf/Makefile.in 2007-06-06 15:05:34.000000000 +0200
-+++ gtk+2.0-2.11.2/perf/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/modules/printbackends/test/Makefile.in gtk+2.0-2.11.3.new/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.11.3.orig/modules/printbackends/test/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/modules/printbackends/test/Makefile.in 2007-06-16 14:30:19.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8951,11 +8836,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-Index: gtk+2.0-2.11.2/tests/Makefile.in
-===================================================================
---- gtk+2.0-2.11.2.orig/tests/Makefile.in 2007-06-06 15:05:32.000000000 +0200
-+++ gtk+2.0-2.11.2/tests/Makefile.in 2007-06-13 16:33:27.000000000 +0200
-@@ -91,6 +91,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/perf/Makefile.in gtk+2.0-2.11.3.new/perf/Makefile.in
+--- gtk+2.0-2.11.3.orig/perf/Makefile.in 2007-06-15 20:26:25.000000000 +0200
++++ gtk+2.0-2.11.3.new/perf/Makefile.in 2007-06-16 14:30:20.000000000 +0200
+@@ -89,6 +89,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
@@ -8964,3 +8848,15 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.3.orig/tests/Makefile.in gtk+2.0-2.11.3.new/tests/Makefile.in
+--- gtk+2.0-2.11.3.orig/tests/Makefile.in 2007-06-15 20:26:26.000000000 +0200
++++ gtk+2.0-2.11.3.new/tests/Makefile.in 2007-06-16 14:30:20.000000000 +0200
+@@ -89,6 +89,8 @@
+ ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
+ ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
+ ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@
++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@
++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11546&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Sat Jun 16 13:05:24 2007
@@ -48,7 +48,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.11.2
+SHVER := 2.11.3
# 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