r11502 - in /desktop/experimental/gtk+2.0/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed Jun 13 12:05:15 UTC 2007
Author: lool
Date: Wed Jun 13 12:05:15 2007
New Revision: 11502
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11502
Log:
* New upstream release series; these are development releases, the new API
may still change incompatibly.
- Target at experimental; include check-dist.
- Bump shlibs to >= 2.11.2.
- Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico,
009_gtk-export-filechooser, 015_default-fallback-icon-theme,
033_treeview_resizing, 041_ia32-libs to apply cleanly.
- Update patch 021_loader-files-d to apply with the upstream G_MODULE
changes and the support for included modules.
- Update patch 030_gtkentry_password-char-circle to apply.
- Drop patch 031_cursor-blinking-timeout, merged upstream.
- Disable 040_filechooser_single-click for now as it doesn't apply cleanly
and doesn't seem critical; add a description and cross-refs.
- Update relibtoolizing patch, 070_mandatory-relibtoolize.
- Bump up libglib2.0-dev build-dep to >= 2.13.1.
* XXX WIP XXX
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/control
desktop/experimental/gtk+2.0/debian/control.in
desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
desktop/experimental/gtk+2.0/debian/patches/005_xpmico.patch
desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
desktop/experimental/gtk+2.0/debian/patches/021_loader-files-d.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/patches/series
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=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Wed Jun 13 12:05:15 2007
@@ -1,3 +1,24 @@
+gtk+2.0 (2.11.2-1) UNRELEASED; urgency=low
+
+ * New upstream release series; these are development releases, the new API
+ may still change incompatibly.
+ - Target at experimental; include check-dist.
+ - Bump shlibs to >= 2.11.2.
+ - Refresh patches 001_static-linking-dont-query-immodules, 005_xpmico,
+ 009_gtk-export-filechooser, 015_default-fallback-icon-theme,
+ 033_treeview_resizing, 041_ia32-libs to apply cleanly.
+ - Update patch 021_loader-files-d to apply with the upstream G_MODULE
+ changes and the support for included modules.
+ - Update patch 030_gtkentry_password-char-circle to apply.
+ - Drop patch 031_cursor-blinking-timeout, merged upstream.
+ - Disable 040_filechooser_single-click for now as it doesn't apply cleanly
+ and doesn't seem critical; add a description and cross-refs.
+ - Update relibtoolizing patch, 070_mandatory-relibtoolize.
+ - Bump up libglib2.0-dev build-dep to >= 2.13.1.
+ * XXX WIP XXX
+
+ -- Loic Minier <lool at dooz.org> Wed, 13 Jun 2007 12:09:29 +0200
+
gtk+2.0 (2.10.13-1) unstable; urgency=low
* Bump Conflicts to iiimf-client-gtk << 12.3.91-4.
Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control (original)
+++ desktop/experimental/gtk+2.0/debian/control Wed Jun 13 12:05:15 2007
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,
- libglib2.0-dev (>= 2.12.0),
+ libglib2.0-dev (>= 2.13.1),
libpango1.0-dev (>= 1.12.1-2),
libatk1.0-dev (>= 1.9.0),
libx11-dev (>= 2:1.0.0-6),
Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in (original)
+++ desktop/experimental/gtk+2.0/debian/control.in Wed Jun 13 12:05:15 2007
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,
- libglib2.0-dev (>= 2.12.0),
+ libglib2.0-dev (>= 2.13.1),
libpango1.0-dev (>= 1.12.1-2),
libatk1.0-dev (>= 1.9.0),
libx11-dev (>= 2:1.0.0-6),
Modified: desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch Wed Jun 13 12:05:15 2007
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.10.10/configure.in
+Index: gtk+2.0-2.11.2/configure.in
===================================================================
---- gtk+2.0-2.10.10.orig/configure.in 2007-03-13 14:10:00.000000000 +0100
-+++ gtk+2.0-2.10.10/configure.in 2007-03-13 14:10:04.000000000 +0100
+--- gtk+2.0-2.11.2.orig/configure.in 2007-06-06 15:02:43.000000000 +0200
++++ gtk+2.0-2.11.2/configure.in 2007-06-13 11:06:48.000000000 +0200
@@ -134,6 +134,7 @@
dnl Initialize libtool
AC_PROG_CC
@@ -10,11 +10,11 @@
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
-Index: gtk+2.0-2.10.10/modules/input/Makefile.am
+Index: gtk+2.0-2.11.2/modules/input/Makefile.am
===================================================================
---- gtk+2.0-2.10.10.orig/modules/input/Makefile.am 2007-03-12 14:58:52.000000000 +0100
-+++ gtk+2.0-2.10.10/modules/input/Makefile.am 2007-03-13 14:10:04.000000000 +0100
-@@ -94,8 +94,12 @@
+--- gtk+2.0-2.11.2.orig/modules/input/Makefile.am 2007-06-06 13:43:17.000000000 +0200
++++ gtk+2.0-2.11.2/modules/input/Makefile.am 2007-06-13 11:06:48.000000000 +0200
+@@ -106,8 +106,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false
else
@@ -27,7 +27,7 @@
# Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it.
-@@ -135,7 +139,18 @@
+@@ -148,7 +152,18 @@
$(IM_IME_MODULE)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
Modified: desktop/experimental/gtk+2.0/debian/patches/005_xpmico.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/005_xpmico.patch?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/005_xpmico.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/005_xpmico.patch Wed Jun 13 12:05:15 2007
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c
+Index: gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c
===================================================================
---- gtk+2.0-2.10.10.orig/gdk-pixbuf/io-ico.c 2007-03-12 14:57:04.000000000 +0100
-+++ gtk+2.0-2.10.10/gdk-pixbuf/io-ico.c 2007-03-13 14:10:18.000000000 +0100
-@@ -210,6 +210,14 @@
+--- gtk+2.0-2.11.2.orig/gdk-pixbuf/io-ico.c 2007-06-06 13:43:15.000000000 +0200
++++ gtk+2.0-2.11.2/gdk-pixbuf/io-ico.c 2007-06-13 11:07:11.000000000 +0200
+@@ -208,6 +208,14 @@
State->HeaderSize = 6 + IconCount*16;
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=11502&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 Wed Jun 13 12:05:15 2007
@@ -26,10 +26,10 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: gtk+2.0-2.10.12/gtk/Makefile.am
+Index: gtk+2.0-2.11.2/gtk/Makefile.am
===================================================================
---- gtk+2.0-2.10.12.orig/gtk/Makefile.am 2007-05-02 18:41:42.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/Makefile.am 2007-05-30 15:24:54.000000000 +0200
+--- 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
@@ -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) \
-@@ -329,7 +331,10 @@
+@@ -333,7 +335,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 = \
-@@ -338,10 +343,7 @@
+@@ -347,10 +352,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -62,11 +62,11 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-Index: gtk+2.0-2.10.12/gtk/gtk.symbols
+Index: gtk+2.0-2.11.2/gtk/gtk.symbols
===================================================================
---- gtk+2.0-2.10.12.orig/gtk/gtk.symbols 2007-05-02 18:26:59.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/gtk.symbols 2007-05-30 15:24:16.000000000 +0200
-@@ -1363,6 +1363,12 @@
+--- 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 @@
#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.10.12/gtk/gtkfilechooserprivate.h
+Index: gtk+2.0-2.11.2/gtk/gtkfilechooserprivate.h
===================================================================
---- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserprivate.h 2007-05-02 18:26:59.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/gtkfilechooserprivate.h 2007-05-30 15:24:16.000000000 +0200
+--- 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
@@ -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.10.12/gtk/gtkfilechooserutils.c
+Index: gtk+2.0-2.11.2/gtk/gtkfilechooserutils.c
===================================================================
---- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.c 2007-05-02 18:26:59.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.c 2007-05-30 15:24:16.000000000 +0200
+--- 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
@@ -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.10.12/gtk/gtkfilechooserutils.h
+Index: gtk+2.0-2.11.2/gtk/gtkfilechooserutils.h
===================================================================
---- gtk+2.0-2.10.12.orig/gtk/gtkfilechooserutils.h 2007-05-02 18:26:59.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/gtkfilechooserutils.h 2007-05-30 15:24:16.000000000 +0200
+--- 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
@@ -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.10.12/gtk/gtkfilesystemmodel.h
+Index: gtk+2.0-2.11.2/gtk/gtkfilesystemmodel.h
===================================================================
---- gtk+2.0-2.10.12.orig/gtk/gtkfilesystemmodel.h 2007-05-02 18:26:59.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/gtkfilesystemmodel.h 2007-05-30 15:24:16.000000000 +0200
+--- 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
@@ -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.10.12/tests/autotestfilechooser.c
+Index: gtk+2.0-2.11.2/tests/autotestfilechooser.c
===================================================================
---- gtk+2.0-2.10.12.orig/tests/autotestfilechooser.c 2007-05-02 18:27:12.000000000 +0200
-+++ gtk+2.0-2.10.12/tests/autotestfilechooser.c 2007-05-30 15:24:16.000000000 +0200
+--- 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
@@ -30,6 +30,7 @@
*/
Modified: desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/015_default-fallback-icon-theme.patch?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch Wed Jun 13 12:05:15 2007
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.10.12/gtk/gtksettings.c
+Index: gtk+2.0-2.11.2/gtk/gtksettings.c
===================================================================
---- gtk+2.0-2.10.12.orig/gtk/gtksettings.c 2007-05-03 21:26:35.000000000 +0200
-+++ gtk+2.0-2.10.12/gtk/gtksettings.c 2007-05-03 21:26:40.000000000 +0200
-@@ -247,7 +247,7 @@
+--- gtk+2.0-2.11.2.orig/gtk/gtksettings.c 2007-06-06 13:43:08.000000000 +0200
++++ gtk+2.0-2.11.2/gtk/gtksettings.c 2007-06-13 11:07:39.000000000 +0200
+@@ -289,7 +289,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),
Modified: desktop/experimental/gtk+2.0/debian/patches/021_loader-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/021_loader-files-d.patch?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/021_loader-files-d.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/021_loader-files-d.patch Wed Jun 13 12:05:15 2007
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c
+Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
---- gtk+2.0-2.10.10.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-12 14:57:01.000000000 +0100
-+++ gtk+2.0-2.10.10/gdk-pixbuf/gdk-pixbuf-io.c 2007-03-13 14:10:35.000000000 +0100
+--- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-06 13:43:15.000000000 +0200
++++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:57:45.000000000 +0200
@@ -45,6 +45,9 @@
#undef STRICT
#endif
@@ -12,9 +12,9 @@
static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size)
{
-@@ -282,28 +285,93 @@
- return result;
- }
+@@ -284,87 +287,93 @@
+
+ #endif /* USE_GMODULE */
+/* FIXME this is a static copy of a public pango function which should really
+ * livein glib */
@@ -95,6 +95,7 @@
-gdk_pixbuf_io_init (void)
+process_module_file (const gchar *filename, GIOChannel *channel)
{
+-#ifdef USE_GMODULE
- GIOChannel *channel;
gchar *line_buf;
gsize term;
@@ -106,18 +107,76 @@
int n_patterns = 0;
GdkPixbufModulePattern *pattern;
- GError *error = NULL;
-
+-#endif
+- GdkPixbufModule *builtin_module = NULL;
+-
+-#define load_one_builtin_module(format) \
+- builtin_module = g_new0 (GdkPixbufModule, 1); \
+- builtin_module->module_name = #format; \
+- if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
+- file_formats = g_slist_prepend (file_formats, builtin_module);\
+- else \
+- g_free (builtin_module)
+-
+-#ifdef INCLUDE_ani
+- load_one_builtin_module (ani);
+-#endif
+-#ifdef INCLUDE_png
+- load_one_builtin_module (png);
+-#endif
+-#ifdef INCLUDE_bmp
+- load_one_builtin_module (bmp);
+-#endif
+-#ifdef INCLUDE_wbmp
+- load_one_builtin_module (wbmp);
+-#endif
+-#ifdef INCLUDE_gif
+- load_one_builtin_module (gif);
+-#endif
+-#ifdef INCLUDE_ico
+- load_one_builtin_module (ico);
+-#endif
+-#ifdef INCLUDE_jpeg
+- load_one_builtin_module (jpeg);
+-#endif
+-#ifdef INCLUDE_pnm
+- load_one_builtin_module (pnm);
+-#endif
+-#ifdef INCLUDE_ras
+- load_one_builtin_module (ras);
+-#endif
+-#ifdef INCLUDE_tiff
+- load_one_builtin_module (tiff);
+-#endif
+-#ifdef INCLUDE_xpm
+- load_one_builtin_module (xpm);
+-#endif
+-#ifdef INCLUDE_xbm
+- load_one_builtin_module (xbm);
+-#endif
+-#ifdef INCLUDE_tga
+- load_one_builtin_module (tga);
+-#endif
+-#ifdef INCLUDE_pcx
+- load_one_builtin_module (pcx);
+-#endif
+-
+-#undef load_one_builtin_module
+
+-#ifdef USE_GMODULE
- channel = g_io_channel_new_file (filename, "r", &error);
- if (!channel) {
-- g_warning ("Cannot open pixbuf loader module file '%s': %s",
-- filename, error->message);
+- /* Don't bother warning if we have some built-in loaders */
+- if (file_formats == NULL)
+- g_warning ("Cannot open pixbuf loader module file '%s': %s",
+- filename, error->message);
- return;
- }
-
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p;
-@@ -436,8 +504,81 @@
+@@ -497,8 +506,138 @@
g_free (line_buf);
}
g_string_free (tmp_buf, TRUE);
@@ -128,6 +187,7 @@
+static void
+gdk_pixbuf_io_init (void)
+{
++#ifdef USE_GMODULE
+ GIOChannel *channel;
+ gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
+ /* FIXME: using an absolute path requires patching Makefile.am */
@@ -139,7 +199,63 @@
+ char **files;
+ GError *error = NULL;
+ int n;
-+
++#endif
++ GdkPixbufModule *builtin_module = NULL;
++
++#define load_one_builtin_module(format) \
++ builtin_module = g_new0 (GdkPixbufModule, 1); \
++ builtin_module->module_name = #format; \
++ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \
++ file_formats = g_slist_prepend (file_formats, builtin_module);\
++ else \
++ g_free (builtin_module)
++
++#ifdef INCLUDE_ani
++ load_one_builtin_module (ani);
++#endif
++#ifdef INCLUDE_png
++ load_one_builtin_module (png);
++#endif
++#ifdef INCLUDE_bmp
++ load_one_builtin_module (bmp);
++#endif
++#ifdef INCLUDE_wbmp
++ load_one_builtin_module (wbmp);
++#endif
++#ifdef INCLUDE_gif
++ load_one_builtin_module (gif);
++#endif
++#ifdef INCLUDE_ico
++ load_one_builtin_module (ico);
++#endif
++#ifdef INCLUDE_jpeg
++ load_one_builtin_module (jpeg);
++#endif
++#ifdef INCLUDE_pnm
++ load_one_builtin_module (pnm);
++#endif
++#ifdef INCLUDE_ras
++ load_one_builtin_module (ras);
++#endif
++#ifdef INCLUDE_tiff
++ load_one_builtin_module (tiff);
++#endif
++#ifdef INCLUDE_xpm
++ load_one_builtin_module (xpm);
++#endif
++#ifdef INCLUDE_xbm
++ load_one_builtin_module (xbm);
++#endif
++#ifdef INCLUDE_tga
++ load_one_builtin_module (tga);
++#endif
++#ifdef INCLUDE_pcx
++ load_one_builtin_module (pcx);
++#endif
++
++#undef load_one_builtin_module
++
++#ifdef USE_GMODULE
+ list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+ gdkpixbuf_module_file_str,
+ gdkpixbuf_module_files_d_str,
@@ -198,6 +314,6 @@
+ g_free (list_str);
+ g_free (gdkpixbuf_module_files_d_str);
+ g_free (gdkpixbuf_module_file_str);
+ #endif
}
- /* actually load the image handler - gdk_pixbuf_get_module only get a */
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=11502&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 Wed Jun 13 12:05:15 2007
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.10.10/gtk/gtkentry.c
+Index: gtk+2.0-2.11.2/gtk/gtkentry.c
===================================================================
---- gtk+2.0-2.10.10.orig/gtk/gtkentry.c 2007-03-12 14:51:19.000000000 +0100
-+++ gtk+2.0-2.10.10/gtk/gtkentry.c 2007-03-13 14:10:39.000000000 +0100
-@@ -526,7 +526,7 @@
+--- 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
+@@ -537,7 +537,7 @@
g_param_spec_unichar ("invisible-char",
P_("Invisible character"),
P_("The character to use when masking entry contents (in \"password mode\")"),
@@ -11,7 +11,7 @@
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
-@@ -1064,7 +1064,7 @@
+@@ -1101,7 +1101,7 @@
entry->editable = TRUE;
entry->visible = TRUE;
@@ -20,7 +20,7 @@
entry->dnd_position = -1;
entry->width_chars = -1;
entry->is_cell_renderer = FALSE;
-@@ -4325,9 +4325,9 @@
+@@ -4495,9 +4495,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
@@ -30,6 +30,6 @@
+ * invisible char is a black circle (Unicode character 25CF). If
+ * you set the invisible char to 0, then the user will get no
+ * feedback at all; there will be no text on the screen as they type.
- *
**/
void
+ gtk_entry_set_invisible_char (GtkEntry *entry,
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=11502&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 Wed Jun 13 12:05:15 2007
@@ -1,8 +1,8 @@
-Index: gtk+-2.10.12/gtk/gtktreeviewcolumn.c
+Index: gtk+2.0-2.11.2/gtk/gtktreeviewcolumn.c
===================================================================
---- gtk+-2.10.12.orig/gtk/gtktreeviewcolumn.c 2007-05-18 19:06:21.720534000 +0200
-+++ gtk+-2.10.12/gtk/gtktreeviewcolumn.c 2007-05-18 19:36:28.845472250 +0200
-@@ -2115,6 +2115,7 @@
+--- 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 @@
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.10.12/gtk/gtktreeview.c
+Index: gtk+2.0-2.11.2/gtk/gtktreeview.c
===================================================================
---- gtk+-2.10.12.orig/gtk/gtktreeview.c 2007-05-18 19:06:21.696532500 +0200
-+++ gtk+-2.10.12/gtk/gtktreeview.c 2007-05-18 20:30:24.331677500 +0200
-@@ -2093,18 +2093,20 @@
+--- 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 @@
/* GtkWidget::size_allocate helper */
static void
@@ -37,7 +37,7 @@
tree_view = GTK_TREE_VIEW (widget);
-@@ -2139,12 +2141,38 @@
+@@ -2151,12 +2153,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))
-@@ -2199,6 +2227,10 @@
+@@ -2211,6 +2239,10 @@
{
column->width += extra;
}
@@ -88,7 +88,7 @@
g_object_notify (G_OBJECT (column), "width");
-@@ -2233,13 +2265,13 @@
+@@ -2245,13 +2277,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@@ -105,7 +105,7 @@
tmp_list = tree_view->priv->children;
while (tmp_list)
-@@ -2326,7 +2358,7 @@
+@@ -2338,7 +2370,7 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@@ -114,7 +114,7 @@
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
-@@ -2737,7 +2769,7 @@
+@@ -2749,7 +2781,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");
-@@ -3450,6 +3482,8 @@
+@@ -3458,6 +3490,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@@ -132,7 +132,7 @@
gtk_widget_queue_resize (widget);
}
-@@ -11192,7 +11226,7 @@
+@@ -11253,7 +11287,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -141,11 +141,11 @@
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
-Index: gtk+-2.10.12/gtk/gtktreeprivate.h
+Index: gtk+2.0-2.11.2/gtk/gtktreeprivate.h
===================================================================
---- gtk+-2.10.12.orig/gtk/gtktreeprivate.h 2007-05-18 19:06:21.648529500 +0200
-+++ gtk+-2.10.12/gtk/gtktreeprivate.h 2007-05-18 19:36:28.869473750 +0200
-@@ -263,6 +263,10 @@
+--- 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
+@@ -264,6 +264,10 @@
gboolean tree_lines_enabled;
GdkGC *tree_line_gc;
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=11502&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 Wed Jun 13 12:05:15 2007
@@ -1,3 +1,6 @@
+Debian #405296; GNOME #148828; permit single click in filechooser instead of
+requiring double-click.
+
Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
===================================================================
--- gtk+-2.10.12.orig/gtk/gtkfilechooserdefault.c 2007-05-18 18:33:08.711978750 +0200
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=11502&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 Wed Jun 13 12:05:15 2007
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c
+Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
---- gtk+2.0-2.10.11.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:36.000000000 +0200
-+++ gtk+2.0-2.10.11/gdk-pixbuf/gdk-pixbuf-io.c 2007-04-13 10:56:40.000000000 +0200
+--- 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
@@ -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.10.11/gtk/gtkrc.c
+Index: gtk+2.0-2.11.2/gtk/gtkrc.c
===================================================================
---- gtk+2.0-2.10.11.orig/gtk/gtkrc.c 2007-04-13 10:56:36.000000000 +0200
-+++ gtk+2.0-2.10.11/gtk/gtkrc.c 2007-04-13 10:56:40.000000000 +0200
-@@ -447,7 +447,20 @@
+--- 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 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
@@ -51,7 +51,7 @@
}
return result;
-@@ -519,7 +532,21 @@
+@@ -521,7 +534,21 @@
else
{
const gchar *home;
@@ -74,7 +74,7 @@
gtk_rc_add_default_file (str);
g_free (str);
-@@ -527,7 +554,21 @@
+@@ -529,7 +556,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=11502&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 Wed Jun 13 12:05:15 2007
@@ -6,10 +6,10 @@
rm -rf autom4te.cache
exclude config.guess and sub with diff -urN -x config.guess -x config.sub
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/Makefile.in gtk+2.0-2.10.13/Makefile.in
---- gtk+2.0-2.10.13.orig/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/Makefile.in 2007-06-13 10:00:13.000000000 +0200
-@@ -90,6 +90,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/Makefile.in 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 11:49:11.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@
@@ -18,7 +18,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -296,7 +298,10 @@
+@@ -327,7 +329,10 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -30,14 +30,7 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-@@ -447,13 +452,14 @@
- DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
- acinclude.m4 aclocal.m4 compile config.guess config.h.in \
-- config.h.win32.in config.sub configure.in depcomp \
-+ config.h.win32.in config.sub configure configure.in depcomp \
- gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \
- gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \
+@@ -484,7 +489,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
@@ -47,7 +40,7 @@
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -705,7 +711,7 @@
+@@ -736,7 +742,7 @@
|| exit 1; \
fi; \
done
@@ -56,9 +49,9 @@
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/aclocal.m4 gtk+2.0-2.10.13/aclocal.m4
---- gtk+2.0-2.10.13.orig/aclocal.m4 2007-06-13 05:12:12.000000000 +0200
-+++ gtk+2.0-2.10.13/aclocal.m4 2007-06-13 10:00:08.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/aclocal.m4 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 11:49:05.000000000 +0200
@@ -941,7 +941,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -353,14 +346,14 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
])
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/configure gtk+2.0-2.10.13/configure
---- gtk+2.0-2.10.13.orig/configure 2007-06-13 05:12:27.000000000 +0200
-+++ gtk+2.0-2.10.13/configure 2007-06-13 10:00:12.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/configure 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 11:49:10.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.10.13.
-+# Generated by GNU Autoconf 2.61 for gtk+ 2.10.13.
+-# Generated by GNU Autoconf 2.60 for gtk+ 2.11.2.
++# Generated by GNU Autoconf 2.61 for gtk+ 2.11.2.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -544,7 +537,7 @@
GREP
EGREP
LN_S
-@@ -1020,6 +1037,7 @@
+@@ -1051,6 +1068,7 @@
CC
CFLAGS
LDFLAGS
@@ -552,7 +545,7 @@
CPPFLAGS
CPP
CXX
-@@ -1137,10 +1155,10 @@
+@@ -1168,10 +1186,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -565,7 +558,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1156,10 +1174,10 @@
+@@ -1187,10 +1205,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -578,7 +571,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1353,19 +1371,19 @@
+@@ -1384,19 +1402,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -602,16 +595,16 @@
eval with_$ac_package=no ;;
--x)
-@@ -1638,7 +1656,7 @@
- [default=auto]
- --disable-glibtest do not try to compile and run a test GLIB program
+@@ -1673,7 +1691,7 @@
--disable-modules disable dynamic module loading
+ --enable-test-print-backend
+ build test print backend
- --enable-gtk-doc use gtk-doc to build documentation default=no
+ --enable-gtk-doc use gtk-doc to build documentation [default=no]
--enable-man regenerate man pages from Docbook [default=no]
Optional Packages:
-@@ -1668,6 +1686,7 @@
+@@ -1700,6 +1718,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -619,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
-@@ -1748,7 +1767,7 @@
+@@ -1780,7 +1799,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.10.13
+ gtk+ configure 2.11.2
-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.
-@@ -1762,7 +1781,7 @@
+@@ -1794,7 +1813,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.10.13, which was
+ It was created by gtk+ $as_me 2.11.2, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2188,7 +2207,7 @@
+@@ -2220,7 +2239,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -646,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.
-@@ -2322,7 +2341,7 @@
+@@ -2354,7 +2373,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -655,7 +648,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2451,7 +2470,7 @@
+@@ -2483,7 +2502,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -664,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
-@@ -2491,7 +2510,7 @@
+@@ -2523,7 +2542,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -673,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
-@@ -2732,7 +2751,7 @@
+@@ -2764,7 +2783,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -682,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
-@@ -2772,7 +2791,7 @@
+@@ -2804,7 +2823,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -691,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
-@@ -2829,7 +2848,7 @@
+@@ -2861,7 +2880,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -700,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
-@@ -2870,7 +2889,7 @@
+@@ -2902,7 +2921,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -709,7 +702,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2928,7 +2947,7 @@
+@@ -2960,7 +2979,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -718,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
-@@ -2972,7 +2991,7 @@
+@@ -3004,7 +3023,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -727,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
-@@ -3113,7 +3132,7 @@
+@@ -3145,7 +3164,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.
@@ -736,7 +729,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
-@@ -3141,6 +3160,12 @@
+@@ -3173,6 +3192,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
@@ -749,7 +742,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3152,8 +3177,6 @@
+@@ -3184,8 +3209,6 @@
fi
ac_exeext=$ac_cv_exeext
@@ -758,7 +751,7 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-@@ -3331,27 +3354,10 @@
+@@ -3363,27 +3386,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -790,7 +783,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3406,27 +3412,10 @@
+@@ -3438,27 +3444,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -822,7 +815,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3461,27 +3450,10 @@
+@@ -3493,27 +3482,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -854,7 +847,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -3517,27 +3489,10 @@
+@@ -3549,27 +3521,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -886,7 +879,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -3653,27 +3608,10 @@
+@@ -3685,27 +3640,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -918,7 +911,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -3903,6 +3841,16 @@
+@@ -3935,6 +3873,16 @@
@@ -935,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
-@@ -4044,7 +3992,7 @@
+@@ -4076,7 +4024,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"
@@ -944,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
-@@ -4126,7 +4074,7 @@
+@@ -4158,7 +4106,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"
@@ -953,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
-@@ -4432,7 +4380,7 @@
+@@ -4464,7 +4412,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -962,7 +955,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -4486,11 +4434,11 @@
+@@ -4518,11 +4466,11 @@
;;
# This must be Linux ELF.
@@ -976,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
-@@ -4607,7 +4555,7 @@
+@@ -4639,7 +4587,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 4610 "configure"' > conftest.$ac_ext
-+ echo '#line 4558 "configure"' > conftest.$ac_ext
+- echo '#line 4642 "configure"' > conftest.$ac_ext
++ echo '#line 4590 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -4731,27 +4679,11 @@
+@@ -4763,27 +4711,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1018,7 +1011,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4760,7 +4692,7 @@
+@@ -4792,7 +4724,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -1027,7 +1020,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4814,7 +4746,7 @@
+@@ -4846,7 +4778,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1036,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
-@@ -4854,7 +4786,7 @@
+@@ -4886,7 +4818,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1045,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
-@@ -4910,7 +4842,7 @@
+@@ -4942,7 +4874,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1054,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
-@@ -4950,7 +4882,7 @@
+@@ -4982,7 +4914,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1063,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
-@@ -5006,7 +4938,7 @@
+@@ -5038,7 +4970,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1072,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
-@@ -5046,7 +4978,7 @@
+@@ -5078,7 +5010,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1081,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
-@@ -5144,17 +5076,10 @@
+@@ -5176,17 +5108,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1103,7 +1096,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5188,17 +5113,10 @@
+@@ -5220,17 +5145,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1125,7 +1118,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5263,17 +5181,10 @@
+@@ -5295,17 +5213,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1147,7 +1140,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5307,17 +5218,10 @@
+@@ -5339,17 +5250,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1169,7 +1162,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5388,27 +5292,10 @@
+@@ -5420,27 +5324,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1201,7 +1194,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5584,27 +5471,10 @@
+@@ -5616,27 +5503,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1233,7 +1226,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -5667,27 +5537,10 @@
+@@ -5699,27 +5569,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1265,7 +1258,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5723,17 +5576,10 @@
+@@ -5755,17 +5608,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1287,7 +1280,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5825,7 +5671,7 @@
+@@ -5857,7 +5703,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1296,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
-@@ -5869,7 +5715,7 @@
+@@ -5901,7 +5747,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1305,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
-@@ -5982,27 +5828,10 @@
+@@ -6014,27 +5860,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1337,7 +1330,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6057,27 +5886,10 @@
+@@ -6089,27 +5918,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1369,7 +1362,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6112,27 +5924,10 @@
+@@ -6144,27 +5956,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1401,7 +1394,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6168,27 +5963,10 @@
+@@ -6200,27 +5995,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1433,7 +1426,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6384,17 +6162,10 @@
+@@ -6416,17 +6194,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1455,7 +1448,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6428,17 +6199,10 @@
+@@ -6460,17 +6231,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1477,7 +1470,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6503,17 +6267,10 @@
+@@ -6535,17 +6299,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1499,7 +1492,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6547,17 +6304,10 @@
+@@ -6579,17 +6336,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1521,7 +1514,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6598,7 +6348,7 @@
+@@ -6630,7 +6380,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
@@ -1530,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
-@@ -6616,7 +6366,7 @@
+@@ -6648,7 +6398,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1539,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
-@@ -6642,7 +6392,7 @@
+@@ -6674,7 +6424,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -1548,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
-@@ -6660,7 +6410,7 @@
+@@ -6692,7 +6442,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1557,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
-@@ -6767,27 +6517,10 @@
+@@ -6799,27 +6549,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1589,7 +1582,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6830,27 +6563,10 @@
+@@ -6862,27 +6595,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1621,7 +1614,7 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7048,7 +6764,7 @@
+@@ -7080,7 +6796,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'"
;;
@@ -1630,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'"
-@@ -7305,7 +7021,7 @@
+@@ -7337,7 +7053,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1639,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
-@@ -7345,7 +7061,7 @@
+@@ -7377,7 +7093,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1648,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
-@@ -7401,7 +7117,7 @@
+@@ -7433,7 +7149,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1657,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
-@@ -7441,7 +7157,7 @@
+@@ -7473,7 +7189,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1666,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
-@@ -7497,7 +7213,7 @@
+@@ -7529,7 +7245,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1675,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
-@@ -7537,7 +7253,7 @@
+@@ -7569,7 +7285,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1684,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
-@@ -7854,11 +7570,11 @@
+@@ -7886,11 +7602,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:7857: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7573: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7889: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7605: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7861: \$? = $ac_status" >&5
-+ echo "$as_me:7577: \$? = $ac_status" >&5
+- echo "$as_me:7893: \$? = $ac_status" >&5
++ echo "$as_me:7609: \$? = $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.
-@@ -8016,7 +7732,7 @@
+@@ -8048,7 +7764,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -1707,35 +1700,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -8122,11 +7838,11 @@
+@@ -8154,11 +7870,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:8125: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7841: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8157: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7873: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8129: \$? = $ac_status" >&5
-+ echo "$as_me:7845: \$? = $ac_status" >&5
+- echo "$as_me:8161: \$? = $ac_status" >&5
++ echo "$as_me:7877: \$? = $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.
-@@ -8226,11 +7942,11 @@
+@@ -8258,11 +7974,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:8229: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7945: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8261: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7977: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8233: \$? = $ac_status" >&5
-+ echo "$as_me:7949: \$? = $ac_status" >&5
+- echo "$as_me:8265: \$? = $ac_status" >&5
++ echo "$as_me:7981: \$? = $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
-@@ -8455,7 +8171,7 @@
+@@ -8487,7 +8203,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'
;;
@@ -1744,7 +1737,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8481,12 +8197,13 @@
+@@ -8513,12 +8229,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
@@ -1759,7 +1752,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8706,27 +8423,11 @@
+@@ -8738,27 +8455,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1792,7 +1785,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -8740,7 +8441,7 @@
+@@ -8772,7 +8473,7 @@
fi
@@ -1801,7 +1794,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8781,27 +8482,11 @@
+@@ -8813,27 +8514,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1834,7 +1827,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -8815,7 +8500,7 @@
+@@ -8847,7 +8532,7 @@
fi
@@ -1843,7 +1836,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8946,7 +8631,7 @@
+@@ -8978,7 +8663,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1852,7 +1845,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -9048,7 +8733,7 @@
+@@ -9080,7 +8765,7 @@
link_all_deplibs=yes
;;
@@ -1861,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
-@@ -9538,18 +9223,6 @@
+@@ -9570,18 +9255,6 @@
dynamic_linker=no
;;
@@ -1880,7 +1873,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -9705,7 +9378,7 @@
+@@ -9737,7 +9410,7 @@
;;
# This must be Linux ELF.
@@ -1889,7 +1882,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9719,31 +9392,10 @@
+@@ -9751,31 +9424,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -1897,7 +1890,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 9726 "configure"' > conftest.$ac_ext
+- echo '#line 9758 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -1922,7 +1915,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9755,7 +9407,7 @@
+@@ -9787,7 +9439,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1931,7 +1924,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9764,7 +9416,7 @@
+@@ -9796,7 +9448,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -1940,7 +1933,7 @@
;;
netbsd*)
-@@ -10084,27 +9736,11 @@
+@@ -10116,27 +9768,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1973,7 +1966,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10113,7 +9749,7 @@
+@@ -10145,7 +9781,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -1982,7 +1975,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10195,27 +9831,11 @@
+@@ -10227,27 +9863,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2015,7 +2008,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10224,7 +9844,7 @@
+@@ -10256,7 +9876,7 @@
ac_cv_func_shl_load=no
fi
@@ -2024,7 +2017,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10274,27 +9894,11 @@
+@@ -10306,27 +9926,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2057,7 +2050,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10303,7 +9907,7 @@
+@@ -10335,7 +9939,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -2066,7 +2059,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10375,27 +9979,11 @@
+@@ -10407,27 +10011,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2099,7 +2092,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10404,7 +9992,7 @@
+@@ -10436,7 +10024,7 @@
ac_cv_func_dlopen=no
fi
@@ -2108,7 +2101,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10454,27 +10042,11 @@
+@@ -10486,27 +10074,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2141,7 +2134,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10483,7 +10055,7 @@
+@@ -10515,7 +10087,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -2150,7 +2143,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10534,27 +10106,11 @@
+@@ -10566,27 +10138,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2183,7 +2176,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10563,7 +10119,7 @@
+@@ -10595,7 +10151,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -2192,7 +2185,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10614,27 +10170,11 @@
+@@ -10646,27 +10202,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2225,7 +2218,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10643,7 +10183,7 @@
+@@ -10675,7 +10215,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -2234,25 +2227,25 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10699,7 +10239,7 @@
+@@ -10731,7 +10271,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10702 "configure"
-+#line 10242 "configure"
+-#line 10734 "configure"
++#line 10274 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10799,7 +10339,7 @@
+@@ -10831,7 +10371,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10802 "configure"
-+#line 10342 "configure"
+-#line 10834 "configure"
++#line 10374 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11886,27 +11426,11 @@
+@@ -11918,27 +11458,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2285,7 +2278,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -11920,7 +11444,7 @@
+@@ -11952,7 +11476,7 @@
fi
@@ -2294,7 +2287,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -11962,27 +11486,11 @@
+@@ -11994,27 +11518,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2327,7 +2320,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -11996,7 +11504,7 @@
+@@ -12028,7 +11536,7 @@
fi
@@ -2336,7 +2329,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12144,7 +11652,7 @@
+@@ -12176,7 +11684,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -2345,7 +2338,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12303,7 +11811,7 @@
+@@ -12335,7 +11843,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -2354,7 +2347,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12405,7 +11913,7 @@
+@@ -12437,7 +11945,7 @@
;;
esac
;;
@@ -2363,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=
-@@ -12972,7 +12480,7 @@
+@@ -13004,7 +12512,7 @@
;;
esac
;;
@@ -2372,7 +2365,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13015,7 +12523,7 @@
+@@ -13047,7 +12555,7 @@
;;
esac
;;
@@ -2381,7 +2374,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13058,7 +12566,7 @@
+@@ -13090,7 +12598,7 @@
;;
esac
;;
@@ -2390,35 +2383,35 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13167,11 +12675,11 @@
+@@ -13199,11 +12707,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:13170: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12678: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13202: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12710: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13174: \$? = $ac_status" >&5
-+ echo "$as_me:12682: \$? = $ac_status" >&5
+- echo "$as_me:13206: \$? = $ac_status" >&5
++ echo "$as_me:12714: \$? = $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.
-@@ -13271,11 +12779,11 @@
+@@ -13303,11 +12811,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:13274: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12782: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13306: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12814: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13278: \$? = $ac_status" >&5
-+ echo "$as_me:12786: \$? = $ac_status" >&5
+- echo "$as_me:13310: \$? = $ac_status" >&5
++ echo "$as_me:12818: \$? = $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
-@@ -13343,6 +12851,9 @@
+@@ -13375,6 +12883,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'
;;
@@ -2428,7 +2421,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -13622,18 +13133,6 @@
+@@ -13654,18 +13165,6 @@
dynamic_linker=no
;;
@@ -2447,7 +2440,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13789,7 +13288,7 @@
+@@ -13821,7 +13320,7 @@
;;
# This must be Linux ELF.
@@ -2456,7 +2449,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13803,31 +13302,10 @@
+@@ -13835,31 +13334,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -2464,7 +2457,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 13810 "configure"' > conftest.$ac_ext
+- echo '#line 13842 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2489,7 +2482,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -13839,7 +13317,7 @@
+@@ -13871,7 +13349,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2498,7 +2491,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13848,7 +13326,7 @@
+@@ -13880,7 +13358,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2507,7 +2500,7 @@
;;
netbsd*)
-@@ -14756,7 +14234,7 @@
+@@ -14788,7 +14266,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -2516,35 +2509,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -14862,11 +14340,11 @@
+@@ -14894,11 +14372,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:14865: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14343: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14897: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14375: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14869: \$? = $ac_status" >&5
-+ echo "$as_me:14347: \$? = $ac_status" >&5
+- echo "$as_me:14901: \$? = $ac_status" >&5
++ echo "$as_me:14379: \$? = $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.
-@@ -14966,11 +14444,11 @@
+@@ -14998,11 +14476,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:14969: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14447: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15001: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14479: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14973: \$? = $ac_status" >&5
-+ echo "$as_me:14451: \$? = $ac_status" >&5
+- echo "$as_me:15005: \$? = $ac_status" >&5
++ echo "$as_me:14483: \$? = $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
-@@ -15195,7 +14673,7 @@
+@@ -15227,7 +14705,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'
;;
@@ -2553,7 +2546,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15221,12 +14699,13 @@
+@@ -15253,12 +14731,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
@@ -2568,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=
-@@ -15436,27 +14915,11 @@
+@@ -15468,27 +14947,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2601,7 +2594,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -15470,7 +14933,7 @@
+@@ -15502,7 +14965,7 @@
fi
@@ -2610,7 +2603,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15501,27 +14964,11 @@
+@@ -15533,27 +14996,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2643,7 +2636,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -15535,7 +14982,7 @@
+@@ -15567,7 +15014,7 @@
fi
@@ -2652,7 +2645,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15666,7 +15113,7 @@
+@@ -15698,7 +15145,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2661,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
-@@ -15768,7 +15215,7 @@
+@@ -15800,7 +15247,7 @@
link_all_deplibs_F77=yes
;;
@@ -2670,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
-@@ -16258,18 +15705,6 @@
+@@ -16290,18 +15737,6 @@
dynamic_linker=no
;;
@@ -2689,7 +2682,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -16425,7 +15860,7 @@
+@@ -16457,7 +15892,7 @@
;;
# This must be Linux ELF.
@@ -2698,7 +2691,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16439,31 +15874,10 @@
+@@ -16471,31 +15906,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -2706,7 +2699,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 16446 "configure"' > conftest.$ac_ext
+- echo '#line 16478 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2731,7 +2724,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16475,7 +15889,7 @@
+@@ -16507,7 +15921,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2740,7 +2733,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16484,7 +15898,7 @@
+@@ -16516,7 +15930,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2749,21 +2742,21 @@
;;
netbsd*)
-@@ -17217,11 +16631,11 @@
+@@ -17249,11 +16663,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:17220: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16634: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17252: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16666: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17224: \$? = $ac_status" >&5
-+ echo "$as_me:16638: \$? = $ac_status" >&5
+- echo "$as_me:17256: \$? = $ac_status" >&5
++ echo "$as_me:16670: \$? = $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.
-@@ -17379,7 +16793,7 @@
+@@ -17411,7 +16825,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -2772,35 +2765,35 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17485,11 +16899,11 @@
+@@ -17517,11 +16931,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:17488: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16902: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17520: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16934: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17492: \$? = $ac_status" >&5
-+ echo "$as_me:16906: \$? = $ac_status" >&5
+- echo "$as_me:17524: \$? = $ac_status" >&5
++ echo "$as_me:16938: \$? = $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.
-@@ -17589,11 +17003,11 @@
+@@ -17621,11 +17035,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:17592: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17006: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17624: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17038: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17596: \$? = $ac_status" >&5
-+ echo "$as_me:17010: \$? = $ac_status" >&5
+- echo "$as_me:17628: \$? = $ac_status" >&5
++ echo "$as_me:17042: \$? = $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
-@@ -17818,7 +17232,7 @@
+@@ -17850,7 +17264,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'
;;
@@ -2809,7 +2802,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17844,12 +17258,13 @@
+@@ -17876,12 +17290,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
@@ -2824,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=
-@@ -18069,27 +17484,11 @@
+@@ -18101,27 +17516,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2857,7 +2850,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -18103,7 +17502,7 @@
+@@ -18135,7 +17534,7 @@
fi
@@ -2866,7 +2859,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18144,27 +17543,11 @@
+@@ -18176,27 +17575,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2899,7 +2892,7 @@
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
-@@ -18178,7 +17561,7 @@
+@@ -18210,7 +17593,7 @@
fi
@@ -2908,7 +2901,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18309,7 +17692,7 @@
+@@ -18341,7 +17724,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2917,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
-@@ -18411,7 +17794,7 @@
+@@ -18443,7 +17826,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -2926,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
-@@ -18901,18 +18284,6 @@
+@@ -18933,18 +18316,6 @@
dynamic_linker=no
;;
@@ -2945,7 +2938,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19068,7 +18439,7 @@
+@@ -19100,7 +18471,7 @@
;;
# This must be Linux ELF.
@@ -2954,7 +2947,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19082,31 +18453,10 @@
+@@ -19114,31 +18485,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -2962,7 +2955,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 19089 "configure"' > conftest.$ac_ext
+- echo '#line 19121 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -2987,7 +2980,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19118,7 +18468,7 @@
+@@ -19150,7 +18500,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2996,7 +2989,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19127,7 +18477,7 @@
+@@ -19159,7 +18509,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -3005,7 +2998,7 @@
;;
netbsd*)
-@@ -20360,27 +19710,10 @@
+@@ -20392,27 +19742,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3037,7 +3030,7 @@
break
else
echo "$as_me: failed program was:" >&5
-@@ -20404,27 +19737,10 @@
+@@ -20436,27 +19769,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3069,7 +3062,7 @@
ac_cv_sys_largefile_CC=' -n32'; break
else
echo "$as_me: failed program was:" >&5
-@@ -20452,7 +19768,6 @@
+@@ -20484,7 +19800,6 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
while :; do
@@ -3077,7 +3070,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20489,28 +19804,11 @@
+@@ -20521,28 +19836,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3111,7 +3104,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20556,27 +19854,10 @@
+@@ -20588,27 +19886,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3143,7 +3136,7 @@
ac_cv_sys_file_offset_bits=64; break
else
echo "$as_me: failed program was:" >&5
-@@ -20586,26 +19867,28 @@
+@@ -20618,26 +19899,28 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3178,7 +3171,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20642,28 +19925,11 @@
+@@ -20674,28 +19957,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3212,7 +3205,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -20709,27 +19975,10 @@
+@@ -20741,27 +20007,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3244,7 +3237,7 @@
ac_cv_sys_large_files=1; break
else
echo "$as_me: failed program was:" >&5
-@@ -20739,19 +19988,22 @@
+@@ -20771,19 +20020,22 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3271,7 +3264,7 @@
fi
-@@ -20780,7 +20032,7 @@
+@@ -20812,7 +20064,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3280,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
-@@ -20901,7 +20153,7 @@
+@@ -20933,7 +20185,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3289,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
-@@ -20941,7 +20193,7 @@
+@@ -20973,7 +20225,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3298,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
-@@ -21001,7 +20253,7 @@
+@@ -21033,7 +20285,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3307,7 +3300,7 @@
ac_cv_prog_ms_librarian="yes"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21254,27 +20506,11 @@
+@@ -21281,27 +20533,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3340,7 +3333,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -21283,7 +20519,7 @@
+@@ -21310,7 +20546,7 @@
fi
@@ -3349,7 +3342,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -21383,27 +20619,10 @@
+@@ -21410,27 +20646,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3381,7 +3374,7 @@
am_cv_prog_cc_stdc="$ac_arg"; break
else
echo "$as_me: failed program was:" >&5
-@@ -21466,7 +20685,7 @@
+@@ -21493,7 +20712,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3390,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.
-@@ -21630,7 +20849,7 @@
+@@ -21657,7 +20876,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3399,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
-@@ -21673,7 +20892,7 @@
+@@ -21700,7 +20919,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3408,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
-@@ -21915,7 +21134,7 @@
+@@ -21942,7 +21161,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3417,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
-@@ -21958,7 +21177,7 @@
+@@ -21985,7 +21204,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3426,7 +3419,7 @@
ac_cv_prog_INDENT="indent"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -22058,27 +21277,11 @@
+@@ -22085,27 +21304,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3459,7 +3452,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -22087,7 +21290,7 @@
+@@ -22114,7 +21317,7 @@
eval "$as_ac_var=no"
fi
@@ -3468,7 +3461,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -22136,27 +21339,11 @@
+@@ -22163,27 +21366,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3501,7 +3494,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22165,7 +21352,7 @@
+@@ -22192,7 +21379,7 @@
gtk_ok=no
fi
@@ -3510,7 +3503,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22211,27 +21398,11 @@
+@@ -22238,27 +21425,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3543,7 +3536,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22240,7 +21411,7 @@
+@@ -22267,7 +21438,7 @@
gtk_ok=no
fi
@@ -3552,7 +3545,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22286,27 +21457,11 @@
+@@ -22313,27 +21484,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3585,7 +3578,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22315,7 +21470,7 @@
+@@ -22342,7 +21497,7 @@
gtk_ok=no
fi
@@ -3594,7 +3587,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22361,27 +21516,11 @@
+@@ -22388,27 +21543,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3627,7 +3620,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22390,7 +21529,7 @@
+@@ -22417,7 +21556,7 @@
gtk_ok=no
fi
@@ -3636,7 +3629,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22436,27 +21575,11 @@
+@@ -22463,27 +21602,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3669,7 +3662,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22465,7 +21588,7 @@
+@@ -22492,7 +21615,7 @@
gtk_ok=no
fi
@@ -3678,7 +3671,7 @@
conftest$ac_exeext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $gtk_ok" >&5
echo "${ECHO_T}$gtk_ok" >&6; }
-@@ -22523,27 +21646,10 @@
+@@ -22550,27 +21673,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3710,7 +3703,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22579,17 +21685,10 @@
+@@ -22606,17 +21712,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3732,7 +3725,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22687,27 +21786,11 @@
+@@ -22714,27 +21813,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3765,7 +3758,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22716,7 +21799,7 @@
+@@ -22743,7 +21826,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -3774,7 +3767,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -22772,27 +21855,10 @@
+@@ -22799,27 +21882,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3806,7 +3799,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22828,17 +21894,10 @@
+@@ -22855,17 +21921,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3828,7 +3821,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22934,27 +21993,11 @@
+@@ -22961,27 +22020,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3861,7 +3854,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -22963,7 +22006,7 @@
+@@ -22990,7 +22033,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -3870,7 +3863,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23006,27 +22049,11 @@
+@@ -23033,27 +22076,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3903,7 +3896,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23035,7 +22062,7 @@
+@@ -23062,7 +22089,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -3912,7 +3905,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -23111,27 +22138,11 @@
+@@ -23138,27 +22165,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3945,7 +3938,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23140,7 +22151,7 @@
+@@ -23167,7 +22178,7 @@
eval "$as_ac_var=no"
fi
@@ -3954,7 +3947,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23205,27 +22216,11 @@
+@@ -23232,27 +22243,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3987,7 +3980,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23234,7 +22229,7 @@
+@@ -23261,7 +22256,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -3996,7 +3989,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23283,27 +22278,11 @@
+@@ -23310,27 +22305,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4029,7 +4022,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23312,7 +22291,7 @@
+@@ -23339,7 +22318,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -4038,7 +4031,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23361,27 +22340,11 @@
+@@ -23388,27 +22367,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4071,7 +4064,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23390,7 +22353,7 @@
+@@ -23417,7 +22380,7 @@
ac_cv_lib_intl_dgettext=no
fi
@@ -4080,7 +4073,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23452,27 +22415,11 @@
+@@ -23479,27 +22442,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4113,7 +4106,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23481,7 +22428,7 @@
+@@ -23508,7 +22455,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -4122,7 +4115,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23530,27 +22477,11 @@
+@@ -23557,27 +22504,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4155,7 +4148,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -23559,7 +22490,7 @@
+@@ -23586,7 +22517,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -4164,7 +4157,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -23654,27 +22585,11 @@
+@@ -23681,27 +22612,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4197,7 +4190,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23683,7 +22598,7 @@
+@@ -23710,7 +22625,7 @@
eval "$as_ac_var=no"
fi
@@ -4206,7 +4199,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23830,27 +22745,11 @@
+@@ -23857,27 +22772,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4239,7 +4232,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -23859,7 +22758,7 @@
+@@ -23886,7 +22785,7 @@
eval "$as_ac_var=no"
fi
@@ -4248,7 +4241,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -23920,7 +22819,7 @@
+@@ -23947,7 +22846,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4257,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
-@@ -24008,27 +22907,11 @@
+@@ -24035,27 +22934,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4290,7 +4283,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -24100,27 +22983,11 @@
+@@ -24127,27 +23010,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4323,7 +4316,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -24129,7 +22996,7 @@
+@@ -24156,7 +23023,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -4332,7 +4325,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -24150,7 +23017,7 @@
+@@ -24177,7 +23044,7 @@
esac
fi
@@ -4341,7 +4334,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -24458,27 +23325,10 @@
+@@ -24485,27 +23352,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4373,7 +4366,7 @@
{ echo "$as_me:$LINENO: result: none needed" >&5
echo "${ECHO_T}none needed" >&6; }
else
-@@ -24515,27 +23365,10 @@
+@@ -24542,27 +23392,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4405,7 +4398,7 @@
{ echo "$as_me:$LINENO: result: -posix" >&5
echo "${ECHO_T}-posix" >&6; }
else
-@@ -24609,7 +23442,7 @@
+@@ -24636,7 +23469,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4414,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
-@@ -24652,7 +23485,7 @@
+@@ -24679,7 +23512,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4423,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
-@@ -24921,27 +23754,11 @@
+@@ -24948,27 +23781,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4456,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"
-@@ -24959,7 +23776,7 @@
+@@ -24986,7 +23803,7 @@
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
@@ -4465,7 +4458,7 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -25063,27 +23880,11 @@
+@@ -25090,27 +23907,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4498,7 +4491,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25092,7 +23893,7 @@
+@@ -25119,7 +23920,7 @@
eval "$as_ac_var=no"
fi
@@ -4507,7 +4500,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25147,27 +23948,10 @@
+@@ -25174,27 +23975,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4539,7 +4532,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25203,17 +23987,10 @@
+@@ -25230,17 +24014,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4561,7 +4554,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25319,27 +24096,10 @@
+@@ -25346,27 +24123,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4593,7 +4586,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25375,17 +24135,10 @@
+@@ -25402,17 +24162,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4615,7 +4608,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25491,27 +24244,10 @@
+@@ -25518,27 +24271,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4647,7 +4640,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25547,17 +24283,10 @@
+@@ -25574,17 +24310,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4669,7 +4662,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25671,27 +24400,10 @@
+@@ -25690,27 +24419,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4698,10 +4691,32 @@
+ 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; }
- { echo "$as_me:$LINENO: checking for IE55 uuid.lib" >&5
-@@ -25770,27 +24482,10 @@
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -25746,17 +24458,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -25856,27 +24561,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4730,10 +4745,10 @@
+ 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; }
- { echo "$as_me:$LINENO: checking for wntab32x.lib" >&5
-@@ -25877,27 +24572,10 @@
+ gtk_ok=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -25941,27 +24629,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4765,7 +4780,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26052,10 +24730,10 @@
+@@ -26116,10 +24787,10 @@
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -4779,7 +4794,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -26064,11 +24742,11 @@
+@@ -26128,11 +24799,11 @@
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -4795,7 +4810,7 @@
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
-@@ -26095,7 +24773,7 @@
+@@ -26159,7 +24830,7 @@
const int foo = 10;
if (!foo) return 0;
}
@@ -4804,7 +4819,7 @@
#endif
;
-@@ -26115,27 +24793,10 @@
+@@ -26179,27 +24850,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4836,7 +4851,7 @@
ac_cv_c_const=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26193,27 +24854,10 @@
+@@ -26257,27 +24911,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4868,7 +4883,7 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -26272,27 +24916,10 @@
+@@ -26336,27 +24973,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4900,7 +4915,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26328,17 +24955,10 @@
+@@ -26392,17 +25012,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4922,7 +4937,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26469,27 +25089,11 @@
+@@ -26533,27 +25146,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4955,7 +4970,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26498,7 +25102,7 @@
+@@ -26562,7 +25159,7 @@
eval "$as_ac_var=no"
fi
@@ -4964,7 +4979,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26555,21 +25159,21 @@
+@@ -26619,21 +25216,21 @@
#include <fcntl.h>
#include <sys/mman.h>
@@ -4990,7 +5005,7 @@
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
-@@ -26766,27 +25370,11 @@
+@@ -26830,27 +25427,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5023,7 +5038,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26795,7 +25383,7 @@
+@@ -26859,7 +25440,7 @@
eval "$as_ac_var=no"
fi
@@ -5032,7 +5047,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26876,27 +25464,11 @@
+@@ -26940,27 +25521,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5065,7 +5080,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26905,7 +25477,7 @@
+@@ -26969,7 +25534,7 @@
eval "$as_ac_var=no"
fi
@@ -5074,7 +5089,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26989,27 +25561,10 @@
+@@ -27053,27 +25618,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5106,7 +5121,7 @@
gtk_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27078,17 +25633,10 @@
+@@ -27142,17 +25690,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5128,7 +5143,7 @@
gdk_wchar_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27131,17 +25679,10 @@
+@@ -27195,17 +25736,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5150,7 +5165,7 @@
gdk_wctype_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27226,27 +25767,11 @@
+@@ -27290,27 +25824,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5183,7 +5198,7 @@
ac_cv_func_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27255,7 +25780,7 @@
+@@ -27319,7 +25837,7 @@
ac_cv_func_iswalnum=no
fi
@@ -5192,7 +5207,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5
-@@ -27305,27 +25830,11 @@
+@@ -27369,27 +25887,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5225,7 +5240,7 @@
ac_cv_lib_w_iswalnum=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27334,7 +25843,7 @@
+@@ -27398,7 +25900,7 @@
ac_cv_lib_w_iswalnum=no
fi
@@ -5234,7 +5249,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27393,27 +25902,11 @@
+@@ -27457,27 +25959,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5267,7 +5282,7 @@
gdk_working_wctype=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27422,7 +25915,7 @@
+@@ -27486,7 +25972,7 @@
gdk_working_wctype=no
fi
@@ -5276,7 +5291,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$oLIBS"
-@@ -27461,17 +25954,10 @@
+@@ -27525,17 +26011,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5298,7 +5313,7 @@
gtk_uxtheme_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27532,27 +26018,10 @@
+@@ -27595,27 +26074,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5330,7 +5345,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27588,17 +26057,10 @@
+@@ -27651,17 +26113,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5352,7 +5367,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -27729,27 +26191,11 @@
+@@ -27792,27 +26247,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5385,7 +5400,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -27758,7 +26204,7 @@
+@@ -27821,7 +26260,7 @@
eval "$as_ac_var=no"
fi
@@ -5394,7 +5409,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -27905,27 +26351,11 @@
+@@ -27969,27 +26408,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5424,11 +5439,11 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
- ac_cv_lib_tiff_TIFFReadScanline=yes
- else
- echo "$as_me: failed program was:" >&5
-@@ -27934,7 +26364,7 @@
- ac_cv_lib_tiff_TIFFReadScanline=no
+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -27998,7 +26421,7 @@
+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -5436,7 +5451,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -27975,27 +26405,10 @@
+@@ -28039,27 +26462,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5468,7 +5483,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28031,17 +26444,10 @@
+@@ -28095,17 +26501,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5490,7 +5505,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28146,27 +26552,11 @@
+@@ -28210,27 +26609,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5523,7 +5538,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28175,7 +26565,7 @@
+@@ -28239,7 +26622,7 @@
ac_cv_lib_tiff_TIFFWriteScanline=no
fi
@@ -5532,7 +5547,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28216,27 +26606,10 @@
+@@ -28280,27 +26663,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5564,7 +5579,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28272,17 +26645,10 @@
+@@ -28336,17 +26702,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5586,7 +5601,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28387,27 +26753,11 @@
+@@ -28451,27 +26810,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5619,7 +5634,7 @@
ac_cv_lib_tiff34_TIFFFlushData=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28416,7 +26766,7 @@
+@@ -28480,7 +26823,7 @@
ac_cv_lib_tiff34_TIFFFlushData=no
fi
@@ -5628,7 +5643,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28457,27 +26807,10 @@
+@@ -28521,27 +26864,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5660,7 +5675,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28513,17 +26846,10 @@
+@@ -28577,17 +26903,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5682,7 +5697,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28651,27 +26977,11 @@
+@@ -28715,27 +27034,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5715,7 +5730,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28680,7 +26990,7 @@
+@@ -28744,7 +27047,7 @@
ac_cv_lib_jpeg_jpeg_destroy_decompress=no
fi
@@ -5724,7 +5739,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28721,17 +27031,10 @@
+@@ -28785,17 +27088,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5746,7 +5761,7 @@
jpeg_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28787,27 +27090,11 @@
+@@ -28851,27 +27147,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5779,7 +5794,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28816,7 +27103,7 @@
+@@ -28880,7 +27160,7 @@
ac_cv_lib_jpeg_jpeg_simple_progression=no
fi
@@ -5788,7 +5803,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28905,27 +27192,11 @@
+@@ -28969,27 +27249,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5821,7 +5836,7 @@
ac_cv_lib_png_png_read_info=yes
else
echo "$as_me: failed program was:" >&5
-@@ -28934,7 +27205,7 @@
+@@ -28998,7 +27262,7 @@
ac_cv_lib_png_png_read_info=no
fi
@@ -5830,7 +5845,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -28975,27 +27246,10 @@
+@@ -29039,27 +27303,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5862,7 +5877,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29031,17 +27285,10 @@
+@@ -29095,17 +27342,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5884,7 +5899,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29138,27 +27385,10 @@
+@@ -29202,27 +27442,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5916,7 +5931,7 @@
png_ok=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29309,27 +27539,10 @@
+@@ -29515,27 +27738,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5948,7 +5963,7 @@
ac_cv_header_sys_wait_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -29386,27 +27599,10 @@
+@@ -29592,27 +27798,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -5980,25 +5995,39 @@
ac_cv_type_signal=int
else
echo "$as_me: failed program was:" >&5
-@@ -29569,7 +27765,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- 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
-@@ -29610,7 +27806,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- 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
-@@ -29840,17 +28036,10 @@
+@@ -29715,27 +27904,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_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -29771,17 +27943,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6017,10 +6046,188 @@
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -29877,27 +28042,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_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -29933,17 +28081,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -30053,27 +28194,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_mlib_mlib_ImageSetStruct=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -30082,7 +28207,7 @@
+ ac_cv_lib_mlib_mlib_ImageSetStruct=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
+@@ -30147,27 +28272,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_mlib_mlib_VideoColorRGBint_to_BGRAint=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -30176,7 +28285,7 @@
+ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=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
+@@ -30313,7 +28422,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
# We can compile using X headers with no special include directory.
ac_x_includes=
else
-@@ -29873,7 +28062,7 @@
+@@ -30617,7 +28719,7 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -6029,7 +6236,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29902,27 +28091,11 @@
+@@ -30646,27 +28748,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6062,7 +6269,7 @@
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
-@@ -29935,7 +28108,7 @@
+@@ -30679,7 +28765,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
@@ -6071,7 +6278,7 @@
ac_x_libraries=$ac_dir
break 2
fi
-@@ -29943,7 +28116,7 @@
+@@ -30687,7 +28773,7 @@
done
fi
@@ -6080,7 +6287,7 @@
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -29998,12 +28171,12 @@
+@@ -30742,12 +28828,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 . . . .
@@ -6098,7 +6305,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -30031,44 +28204,20 @@
+@@ -30775,44 +28861,20 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6152,7 +6359,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -30096,48 +28245,30 @@
+@@ -30840,48 +28902,30 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6218,7 +6425,7 @@
fi
# Check for system-dependent libraries X programs must link with.
-@@ -30186,27 +28317,11 @@
+@@ -30930,27 +28974,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6251,7 +6458,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -30254,27 +28369,11 @@
+@@ -30998,27 +29026,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6284,7 +6491,7 @@
ac_cv_lib_dnet_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30283,7 +28382,7 @@
+@@ -31027,7 +29039,7 @@
ac_cv_lib_dnet_dnet_ntoa=no
fi
@@ -6293,7 +6500,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30336,27 +28435,11 @@
+@@ -31080,27 +29092,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6326,7 +6533,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30365,7 +28448,7 @@
+@@ -31109,7 +29105,7 @@
ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
@@ -6335,7 +6542,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30378,7 +28461,7 @@
+@@ -31122,7 +29118,7 @@
fi
fi
@@ -6344,7 +6551,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -30453,27 +28536,11 @@
+@@ -31197,27 +29193,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6377,7 +6584,7 @@
ac_cv_func_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30482,7 +28549,7 @@
+@@ -31226,7 +29206,7 @@
ac_cv_func_gethostbyname=no
fi
@@ -6386,7 +6593,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -30531,27 +28598,11 @@
+@@ -31275,27 +29255,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6419,7 +6626,7 @@
ac_cv_lib_nsl_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30560,7 +28611,7 @@
+@@ -31304,7 +29268,7 @@
ac_cv_lib_nsl_gethostbyname=no
fi
@@ -6428,7 +6635,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30613,27 +28664,11 @@
+@@ -31357,27 +29321,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6461,7 +6668,7 @@
ac_cv_lib_bsd_gethostbyname=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30642,7 +28677,7 @@
+@@ -31386,7 +29334,7 @@
ac_cv_lib_bsd_gethostbyname=no
fi
@@ -6470,7 +6677,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30725,27 +28760,11 @@
+@@ -31469,27 +29417,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6503,7 +6710,7 @@
ac_cv_func_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30754,7 +28773,7 @@
+@@ -31498,7 +29430,7 @@
ac_cv_func_connect=no
fi
@@ -6512,7 +6719,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -30803,27 +28822,11 @@
+@@ -31547,27 +29479,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6545,7 +6752,7 @@
ac_cv_lib_socket_connect=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30832,7 +28835,7 @@
+@@ -31576,7 +29492,7 @@
ac_cv_lib_socket_connect=no
fi
@@ -6554,7 +6761,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -30908,27 +28911,11 @@
+@@ -31652,27 +29568,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6587,7 +6794,7 @@
ac_cv_func_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -30937,7 +28924,7 @@
+@@ -31681,7 +29581,7 @@
ac_cv_func_remove=no
fi
@@ -6596,7 +6803,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -30986,27 +28973,11 @@
+@@ -31730,27 +29630,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6629,7 +6836,7 @@
ac_cv_lib_posix_remove=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31015,7 +28986,7 @@
+@@ -31759,7 +29643,7 @@
ac_cv_lib_posix_remove=no
fi
@@ -6638,7 +6845,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31091,27 +29062,11 @@
+@@ -31835,27 +29719,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -6671,7 +6878,7 @@
ac_cv_func_shmat=yes
else
echo "$as_me: failed program was:" >&5
-@@ -31120,7 +29075,7 @@
+@@ -31864,7 +29732,7 @@
ac_cv_func_shmat=no
fi
@@ -6680,17 +6887,94 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -31150,46 +29105,30 @@
- char shmat ();
- int
- main ()
--{
--return shmat ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -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
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -6716,13 +7000,6 @@
- (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;;
@@ -6742,11 +7019,485 @@
+ 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
-@@ -31198,7 +29137,7 @@
- ac_cv_lib_ipc_shmat=no
+ 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
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -6754,565 +7505,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -31262,27 +29201,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
-@@ -31291,7 +29214,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
-@@ -31394,27 +29317,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
-@@ -31423,7 +29330,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
-@@ -31499,27 +29406,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
-@@ -31528,7 +29419,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
-@@ -31604,27 +29495,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
-@@ -31633,7 +29508,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
-@@ -31679,27 +29554,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
-@@ -31735,27 +29593,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; }
-
-@@ -31849,27 +29690,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
-@@ -31878,7 +29703,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'}'`
-@@ -31962,27 +29787,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
-@@ -31991,7 +29800,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
-@@ -32092,27 +29901,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
-@@ -32121,7 +29914,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
-@@ -32203,27 +29996,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
-@@ -32232,7 +30009,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
-@@ -32312,27 +30089,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
-@@ -32341,7 +30102,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
-@@ -32375,27 +30136,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
-@@ -32491,27 +30235,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
-@@ -32520,7 +30248,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
-@@ -32571,27 +30299,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
-@@ -32600,7 +30312,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
-@@ -32654,27 +30366,10 @@
+@@ -33398,27 +31023,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7344,7 +7537,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32710,17 +30405,10 @@
+@@ -33454,17 +31062,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7366,7 +7559,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32818,27 +30506,10 @@
+@@ -33562,27 +31163,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7398,7 +7591,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32874,17 +30545,10 @@
+@@ -33618,17 +31202,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7420,7 +7613,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -32994,27 +30658,10 @@
+@@ -33738,27 +31315,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7452,7 +7645,7 @@
have_xshm=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33111,27 +30758,11 @@
+@@ -33855,27 +31415,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7485,7 +7678,7 @@
ac_cv_func_XineramaGetInfo=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33140,7 +30771,7 @@
+@@ -33884,7 +31428,7 @@
ac_cv_func_XineramaGetInfo=no
fi
@@ -7494,7 +7687,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5
-@@ -33174,27 +30805,10 @@
+@@ -33918,27 +31462,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7526,7 +7719,7 @@
ac_cv_header_X11_extensions_xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33285,27 +30899,11 @@
+@@ -34029,27 +31556,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7559,7 +7752,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33314,7 +30912,7 @@
+@@ -34058,7 +31569,7 @@
ac_cv_lib_Xinerama_XineramaQueryExtension=no
fi
@@ -7568,7 +7761,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -33349,27 +30947,10 @@
+@@ -34093,27 +31604,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7600,7 +7793,7 @@
ac_cv_header_X11_extensions_Xinerama_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33500,27 +31081,11 @@
+@@ -34245,27 +31739,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7633,7 +7826,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33529,7 +31094,7 @@
+@@ -34274,7 +31752,7 @@
ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
fi
@@ -7642,7 +7835,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -33564,27 +31129,10 @@
+@@ -34309,27 +31787,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7674,7 +7867,7 @@
ac_cv_header_X11_extensions_Xrandr_h=yes
else
echo "$as_me: failed program was:" >&5
-@@ -33957,27 +31505,11 @@
+@@ -34721,27 +32182,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7707,7 +7900,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -33992,7 +31524,7 @@
+@@ -34756,7 +32201,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -7716,7 +7909,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34088,27 +31620,11 @@
+@@ -34852,27 +32297,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7749,7 +7942,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -34123,7 +31639,7 @@
+@@ -34887,7 +32316,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -7758,7 +7951,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$gtk_save_LIBS"
fi
-@@ -34170,7 +31686,7 @@
+@@ -34943,7 +32372,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7767,7 +7960,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
-@@ -34262,27 +31778,10 @@
+@@ -35035,27 +32464,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7799,7 +7992,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34318,17 +31817,10 @@
+@@ -35091,17 +32503,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7821,7 +8014,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34431,27 +31923,10 @@
+@@ -35204,27 +32609,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7853,7 +8046,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34487,17 +31962,10 @@
+@@ -35260,17 +32648,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -7875,7 +8068,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -34637,7 +32105,7 @@
+@@ -35429,7 +32810,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7884,7 +8077,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
-@@ -34722,7 +32190,7 @@
+@@ -35514,7 +32895,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7893,7 +8086,7 @@
ac_cv_prog_DB2HTML="true"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -34782,7 +32250,7 @@
+@@ -35574,7 +32955,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7902,7 +8095,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
-@@ -34851,7 +32319,7 @@
+@@ -35643,7 +33024,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7911,7 +8104,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
-@@ -35052,6 +32520,13 @@
+@@ -35844,6 +33225,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7925,7 +8118,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
-@@ -35342,7 +32817,8 @@
+@@ -36239,7 +33627,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -7935,7 +8128,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -35351,10 +32827,13 @@
+@@ -36248,10 +33637,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -7952,7 +8145,7 @@
# PATH needs CR
-@@ -35578,19 +33057,28 @@
+@@ -36475,19 +33867,28 @@
as_mkdir_p=false
fi
@@ -7992,16 +8185,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'"
-@@ -35606,7 +33094,7 @@
+@@ -36503,7 +33904,7 @@
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.10.13, which was
+ This file was extended by gtk+ $as_me 2.11.2, 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
-@@ -35635,7 +33123,7 @@
+@@ -36532,7 +33933,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -8010,16 +8203,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
-@@ -35659,7 +33147,7 @@
+@@ -36556,7 +33957,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- gtk+ config.status 2.10.13
+ gtk+ config.status 2.11.2
-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.
-@@ -36029,9 +33517,9 @@
+@@ -36927,9 +34328,9 @@
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
@@ -8031,7 +8224,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -36073,6 +33561,8 @@
+@@ -36971,6 +34372,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -8040,37 +8233,100 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
-@@ -36168,8 +33658,6 @@
- CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim
- GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim
- GTK_UPDATE_ICON_CACHE!$GTK_UPDATE_ICON_CACHE$ac_delim
--REBUILD_PNGS!$REBUILD_PNGS$ac_delim
--GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim
+@@ -37066,8 +34469,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
+-INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim
+-INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -36211,6 +33699,8 @@
+@@ -37109,6 +34510,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+REBUILD_PNGS!$REBUILD_PNGS$ac_delim
-+GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim
- GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim
- GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim
- GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim
-@@ -36278,7 +33768,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
++INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim
++INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim
+ 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 +34607,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
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
+- 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
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/contrib/Makefile.in gtk+2.0-2.10.13/contrib/Makefile.in
---- gtk+2.0-2.10.13.orig/contrib/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/contrib/Makefile.in 2007-06-13 10:00:13.000000000 +0200
-@@ -90,6 +90,8 @@
+@@ -37243,6 +34645,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 +34932,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"; } &&
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/contrib/Makefile.in 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 11:49:11.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@
@@ -8079,141 +8335,9 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.10.13/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.10.13.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/contrib/gdk-pixbuf-xlib/Makefile.in 2007-06-13 10:00:13.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.10.13.orig/demos/Makefile.in gtk+2.0-2.10.13/demos/Makefile.in
---- gtk+2.0-2.10.13.orig/demos/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/demos/Makefile.in 2007-06-13 10:00:13.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.10.13.orig/demos/gtk-demo/Makefile.in gtk+2.0-2.10.13/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.10.13.orig/demos/gtk-demo/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/demos/gtk-demo/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/Makefile.in gtk+2.0-2.10.13/docs/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/faq/Makefile.in gtk+2.0-2.10.13/docs/faq/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/faq/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/faq/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/reference/Makefile.in gtk+2.0-2.10.13/docs/reference/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/reference/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/reference/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/reference/gdk/Makefile.in gtk+2.0-2.10.13/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/reference/gdk/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/reference/gdk/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.10.13/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/reference/gdk-pixbuf/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/reference/gdk-pixbuf/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/reference/gtk/Makefile.in gtk+2.0-2.10.13/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/reference/gtk/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/reference/gtk/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/tools/Makefile.in gtk+2.0-2.10.13/docs/tools/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/tools/Makefile.in 2007-06-13 05:12:22.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/tools/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/docs/tutorial/Makefile.in gtk+2.0-2.10.13/docs/tutorial/Makefile.in
---- gtk+2.0-2.10.13.orig/docs/tutorial/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/docs/tutorial/Makefile.in 2007-06-13 10:00:14.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.10.13.orig/gdk/Makefile.in gtk+2.0-2.10.13/gdk/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk/Makefile.in 2007-06-13 10:00:15.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/contrib/gdk-pixbuf-xlib/Makefile.in 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 11:49:11.000000000 +0200
@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8223,10 +8347,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/directfb/Makefile.in gtk+2.0-2.10.13/gdk/directfb/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk/directfb/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk/directfb/Makefile.in 2007-06-13 10:00:15.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/demos/Makefile.in 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 11:49:11.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@
@@ -8235,57 +8359,9 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk/linux-fb/Makefile.in gtk+2.0-2.10.13/gdk/linux-fb/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk/linux-fb/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk/linux-fb/Makefile.in 2007-06-13 10:00: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@
-+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.10.13.orig/gdk/quartz/Makefile.in gtk+2.0-2.10.13/gdk/quartz/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk/quartz/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk/quartz/Makefile.in 2007-06-13 10:00:15.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.10.13.orig/gdk/win32/Makefile.in gtk+2.0-2.10.13/gdk/win32/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk/win32/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk/win32/Makefile.in 2007-06-13 10:00:15.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.10.13.orig/gdk/win32/rc/Makefile.in gtk+2.0-2.10.13/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk/win32/rc/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk/win32/rc/Makefile.in 2007-06-13 10:00:15.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.10.13.orig/gdk/x11/Makefile.in gtk+2.0-2.10.13/gdk/x11/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk/x11/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk/x11/Makefile.in 2007-06-13 10:00:15.000000000 +0200
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/demos/gtk-demo/Makefile.in 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 11:49:11.000000000 +0200
@@ -91,6 +91,8 @@
ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@
@@ -8295,10 +8371,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk-pixbuf/Makefile.in gtk+2.0-2.10.13/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk-pixbuf/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk-pixbuf/Makefile.in 2007-06-13 10:00:14.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/Makefile.in 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 11:49:11.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@
@@ -8307,10 +8383,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.10.13/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.10.13.orig/gdk-pixbuf/pixops/Makefile.in 2007-06-13 05:12:23.000000000 +0200
-+++ gtk+2.0-2.10.13/gdk-pixbuf/pixops/Makefile.in 2007-06-13 10:00:15.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/faq/Makefile.in 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 11:49:11.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@
@@ -8319,10 +8395,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gtk/Makefile.in gtk+2.0-2.10.13/gtk/Makefile.in
---- gtk+2.0-2.10.13.orig/gtk/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/gtk/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -110,6 +110,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/reference/Makefile.in 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 11:49:11.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@
@@ -8331,7 +8407,187 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -342,6 +344,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/reference/gdk/Makefile.in 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 11:49:12.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/reference/gdk-pixbuf/Makefile.in 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 11:49:11.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/reference/gtk/Makefile.in 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 11:49:12.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/tools/Makefile.in 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 11:49:12.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/docs/tutorial/Makefile.in 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 11:49:12.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk/Makefile.in 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 11:49:12.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk/directfb/Makefile.in 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 11:49:13.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk/linux-fb/Makefile.in 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 11:49:13.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk/quartz/Makefile.in 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 11:49:13.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk/win32/Makefile.in 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 11:49:13.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk/win32/rc/Makefile.in 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 11:49:13.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk/x11/Makefile.in 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 11:49:13.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk-pixbuf/Makefile.in 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 11:49:12.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gdk-pixbuf/pixops/Makefile.in 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 11:49:12.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@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gtk/Makefile.in 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 11:49:13.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 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@@ -8340,7 +8596,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -591,7 +595,10 @@
+@@ -627,7 +631,10 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -8352,7 +8608,7 @@
# GTK+ header files that don't get installed
-@@ -601,10 +608,7 @@
+@@ -642,10 +649,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -8363,10 +8619,10 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gtk/theme-bits/Makefile.in gtk+2.0-2.10.13/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.10.13.orig/gtk/theme-bits/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/gtk/theme-bits/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gtk/theme-bits/Makefile.in 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 11:49:14.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@
@@ -8375,10 +8631,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/gtk/xdgmime/Makefile.in gtk+2.0-2.10.13/gtk/xdgmime/Makefile.in
---- gtk+2.0-2.10.13.orig/gtk/xdgmime/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/gtk/xdgmime/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/gtk/xdgmime/Makefile.in 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 11:49:14.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@
@@ -8387,9 +8643,9 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/ltmain.sh gtk+2.0-2.10.13/ltmain.sh
---- gtk+2.0-2.10.13.orig/ltmain.sh 2007-01-14 05:15:09.000000000 +0100
-+++ gtk+2.0-2.10.13/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/ltmain.sh 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 2006-03-11 19:49:04.000000000 +0100
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -8423,10 +8679,10 @@
esac
;;
no)
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/m4macros/Makefile.in gtk+2.0-2.10.13/m4macros/Makefile.in
---- gtk+2.0-2.10.13.orig/m4macros/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/m4macros/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/m4macros/Makefile.in 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 11:49:14.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@
@@ -8435,10 +8691,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/Makefile.in gtk+2.0-2.10.13/modules/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/Makefile.in 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 11:49:14.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@
@@ -8447,10 +8703,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/Makefile.in gtk+2.0-2.10.13/modules/engines/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/engines/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/engines/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/engines/Makefile.in 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 11:49:14.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@
@@ -8459,10 +8715,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Makefile.in gtk+2.0-2.10.13/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/engines/ms-windows/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/engines/ms-windows/Makefile.in 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 11:49:14.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@
@@ -8471,10 +8727,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/Makefile.in 2007-06-13 05:12:24.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/engines/ms-windows/Theme/Makefile.in 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 11:49:14.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@
@@ -8483,10 +8739,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2007-06-13 10:00:16.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 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 11:49:14.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@
@@ -8495,10 +8751,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/engines/pixbuf/Makefile.in gtk+2.0-2.10.13/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/engines/pixbuf/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/engines/pixbuf/Makefile.in 2007-06-13 10:00:17.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/engines/pixbuf/Makefile.in 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 11:49:14.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@
@@ -8507,10 +8763,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/input/Makefile.in gtk+2.0-2.10.13/modules/input/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/input/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/input/Makefile.in 2007-06-13 10:00:17.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/input/Makefile.in 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 11:49:15.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@
@@ -8519,10 +8775,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-@@ -384,9 +386,10 @@
-
- im_ime_la_LIBADD = -limm32 $(LDADDS)
- @USE_WIN32_TRUE at IM_IME_MODULE = im-ime.la
+@@ -428,9 +430,10 @@
+
+ imconffiledir = $(sysconfdir)/gtk-2.0
+ dist_imconffile_DATA = im-multipress.conf
+ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
@CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
@@ -8531,7 +8787,7 @@
module_LTLIBRARIES = \
$(IM_XIM_MODULE) \
-@@ -838,7 +841,18 @@
+@@ -983,7 +986,18 @@
rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -8551,10 +8807,10 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/Makefile.in gtk+2.0-2.10.13/modules/printbackends/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/printbackends/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/printbackends/Makefile.in 2007-06-13 10:00:17.000000000 +0200
-@@ -90,6 +90,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/printbackends/Makefile.in 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 11:49:15.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@
@@ -8563,10 +8819,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/cups/Makefile.in gtk+2.0-2.10.13/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/printbackends/cups/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/printbackends/cups/Makefile.in 2007-06-13 10:00:17.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/printbackends/cups/Makefile.in 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 11:49:15.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@
@@ -8575,10 +8831,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/file/Makefile.in gtk+2.0-2.10.13/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/printbackends/file/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/printbackends/file/Makefile.in 2007-06-13 10:00:17.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/printbackends/file/Makefile.in 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 11:49:15.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@
@@ -8587,10 +8843,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/modules/printbackends/lpr/Makefile.in gtk+2.0-2.10.13/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.10.13.orig/modules/printbackends/lpr/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/modules/printbackends/lpr/Makefile.in 2007-06-13 10:00:17.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/printbackends/lpr/Makefile.in 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 11:49:15.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@
@@ -8599,10 +8855,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/perf/Makefile.in gtk+2.0-2.10.13/perf/Makefile.in
---- gtk+2.0-2.10.13.orig/perf/Makefile.in 2007-06-13 05:12:25.000000000 +0200
-+++ gtk+2.0-2.10.13/perf/Makefile.in 2007-06-13 10:00:17.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/modules/printbackends/test/Makefile.in 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 11:49:15.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@
@@ -8611,10 +8867,10 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.10.13.orig/tests/Makefile.in gtk+2.0-2.10.13/tests/Makefile.in
---- gtk+2.0-2.10.13.orig/tests/Makefile.in 2007-06-13 05:12:26.000000000 +0200
-+++ gtk+2.0-2.10.13/tests/Makefile.in 2007-06-13 10:00:18.000000000 +0200
-@@ -89,6 +89,8 @@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/perf/Makefile.in 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 11:49:15.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@
@@ -8623,3 +8879,15 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+diff -urN -urN -x config.guess -x config.sub gtk+2.0-2.11.2.orig/tests/Makefile.in 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 11:49:16.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@
Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series Wed Jun 13 12:05:15 2007
@@ -9,8 +9,7 @@
020_immodules-files-d.patch
021_loader-files-d.patch
030_gtkentry_password-char-circle.patch
-031_cursor-blinking-timeout.patch
033_treeview_resizing.patch
-040_filechooser_single-click.patch
+#040_filechooser_single-click.patch
041_ia32-libs.patch
070_mandatory-relibtoolize.patch
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11502&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Wed Jun 13 12:05:15 2007
@@ -3,6 +3,8 @@
# Debian GNOME Maintainers
DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+# prevent accidental uploads to unstable
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
# get-orig-source target
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -40,7 +42,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.10.12-3
+SHVER := 2.11.2
# 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