r24930 - in /desktop/experimental/gtk+3.0/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Jul 30 17:16:56 UTC 2010
Author: slomo
Date: Fri Jul 30 17:16:49 2010
New Revision: 24930
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24930
Log:
* refresh and update patches
Removed:
desktop/experimental/gtk+3.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
desktop/experimental/gtk+3.0/debian/patches/011_immodule-cache-dir.patch
Modified:
desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postinst.in
desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in
desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch
desktop/experimental/gtk+3.0/debian/patches/002_static-linking-dont-build-perf.patch
desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch
desktop/experimental/gtk+3.0/debian/patches/005_support_disabling_x11_extensions.patch
desktop/experimental/gtk+3.0/debian/patches/009_gtk-export-filechooser.patch
desktop/experimental/gtk+3.0/debian/patches/041_ia32-libs.patch
desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch
desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch
desktop/experimental/gtk+3.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch
desktop/experimental/gtk+3.0/debian/patches/series
Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-0.postinst.in?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postinst.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postinst.in [utf-8] Fri Jul 30 17:16:49 2010
@@ -10,7 +10,7 @@
/@MODULES_BASE_PATH@/immodules)
# This is triggered everytime an application installs a
# GTK immodule loader
- /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true
+ /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
;;
esac
done
@@ -21,6 +21,6 @@
# Also handle the initial installation
if [ -d /@MODULES_BASE_PATH@/immodules ]; then
- /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true
+ /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-3.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/immodules.cache || true
fi
Modified: desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk3.0-0.postrm.in?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk3.0-0.postrm.in [utf-8] Fri Jul 30 17:16:49 2010
@@ -12,6 +12,6 @@
if [ -d /@MODULES_BASE_PATH@/immodules ]; then
# Purge the cache
- rm -f /@MODULES_BASE_PATH@/gtk.immodules
+ rm -f /@MODULES_BASE_PATH@/immodules.cache
rmdir -p --ignore-fail-on-non-empty /@MODULES_BASE_PATH@
fi
Modified: desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -2,22 +2,23 @@
when --disable-shared was given
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
-Index: gtk+2.0-2.21.5/configure.in
+Index: gtk+3.0-2.90.5/configure.ac
===================================================================
---- gtk+2.0-2.21.5.orig/configure.in 2010-07-12 18:23:54.000000000 +0200
-+++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:53:08.402066616 +0200
-@@ -150,6 +150,7 @@
- dnl Initialize libtool
- AC_PROG_CC
- AM_DISABLE_STATIC
+--- gtk+3.0-2.90.5.orig/configure.ac 2010-07-10 03:00:32.000000000 +0200
++++ gtk+3.0-2.90.5/configure.ac 2010-07-30 12:46:09.735086524 +0200
+@@ -188,6 +188,8 @@
+ # Create libtool early, because it's used in configure
+ LT_OUTPUT
+
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
++
+ # Make sure we use 64-bit versions of various file stuff.
+ AC_SYS_LARGEFILE
- dnl
- dnl Check for a working C++ compiler, but do not bail out, if none is found.
-Index: gtk+2.0-2.21.5/modules/input/Makefile.am
+Index: gtk+3.0-2.90.5/modules/input/Makefile.am
===================================================================
---- gtk+2.0-2.21.5.orig/modules/input/Makefile.am 2010-07-12 18:23:45.000000000 +0200
-+++ gtk+2.0-2.21.5/modules/input/Makefile.am 2010-07-22 17:53:08.406083537 +0200
+--- gtk+3.0-2.90.5.orig/modules/input/Makefile.am 2010-06-30 13:37:21.000000000 +0200
++++ gtk+3.0-2.90.5/modules/input/Makefile.am 2010-07-30 12:45:30.532083145 +0200
@@ -176,8 +176,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false
@@ -31,23 +32,3 @@
# Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it.
-@@ -238,7 +242,18 @@
- included-modules: $(noinst_LTLIBRARIES)
-
- gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
-+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
-+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
-+ else \
-+ echo "***" ; \
-+ echo "*** Warning: gtk.immodules not built" ; \
-+ echo "***" ; \
-+ echo "*** Generate this file manually on host" ; \
-+ echo "*** system using gtk-query-immodules-2.0" ; \
-+ echo "***" ; \
-+ touch gtk.immodules; \
-+ fi
-
- CLEANFILES = gtk.immodules
-
Modified: desktop/experimental/gtk+3.0/debian/patches/002_static-linking-dont-build-perf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/002_static-linking-dont-build-perf.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,10 +1,10 @@
Description: don't build perf measurement tools in static builds
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559
-Index: gtk+2.0-2.21.5/Makefile.am
+Index: gtk+3.0-2.90.5/Makefile.am
===================================================================
---- gtk+2.0-2.21.5.orig/Makefile.am 2010-07-12 18:23:43.000000000 +0200
-+++ gtk+2.0-2.21.5/Makefile.am 2010-07-22 17:54:31.193051851 +0200
+--- gtk+3.0-2.90.5.orig/Makefile.am 2010-06-30 13:37:16.000000000 +0200
++++ gtk+3.0-2.90.5/Makefile.am 2010-07-30 18:57:46.184082799 +0200
@@ -1,7 +1,12 @@
## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl
@@ -18,4 +18,4 @@
+SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- # require automake 1.4
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
Modified: desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/003_gdk.pc_privates.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.21.5/configure.in
+Index: gtk+3.0-2.90.5/configure.ac
===================================================================
---- gtk+2.0-2.21.5.orig/configure.in 2010-07-22 17:53:08.402066616 +0200
-+++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:54:32.685052226 +0200
-@@ -1310,23 +1310,27 @@
+--- gtk+3.0-2.90.5.orig/configure.ac 2010-07-30 12:46:09.000000000 +0200
++++ gtk+3.0-2.90.5/configure.ac 2010-07-30 18:58:23.812082593 +0200
+@@ -1302,23 +1302,27 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
@@ -35,14 +35,14 @@
AC_SUBST(GDK_EXTRA_LIBS)
AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+2.0-2.21.5/gdk-2.0.pc.in
+Index: gtk+3.0-2.90.5/gdk-3.0.pc.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk-2.0.pc.in 2010-07-12 18:23:43.000000000 +0200
-+++ gtk+2.0-2.21.5/gdk-2.0.pc.in 2010-07-22 17:54:32.685052226 +0200
+--- gtk+3.0-2.90.5.orig/gdk-3.0.pc.in 2010-07-30 18:58:42.904083678 +0200
++++ gtk+3.0-2.90.5/gdk-3.0.pc.in 2010-07-30 18:59:03.548085289 +0200
@@ -8,5 +8,6 @@
Description: GTK+ Drawing Kit (${target} target)
Version: @VERSION@
Requires: @GDK_PACKAGES@
+Requires.private: @GDK_PRIVATE_PACKAGES@
Libs: -L${libdir} -lgdk-${target}- at GTK_API_VERSION@ @GDK_EXTRA_LIBS@
- Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@
+ Cflags: -I${includedir}/gtk- at GTK_API_VERSION@ -I${libdir}/gtk- at GTK_API_VERSION@/include @GDK_EXTRA_CFLAGS@ -DGSEAL_ENABLE
Modified: desktop/experimental/gtk+3.0/debian/patches/005_support_disabling_x11_extensions.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/005_support_disabling_x11_extensions.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -3,10 +3,10 @@
Support disabling X11 extensions
-Index: gtk+2.0-2.21.5/configure.in
+Index: gtk+3.0-2.90.5/configure.ac
===================================================================
---- gtk+2.0-2.21.5.orig/configure.in 2010-07-22 17:54:32.685052226 +0200
-+++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:54:36.285051810 +0200
+--- gtk+3.0-2.90.5.orig/configure.ac 2010-07-30 18:58:23.000000000 +0200
++++ gtk+3.0-2.90.5/configure.ac 2010-07-30 19:02:06.696082790 +0200
@@ -241,6 +241,18 @@
[AC_HELP_STRING([--enable-xinerama],
[support xinerama extension if available [default=yes]])],,
@@ -26,8 +26,8 @@
AC_ARG_ENABLE(rebuilds,
[AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
-@@ -1187,7 +1199,8 @@
- AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
+@@ -1178,7 +1190,8 @@
+ AM_CONDITIONAL(XINPUT_2, test "x$have_xinput2" = "xyes")
# Check for the RANDR extension
- if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
@@ -36,17 +36,17 @@
AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
X_PACKAGES="$X_PACKAGES xrandr"
-@@ -1203,7 +1216,8 @@
+@@ -1194,7 +1207,8 @@
# Checks for XFixes extension
-
+
- if $PKG_CONFIG --exists xfixes ; then
+ if test x"$enable_xfixes" != xno && \
+ $PKG_CONFIG --exists xfixes ; then
AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
-
+
X_PACKAGES="$X_PACKAGES xfixes"
-@@ -1212,7 +1226,8 @@
+@@ -1203,7 +1217,8 @@
# Checks for Xcomposite extension
@@ -56,7 +56,7 @@
AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -1221,7 +1236,7 @@
+@@ -1212,7 +1227,7 @@
# Checks for Xdamage extension
Modified: desktop/experimental/gtk+3.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/009_gtk-export-filechooser.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -34,10 +34,10 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: gtk+2.0-2.21.5/gtk/Makefile.am
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/Makefile.am 2010-07-12 18:23:44.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/Makefile.am 2010-07-22 17:54:37.921095291 +0200
+Index: gtk+3.0-2.90.5/gtk/Makefile.am
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/Makefile.am 2010-07-10 03:01:27.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/Makefile.am 2010-07-30 19:02:24.463083637 +0200
@@ -49,6 +49,8 @@
-I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
@@ -47,7 +47,7 @@
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -356,12 +358,16 @@
+@@ -349,12 +351,16 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -67,7 +67,7 @@
gtksearchenginesimple.h \
gtkdndcursors.h \
gtkentryprivate.h \
-@@ -370,11 +376,7 @@
+@@ -363,11 +369,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -79,11 +79,11 @@
gtkiconcache.h \
gtkintl.h \
gtkkeyhash.h \
-Index: gtk+2.0-2.21.5/gtk/gtk.symbols
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtk.symbols 2010-07-12 18:57:41.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtk.symbols 2010-07-22 17:54:37.941054321 +0200
-@@ -1639,6 +1639,12 @@
+Index: gtk+3.0-2.90.5/gtk/gtk.symbols
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/gtk.symbols 2010-07-12 16:05:33.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtk.symbols 2010-07-30 19:02:24.479083436 +0200
+@@ -1348,6 +1348,12 @@
#endif
#endif
@@ -96,10 +96,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.21.5/gtk/gtkfilechooserprivate.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserprivate.h 2010-06-16 17:27:01.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilechooserprivate.h 2010-07-22 17:54:37.941054321 +0200
+Index: gtk+3.0-2.90.5/gtk/gtkfilechooserprivate.h
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/gtkfilechooserprivate.h 2010-06-16 17:27:01.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtkfilechooserprivate.h 2010-07-30 19:02:24.499082975 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@@ -115,11 +115,11 @@
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
-Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.c 2010-07-12 18:23:44.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c 2010-07-22 17:54:37.949054430 +0200
-@@ -122,6 +122,22 @@
+Index: gtk+3.0-2.90.5/gtk/gtkfilechooserutils.c
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/gtkfilechooserutils.c 2010-07-10 03:00:19.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtkfilechooserutils.c 2010-07-30 19:02:24.507083642 +0200
+@@ -119,6 +119,22 @@
"create-folders");
}
@@ -142,17 +142,17 @@
/**
* _gtk_file_chooser_delegate_iface_init:
* @iface: a #GtkFileChoserIface structure
-@@ -363,3 +379,6 @@
+@@ -360,3 +376,6 @@
g_signal_emit_by_name (data, "confirm-overwrite", &conf);
return conf;
}
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
-Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.h 2010-07-12 18:23:44.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h 2010-07-22 17:54:37.961058330 +0200
+Index: gtk+3.0-2.90.5/gtk/gtkfilechooserutils.h
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/gtkfilechooserutils.h 2010-06-30 13:37:19.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtkfilechooserutils.h 2010-07-30 19:02:24.515083192 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@@ -168,7 +168,7 @@
#include "gtkfilechooserprivate.h"
G_BEGIN_DECLS
-@@ -46,6 +54,9 @@
+@@ -45,6 +53,9 @@
} GtkFileChooserProp;
void _gtk_file_chooser_install_properties (GObjectClass *klass);
@@ -178,10 +178,10 @@
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
-Index: gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkfilesystemmodel.h 2010-06-16 17:27:02.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h 2010-07-22 17:54:37.961058330 +0200
+Index: gtk+3.0-2.90.5/gtk/gtkfilesystemmodel.h
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/gtkfilesystemmodel.h 2010-06-16 17:27:02.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtkfilesystemmodel.h 2010-07-30 19:02:24.527082900 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@@ -193,10 +193,10 @@
#include <gio/gio.h>
#include <gtk/gtkfilefilter.h>
#include <gtk/gtktreemodel.h>
-Index: gtk+2.0-2.21.5/gtk/gtkquery.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkquery.h 2009-04-02 15:54:56.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkquery.h 2010-07-22 17:54:37.977054916 +0200
+Index: gtk+3.0-2.90.5/gtk/gtkquery.h
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/gtkquery.h 2009-04-02 15:54:56.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtkquery.h 2010-07-30 19:02:24.543084235 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__
@@ -212,10 +212,10 @@
#include <glib-object.h>
G_BEGIN_DECLS
-Index: gtk+2.0-2.21.5/gtk/gtksearchengine.h
-===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtksearchengine.h 2010-04-09 04:29:58.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtksearchengine.h 2010-07-22 17:54:37.977054916 +0200
+Index: gtk+3.0-2.90.5/gtk/gtksearchengine.h
+===================================================================
+--- gtk+3.0-2.90.5.orig/gtk/gtksearchengine.h 2010-04-09 04:29:58.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtksearchengine.h 2010-07-30 19:02:24.555085689 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__
Modified: desktop/experimental/gtk+3.0/debian/patches/041_ia32-libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/041_ia32-libs.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/041_ia32-libs.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/041_ia32-libs.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,69 +1,63 @@
-Index: gtk+2.0-2.21.5/gtk/gtkrc.c
+Index: gtk+3.0-2.90.5/gtk/gtkrc.c
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtkrc.c 2010-07-22 17:55:14.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtkrc.c 2010-07-22 17:57:19.657052790 +0200
-@@ -450,7 +450,20 @@
+--- gtk+3.0-2.90.5.orig/gtk/gtkrc.c 2010-07-10 03:00:19.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtkrc.c 2010-07-30 19:12:34.775081660 +0200
+@@ -450,6 +450,17 @@
if (im_module_file)
- result = g_strdup (im_module_file);
+ result = g_strdup (im_module_file);
else
-- result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL);
-+ {
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+# if defined (__i386__)
-+ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules.32", NULL);
++ result = gtk_rc_make_default_dir ("immodules.cache.32");
+# else
-+ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules.64", NULL);
++ result = gtk_rc_make_default_dir ("immodules.cache.64");
+# endif
-+ /* Prefer compat gtk.immodules file if it's usable. */
-+ if (g_file_test(result, G_FILE_TEST_EXISTS))
-+ return result;
-+ g_free (result);
++ /* Prefer compat immodules.cache file if it's usable. */
++ if (g_file_test(result, G_FILE_TEST_EXISTS))
++ return result;
++ g_free (result);
+#endif
-+ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, "gtk.immodules", NULL);
-+ }
+ result = gtk_rc_make_default_dir ("immodules.cache");
}
- return result;
-@@ -522,7 +535,21 @@
+@@ -522,7 +533,21 @@
else
{
const gchar *home;
-- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+# if defined (__i386__)
-+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.32", NULL);
++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc.32", NULL);
+# else
-+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc.64", NULL);
++ str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc.64", NULL);
+# endif
+ /* Prefer compat gtkrc if it's usable. */
+ if (!g_file_test(str, G_FILE_TEST_EXISTS))
+ {
+ g_free (str), /* continue in next line */
+#endif
-+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+ }
+#endif
gtk_rc_add_default_file (str);
g_free (str);
-@@ -530,7 +557,21 @@
+@@ -530,7 +555,21 @@
home = g_get_home_dir ();
if (home)
{
-- str = g_build_filename (home, ".gtkrc-2.0", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+# if defined (__i386__)
-+ str = g_build_filename (home, ".gtkrc-2.0.32", NULL);
++ str = g_build_filename (home, ".gtkrc-3.0.32", NULL);
+# else
-+ str = g_build_filename (home, ".gtkrc-2.0.64", NULL);
++ str = g_build_filename (home, ".gtkrc-3.0.64", NULL);
+# endif
-+ /* Prefer compat .gtkrc-2.0 if it's usable. */
++ /* Prefer compat .gtkrc-3.0 if it's usable. */
+ if (!g_file_test(str, G_FILE_TEST_EXISTS))
+ {
+ g_free (str), /* continue in next line */
+#endif
-+ str = g_build_filename (home, ".gtkrc-2.0", NULL);
+ str = g_build_filename (home, ".gtkrc-3.0", NULL);
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+ }
+#endif
Modified: desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/042_treeview_single-focus.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.21.5/gtk/gtktreeview.c
+Index: gtk+3.0-2.90.5/gtk/gtktreeview.c
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/gtktreeview.c 2010-07-12 18:32:54.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/gtktreeview.c 2010-07-22 17:57:20.833053801 +0200
-@@ -9591,7 +9591,8 @@
+--- gtk+3.0-2.90.5.orig/gtk/gtktreeview.c 2010-07-10 03:00:19.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/gtktreeview.c 2010-07-30 19:12:47.187084280 +0200
+@@ -9588,7 +9588,8 @@
if (cursor_path)
{
Modified: desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/060_ignore-random-icons.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.5/gtk/updateiconcache.c
+Index: gtk+3.0-2.90.5/gtk/updateiconcache.c
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/updateiconcache.c 2010-05-08 06:39:07.000000000 +0200
-+++ gtk+2.0-2.21.5/gtk/updateiconcache.c 2010-07-22 17:57:21.973055310 +0200
+--- gtk+3.0-2.90.5.orig/gtk/updateiconcache.c 2010-05-08 06:39:07.000000000 +0200
++++ gtk+3.0-2.90.5/gtk/updateiconcache.c 2010-07-30 19:12:50.495114783 +0200
@@ -660,7 +660,7 @@
directories = g_list_append (directories, g_strdup (subdir));
}
Modified: desktop/experimental/gtk+3.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/061_use_pdf_as_default_printing_standard.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/061_use_pdf_as_default_printing_standard.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/061_use_pdf_as_default_printing_standard.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,7 +1,7 @@
-Index: gtk+2.0-2.21.5/modules/printbackends/cups/gtkprintbackendcups.c
+Index: gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/cups/gtkprintbackendcups.c 2010-06-28 01:19:39.000000000 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/cups/gtkprintbackendcups.c 2010-07-22 17:57:22.973051749 +0200
+--- gtk+3.0-2.90.5.orig/modules/printbackends/cups/gtkprintbackendcups.c 2010-06-28 01:19:39.000000000 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/cups/gtkprintbackendcups.c 2010-07-30 19:12:53.163085281 +0200
@@ -344,8 +344,9 @@
/* TODO: check if it is a ps or pdf printer */
@@ -21,10 +21,10 @@
cairo_surface_set_fallback_resolution (surface,
2.0 * gtk_print_settings_get_printer_lpi (settings),
-Index: gtk+2.0-2.21.5/modules/printbackends/lpr/gtkprintbackendlpr.c
+Index: gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-06-16 17:27:06.000000000 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-07-22 17:57:23.001065368 +0200
+--- gtk+3.0-2.90.5.orig/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-06-16 17:27:06.000000000 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-07-30 19:12:53.171184913 +0200
@@ -31,6 +31,8 @@
#include <cairo.h>
#include <cairo-ps.h>
Modified: desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/070_mandatory-relibtoolize.patch?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,7 +1,73 @@
-Index: gtk+2.0-2.21.5/aclocal.m4
+Index: gtk+3.0-2.90.5/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/aclocal.m4 2010-07-22 17:59:09.889062200 +0200
-+++ gtk+2.0-2.21.5/aclocal.m4 2010-07-22 17:58:41.518052047 +0200
+--- gtk+3.0-2.90.5.orig/Makefile.in 2010-07-30 19:15:12.428085888 +0200
++++ gtk+3.0-2.90.5/Makefile.in 2010-07-30 19:14:39.839083232 +0200
+@@ -45,17 +45,20 @@
+ $(srcdir)/gtk+-unix-print-3.0.pc.in $(srcdir)/gtk-zip.sh.in \
+ $(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+- install-sh ltmain.sh missing
++ install-sh ltmain.sh missing mkinstalldirs
+ @OS_UNIX_TRUE at am__append_1 = gtk+-unix-print-3.0.pc
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-3.0.pc gtk+-3.0.pc \
+ gtk+-unix-print-3.0.pc gail-3.0.pc gdk-3.0-uninstalled.pc \
+@@ -106,7 +109,8 @@
+ distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = po po-properties gdk gtk modules demos tests perf docs \
++ m4macros build
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -204,6 +208,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -355,6 +360,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+@@ -450,7 +456,10 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++
++# don't build perf measurement tools in static builds
++ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
++SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ MAINTAINERCLEANFILES = \
+Index: gtk+3.0-2.90.5/aclocal.m4
+===================================================================
+--- gtk+3.0-2.90.5.orig/aclocal.m4 2010-07-30 19:15:06.152083135 +0200
++++ gtk+3.0-2.90.5/aclocal.m4 2010-07-30 19:14:30.795085460 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -8200,7 +8266,7 @@
])# PKG_CHECK_MODULES
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-@@ -10010,5 +1911,11 @@
+@@ -9940,5 +1841,11 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
@@ -8212,10 +8278,10 @@
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
m4_include([acinclude.m4])
-Index: gtk+2.0-2.21.5/build/Makefile.in
+Index: gtk+3.0-2.90.5/build/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/build/Makefile.in 2010-07-22 17:59:08.757060229 +0200
-+++ gtk+2.0-2.21.5/build/Makefile.in 2010-07-22 17:58:44.326051820 +0200
+--- gtk+3.0-2.90.5.orig/build/Makefile.in 2010-07-30 19:15:04.051099708 +0200
++++ gtk+3.0-2.90.5/build/Makefile.in 2010-07-30 19:14:33.956084144 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build
@@ -8225,7 +8291,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -8241,7 +8307,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -308,6 +312,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8249,10 +8315,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/build/win32/Makefile.in
+Index: gtk+3.0-2.90.5/build/win32/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/build/win32/Makefile.in 2010-07-22 17:59:08.705081202 +0200
-+++ gtk+2.0-2.21.5/build/win32/Makefile.in 2010-07-22 17:58:44.394051311 +0200
+--- gtk+3.0-2.90.5.orig/build/win32/Makefile.in 2010-07-30 19:15:03.991089850 +0200
++++ gtk+3.0-2.90.5/build/win32/Makefile.in 2010-07-30 19:14:34.048081727 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32
@@ -8262,7 +8328,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -8278,7 +8344,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -308,6 +312,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8286,10 +8352,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/build/win32/vs9/Makefile.in
+Index: gtk+3.0-2.90.5/build/win32/vs9/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/build/win32/vs9/Makefile.in 2010-07-22 17:59:08.641050994 +0200
-+++ gtk+2.0-2.21.5/build/win32/vs9/Makefile.in 2010-07-22 17:58:44.458050848 +0200
+--- gtk+3.0-2.90.5.orig/build/win32/vs9/Makefile.in 2010-07-30 19:15:03.935086433 +0200
++++ gtk+3.0-2.90.5/build/win32/vs9/Makefile.in 2010-07-30 19:14:34.120081722 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32/vs9
@@ -8299,7 +8365,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -8315,7 +8381,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -267,6 +271,7 @@
+@@ -268,6 +272,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8323,15 +8389,15 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/configure
+Index: gtk+3.0-2.90.5/configure
===================================================================
---- gtk+2.0-2.21.5.orig/configure 2010-07-22 17:59:08.553063831 +0200
-+++ gtk+2.0-2.21.5/configure 2010-07-22 17:58:43.046052744 +0200
+--- gtk+3.0-2.90.5.orig/configure 2010-07-30 19:15:03.683083930 +0200
++++ gtk+3.0-2.90.5/configure 2010-07-30 19:14:32.663081737 +0200
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.66 for gtk+ 2.21.5.
-+# Generated by GNU Autoconf 2.65 for gtk+ 2.21.5.
+-# Generated by GNU Autoconf 2.66 for gtk+ 2.90.5.
++# Generated by GNU Autoconf 2.65 for gtk+ 2.90.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -8559,7 +8625,7 @@
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-@@ -673,6 +812,7 @@
+@@ -674,6 +813,7 @@
GDK_DEP_LIBS
GDK_EXTRA_CFLAGS
GDK_EXTRA_LIBS
@@ -8567,7 +8633,16 @@
GDK_PACKAGES
USE_DIRECTFB_FALSE
USE_DIRECTFB_TRUE
-@@ -797,6 +937,7 @@
+@@ -790,6 +930,8 @@
+ CCASDEPMODE
+ CCASFLAGS
+ CCAS
++ENABLE_STATIC_FALSE
++ENABLE_STATIC_TRUE
+ CXXCPP
+ CPP
+ OTOOL64
+@@ -797,6 +939,7 @@
LIPO
NMEDIT
DSYMUTIL
@@ -8575,16 +8650,7 @@
RANLIB
AR
LN_S
-@@ -822,6 +963,8 @@
- CXXFLAGS
- ac_ct_CXX
- CXX
-+ENABLE_STATIC_FALSE
-+ENABLE_STATIC_TRUE
- am__fastdepCC_FALSE
- am__fastdepCC_TRUE
- CCDEPMODE
-@@ -941,6 +1084,10 @@
+@@ -944,6 +1087,10 @@
enable_shm
enable_xkb
enable_xinerama
@@ -8595,7 +8661,7 @@
enable_rebuilds
enable_visibility
with_xinput
-@@ -1094,7 +1241,7 @@
+@@ -1098,7 +1245,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8604,7 +8670,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1120,7 +1267,7 @@
+@@ -1124,7 +1271,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8613,7 +8679,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1324,7 +1471,7 @@
+@@ -1328,7 +1475,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8622,7 +8688,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1340,7 +1487,7 @@
+@@ -1344,7 +1491,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8631,7 +8697,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1370,8 +1517,8 @@
+@@ -1374,8 +1521,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -8642,7 +8708,7 @@
;;
*=*)
-@@ -1379,7 +1526,7 @@
+@@ -1383,7 +1530,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
@@ -8651,7 +8717,7 @@
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1397,13 +1544,13 @@
+@@ -1401,13 +1548,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -8667,7 +8733,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1426,7 +1573,7 @@
+@@ -1430,7 +1577,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -8676,7 +8742,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1440,8 +1587,8 @@
+@@ -1444,8 +1591,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -8687,7 +8753,7 @@
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1456,9 +1603,9 @@
+@@ -1460,9 +1607,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -8699,7 +8765,7 @@
# Find the source files, if location was not specified.
-@@ -1497,11 +1644,11 @@
+@@ -1501,11 +1648,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -8713,7 +8779,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1541,7 +1688,7 @@
+@@ -1545,7 +1692,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -8722,7 +8788,7 @@
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
-@@ -1627,6 +1774,12 @@
+@@ -1631,6 +1778,12 @@
--enable-xkb support XKB [default=maybe]
--enable-xinerama support xinerama extension if available
[default=yes]
@@ -8733,12 +8799,12 @@
+ --enable-xdamage support X Damage extension if available
+ [default=yes]
--disable-rebuilds disable all source autogeneration rules
- --disable-visibility don't use ELF visibility attributes
+ --disable-visibility do not use ELF visibility attributes
--enable-explicit-deps=[yes/no/auto]
-@@ -1764,9 +1917,9 @@
+@@ -1769,9 +1922,9 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.21.5
+ gtk+ configure 2.90.5
-generated by GNU Autoconf 2.66
+generated by GNU Autoconf 2.65
@@ -8747,7 +8813,7 @@
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1908,7 +2061,7 @@
+@@ -1913,7 +2066,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -8756,7 +8822,7 @@
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2017,7 +2170,7 @@
+@@ -2022,7 +2175,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -8765,7 +8831,7 @@
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2167,10 +2320,10 @@
+@@ -2172,10 +2325,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -8778,7 +8844,7 @@
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
-@@ -2229,15 +2382,17 @@
+@@ -2234,15 +2387,17 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
@@ -8799,7 +8865,7 @@
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
-@@ -2259,7 +2414,7 @@
+@@ -2264,7 +2419,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
$as_echo_n "checking for $2.$3... " >&6; }
@@ -8808,16 +8874,16 @@
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2311,7 +2466,7 @@
+@@ -2316,7 +2471,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.21.5, which was
+ It was created by gtk+ $as_me 2.90.5, which was
-generated by GNU Autoconf 2.66. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -2421,9 +2576,11 @@
+@@ -2426,9 +2581,11 @@
{
echo
@@ -8831,7 +8897,7 @@
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -2457,9 +2614,11 @@
+@@ -2462,9 +2619,11 @@
)
echo
@@ -8845,7 +8911,7 @@
echo
for ac_var in $ac_subst_vars
do
-@@ -2472,9 +2631,11 @@
+@@ -2477,9 +2636,11 @@
echo
if test -n "$ac_subst_files"; then
@@ -8859,7 +8925,7 @@
echo
for ac_var in $ac_subst_files
do
-@@ -2488,9 +2649,11 @@
+@@ -2493,9 +2654,11 @@
fi
if test -s confdefs.h; then
@@ -8873,7 +8939,7 @@
echo
cat confdefs.h
echo
-@@ -2545,12 +2708,7 @@
+@@ -2550,12 +2713,7 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
@@ -8887,7 +8953,7 @@
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -2565,11 +2723,7 @@
+@@ -2570,11 +2728,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
@@ -8900,7 +8966,7 @@
fi
done
-@@ -2648,7 +2802,7 @@
+@@ -2653,7 +2807,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
@@ -8909,7 +8975,7 @@
fi
## -------------------- ##
## Main body of script. ##
-@@ -2673,22 +2827,16 @@
+@@ -2679,22 +2833,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -8940,7 +9006,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2804,11 +2952,11 @@
+@@ -2810,11 +2958,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -8954,7 +9020,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2830,7 +2978,7 @@
+@@ -2836,7 +2984,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -8963,7 +9029,7 @@
alias in your environment" "$LINENO" 5
fi
-@@ -2840,7 +2988,7 @@
+@@ -2846,7 +2994,7 @@
# Ok.
:
else
@@ -8972,7 +9038,7 @@
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -3078,7 +3226,7 @@
+@@ -3084,7 +3232,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
@@ -8981,7 +9047,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -3086,7 +3234,7 @@
+@@ -3092,7 +3240,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -8990,7 +9056,7 @@
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -3120,7 +3268,7 @@
+@@ -3126,7 +3274,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -8999,54 +9065,7 @@
fi
fi
-@@ -3250,7 +3398,7 @@
-
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
-@@ -3261,16 +3409,16 @@
- test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
-- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -3295,7 +3443,7 @@
- ac_cv_host=$ac_cv_build
- else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
-
- fi
-@@ -3303,7 +3451,7 @@
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -3653,8 +3801,8 @@
+@@ -3567,8 +3715,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9057,7 +9076,7 @@
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3768,8 +3916,9 @@
+@@ -3682,8 +3830,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9069,7 +9088,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3811,8 +3960,8 @@
+@@ -3725,8 +3874,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9080,7 +9099,7 @@
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3869,9 +4018,9 @@
+@@ -3783,9 +3932,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9092,7 +9111,7 @@
fi
fi
fi
-@@ -3922,8 +4071,8 @@
+@@ -3836,8 +3985,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9103,31 +9122,81 @@
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -4363,6 +4512,14 @@
-
-
-
-+ if test "$enable_static" = yes; then
-+ ENABLE_STATIC_TRUE=
-+ ENABLE_STATIC_FALSE='#'
-+else
-+ ENABLE_STATIC_TRUE='#'
-+ ENABLE_STATIC_FALSE=
-+fi
-+
-
- if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-@@ -4934,7 +5091,7 @@
- enable_win32_dll=yes
-
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
- set dummy ${ac_tool_prefix}as; ac_word=$2
-@@ -5242,8 +5399,8 @@
+@@ -4255,7 +4404,7 @@
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4655,7 +4804,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -4663,7 +4812,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -4694,7 +4843,7 @@
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+@@ -4705,16 +4854,16 @@
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4739,7 +4888,7 @@
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+
+ fi
+@@ -4747,7 +4896,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5372,8 +5521,8 @@
@@ -9138,7 +9207,7 @@
-@@ -5259,75 +5416,6 @@
+@@ -5389,75 +5538,6 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -9214,7 +9283,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if test "${ac_cv_path_SED+set}" = set; then :
-@@ -5385,7 +5473,7 @@
+@@ -5515,7 +5595,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
@@ -9223,7 +9292,7 @@
fi
else
ac_cv_path_SED=$SED
-@@ -5461,7 +5549,7 @@
+@@ -5591,7 +5671,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
@@ -9232,7 +9301,7 @@
fi
else
ac_cv_path_GREP=$GREP
-@@ -5527,7 +5615,7 @@
+@@ -5657,7 +5737,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
@@ -9241,7 +9310,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5594,7 +5682,7 @@
+@@ -5724,7 +5804,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
@@ -9250,7 +9319,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -5710,7 +5798,7 @@
+@@ -5840,7 +5920,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -9259,7 +9328,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-@@ -5793,11 +5881,8 @@
+@@ -5923,11 +6003,8 @@
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -9273,7 +9342,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
-@@ -5841,7 +5926,7 @@
+@@ -5971,7 +6048,7 @@
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -9282,7 +9351,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
-@@ -5896,15 +5981,6 @@
+@@ -6026,15 +6103,6 @@
fi
fi
@@ -9298,24 +9367,24 @@
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5924,13 +6000,13 @@
+@@ -6054,13 +6122,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6003: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6125: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6006: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6128: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+ (eval echo "\"\$as_me:6009: output\"" >&5)
++ (eval echo "\"\$as_me:6131: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5987,11 +6063,6 @@
+@@ -6117,11 +6185,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -9327,7 +9396,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -6056,8 +6127,8 @@
+@@ -6186,8 +6249,8 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
@@ -9338,7 +9407,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -6325,18 +6396,16 @@
+@@ -6455,18 +6518,16 @@
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -9360,7 +9429,7 @@
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -6366,10 +6435,6 @@
+@@ -6496,10 +6557,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -9371,7 +9440,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -6378,11 +6443,11 @@
+@@ -6508,11 +6565,11 @@
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -9385,7 +9454,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -6408,7 +6473,7 @@
+@@ -6538,7 +6595,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -9394,7 +9463,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6820,18 +6885,6 @@
+@@ -6950,18 +7007,6 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -9413,7 +9482,7 @@
-@@ -7001,8 +7054,8 @@
+@@ -7131,8 +7176,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -9424,16 +9493,16 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7156,7 +7209,7 @@
+@@ -7286,7 +7331,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+ echo '#line 7212 "configure"' > conftest.$ac_ext
++ echo '#line 7334 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7868,38 +7921,6 @@
+@@ -7998,38 +8043,6 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -9472,7 +9541,7 @@
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -7927,7 +7948,7 @@
+@@ -8057,7 +8070,7 @@
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -9481,7 +9550,7 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -8062,8 +8083,8 @@
+@@ -8192,8 +8205,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -9492,7 +9561,7 @@
fi
ac_ext=c
-@@ -8192,7 +8213,8 @@
+@@ -8322,7 +8335,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
@@ -9502,10 +9571,49 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8217,20 +8239,544 @@
-
-
-
+@@ -8347,52 +8361,27 @@
+
+
+
+-
+-
+-# Set options
+-# Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then :
+- enableval=$enable_static; p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_static=yes ;;
+- no) enable_static=no ;;
+- *)
+- enable_static=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_static=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac
+-else
+- enable_static=no
+-fi
+-
+-
+-
+-
+-
+-
+-
+-enable_win32_dll=yes
+-
+-case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}as; ac_word=$2
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9520,107 +9628,122 @@
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AS+set}" = set; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$AS"; then
+- ac_cv_prog_AS="$AS" # Let the user override the test.
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -8401,7 +8390,7 @@
+ 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_AS="${ac_tool_prefix}as"
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
-+fi
-+fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -8411,28 +8400,32 @@
+
+ fi
+ fi
+-AS=$ac_cv_prog_AS
+-if test -n "$AS"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+-$as_echo "$AS" >&6; }
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
--# Set options
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+ test -n "$CXX" && break
+ done
-+fi
+ fi
+-if test -z "$ac_cv_prog_AS"; then
+- ac_ct_AS=$AS
+- # Extract the first word of "as", so it can be a program name with args.
+-set dummy as; ac_word=$2
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "(cached) " >&6
+ else
+- if test -n "$ac_ct_AS"; then
+- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -8441,7 +8434,7 @@
+ 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_AS="as"
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-
-+fi
-+fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -8451,17 +8444,21 @@
+
+ fi
+ fi
+-ac_ct_AS=$ac_cv_prog_ac_ct_AS
+-if test -n "$ac_ct_AS"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+-$as_echo "$ac_ct_AS" >&6; }
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
-- enable_dlopen=no
-
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+- if test "x$ac_ct_AS" = x; then
+- AS="false"
++
+ test -n "$ac_ct_CXX" && break
+done
-
++
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+@@ -8469,14 +8466,555 @@
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+- AS=$ac_ct_AS
+ CXX=$ac_ct_CXX
-+ fi
-+fi
-
-- # Check whether --enable-shared was given.
--if test "${enable_shared+set}" = set; then :
-- enableval=$enable_shared; p=${PACKAGE-default}
-- case $enableval in
+ fi
+-else
+- AS="$ac_cv_prog_AS"
+ fi
+
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+ fi
+fi
+# Provide some information about the compiler.
@@ -10039,21 +10162,137 @@
+
+
+# Set options
-+
-+
-+
-+ enable_dlopen=no
-+
-+
-+
-+ # Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then :
-+ enableval=$enable_shared; p=${PACKAGE-default}
++# Check whether --enable-static was given.
++if test "${enable_static+set}" = set; then :
++ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
-@@ -8339,7 +8885,6 @@
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
++else
++ enable_static=no
++fi
++
++
++
++
++
++
++
++enable_win32_dll=yes
++
++case $host in
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
++set dummy ${ac_tool_prefix}as; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AS+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$AS"; then
++ ac_cv_prog_AS="$AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_AS="${ac_tool_prefix}as"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++AS=$ac_cv_prog_AS
++if test -n "$AS"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
++$as_echo "$AS" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_AS"; then
++ ac_ct_AS=$AS
++ # Extract the first word of "as", so it can be a program name with args.
++set dummy as; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_AS"; then
++ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_AS="as"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_AS=$ac_cv_prog_ac_ct_AS
++if test -n "$ac_ct_AS"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
++$as_echo "$ac_ct_AS" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_ct_AS" = x; then
++ AS="false"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ AS=$ac_ct_AS
++ fi
++else
++ AS="$ac_cv_prog_AS"
++fi
++
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+@@ -8798,7 +9336,6 @@
@@ -10061,7 +10300,7 @@
test -z "$LN_S" && LN_S="ln -s"
-@@ -8389,6 +8934,19 @@
+@@ -8848,6 +9385,19 @@
@@ -10081,7 +10320,7 @@
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8401,6 +8959,23 @@
+@@ -8860,6 +9410,23 @@
;;
esac
@@ -10105,7 +10344,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8429,7 +9004,7 @@
+@@ -8888,7 +9455,7 @@
*) break;;
esac
done
@@ -10114,7 +10353,7 @@
# Only perform the check for file, if the check method requires it
-@@ -8629,17 +9204,16 @@
+@@ -9088,17 +9655,16 @@
$RM -r conftest*
@@ -10137,17 +10376,17 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-@@ -8659,15 +9233,15 @@
+@@ -9118,15 +9684,15 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9687: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9240: \$? = $ac_status" >&5
++ echo "$as_me:9691: \$? = $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.
@@ -10156,7 +10395,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8745,12 +9319,6 @@
+@@ -9204,12 +9770,6 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -10169,7 +10408,7 @@
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8793,13 +9361,6 @@
+@@ -9252,13 +9812,6 @@
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -10183,7 +10422,7 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8862,7 +9423,7 @@
+@@ -9321,7 +9874,7 @@
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -10192,7 +10431,7 @@
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8874,26 +9435,26 @@
+@@ -9333,26 +9886,26 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -10227,7 +10466,7 @@
esac
;;
esac
-@@ -8924,7 +9485,7 @@
+@@ -9383,7 +9936,7 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -10236,17 +10475,17 @@
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -9011,15 +9572,15 @@
+@@ -9470,15 +10023,15 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9575: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10026: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9579: \$? = $ac_status" >&5
++ echo "$as_me:10030: \$? = $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.
@@ -10255,7 +10494,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
-@@ -9067,7 +9628,7 @@
+@@ -9526,7 +10079,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -10264,17 +10503,17 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -9116,16 +9677,16 @@
+@@ -9575,16 +10128,16 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9680: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10131: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9684: \$? = $ac_status" >&5
++ echo "$as_me:10135: \$? = $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
@@ -10284,17 +10523,17 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -9171,16 +9732,16 @@
+@@ -9630,16 +10183,16 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9735: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10186: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:9739: \$? = $ac_status" >&5
++ echo "$as_me:10190: \$? = $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
@@ -10304,7 +10543,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -9290,36 +9851,13 @@
+@@ -9749,36 +10302,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -10344,7 +10583,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9353,12 +9891,11 @@
+@@ -9812,12 +10342,11 @@
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -10360,7 +10599,7 @@
_LT_EOF
fi
-@@ -9394,7 +9931,6 @@
+@@ -9853,7 +10382,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -10368,7 +10607,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
-@@ -9416,11 +9952,6 @@
+@@ -9875,11 +10403,6 @@
fi
;;
@@ -10380,7 +10619,7 @@
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9450,12 +9981,11 @@
+@@ -9909,12 +10432,11 @@
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -10396,7 +10635,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9466,17 +9996,13 @@
+@@ -9925,17 +10447,13 @@
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -10416,7 +10655,7 @@
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9492,17 +10018,17 @@
+@@ -9951,17 +10469,17 @@
fi
case $cc_basename in
@@ -10437,7 +10676,7 @@
fi
;;
esac
-@@ -9511,7 +10037,7 @@
+@@ -9970,7 +10488,7 @@
fi
;;
@@ -10446,7 +10685,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9623,10 +10149,8 @@
+@@ -10082,10 +10600,8 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -10458,7 +10697,7 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -9688,6 +10212,7 @@
+@@ -10147,6 +10663,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10466,7 +10705,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9744,7 +10269,7 @@
+@@ -10203,7 +10720,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10475,7 +10714,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9788,13 +10313,8 @@
+@@ -10247,13 +10764,8 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -10491,7 +10730,7 @@
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9833,7 +10353,7 @@
+@@ -10292,7 +10804,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -10500,7 +10739,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9849,11 +10369,7 @@
+@@ -10308,11 +10820,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -10513,7 +10752,7 @@
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9861,7 +10377,7 @@
+@@ -10320,7 +10828,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -10522,7 +10761,7 @@
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9927,7 +10443,7 @@
+@@ -10386,7 +10894,7 @@
;;
hpux10*)
@@ -10531,7 +10770,7 @@
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-@@ -9946,7 +10462,7 @@
+@@ -10405,7 +10913,7 @@
;;
hpux11*)
@@ -10540,7 +10779,7 @@
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -9967,46 +10483,7 @@
+@@ -10426,46 +10934,7 @@
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -10588,7 +10827,7 @@
;;
esac
fi
-@@ -10034,7 +10511,7 @@
+@@ -10493,7 +10962,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10597,7 +10836,7 @@
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
-@@ -10045,15 +10522,15 @@
+@@ -10504,15 +10973,15 @@
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -10616,7 +10855,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10062,7 +10539,7 @@
+@@ -10521,7 +10990,7 @@
link_all_deplibs=yes
;;
@@ -10625,7 +10864,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10115,17 +10592,17 @@
+@@ -10574,17 +11043,17 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -10646,7 +10885,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10135,13 +10612,13 @@
+@@ -10594,13 +11063,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -10663,7 +10902,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10344,50 +10821,44 @@
+@@ -10803,50 +11272,44 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -10743,7 +10982,7 @@
;;
esac
fi
-@@ -10558,23 +11029,16 @@
+@@ -11017,23 +11480,16 @@
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -10773,7 +11012,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -10587,7 +11051,7 @@
+@@ -11046,7 +11502,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -10782,7 +11021,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -10607,13 +11071,7 @@
+@@ -11066,13 +11522,7 @@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -10797,7 +11036,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10701,7 +11159,7 @@
+@@ -11160,7 +11610,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -10806,7 +11045,7 @@
;;
esac
;;
-@@ -10754,12 +11212,23 @@
+@@ -11213,12 +11663,23 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -10832,7 +11071,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -10859,19 +11328,6 @@
+@@ -11318,19 +11779,6 @@
hardcode_into_libs=yes
;;
@@ -10852,7 +11091,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -10914,10 +11370,8 @@
+@@ -11373,10 +11821,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -10864,7 +11103,7 @@
;;
interix[3-9]*)
-@@ -10984,17 +11438,12 @@
+@@ -11443,17 +11889,12 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -10887,7 +11126,7 @@
/* end confdefs.h. */
int
-@@ -11007,31 +11456,23 @@
+@@ -11466,31 +11907,23 @@
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -10924,7 +11163,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11043,6 +11484,18 @@
+@@ -11502,6 +11935,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10943,7 +11182,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11333,11 +11786,6 @@
+@@ -11792,11 +12237,6 @@
@@ -10955,16 +11194,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
-@@ -11668,7 +12116,7 @@
+@@ -12127,7 +12567,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-+#line 12119 "configure"
++#line 12570 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11709,13 +12157,7 @@
+@@ -12168,13 +12608,7 @@
# endif
#endif
@@ -10979,7 +11218,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11724,11 +12166,7 @@
+@@ -12183,11 +12617,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -10992,16 +11231,16 @@
/* dlclose (self); */
}
else
-@@ -11774,7 +12212,7 @@
+@@ -12233,7 +12663,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-+#line 12215 "configure"
++#line 12666 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11815,13 +12253,7 @@
+@@ -12274,13 +12704,7 @@
# endif
#endif
@@ -11016,7 +11255,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11830,11 +12262,7 @@
+@@ -12289,11 +12713,7 @@
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -11029,14 +11268,10 @@
/* dlclose (self); */
}
else
-@@ -11970,166 +12398,27 @@
- ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
--$as_echo "$enable_shared" >&6; }
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
--$as_echo_n "checking whether to build static libraries... " >&6; }
+@@ -12433,162 +12853,23 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+ $as_echo_n "checking whether to build static libraries... " >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
@@ -11149,19 +11384,16 @@
- Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-+$as_echo "$enable_shared" >&6; }
++ # Make sure either enable_shared or enable_static is yes.
++ test "$enable_shared" = yes || enable_static=yes
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-+ # Make sure either enable_shared or enable_static is yes.
-+ test "$enable_shared" = yes || enable_static=yes
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
@@ -11189,9 +11421,8 @@
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
--fi
-
-+fi
+ fi
+-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11206,7 +11437,7 @@
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -12156,8 +12445,6 @@
+@@ -12615,8 +12896,6 @@
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
old_archive_cmds_CXX=$old_archive_cmds
@@ -11215,7 +11446,7 @@
no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-@@ -12240,7 +12527,7 @@
+@@ -12699,7 +12978,7 @@
*) break;;
esac
done
@@ -11224,7 +11455,7 @@
if test -n "$compiler"; then
-@@ -12340,7 +12627,7 @@
+@@ -12799,7 +13078,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -11233,7 +11464,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-@@ -12402,7 +12689,7 @@
+@@ -12861,7 +13140,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11242,7 +11473,7 @@
else
GXX=no
-@@ -12544,7 +12831,7 @@
+@@ -13003,7 +13282,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11251,7 +11482,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -12588,13 +12875,8 @@
+@@ -13047,13 +13326,8 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -11267,7 +11498,7 @@
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -12627,7 +12909,6 @@
+@@ -13086,7 +13360,6 @@
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -11275,7 +11506,7 @@
allow_undefined_flag_CXX=unsupported
always_export_symbols_CXX=no
enable_shared_with_static_runtimes_CXX=yes
-@@ -12654,11 +12935,7 @@
+@@ -13113,11 +13386,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
@@ -11288,7 +11519,7 @@
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -12666,7 +12943,7 @@
+@@ -13125,7 +13394,7 @@
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -11297,7 +11528,7 @@
archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -12719,11 +12996,6 @@
+@@ -13178,11 +13447,6 @@
gnu*)
;;
@@ -11309,7 +11540,7 @@
hpux9*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -12748,7 +13020,7 @@
+@@ -13207,7 +13471,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -11318,7 +11549,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -12813,7 +13085,7 @@
+@@ -13272,7 +13536,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -11327,7 +11558,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -12856,7 +13128,7 @@
+@@ -13315,7 +13579,7 @@
case $cc_basename in
CC*)
# SGI C++
@@ -11336,7 +11567,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -12867,9 +13139,9 @@
+@@ -13326,9 +13590,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -11348,7 +11579,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -12898,7 +13170,7 @@
+@@ -13357,7 +13621,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -11357,7 +11588,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12935,26 +13207,26 @@
+@@ -13394,26 +13658,26 @@
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -11390,7 +11621,7 @@
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -12962,7 +13234,7 @@
+@@ -13421,7 +13685,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -11399,7 +11630,7 @@
;;
cxx*)
# Compaq C++
-@@ -12981,9 +13253,9 @@
+@@ -13440,9 +13704,9 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -11411,7 +11642,7 @@
# IBM XL 8.0 on PPC, with GNU ld
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -13003,13 +13275,13 @@
+@@ -13462,13 +13726,13 @@
archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
hardcode_libdir_flag_spec_CXX='-R$libdir'
@@ -11427,7 +11658,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13078,7 +13350,7 @@
+@@ -13537,7 +13801,7 @@
export_dynamic_flag_spec_CXX='${wl}-E'
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -11436,7 +11667,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -13113,15 +13385,15 @@
+@@ -13572,15 +13836,15 @@
case $host in
osf3*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -11455,7 +11686,7 @@
$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
-@@ -13137,17 +13409,17 @@
+@@ -13596,17 +13860,17 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -11476,7 +11707,7 @@
;;
esac
-@@ -13157,7 +13429,7 @@
+@@ -13616,7 +13880,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11485,7 +11716,7 @@
else
# FIXME: insert proper C++ library support
-@@ -13193,7 +13465,7 @@
+@@ -13652,7 +13916,7 @@
solaris*)
case $cc_basename in
@@ -11494,7 +11725,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
-@@ -13214,7 +13486,7 @@
+@@ -13673,7 +13937,7 @@
esac
link_all_deplibs_CXX=yes
@@ -11503,7 +11734,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13241,7 +13513,7 @@
+@@ -13700,7 +13964,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11512,7 +11743,7 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -13252,7 +13524,7 @@
+@@ -13711,7 +13975,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11521,7 +11752,7 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -13306,10 +13578,6 @@
+@@ -13765,10 +14029,6 @@
CC*)
archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -11532,7 +11763,7 @@
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -13491,7 +13759,7 @@
+@@ -13950,7 +14210,7 @@
solaris*)
case $cc_basename in
@@ -11541,7 +11772,7 @@
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -13607,11 +13875,6 @@
+@@ -14066,11 +14326,6 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -11553,7 +11784,7 @@
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -13750,8 +14013,8 @@
+@@ -14209,8 +14464,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
@@ -11564,7 +11795,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -13781,7 +14044,7 @@
+@@ -14240,7 +14495,7 @@
;;
esac
;;
@@ -11573,7 +11804,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -13813,7 +14076,7 @@
+@@ -14272,7 +14527,7 @@
;;
solaris*)
case $cc_basename in
@@ -11582,17 +11813,17 @@
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
-@@ -13905,15 +14168,15 @@
+@@ -14364,15 +14619,15 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14171: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14622: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:14175: \$? = $ac_status" >&5
++ echo "$as_me:14626: \$? = $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.
@@ -11601,7 +11832,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works_CXX=yes
-@@ -13958,7 +14221,7 @@
+@@ -14417,7 +14672,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -11610,17 +11841,17 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works_CXX=yes
-@@ -14004,16 +14267,16 @@
+@@ -14463,16 +14718,16 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14721: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:14274: \$? = $ac_status" >&5
++ echo "$as_me:14725: \$? = $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
@@ -11630,17 +11861,17 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
-@@ -14056,16 +14319,16 @@
+@@ -14515,16 +14770,16 @@
-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:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14773: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:14326: \$? = $ac_status" >&5
++ echo "$as_me:14777: \$? = $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
@@ -11650,7 +11881,7 @@
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
-@@ -14120,10 +14383,8 @@
+@@ -14579,10 +14834,8 @@
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -11662,7 +11893,7 @@
else
export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -14134,6 +14395,9 @@
+@@ -14593,6 +14846,9 @@
cygwin* | mingw* | cegcc*)
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'
;;
@@ -11672,7 +11903,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14170,50 +14434,44 @@
+@@ -14629,50 +14885,44 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -11752,7 +11983,7 @@
;;
esac
fi
-@@ -14370,7 +14628,7 @@
+@@ -14829,7 +15079,7 @@
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11761,7 +11992,7 @@
;;
esac
;;
-@@ -14423,11 +14681,23 @@
+@@ -14882,11 +15132,23 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -11786,7 +12017,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -14526,19 +14796,6 @@
+@@ -14985,19 +15247,6 @@
hardcode_into_libs=yes
;;
@@ -11806,7 +12037,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -14581,10 +14838,8 @@
+@@ -15040,10 +15289,8 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -11818,7 +12049,7 @@
;;
interix[3-9]*)
-@@ -14651,17 +14906,12 @@
+@@ -15110,17 +15357,12 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11841,7 +12072,7 @@
/* end confdefs.h. */
int
-@@ -14674,31 +14924,23 @@
+@@ -15133,31 +15375,23 @@
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -11878,7 +12109,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14710,6 +14952,18 @@
+@@ -15169,6 +15403,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11897,7 +12128,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14949,8 +15203,6 @@
+@@ -15408,8 +15654,6 @@
@@ -11906,7 +12137,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
-@@ -15037,15 +15289,16 @@
+@@ -15497,15 +15741,16 @@
: ${CONFIG_LT=./config.lt}
{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -11928,7 +12159,7 @@
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
-@@ -15170,19 +15423,20 @@
+@@ -15630,19 +15875,20 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -11957,7 +12188,7 @@
as_fn_exit $as_status
} # as_fn_error
-@@ -15378,7 +15632,7 @@
+@@ -15838,7 +16084,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -11966,7 +12197,7 @@
} # as_fn_mkdir_p
-@@ -15419,15 +15673,8 @@
+@@ -15879,15 +16125,8 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -11983,10 +12214,10 @@
exec 5>>config.log
{
echo
-@@ -15452,9 +15699,9 @@
+@@ -15912,9 +16151,9 @@
lt_cl_version="\
- gtk+ config.lt 2.21.5
+ gtk+ config.lt 2.90.5
-configured by $0, generated by GNU Autoconf 2.66.
+configured by $0, generated by GNU Autoconf 2.65.
@@ -11995,7 +12226,7 @@
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -15470,10 +15717,10 @@
+@@ -15930,10 +16169,10 @@
--quiet | --q* | --silent | --s* | -q )
lt_cl_silent=: ;;
@@ -12008,16 +12239,16 @@
Try \`$0 --help' for more information." "$LINENO" 5 ;;
esac
shift
-@@ -15494,203 +15741,186 @@
+@@ -15954,203 +16193,186 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
+-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
--macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
--macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
@@ -12189,12 +12420,12 @@
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
@@ -12386,7 +12617,7 @@
GREP \
EGREP \
FGREP \
-@@ -15713,6 +15943,8 @@
+@@ -16173,6 +16395,8 @@
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12395,7 +12626,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -15742,7 +15974,6 @@
+@@ -16202,7 +16426,6 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -12403,7 +12634,7 @@
finish_eval \
old_striplib \
striplib \
-@@ -15753,7 +15984,6 @@
+@@ -16213,7 +16436,6 @@
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -12411,7 +12642,7 @@
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
lt_prog_compiler_wl_CXX \
-@@ -15779,9 +16009,9 @@
+@@ -16239,9 +16461,9 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -12423,7 +12654,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -15808,7 +16038,6 @@
+@@ -16268,7 +16490,6 @@
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
@@ -12431,7 +12662,7 @@
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -15818,9 +16047,9 @@
+@@ -16278,9 +16499,9 @@
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
prelink_cmds_CXX; do
@@ -12443,7 +12674,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -15828,6 +16057,12 @@
+@@ -16288,6 +16509,12 @@
esac
done
@@ -12456,7 +12687,7 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -15875,8 +16110,7 @@
+@@ -16335,8 +16562,7 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12466,7 +12697,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -15912,13 +16146,13 @@
+@@ -16376,13 +16602,13 @@
build_old_libs=$enable_static
# Assembler program.
@@ -12481,9 +12712,9 @@
-OBJDUMP=$lt_OBJDUMP
+OBJDUMP=$OBJDUMP
- # Which release of libtool.m4 was used?
- macro_version=$macro_version
-@@ -15933,12 +16167,6 @@
+ # Whether or not to build shared libraries.
+ build_libtool_libs=$enable_shared
+@@ -16393,12 +16619,6 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -12496,7 +12727,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -15988,6 +16216,10 @@
+@@ -16448,6 +16668,10 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -12507,7 +12738,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -16006,9 +16238,6 @@
+@@ -16466,9 +16690,6 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -12517,7 +12748,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -16030,6 +16259,12 @@
+@@ -16490,6 +16711,12 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -12530,7 +12761,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -16092,9 +16327,6 @@
+@@ -16552,9 +16779,6 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -12540,7 +12771,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -16134,10 +16366,6 @@
+@@ -16594,10 +16818,6 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -12551,7 +12782,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -16411,7 +16639,7 @@
+@@ -16871,7 +17091,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -12560,7 +12791,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -16422,7 +16650,7 @@
+@@ -16882,7 +17102,7 @@
# func_basename file
func_basename ()
{
@@ -12569,7 +12800,7 @@
}
-@@ -16435,8 +16663,10 @@
+@@ -16895,8 +17115,10 @@
func_stripname ()
{
case ${2} in
@@ -12582,7 +12813,7 @@
esac
}
-@@ -16447,20 +16677,20 @@
+@@ -16907,20 +17129,20 @@
# func_opt_split
func_opt_split ()
{
@@ -12607,7 +12838,7 @@
}
# func_arith arithmetic-term...
-@@ -16521,10 +16751,6 @@
+@@ -16981,10 +17203,6 @@
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -12618,7 +12849,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -16679,13 +16905,15 @@
+@@ -17139,13 +17357,24 @@
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -12638,10 +12869,19 @@
+ exec 5>>config.log
+ $lt_cl_success || as_fn_exit 1
+fi
-
-
-
-@@ -17227,7 +17455,7 @@
++
++
++ if test "$enable_static" = yes; then
++ ENABLE_STATIC_TRUE=
++ ENABLE_STATIC_FALSE='#'
++else
++ ENABLE_STATIC_TRUE='#'
++ ENABLE_STATIC_FALSE=
++fi
+
+
+ # Make sure we use 64-bit versions of various file stuff.
+@@ -17662,7 +17891,7 @@
fi
if test "$WINDRES" = no; then
@@ -12650,7 +12890,7 @@
fi
# Extract the first word of "lib.exe", so it can be a program name with args.
set dummy lib.exe; ac_word=$2
-@@ -17307,6 +17535,26 @@
+@@ -17742,6 +17971,26 @@
enable_xinerama="yes"
fi
@@ -12677,7 +12917,7 @@
# Check whether --enable-rebuilds was given.
if test "${enable_rebuilds+set}" = set; then :
enableval=$enable_rebuilds;
-@@ -17345,7 +17593,7 @@
+@@ -17780,7 +18029,7 @@
case $gdktarget in
x11|win32|quartz|directfb) ;;
@@ -12686,7 +12926,7 @@
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -17390,11 +17638,11 @@
+@@ -17825,11 +18074,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -12700,7 +12940,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -17416,7 +17664,7 @@
+@@ -17851,7 +18100,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -12709,7 +12949,7 @@
alias in your environment" "$LINENO" 5
fi
-@@ -17426,7 +17674,7 @@
+@@ -17861,7 +18110,7 @@
# Ok.
:
else
@@ -12718,45 +12958,7 @@
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -17789,8 +18037,8 @@
-
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -18168,7 +18416,7 @@
- fi
- set dummy $CC; ac_cc=`$as_echo "$2" |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -18290,7 +18538,7 @@
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
-@@ -18298,7 +18546,7 @@
- all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
--# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -18507,10 +18755,6 @@
+@@ -18053,10 +18302,6 @@
fi
fi
@@ -12767,18 +12969,18 @@
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASE_DEPENDENCIES" >&5
$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
-@@ -18518,8 +18762,7 @@
+@@ -18064,8 +18309,7 @@
if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
elif test -n "$PKG_CONFIG"; then
-
-if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
ac_status=$?
-@@ -18528,17 +18771,14 @@
- pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
+@@ -18074,17 +18318,14 @@
+ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
else
pkg_failed=yes
-
@@ -12793,18 +12995,18 @@
-
-if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
ac_status=$?
-@@ -18547,7 +18787,6 @@
- pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
+@@ -18093,7 +18334,6 @@
+ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
else
pkg_failed=yes
-
fi
else
pkg_failed=untried
-@@ -18555,7 +18794,6 @@
+@@ -18101,7 +18341,6 @@
@@ -12812,24 +13014,24 @@
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -18565,7 +18803,6 @@
+@@ -18111,7 +18350,6 @@
else
_pkg_short_errors_supported=no
fi
-
if test $_pkg_short_errors_supported = yes; then
- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>&1`
+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0" 2>&1`
else
-@@ -18574,7 +18811,7 @@
+@@ -18120,7 +18358,7 @@
# Put the nasty error message in config.log where it belongs
echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-- as_fn_error $? "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
-+ as_fn_error "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
+- as_fn_error $? "Package requirements (glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0) were not met:
++ as_fn_error "Package requirements (glib-2.0 >= 2.25.9 atk >= 1.29.2 pango >= 1.20 cairo >= 1.9.10 gdk-pixbuf-2.0 >= 2.21.0) were not met:
$BASE_DEPENDENCIES_PKG_ERRORS
-@@ -18584,13 +18821,12 @@
+@@ -18130,13 +18368,12 @@
Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -12844,7 +13046,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18599,8 +18835,7 @@
+@@ -18145,8 +18382,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12854,7 +13056,7 @@
else
BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-@@ -18609,7 +18844,6 @@
+@@ -18155,7 +18391,6 @@
fi
@@ -12862,7 +13064,7 @@
## In addition to checking that cairo is present, we also need to
## check that the correct cairo backend is there. E.g. if the GDK
## target is win32 we need the cairo-win32 backend and so on.
-@@ -18621,9 +18855,6 @@
+@@ -18167,9 +18402,6 @@
cairo_backend=xlib
fi
@@ -12872,18 +13074,18 @@
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_BACKEND" >&5
$as_echo_n "checking for CAIRO_BACKEND... " >&6; }
-@@ -18631,8 +18862,7 @@
+@@ -18177,8 +18409,7 @@
if test -n "$CAIRO_BACKEND_CFLAGS"; then
pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
elif test -n "$PKG_CONFIG"; then
-
-if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.9.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.9.10") 2>&5
ac_status=$?
-@@ -18641,17 +18871,14 @@
- pkg_cv_CAIRO_BACKEND_CFLAGS=`$PKG_CONFIG --cflags "cairo-$cairo_backend >= 1.6" 2>/dev/null`
+@@ -18187,17 +18418,14 @@
+ pkg_cv_CAIRO_BACKEND_CFLAGS=`$PKG_CONFIG --cflags "cairo-$cairo_backend >= 1.9.10" 2>/dev/null`
else
pkg_failed=yes
-
@@ -12898,18 +13100,18 @@
-
-if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.9.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.9.10") 2>&5
ac_status=$?
-@@ -18660,7 +18887,6 @@
- pkg_cv_CAIRO_BACKEND_LIBS=`$PKG_CONFIG --libs "cairo-$cairo_backend >= 1.6" 2>/dev/null`
+@@ -18206,7 +18434,6 @@
+ pkg_cv_CAIRO_BACKEND_LIBS=`$PKG_CONFIG --libs "cairo-$cairo_backend >= 1.9.10" 2>/dev/null`
else
pkg_failed=yes
-
fi
else
pkg_failed=untried
-@@ -18668,7 +18894,6 @@
+@@ -18214,7 +18441,6 @@
@@ -12917,24 +13119,24 @@
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -18678,7 +18903,6 @@
+@@ -18224,7 +18450,6 @@
else
_pkg_short_errors_supported=no
fi
-
if test $_pkg_short_errors_supported = yes; then
- CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
+ CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-$cairo_backend >= 1.9.10" 2>&1`
else
-@@ -18687,7 +18911,7 @@
+@@ -18233,7 +18458,7 @@
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_BACKEND_PKG_ERRORS" >&5
-- as_fn_error $? "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
-+ as_fn_error "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
+- as_fn_error $? "Package requirements (cairo-$cairo_backend >= 1.9.10) were not met:
++ as_fn_error "Package requirements (cairo-$cairo_backend >= 1.9.10) were not met:
$CAIRO_BACKEND_PKG_ERRORS
-@@ -18697,13 +18921,12 @@
+@@ -18243,13 +18468,12 @@
Alternatively, you may set the environment variables CAIRO_BACKEND_CFLAGS
and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -12949,7 +13151,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -18712,8 +18935,7 @@
+@@ -18258,8 +18482,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12959,7 +13161,7 @@
else
CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
-@@ -18722,7 +18944,6 @@
+@@ -18268,7 +18491,6 @@
fi
@@ -12967,7 +13169,7 @@
if test "$os_win32" != yes; then
# libtool option to control which symbols are exported
# right now, symbols starting with _ are not exported
-@@ -18756,7 +18977,7 @@
+@@ -18302,7 +18524,7 @@
;;
yes|no)
;;
@@ -12976,7 +13178,7 @@
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_explicit_deps" >&5
-@@ -18871,7 +19092,8 @@
+@@ -18417,7 +18639,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -12986,7 +13188,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -20079,7 +20301,6 @@
+@@ -19625,7 +19848,6 @@
fi
fi
@@ -12994,16 +13196,16 @@
no_glib=""
if test "x$PKG_CONFIG" = x ; then
-@@ -20273,7 +20494,7 @@
+@@ -19819,7 +20041,7 @@
GLIB_GENMARSHAL=""
GOBJECT_QUERY=""
GLIB_MKENUMS=""
- as_fn_error $? "
+ as_fn_error "
- *** GLIB 2.25.10 or better is required. The latest version of
+ *** GLIB 2.25.9 or better is required. The latest version of
*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5
fi
-@@ -20641,7 +20862,8 @@
+@@ -20187,7 +20409,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
@@ -13013,7 +13215,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -21240,7 +21462,7 @@
+@@ -20786,7 +21009,7 @@
if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
:
else
@@ -13022,7 +13224,7 @@
fi
INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
-@@ -21667,7 +21889,7 @@
+@@ -21213,7 +21436,7 @@
if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
test "x$REBUILD_PNGS" = "x#" ; then
@@ -13031,7 +13233,7 @@
*** gtkbuiltincache.h is not in the tree, and cannot be built
*** because you don't have libpng, or (when cross-compiling) you
*** don't have a prebuilt gtk-update-icon-cache on the build system." "$LINENO" 5
-@@ -21692,7 +21914,7 @@
+@@ -21238,7 +21461,7 @@
# settings.
#
if $PKG_CONFIG --exists fontconfig; then : ; else
@@ -13040,7 +13242,7 @@
*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5
fi
-@@ -21733,7 +21955,7 @@
+@@ -21279,7 +21502,7 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -13049,7 +13251,7 @@
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-@@ -21751,7 +21973,7 @@
+@@ -21297,7 +21520,7 @@
@echo libdir='${LIBDIR}'
_ACEOF
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
@@ -13058,7 +13260,7 @@
for ac_var in incroot usrlibdir libdir; do
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
-@@ -22402,7 +22624,7 @@
+@@ -21948,7 +22171,7 @@
fi
if test x$no_x = xyes ; then
@@ -13067,7 +13269,7 @@
fi
x_cflags="$X_CFLAGS"
-@@ -22427,21 +22649,21 @@
+@@ -21973,21 +22196,21 @@
if test "x$ac_cv_func_XOpenDisplay" = x""yes; then :
:
else
@@ -13092,7 +13294,7 @@
fi
-@@ -22485,7 +22707,7 @@
+@@ -22031,7 +22254,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
$as_echo "unknown" >&6; }
@@ -13101,7 +13303,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-@@ -22497,7 +22719,8 @@
+@@ -22043,7 +22266,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -13111,7 +13313,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -22559,7 +22782,7 @@
+@@ -22105,7 +22329,7 @@
if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then :
:
else
@@ -13120,7 +13322,7 @@
fi
-@@ -22863,7 +23086,8 @@
+@@ -22419,7 +22643,8 @@
# Check for the RANDR extension
@@ -13130,7 +13332,7 @@
$as_echo "#define HAVE_RANDR 1" >>confdefs.h
-@@ -22883,7 +23107,8 @@
+@@ -22439,7 +22664,8 @@
# Checks for XFixes extension
@@ -13140,7 +13342,7 @@
$as_echo "#define HAVE_XFIXES 1" >>confdefs.h
-@@ -22894,7 +23119,8 @@
+@@ -22450,7 +22676,8 @@
# Checks for Xcomposite extension
@@ -13150,7 +13352,7 @@
$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
-@@ -22905,7 +23131,7 @@
+@@ -22461,7 +22688,7 @@
# Checks for Xdamage extension
@@ -13159,7 +13361,7 @@
$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
-@@ -23008,9 +23234,6 @@
+@@ -22572,9 +22799,6 @@
$as_echo_n "checking for DirectFB... " >&6; }
@@ -13169,7 +13371,7 @@
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
$as_echo_n "checking for DIRECTFB... " >&6; }
-@@ -23018,8 +23241,7 @@
+@@ -22582,8 +22806,7 @@
if test -n "$DIRECTFB_CFLAGS"; then
pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
elif test -n "$PKG_CONFIG"; then
@@ -13179,7 +13381,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
ac_status=$?
-@@ -23028,17 +23250,14 @@
+@@ -22592,17 +22815,14 @@
pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
else
pkg_failed=yes
@@ -13198,7 +13400,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
ac_status=$?
-@@ -23047,7 +23266,6 @@
+@@ -22611,7 +22831,6 @@
pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
else
pkg_failed=yes
@@ -13206,7 +13408,7 @@
fi
else
pkg_failed=untried
-@@ -23055,7 +23273,6 @@
+@@ -22619,7 +22838,6 @@
@@ -13214,7 +13416,7 @@
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -23065,7 +23282,6 @@
+@@ -22629,7 +22847,6 @@
else
_pkg_short_errors_supported=no
fi
@@ -13222,7 +13424,7 @@
if test $_pkg_short_errors_supported = yes; then
DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
else
-@@ -23074,7 +23290,7 @@
+@@ -22638,7 +22855,7 @@
# Put the nasty error message in config.log where it belongs
echo "$DIRECTFB_PKG_ERRORS" >&5
@@ -13231,7 +13433,7 @@
$DIRECTFB_PKG_ERRORS
-@@ -23084,13 +23300,12 @@
+@@ -22648,13 +22865,12 @@
Alternatively, you may set the environment variables DIRECTFB_CFLAGS
and DIRECTFB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -13246,7 +13448,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23099,8 +23314,7 @@
+@@ -22663,8 +22879,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13256,7 +13458,7 @@
else
DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
-@@ -23108,7 +23322,6 @@
+@@ -22672,7 +22887,6 @@
$as_echo "yes" >&6; }
fi
@@ -13264,7 +13466,7 @@
if true; then
USE_DIRECTFB_TRUE=
USE_DIRECTFB_FALSE='#'
-@@ -23146,7 +23359,7 @@
+@@ -22710,7 +22924,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5
$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; }
else
@@ -13273,7 +13475,7 @@
*** Pango not found. Pango built with Cairo support is required
*** to build GTK+. See http://www.pango.org for Pango information.
" "$LINENO" 5
-@@ -23180,7 +23393,7 @@
+@@ -22744,7 +22958,7 @@
if ac_fn_c_try_link "$LINENO"; then :
:
else
@@ -13282,7 +13484,7 @@
*** Can't link to Pango. Pango is required to build
*** GTK+. For more information see http://www.pango.org" "$LINENO" 5
fi
-@@ -23194,20 +23407,23 @@
+@@ -22758,20 +22972,23 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
@@ -13311,7 +13513,7 @@
fi
-@@ -23217,6 +23433,7 @@
+@@ -22781,6 +22998,7 @@
@@ -13319,7 +13521,7 @@
########################################
# Check for Accessibility Toolkit flags
########################################
-@@ -23231,7 +23448,7 @@
+@@ -22795,7 +23013,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ATK_CFLAGS $ATK_LIBS" >&5
$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; }
else
@@ -13328,7 +13530,7 @@
*** Accessibility Toolkit not found. Accessibility Toolkit is required
*** to build GTK+.
" "$LINENO" 5
-@@ -23263,7 +23480,7 @@
+@@ -22827,7 +23045,7 @@
if ac_fn_c_try_link "$LINENO"; then :
:
else
@@ -13337,7 +13539,7 @@
*** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
*** to build GTK+" "$LINENO" 5
fi
-@@ -23582,7 +23799,7 @@
+@@ -23146,7 +23364,7 @@
fi
else
@@ -13346,7 +13548,7 @@
*** cups not found.
" "$LINENO" 5
fi
-@@ -23610,7 +23827,7 @@
+@@ -23174,7 +23392,7 @@
if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
else
@@ -13355,7 +13557,7 @@
fi
-@@ -23743,7 +23960,7 @@
+@@ -23307,7 +23525,7 @@
fi
if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
@@ -13364,7 +13566,7 @@
*** papi not found.
" "$LINENO" 5
fi
-@@ -23765,7 +23982,7 @@
+@@ -23329,7 +23547,7 @@
if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then :
else
@@ -13373,7 +13575,7 @@
*** Can't find cairo-pdf.h. You must build Cairo with the pdf
*** backend enabled." "$LINENO" 5
fi
-@@ -23777,7 +23994,7 @@
+@@ -23341,7 +23559,7 @@
if test "x$ac_cv_header_cairo_ps_h" = x""yes; then :
else
@@ -13382,7 +13584,7 @@
*** Can't find cairo-ps.h. You must build Cairo with the
*** postscript backend enabled." "$LINENO" 5
fi
-@@ -23788,7 +24005,7 @@
+@@ -23352,7 +23570,7 @@
if test "x$ac_cv_header_cairo_svg_h" = x""yes; then :
else
@@ -13391,7 +13593,7 @@
*** Can't find cairo-svg.h. You must build Cairo with the
*** svg backend enabled." "$LINENO" 5
fi
-@@ -23859,8 +24076,7 @@
+@@ -23423,8 +23641,7 @@
found_introspection="no (disabled, use --enable-introspection to enable)"
;; #(
yes) :
@@ -13401,7 +13603,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
ac_status=$?
-@@ -23868,11 +24084,9 @@
+@@ -23432,11 +23649,9 @@
test $ac_status = 0; }; then
:
else
@@ -13412,26 +13614,26 @@
-
-if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.0") 2>&5
ac_status=$?
-@@ -23880,13 +24094,11 @@
+@@ -23444,13 +23659,11 @@
test $ac_status = 0; }; then
found_introspection=yes
else
-- as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
--
-+ as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
+- as_fn_error $? "You need to have gobject-introspection >= 0.9.0 installed to build gtk+" "$LINENO" 5
+-
++ as_fn_error "You need to have gobject-introspection >= 0.9.0 installed to build gtk+" "$LINENO" 5
fi
;; #(
auto) :
-
-if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.0") 2>&5
ac_status=$?
-@@ -23895,11 +24107,10 @@
+@@ -23459,11 +23672,10 @@
found_introspection=yes
else
found_introspection=no
@@ -13444,7 +13646,7 @@
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
-@@ -24095,8 +24306,7 @@
+@@ -23659,8 +23871,7 @@
if test x$enable_gtk_doc = xyes; then
@@ -13454,7 +13656,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5
ac_status=$?
-@@ -24104,8 +24314,7 @@
+@@ -23668,8 +23879,7 @@
test $ac_status = 0; }; then
:
else
@@ -13464,7 +13666,7 @@
fi
fi
-@@ -24491,7 +24700,6 @@
+@@ -24094,7 +24304,6 @@
ac_libobjs=
ac_ltlibobjs=
@@ -13472,9 +13674,14 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -24515,235 +24723,243 @@
+@@ -24118,239 +24327,247 @@
fi
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
@@ -13483,10 +13690,6 @@
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
-+ as_fn_error "conditional \"ENABLE_STATIC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
@@ -13506,16 +13709,15 @@
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
++ as_fn_error "conditional \"ENABLE_STATIC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
+ as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
@@ -13541,11 +13743,6 @@
if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then
- as_fn_error $? "conditional \"MS_LIB_AVAILABLE\" was never defined.
+ as_fn_error "conditional \"MS_LIB_AVAILABLE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then
@@ -13648,6 +13845,11 @@
+ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${XINPUT_2_TRUE}" && test -z "${XINPUT_2_FALSE}"; then
+- as_fn_error $? "conditional \"XINPUT_2\" was never defined.
++ as_fn_error "conditional \"XINPUT_2\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
- as_fn_error $? "conditional \"USE_X11\" was never defined.
+ as_fn_error "conditional \"USE_X11\" was never defined.
@@ -13656,6 +13858,11 @@
if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then
- as_fn_error $? "conditional \"XINPUT_XFREE\" was never defined.
+ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${XINPUT_2_TRUE}" && test -z "${XINPUT_2_FALSE}"; then
+- as_fn_error $? "conditional \"XINPUT_2\" was never defined.
++ as_fn_error "conditional \"XINPUT_2\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
@@ -13774,7 +13981,7 @@
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-@@ -24893,19 +25109,19 @@
+@@ -24500,19 +24717,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -13802,7 +14009,7 @@
as_fn_exit $as_status
} # as_fn_error
-@@ -25101,7 +25317,7 @@
+@@ -24708,7 +24925,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -13811,19 +14018,19 @@
} # as_fn_mkdir_p
-@@ -25155,7 +25371,7 @@
+@@ -24762,7 +24979,7 @@
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.21.5, which was
+ This file was extended by gtk+ $as_me 2.90.5, which was
-generated by GNU Autoconf 2.66. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25221,10 +25437,10 @@
+@@ -24828,10 +25045,10 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- gtk+ config.status 2.21.5
+ gtk+ config.status 2.90.5
-configured by $0, generated by GNU Autoconf 2.66,
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
@@ -13833,7 +14040,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -25280,7 +25496,7 @@
+@@ -24887,7 +25104,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
@@ -13842,7 +14049,7 @@
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-@@ -25289,7 +25505,7 @@
+@@ -24896,7 +25113,7 @@
ac_cs_silent=: ;;
# This is an error.
@@ -13851,16 +14058,16 @@
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
-@@ -25343,203 +25559,186 @@
+@@ -24950,203 +25167,186 @@
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
+-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
--macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
--macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
@@ -14032,12 +14239,12 @@
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
@@ -14229,7 +14436,7 @@
GREP \
EGREP \
FGREP \
-@@ -25562,6 +25761,8 @@
+@@ -25169,6 +25369,8 @@
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -14238,7 +14445,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -25591,7 +25792,6 @@
+@@ -25198,7 +25400,6 @@
libname_spec \
library_names_spec \
soname_spec \
@@ -14246,7 +14453,7 @@
finish_eval \
old_striplib \
striplib \
-@@ -25602,7 +25802,6 @@
+@@ -25209,7 +25410,6 @@
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -14254,7 +14461,7 @@
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
lt_prog_compiler_wl_CXX \
-@@ -25628,9 +25827,9 @@
+@@ -25235,9 +25435,9 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -14266,7 +14473,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25657,7 +25856,6 @@
+@@ -25264,7 +25464,6 @@
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
@@ -14274,7 +14481,7 @@
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -25667,9 +25865,9 @@
+@@ -25274,9 +25473,9 @@
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
prelink_cmds_CXX; do
@@ -14286,7 +14493,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25677,6 +25875,12 @@
+@@ -25284,6 +25483,12 @@
esac
done
@@ -14299,7 +14506,7 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -25811,7 +26015,7 @@
+@@ -25416,7 +25621,7 @@
"modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;;
"perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
@@ -14308,7 +14515,7 @@
esac
done
-@@ -25849,7 +26053,7 @@
+@@ -25454,7 +25659,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -14317,7 +14524,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -25866,7 +26070,7 @@
+@@ -25471,7 +25676,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
@@ -14326,7 +14533,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -25880,18 +26084,18 @@
+@@ -25485,18 +25690,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -14349,7 +14556,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25980,28 +26184,20 @@
+@@ -25585,28 +25790,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -14386,7 +14593,7 @@
s/^[^=]*=[ ]*$//
}'
fi
-@@ -26029,7 +26225,7 @@
+@@ -25634,7 +25831,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -14395,7 +14602,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -26114,7 +26310,7 @@
+@@ -25719,7 +25916,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -14404,7 +14611,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -26127,7 +26323,7 @@
+@@ -25732,7 +25929,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -14413,7 +14620,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -26155,7 +26351,7 @@
+@@ -25760,7 +25957,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -14422,7 +14629,7 @@
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -26182,7 +26378,7 @@
+@@ -25787,7 +25984,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -14431,7 +14638,7 @@
esac
;;
esac
-@@ -26319,22 +26515,22 @@
+@@ -25924,22 +26121,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -14458,7 +14665,7 @@
;;
:H)
#
-@@ -26345,19 +26541,19 @@
+@@ -25950,19 +26147,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -14481,7 +14688,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -26518,8 +26714,7 @@
+@@ -26123,8 +26320,7 @@
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -14491,7 +14698,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -26555,13 +26750,13 @@
+@@ -26164,13 +26360,13 @@
build_old_libs=$enable_static
# Assembler program.
@@ -14506,9 +14713,9 @@
-OBJDUMP=$lt_OBJDUMP
+OBJDUMP=$OBJDUMP
- # Which release of libtool.m4 was used?
- macro_version=$macro_version
-@@ -26576,12 +26771,6 @@
+ # Whether or not to build shared libraries.
+ build_libtool_libs=$enable_shared
+@@ -26181,12 +26377,6 @@
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -14521,7 +14728,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -26631,6 +26820,10 @@
+@@ -26236,6 +26426,10 @@
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -14532,7 +14739,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -26649,9 +26842,6 @@
+@@ -26254,9 +26448,6 @@
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -14542,7 +14749,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -26673,6 +26863,12 @@
+@@ -26278,6 +26469,12 @@
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -14555,7 +14762,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -26735,9 +26931,6 @@
+@@ -26340,9 +26537,6 @@
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -14565,7 +14772,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -26777,10 +26970,6 @@
+@@ -26382,10 +26576,6 @@
# The linker used to build libraries.
LD=$lt_LD
@@ -14576,7 +14783,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -27054,7 +27243,7 @@
+@@ -26659,7 +26849,7 @@
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -14585,7 +14792,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -27065,7 +27254,7 @@
+@@ -26670,7 +26860,7 @@
# func_basename file
func_basename ()
{
@@ -14594,7 +14801,7 @@
}
-@@ -27078,8 +27267,10 @@
+@@ -26683,8 +26873,10 @@
func_stripname ()
{
case ${2} in
@@ -14607,7 +14814,7 @@
esac
}
-@@ -27090,20 +27281,20 @@
+@@ -26695,20 +26887,20 @@
# func_opt_split
func_opt_split ()
{
@@ -14632,7 +14839,7 @@
}
# func_arith arithmetic-term...
-@@ -27164,10 +27355,6 @@
+@@ -26769,10 +26961,6 @@
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -14643,7 +14850,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -27379,7 +27566,7 @@
+@@ -26984,7 +27172,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
@@ -14652,7 +14859,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -27400,7 +27587,7 @@
+@@ -27005,7 +27193,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -14661,12 +14868,49 @@
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-Index: gtk+2.0-2.21.5/demos/gtk-demo/Makefile.in
+Index: gtk+3.0-2.90.5/demos/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/demos/gtk-demo/Makefile.in 2010-07-22 17:59:02.321064383 +0200
-+++ gtk+2.0-2.21.5/demos/gtk-demo/Makefile.in 2010-07-22 17:58:44.718050938 +0200
+--- gtk+3.0-2.90.5.orig/demos/Makefile.in 2010-07-30 19:14:58.467095250 +0200
++++ gtk+3.0-2.90.5/demos/Makefile.in 2010-07-30 19:14:34.276081857 +0200
+@@ -44,11 +44,14 @@
+ testpixbuf$(EXEEXT)
+ subdir = demos
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -213,6 +216,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -364,6 +368,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+3.0-2.90.5/demos/gtk-demo/Makefile.in
+===================================================================
+--- gtk+3.0-2.90.5.orig/demos/gtk-demo/Makefile.in 2010-07-30 19:14:58.359084589 +0200
++++ gtk+3.0-2.90.5/demos/gtk-demo/Makefile.in 2010-07-30 19:14:34.400083239 +0200
@@ -42,11 +42,14 @@
- bin_PROGRAMS = gtk-demo$(EXEEXT)
+ bin_PROGRAMS = gtk3-demo$(EXEEXT)
subdir = demos/gtk-demo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
@@ -14674,7 +14918,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14690,7 +14934,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -343,6 +347,7 @@
+@@ -344,6 +348,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14698,20 +14942,20 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/demos/Makefile.in
+Index: gtk+3.0-2.90.5/docs/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/demos/Makefile.in 2010-07-22 17:59:02.533064976 +0200
-+++ gtk+2.0-2.21.5/demos/Makefile.in 2010-07-22 17:58:44.622052141 +0200
-@@ -44,11 +44,14 @@
- testpixbuf$(EXEEXT)
- subdir = demos
+--- gtk+3.0-2.90.5.orig/docs/Makefile.in 2010-07-30 19:15:06.912083019 +0200
++++ gtk+3.0-2.90.5/docs/Makefile.in 2010-07-30 19:14:34.504082981 +0200
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = docs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14719,7 +14963,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -213,6 +216,7 @@
+@@ -157,6 +160,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -14727,7 +14971,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -363,6 +367,7 @@
+@@ -308,6 +312,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14735,10 +14979,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/faq/Makefile.in
+Index: gtk+3.0-2.90.5/docs/faq/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/faq/Makefile.in 2010-07-22 17:59:10.833064793 +0200
-+++ gtk+2.0-2.21.5/docs/faq/Makefile.in 2010-07-22 17:58:44.850051099 +0200
+--- gtk+3.0-2.90.5.orig/docs/faq/Makefile.in 2010-07-30 19:15:07.180098495 +0200
++++ gtk+3.0-2.90.5/docs/faq/Makefile.in 2010-07-30 19:14:34.596083074 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/faq
@@ -14748,7 +14992,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14764,7 +15008,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -267,6 +271,7 @@
+@@ -268,6 +272,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14772,20 +15016,20 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/Makefile.in
+Index: gtk+3.0-2.90.5/docs/reference/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/Makefile.in 2010-07-22 17:59:10.446084804 +0200
-+++ gtk+2.0-2.21.5/docs/Makefile.in 2010-07-22 17:58:44.786051764 +0200
+--- gtk+3.0-2.90.5.orig/docs/reference/Makefile.in 2010-07-30 19:15:11.559096603 +0200
++++ gtk+3.0-2.90.5/docs/reference/Makefile.in 2010-07-30 19:14:34.692083259 +0200
@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = docs
+ $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
+ subdir = docs/reference
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14801,7 +15045,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -308,6 +312,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14809,10 +15053,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/gdk/Makefile.in
+Index: gtk+3.0-2.90.5/docs/reference/gdk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/gdk/Makefile.in 2010-07-22 17:59:11.741060918 +0200
-+++ gtk+2.0-2.21.5/docs/reference/gdk/Makefile.in 2010-07-22 17:58:45.002055252 +0200
+--- gtk+3.0-2.90.5.orig/docs/reference/gdk/Makefile.in 2010-07-30 19:15:08.255107822 +0200
++++ gtk+3.0-2.90.5/docs/reference/gdk/Makefile.in 2010-07-30 19:14:34.808084040 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gdk
@@ -14822,7 +15066,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14838,7 +15082,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -274,6 +278,7 @@
+@@ -275,6 +279,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14846,10 +15090,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/gtk/Makefile.in
+Index: gtk+3.0-2.90.5/docs/reference/gtk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/gtk/Makefile.in 2010-07-22 17:59:13.962055058 +0200
-+++ gtk+2.0-2.21.5/docs/reference/gtk/Makefile.in 2010-07-22 17:58:45.114051124 +0200
+--- gtk+3.0-2.90.5.orig/docs/reference/gtk/Makefile.in 2010-07-30 19:15:11.459095909 +0200
++++ gtk+3.0-2.90.5/docs/reference/gtk/Makefile.in 2010-07-30 19:14:34.932083397 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gtk
@@ -14859,7 +15103,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14875,7 +15119,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -299,6 +303,7 @@
+@@ -300,6 +304,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14883,10 +15127,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/libgail-util/Makefile.in
+Index: gtk+3.0-2.90.5/docs/reference/libgail-util/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/libgail-util/Makefile.in 2010-07-22 17:59:10.961053605 +0200
-+++ gtk+2.0-2.21.5/docs/reference/libgail-util/Makefile.in 2010-07-22 17:58:45.194051167 +0200
+--- gtk+3.0-2.90.5.orig/docs/reference/libgail-util/Makefile.in 2010-07-30 19:15:07.308084529 +0200
++++ gtk+3.0-2.90.5/docs/reference/libgail-util/Makefile.in 2010-07-30 19:14:35.028083796 +0200
@@ -45,11 +45,14 @@
$(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make
subdir = docs/reference/libgail-util
@@ -14896,7 +15140,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14912,7 +15156,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -273,6 +277,7 @@
+@@ -274,6 +278,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14920,47 +15164,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/reference/Makefile.in
+Index: gtk+3.0-2.90.5/docs/tools/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/reference/Makefile.in 2010-07-22 17:59:14.061084683 +0200
-+++ gtk+2.0-2.21.5/docs/reference/Makefile.in 2010-07-22 17:58:44.918053382 +0200
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
- subdir = docs/reference
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/tools/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/docs/tools/Makefile.in 2010-07-22 17:59:10.354054471 +0200
-+++ gtk+2.0-2.21.5/docs/tools/Makefile.in 2010-07-22 17:58:45.278052772 +0200
+--- gtk+3.0-2.90.5.orig/docs/tools/Makefile.in 2010-07-30 19:15:06.848084795 +0200
++++ gtk+3.0-2.90.5/docs/tools/Makefile.in 2010-07-30 19:14:35.148082975 +0200
@@ -41,11 +41,14 @@
@USE_X11_TRUE at noinst_PROGRAMS = doc-shooter$(EXEEXT)
subdir = docs/tools
@@ -14970,7 +15177,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -14986,7 +15193,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -302,6 +306,7 @@
+@@ -303,6 +307,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -14994,10 +15201,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/docs/tutorial/Makefile.in
+Index: gtk+3.0-2.90.5/docs/tutorial/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/docs/tutorial/Makefile.in 2010-07-22 17:59:14.685367311 +0200
-+++ gtk+2.0-2.21.5/docs/tutorial/Makefile.in 2010-07-22 17:58:45.350052495 +0200
+--- gtk+3.0-2.90.5.orig/docs/tutorial/Makefile.in 2010-07-30 19:15:12.255082819 +0200
++++ gtk+3.0-2.90.5/docs/tutorial/Makefile.in 2010-07-30 19:14:35.244082957 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/tutorial
@@ -15007,7 +15214,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15023,7 +15230,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -267,6 +271,7 @@
+@@ -268,6 +272,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15031,10 +15238,47 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/directfb/Makefile.in
+Index: gtk+3.0-2.90.5/gdk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/directfb/Makefile.in 2010-07-22 17:59:05.690054680 +0200
-+++ gtk+2.0-2.21.5/gdk/directfb/Makefile.in 2010-07-22 17:58:45.602053020 +0200
+--- gtk+3.0-2.90.5.orig/gdk/Makefile.in 2010-07-30 19:14:59.859085497 +0200
++++ gtk+3.0-2.90.5/gdk/Makefile.in 2010-07-30 19:14:35.700102924 +0200
+@@ -45,11 +45,14 @@
+ @HAVE_INTROSPECTION_TRUE at am__append_3 = $(gir_DATA) $(typelibs_DATA)
+ subdir = gdk
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -303,6 +306,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -454,6 +458,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+3.0-2.90.5/gdk/directfb/Makefile.in
+===================================================================
+--- gtk+3.0-2.90.5.orig/gdk/directfb/Makefile.in 2010-07-30 19:14:59.983083176 +0200
++++ gtk+3.0-2.90.5/gdk/directfb/Makefile.in 2010-07-30 19:14:35.816083031 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
subdir = gdk/directfb
@@ -15044,7 +15288,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15060,7 +15304,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -331,6 +335,7 @@
+@@ -332,6 +336,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15068,47 +15312,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/Makefile.in
+Index: gtk+3.0-2.90.5/gdk/quartz/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/Makefile.in 2010-07-22 17:59:05.594052457 +0200
-+++ gtk+2.0-2.21.5/gdk/Makefile.in 2010-07-22 17:58:45.510052218 +0200
-@@ -44,11 +44,14 @@
- @HAVE_INTROSPECTION_TRUE at am__append_2 = $(gir_DATA) $(typelibs_DATA)
- subdir = gdk
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -303,6 +306,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -453,6 +457,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/quartz/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/gdk/quartz/Makefile.in 2010-07-22 17:59:02.789054854 +0200
-+++ gtk+2.0-2.21.5/gdk/quartz/Makefile.in 2010-07-22 17:58:45.694051097 +0200
+--- gtk+3.0-2.90.5.orig/gdk/quartz/Makefile.in 2010-07-30 19:14:58.795097054 +0200
++++ gtk+3.0-2.90.5/gdk/quartz/Makefile.in 2010-07-30 19:14:35.948083476 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/quartz
@@ -15118,7 +15325,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15134,7 +15341,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -330,6 +334,7 @@
+@@ -331,6 +335,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15142,10 +15349,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/tests/Makefile.in
+Index: gtk+3.0-2.90.5/gdk/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/tests/Makefile.in 2010-07-22 17:59:04.493054578 +0200
-+++ gtk+2.0-2.21.5/gdk/tests/Makefile.in 2010-07-22 17:58:45.766051176 +0200
+--- gtk+3.0-2.90.5.orig/gdk/tests/Makefile.in 2010-07-30 19:14:59.736085781 +0200
++++ gtk+3.0-2.90.5/gdk/tests/Makefile.in 2010-07-30 19:14:36.040084343 +0200
@@ -41,11 +41,14 @@
TESTS = $(am__EXEEXT_1)
subdir = gdk/tests
@@ -15155,7 +15362,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15171,7 +15378,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -272,6 +276,7 @@
+@@ -273,6 +277,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15179,10 +15386,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/win32/Makefile.in
+Index: gtk+3.0-2.90.5/gdk/win32/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/win32/Makefile.in 2010-07-22 17:59:03.077052908 +0200
-+++ gtk+2.0-2.21.5/gdk/win32/Makefile.in 2010-07-22 17:58:45.870051964 +0200
+--- gtk+3.0-2.90.5.orig/gdk/win32/Makefile.in 2010-07-30 19:14:59.164084169 +0200
++++ gtk+3.0-2.90.5/gdk/win32/Makefile.in 2010-07-30 19:14:36.176083041 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32
@@ -15192,7 +15399,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15208,7 +15415,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -368,6 +372,7 @@
+@@ -369,6 +373,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15216,10 +15423,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/win32/rc/Makefile.in
+Index: gtk+3.0-2.90.5/gdk/win32/rc/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/win32/rc/Makefile.in 2010-07-22 17:59:02.941054548 +0200
-+++ gtk+2.0-2.21.5/gdk/win32/rc/Makefile.in 2010-07-22 17:58:45.938052290 +0200
+--- gtk+3.0-2.90.5.orig/gdk/win32/rc/Makefile.in 2010-07-30 19:14:58.972085200 +0200
++++ gtk+3.0-2.90.5/gdk/win32/rc/Makefile.in 2010-07-30 19:14:36.272082396 +0200
@@ -40,11 +40,14 @@
$(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32/rc
@@ -15229,7 +15436,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15245,7 +15452,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -269,6 +273,7 @@
+@@ -270,6 +274,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15253,11 +15460,11 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gdk/x11/Makefile.in
+Index: gtk+3.0-2.90.5/gdk/x11/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gdk/x11/Makefile.in 2010-07-22 17:59:03.381053422 +0200
-+++ gtk+2.0-2.21.5/gdk/x11/Makefile.in 2010-07-22 17:58:46.038052635 +0200
-@@ -46,11 +46,14 @@
+--- gtk+3.0-2.90.5.orig/gdk/x11/Makefile.in 2010-07-30 19:14:59.544094559 +0200
++++ gtk+3.0-2.90.5/gdk/x11/Makefile.in 2010-07-30 19:14:36.384081972 +0200
+@@ -56,11 +56,14 @@
TESTS = checksettings$(EXEEXT)
subdir = gdk/x11
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -15266,7 +15473,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15274,7 +15481,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -209,6 +212,7 @@
+@@ -227,6 +230,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -15282,7 +15489,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -359,6 +363,7 @@
+@@ -378,6 +382,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15290,10 +15497,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gtk/Makefile.in
+Index: gtk+3.0-2.90.5/gtk/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/Makefile.in 2010-07-22 17:59:08.357065817 +0200
-+++ gtk+2.0-2.21.5/gtk/Makefile.in 2010-07-22 17:58:46.370051614 +0200
+--- gtk+3.0-2.90.5.orig/gtk/Makefile.in 2010-07-30 19:15:03.439097697 +0200
++++ gtk+3.0-2.90.5/gtk/Makefile.in 2010-07-30 19:14:36.820083815 +0200
@@ -77,11 +77,14 @@
subdir = gtk
@@ -15303,7 +15510,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15311,7 +15518,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
CONFIG_CLEAN_VPATH_FILES =
-@@ -722,6 +725,7 @@
+@@ -703,6 +706,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -15319,7 +15526,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -872,6 +876,7 @@
+@@ -854,6 +858,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15327,7 +15534,7 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-@@ -962,6 +967,8 @@
+@@ -943,6 +948,8 @@
-I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
-DGDK_DISABLE_DEPRECATED \
@@ -15336,7 +15543,7 @@
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -1074,17 +1081,21 @@
+@@ -1186,17 +1193,21 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -15366,10 +15573,10 @@
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
gtkrbtree.h gtkrecentchooserdefault.h \
-Index: gtk+2.0-2.21.5/gtk/tests/Makefile.in
+Index: gtk+3.0-2.90.5/gtk/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/tests/Makefile.in 2010-07-22 17:59:08.097053712 +0200
-+++ gtk+2.0-2.21.5/gtk/tests/Makefile.in 2010-07-22 17:58:46.486051613 +0200
+--- gtk+3.0-2.90.5.orig/gtk/tests/Makefile.in 2010-07-30 19:15:02.988098268 +0200
++++ gtk+3.0-2.90.5/gtk/tests/Makefile.in 2010-07-30 19:14:36.984108373 +0200
@@ -42,11 +42,14 @@
@OS_UNIX_TRUE at am__append_1 = defaultvalue
subdir = gtk/tests
@@ -15379,7 +15586,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15387,7 +15594,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -211,6 +214,7 @@
+@@ -217,6 +220,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -15395,7 +15602,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -361,6 +365,7 @@
+@@ -368,6 +372,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15403,10 +15610,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/gtk/theme-bits/Makefile.in
+Index: gtk+3.0-2.90.5/gtk/theme-bits/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/gtk/theme-bits/Makefile.in 2010-07-22 17:59:06.969066211 +0200
-+++ gtk+2.0-2.21.5/gtk/theme-bits/Makefile.in 2010-07-22 17:58:46.582051036 +0200
+--- gtk+3.0-2.90.5.orig/gtk/theme-bits/Makefile.in 2010-07-30 19:15:01.668093268 +0200
++++ gtk+3.0-2.90.5/gtk/theme-bits/Makefile.in 2010-07-30 19:14:37.123085524 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = decompose-bits$(EXEEXT)
subdir = gtk/theme-bits
@@ -15416,7 +15623,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -15432,7 +15639,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -299,6 +303,7 @@
+@@ -300,6 +304,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -15440,10 +15647,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/ltmain.sh
+Index: gtk+3.0-2.90.5/ltmain.sh
===================================================================
---- gtk+2.0-2.21.5.orig/ltmain.sh 2010-07-22 17:59:02.037054460 +0200
-+++ gtk+2.0-2.21.5/ltmain.sh 2010-07-22 17:58:36.638055918 +0200
+--- gtk+3.0-2.90.5.orig/ltmain.sh 2010-07-30 19:14:57.960084652 +0200
++++ gtk+3.0-2.90.5/ltmain.sh 2010-07-30 19:14:19.307086427 +0200
@@ -1,10 +1,9 @@
# Generated from ltmain.m4sh.
@@ -18546,10 +18753,10 @@
esac
$ECHO > $output "\
# $outputname - a libtool library file
-Index: gtk+2.0-2.21.5/m4/gtk-doc.m4
+Index: gtk+3.0-2.90.5/m4/gtk-doc.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/gtk-doc.m4 2010-07-22 17:58:37.342052247 +0200
++++ gtk+3.0-2.90.5/m4/gtk-doc.m4 2010-07-30 19:14:20.324084677 +0200
@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
@@ -18612,10 +18819,10 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])
-Index: gtk+2.0-2.21.5/m4/libtool.m4
+Index: gtk+3.0-2.90.5/m4/libtool.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/libtool.m4 2010-07-22 17:58:36.722054309 +0200
++++ gtk+3.0-2.90.5/m4/libtool.m4 2010-07-30 19:14:19.435083918 +0200
@@ -0,0 +1,7377 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -25994,10 +26201,539 @@
+ ;;
+ esac
+])
-Index: gtk+2.0-2.21.5/m4/lt~obsolete.m4
+Index: gtk+3.0-2.90.5/m4/ltoptions.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/lt~obsolete.m4 2010-07-22 17:58:37.094054446 +0200
++++ gtk+3.0-2.90.5/m4/ltoptions.m4 2010-07-30 19:14:19.620085354 +0200
+@@ -0,0 +1,368 @@
++# Helper functions for option handling. -*- Autoconf -*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++# serial 6 ltoptions.m4
++
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++
++
++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
++# ------------------------------------------
++m4_define([_LT_MANGLE_OPTION],
++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
++
++
++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
++# ---------------------------------------
++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
++# matching handler defined, dispatch to it. Other OPTION-NAMEs are
++# saved as a flag.
++m4_define([_LT_SET_OPTION],
++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
++ _LT_MANGLE_DEFUN([$1], [$2]),
++ [m4_warning([Unknown $1 option `$2'])])[]dnl
++])
++
++
++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
++# ------------------------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++m4_define([_LT_IF_OPTION],
++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
++
++
++# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
++# -------------------------------------------------------
++# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
++# are set.
++m4_define([_LT_UNLESS_OPTIONS],
++[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
++ [m4_define([$0_found])])])[]dnl
++m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
++])[]dnl
++])
++
++
++# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
++# ----------------------------------------
++# OPTION-LIST is a space-separated list of Libtool options associated
++# with MACRO-NAME. If any OPTION has a matching handler declared with
++# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
++# the unknown option and exit.
++m4_defun([_LT_SET_OPTIONS],
++[# Set options
++m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [_LT_SET_OPTION([$1], _LT_Option)])
++
++m4_if([$1],[LT_INIT],[
++ dnl
++ dnl Simply set some default values (i.e off) if boolean options were not
++ dnl specified:
++ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
++ ])
++ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
++ ])
++ dnl
++ dnl If no reference was made to various pairs of opposing options, then
++ dnl we run the default mode handler for the pair. For example, if neither
++ dnl `shared' nor `disable-shared' was passed, we enable building of shared
++ dnl archives by default:
++ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
++ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
++ [_LT_ENABLE_FAST_INSTALL])
++ ])
++])# _LT_SET_OPTIONS
++
++
++## --------------------------------- ##
++## Macros to handle LT_INIT options. ##
++## --------------------------------- ##
++
++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
++# -----------------------------------------
++m4_define([_LT_MANGLE_DEFUN],
++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
++
++
++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
++# -----------------------------------------------
++m4_define([LT_OPTION_DEFINE],
++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
++])# LT_OPTION_DEFINE
++
++
++# dlopen
++# ------
++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
++])
++
++AU_DEFUN([AC_LIBTOOL_DLOPEN],
++[_LT_SET_OPTION([LT_INIT], [dlopen])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `dlopen' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
++
++
++# win32-dll
++# ---------
++# Declare package support for building win32 dll's.
++LT_OPTION_DEFINE([LT_INIT], [win32-dll],
++[enable_win32_dll=yes
++
++case $host in
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++ AC_CHECK_TOOL(AS, as, false)
++ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++ AC_CHECK_TOOL(OBJDUMP, objdump, false)
++ ;;
++esac
++
++test -z "$AS" && AS=as
++_LT_DECL([], [AS], [0], [Assembler program])dnl
++
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
++
++test -z "$OBJDUMP" && OBJDUMP=objdump
++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
++])# win32-dll
++
++AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++_LT_SET_OPTION([LT_INIT], [win32-dll])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `win32-dll' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
++
++
++# _LT_ENABLE_SHARED([DEFAULT])
++# ----------------------------
++# implement the --enable-shared flag, and supports the `shared' and
++# `disable-shared' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_SHARED],
++[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([shared],
++ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
++
++ _LT_DECL([build_libtool_libs], [enable_shared], [0],
++ [Whether or not to build shared libraries])
++])# _LT_ENABLE_SHARED
++
++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
++
++# Old names:
++AC_DEFUN([AC_ENABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
++])
++
++AC_DEFUN([AC_DISABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], [disable-shared])
++])
++
++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_SHARED], [])
++dnl AC_DEFUN([AM_DISABLE_SHARED], [])
++
++
++
++# _LT_ENABLE_STATIC([DEFAULT])
++# ----------------------------
++# implement the --enable-static flag, and support the `static' and
++# `disable-static' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_STATIC],
++[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([static],
++ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
++
++ _LT_DECL([build_old_libs], [enable_static], [0],
++ [Whether or not to build static libraries])
++])# _LT_ENABLE_STATIC
++
++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
++
++# Old names:
++AC_DEFUN([AC_ENABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
++])
++
++AC_DEFUN([AC_DISABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], [disable-static])
++])
++
++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_STATIC], [])
++dnl AC_DEFUN([AM_DISABLE_STATIC], [])
++
++
++
++# _LT_ENABLE_FAST_INSTALL([DEFAULT])
++# ----------------------------------
++# implement the --enable-fast-install flag, and support the `fast-install'
++# and `disable-fast-install' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_FAST_INSTALL],
++[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([fast-install],
++ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_fast_install=yes ;;
++ no) enable_fast_install=no ;;
++ *)
++ enable_fast_install=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_fast_install=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
++
++_LT_DECL([fast_install], [enable_fast_install], [0],
++ [Whether or not to optimize for fast installation])dnl
++])# _LT_ENABLE_FAST_INSTALL
++
++LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
++
++# Old names:
++AU_DEFUN([AC_ENABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `fast-install' option into LT_INIT's first parameter.])
++])
++
++AU_DEFUN([AC_DISABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `disable-fast-install' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
++
++
++# _LT_WITH_PIC([MODE])
++# --------------------
++# implement the --with-pic flag, and support the `pic-only' and `no-pic'
++# LT_INIT options.
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
++m4_define([_LT_WITH_PIC],
++[AC_ARG_WITH([pic],
++ [AS_HELP_STRING([--with-pic],
++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++ [pic_mode="$withval"],
++ [pic_mode=default])
++
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++
++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
++])# _LT_WITH_PIC
++
++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
++
++# Old name:
++AU_DEFUN([AC_LIBTOOL_PICMODE],
++[_LT_SET_OPTION([LT_INIT], [pic-only])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `pic-only' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
++
++## ----------------- ##
++## LTDL_INIT Options ##
++## ----------------- ##
++
++m4_define([_LTDL_MODE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
++ [m4_define([_LTDL_MODE], [nonrecursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [recursive],
++ [m4_define([_LTDL_MODE], [recursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [subproject],
++ [m4_define([_LTDL_MODE], [subproject])])
++
++m4_define([_LTDL_TYPE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [installable],
++ [m4_define([_LTDL_TYPE], [installable])])
++LT_OPTION_DEFINE([LTDL_INIT], [convenience],
++ [m4_define([_LTDL_TYPE], [convenience])])
+Index: gtk+3.0-2.90.5/m4/ltsugar.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+3.0-2.90.5/m4/ltsugar.m4 2010-07-30 19:14:19.716083308 +0200
+@@ -0,0 +1,123 @@
++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++# serial 6 ltsugar.m4
++
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
++
++
++# lt_join(SEP, ARG1, [ARG2...])
++# -----------------------------
++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
++# associated separator.
++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
++# versions in m4sugar had bugs.
++m4_define([lt_join],
++[m4_if([$#], [1], [],
++ [$#], [2], [[$2]],
++ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
++m4_define([_lt_join],
++[m4_if([$#$2], [2], [],
++ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
++
++
++# lt_car(LIST)
++# lt_cdr(LIST)
++# ------------
++# Manipulate m4 lists.
++# These macros are necessary as long as will still need to support
++# Autoconf-2.59 which quotes differently.
++m4_define([lt_car], [[$1]])
++m4_define([lt_cdr],
++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
++ [$#], 1, [],
++ [m4_dquote(m4_shift($@))])])
++m4_define([lt_unquote], $1)
++
++
++# lt_append(MACRO-NAME, STRING, [SEPARATOR])
++# ------------------------------------------
++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
++# Note that neither SEPARATOR nor STRING are expanded; they are appended
++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
++# No SEPARATOR is output if MACRO-NAME was previously undefined (different
++# than defined and empty).
++#
++# This macro is needed until we can rely on Autoconf 2.62, since earlier
++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
++m4_define([lt_append],
++[m4_define([$1],
++ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
++
++
++
++# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
++# ----------------------------------------------------------
++# Produce a SEP delimited list of all paired combinations of elements of
++# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
++# has the form PREFIXmINFIXSUFFIXn.
++# Needed until we can rely on m4_combine added in Autoconf 2.62.
++m4_define([lt_combine],
++[m4_if(m4_eval([$# > 3]), [1],
++ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
++[[m4_foreach([_Lt_prefix], [$2],
++ [m4_foreach([_Lt_suffix],
++ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
++ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
++
++
++# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
++# -----------------------------------------------------------------------
++# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
++# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
++m4_define([lt_if_append_uniq],
++[m4_ifdef([$1],
++ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
++ [lt_append([$1], [$2], [$3])$4],
++ [$5])],
++ [lt_append([$1], [$2], [$3])$4])])
++
++
++# lt_dict_add(DICT, KEY, VALUE)
++# -----------------------------
++m4_define([lt_dict_add],
++[m4_define([$1($2)], [$3])])
++
++
++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
++# --------------------------------------------
++m4_define([lt_dict_add_subkey],
++[m4_define([$1($2:$3)], [$4])])
++
++
++# lt_dict_fetch(DICT, KEY, [SUBKEY])
++# ----------------------------------
++m4_define([lt_dict_fetch],
++[m4_ifval([$3],
++ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
++ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
++
++
++# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
++# -----------------------------------------------------------------
++m4_define([lt_if_dict_fetch],
++[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
++ [$5],
++ [$6])])
++
++
++# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
++# --------------------------------------------------------------
++m4_define([lt_dict_filter],
++[m4_if([$5], [], [],
++ [lt_join(m4_quote(m4_default([$4], [[, ]])),
++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
++ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
++])
+Index: gtk+3.0-2.90.5/m4/ltversion.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+3.0-2.90.5/m4/ltversion.m4 2010-07-30 19:14:19.915085356 +0200
+@@ -0,0 +1,23 @@
++# ltversion.m4 -- version numbers -*- Autoconf -*-
++#
++# Copyright (C) 2004 Free Software Foundation, Inc.
++# Written by Scott James Remnant, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++# Generated from ltversion.in.
++
++# serial 3017 ltversion.m4
++# This file is part of GNU Libtool
++
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
++
++AC_DEFUN([LTVERSION_VERSION],
++[macro_version='2.2.6b'
++macro_revision='1.3017'
++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
++_LT_DECL(, macro_revision, 0)
++])
+Index: gtk+3.0-2.90.5/m4/lt~obsolete.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+3.0-2.90.5/m4/lt~obsolete.m4 2010-07-30 19:14:20.019087123 +0200
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@@ -26091,539 +26827,10 @@
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-Index: gtk+2.0-2.21.5/m4/ltoptions.m4
+Index: gtk+3.0-2.90.5/m4macros/Makefile.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/ltoptions.m4 2010-07-22 17:58:36.854053352 +0200
-@@ -0,0 +1,368 @@
-+# Helper functions for option handling. -*- Autoconf -*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltoptions.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+
-+
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+
-+
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+ _LT_MANGLE_DEFUN([$1], [$2]),
-+ [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
-+
-+
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-+
-+
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+ [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
-+
-+
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME. If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+ dnl
-+ dnl Simply set some default values (i.e off) if boolean options were not
-+ dnl specified:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+ ])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+ ])
-+ dnl
-+ dnl If no reference was made to various pairs of opposing options, then
-+ dnl we run the default mode handler for the pair. For example, if neither
-+ dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+ dnl archives by default:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+ [_LT_ENABLE_FAST_INSTALL])
-+ ])
-+])# _LT_SET_OPTIONS
-+
-+
-+## --------------------------------- ##
-+## Macros to handle LT_INIT options. ##
-+## --------------------------------- ##
-+
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+
-+
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
-+
-+
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
-+
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+
-+
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
-+
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+ AC_CHECK_TOOL(AS, as, false)
-+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+ ;;
-+esac
-+
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS], [0], [Assembler program])dnl
-+
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
-+
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+
-+
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+
-+ _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+ [Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
-+
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
-+
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
-+
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-+
-+ _LT_DECL([build_old_libs], [enable_static], [0],
-+ [Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
-+
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
-+
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-+
-+
-+
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-+
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+ [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+
-+
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+ [AS_HELP_STRING([--with-pic],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [pic_mode="$withval"],
-+ [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
-+## ----------------- ##
-+## LTDL_INIT Options ##
-+## ----------------- ##
-+
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+ [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+ [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+ [m4_define([_LTDL_MODE], [subproject])])
-+
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+ [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+ [m4_define([_LTDL_TYPE], [convenience])])
-Index: gtk+2.0-2.21.5/m4/ltsugar.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/ltsugar.m4 2010-07-22 17:58:36.942056499 +0200
-@@ -0,0 +1,123 @@
-+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltsugar.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+
-+
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+ [$#], [2], [[$2]],
-+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+
-+
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+ [$#], 1, [],
-+ [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-+
-+
-+
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+ [m4_foreach([_Lt_suffix],
-+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-+
-+
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+ [lt_append([$1], [$2], [$3])$4],
-+ [$5])],
-+ [lt_append([$1], [$2], [$3])$4])])
-+
-+
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-+
-+
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-+
-+
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+
-+
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+ [$5],
-+ [$6])])
-+
-+
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+ [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
-Index: gtk+2.0-2.21.5/m4/ltversion.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/m4/ltversion.m4 2010-07-22 17:58:37.010052915 +0200
-@@ -0,0 +1,23 @@
-+# ltversion.m4 -- version numbers -*- Autoconf -*-
-+#
-+# Copyright (C) 2004 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# Generated from ltversion.in.
-+
-+# serial 3017 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
-Index: gtk+2.0-2.21.5/m4macros/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/m4macros/Makefile.in 2010-07-22 17:59:02.117065331 +0200
-+++ gtk+2.0-2.21.5/m4macros/Makefile.in 2010-07-22 17:58:46.650050811 +0200
+--- gtk+3.0-2.90.5.orig/m4macros/Makefile.in 2010-07-30 19:14:58.039096997 +0200
++++ gtk+3.0-2.90.5/m4macros/Makefile.in 2010-07-30 19:14:37.211082322 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = m4macros
@@ -26633,7 +26840,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -26649,7 +26856,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -291,6 +295,7 @@
+@@ -292,6 +296,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -26657,76 +26864,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/Makefile.in 2010-07-22 17:59:14.750052494 +0200
-+++ gtk+2.0-2.21.5/Makefile.in 2010-07-22 17:58:48.926051254 +0200
-@@ -45,17 +45,20 @@
- $(srcdir)/gtk-zip.sh.in $(top_srcdir)/Makefile.decl \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
-- missing
-+ missing mkinstalldirs
- @OS_UNIX_TRUE at am__append_1 = gtk+-unix-print-2.0.pc
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-2.0.pc gtk+-2.0.pc \
- gtk+-unix-print-2.0.pc gail.pc gdk-2.0-uninstalled.pc \
-@@ -106,7 +109,8 @@
- distdir dist dist-all distcheck
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = $(SUBDIRS)
-+DIST_SUBDIRS = po po-properties gdk gtk modules demos tests perf docs \
-+ m4macros build
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -204,6 +208,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -354,6 +359,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-@@ -455,7 +461,10 @@
- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- && DISPLAY=:$$XID && export DISPLAY
-
--SRC_SUBDIRS = gdk gtk modules demos tests perf
-+
-+# don't build perf measurement tools in static builds
-+ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
-+SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
-
- # require automake 1.4
-Index: gtk+2.0-2.21.5/mkinstalldirs
+Index: gtk+3.0-2.90.5/mkinstalldirs
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gtk+2.0-2.21.5/mkinstalldirs 2010-07-22 17:58:48.878051861 +0200
++++ gtk+3.0-2.90.5/mkinstalldirs 2010-07-30 19:14:39.771085063 +0200
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -26890,10 +27031,47 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-Index: gtk+2.0-2.21.5/modules/engines/Makefile.in
+Index: gtk+3.0-2.90.5/modules/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/Makefile.in 2010-07-22 17:58:59.382060735 +0200
-+++ gtk+2.0-2.21.5/modules/engines/Makefile.in 2010-07-22 17:58:46.794051384 +0200
+--- gtk+3.0-2.90.5.orig/modules/Makefile.in 2010-07-30 19:14:56.543082489 +0200
++++ gtk+3.0-2.90.5/modules/Makefile.in 2010-07-30 19:14:37.299083454 +0200
+@@ -40,11 +40,14 @@
+ @OS_UNIX_TRUE at am__append_1 = printbackends
+ subdir = modules
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -158,6 +161,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -309,6 +313,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+3.0-2.90.5/modules/engines/Makefile.in
+===================================================================
+--- gtk+3.0-2.90.5.orig/modules/engines/Makefile.in 2010-07-30 19:14:54.624084173 +0200
++++ gtk+3.0-2.90.5/modules/engines/Makefile.in 2010-07-30 19:14:37.391081745 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines
@@ -26903,7 +27081,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -26919,7 +27097,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -308,6 +312,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -26927,10 +27105,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Makefile.in
+Index: gtk+3.0-2.90.5/modules/engines/ms-windows/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Makefile.in 2010-07-22 17:58:59.833069875 +0200
-+++ gtk+2.0-2.21.5/modules/engines/ms-windows/Makefile.in 2010-07-22 17:58:46.882050834 +0200
+--- gtk+3.0-2.90.5.orig/modules/engines/ms-windows/Makefile.in 2010-07-30 19:14:54.848108813 +0200
++++ gtk+3.0-2.90.5/modules/engines/ms-windows/Makefile.in 2010-07-30 19:14:37.499082067 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows
@@ -26940,7 +27118,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -26956,7 +27134,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -364,6 +368,7 @@
+@@ -365,6 +369,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -26964,20 +27142,57 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+Index: gtk+3.0-2.90.5/modules/engines/ms-windows/Theme/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 17:58:59.625052638 +0200
-+++ gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 17:58:47.022050949 +0200
-@@ -40,11 +40,14 @@
+--- gtk+3.0-2.90.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2010-07-30 19:14:54.800092373 +0200
++++ gtk+3.0-2.90.5/modules/engines/ms-windows/Theme/Makefile.in 2010-07-30 19:14:37.591083278 +0200
+@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows/Theme/gtk-2.0
+ subdir = modules/engines/ms-windows/Theme
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -308,6 +312,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+3.0-2.90.5/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
+===================================================================
+--- gtk+3.0-2.90.5.orig/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in 2010-07-30 19:14:54.752085571 +0200
++++ gtk+3.0-2.90.5/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in 2010-07-30 19:14:37.675081726 +0200
+@@ -40,11 +40,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = modules/engines/ms-windows/Theme/gtk-3.0
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -26993,7 +27208,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -291,6 +295,7 @@
+@@ -292,6 +296,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27001,20 +27216,104 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/Makefile.in
+Index: gtk+3.0-2.90.5/modules/engines/pixbuf/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 17:58:59.702072908 +0200
-+++ gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 17:58:46.954051458 +0200
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows/Theme
+--- gtk+3.0-2.90.5.orig/modules/engines/pixbuf/Makefile.in 2010-07-30 19:14:54.572114024 +0200
++++ gtk+3.0-2.90.5/modules/engines/pixbuf/Makefile.in 2010-07-30 19:14:37.783082049 +0200
+@@ -40,11 +40,14 @@
+ $(top_srcdir)/Makefile.decl ChangeLog
+ subdir = modules/engines/pixbuf
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -177,6 +180,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -328,6 +332,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+3.0-2.90.5/modules/input/Makefile.in
+===================================================================
+--- gtk+3.0-2.90.5.orig/modules/input/Makefile.in 2010-07-30 19:14:55.080085438 +0200
++++ gtk+3.0-2.90.5/modules/input/Makefile.in 2010-07-30 19:14:38.039085194 +0200
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
+ subdir = modules/input
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -378,6 +381,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -529,6 +533,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+@@ -694,7 +699,8 @@
+ @INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
+ imconffiledir = $(sysconfdir)/gtk-3.0
+ dist_imconffile_DATA = im-multipress.conf
+- at CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE at RUN_QUERY_IMMODULES_TEST = false
+ @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
+ @BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
+ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
+Index: gtk+3.0-2.90.5/modules/other/Makefile.in
+===================================================================
+--- gtk+3.0-2.90.5.orig/modules/other/Makefile.in 2010-07-30 19:14:55.943091710 +0200
++++ gtk+3.0-2.90.5/modules/other/Makefile.in 2010-07-30 19:14:38.119082014 +0200
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = modules/other
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27030,147 +27329,6 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/engines/pixbuf/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/modules/engines/pixbuf/Makefile.in 2010-07-22 17:58:59.330054264 +0200
-+++ gtk+2.0-2.21.5/modules/engines/pixbuf/Makefile.in 2010-07-22 17:58:47.110052152 +0200
-@@ -40,11 +40,14 @@
- $(top_srcdir)/Makefile.decl ChangeLog
- subdir = modules/engines/pixbuf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -177,6 +180,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -327,6 +331,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/input/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/modules/input/Makefile.in 2010-07-22 17:58:59.949061219 +0200
-+++ gtk+2.0-2.21.5/modules/input/Makefile.in 2010-07-22 17:58:47.290050875 +0200
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/input
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -378,6 +381,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -528,6 +532,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-@@ -693,7 +698,8 @@
- @INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
- imconffiledir = $(sysconfdir)/gtk-2.0
- dist_imconffile_DATA = im-multipress.conf
-- at CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
-+ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
-+ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE at RUN_QUERY_IMMODULES_TEST = false
- @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
- @BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
- @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
-@@ -1245,7 +1251,18 @@
- included-modules: $(noinst_LTLIBRARIES)
-
- gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
-+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
-+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
-+ else \
-+ echo "***" ; \
-+ echo "*** Warning: gtk.immodules not built" ; \
-+ echo "***" ; \
-+ echo "*** Generate this file manually on host" ; \
-+ echo "*** system using gtk-query-immodules-2.0" ; \
-+ echo "***" ; \
-+ touch gtk.immodules; \
-+ fi
-
- @CROSS_COMPILING_FALSE at all-local: gtk.immodules
-
-Index: gtk+2.0-2.21.5/modules/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/modules/Makefile.in 2010-07-22 17:59:01.246053515 +0200
-+++ gtk+2.0-2.21.5/modules/Makefile.in 2010-07-22 17:58:46.722050609 +0200
-@@ -40,11 +40,14 @@
- @OS_UNIX_TRUE at am__append_1 = printbackends
- subdir = modules
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -158,6 +161,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
@@ -308,6 +312,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -27179,10 +27337,47 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/gail/libgail-util/Makefile.in
+Index: gtk+3.0-2.90.5/modules/other/gail/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/gail/libgail-util/Makefile.in 2010-07-22 17:59:00.077053466 +0200
-+++ gtk+2.0-2.21.5/modules/other/gail/libgail-util/Makefile.in 2010-07-22 17:58:47.802051353 +0200
+--- gtk+3.0-2.90.5.orig/modules/other/gail/Makefile.in 2010-07-30 19:14:55.871093449 +0200
++++ gtk+3.0-2.90.5/modules/other/gail/Makefile.in 2010-07-30 19:14:38.455082410 +0200
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
+ subdir = modules/other/gail
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -245,6 +248,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -396,6 +400,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+3.0-2.90.5/modules/other/gail/libgail-util/Makefile.in
+===================================================================
+--- gtk+3.0-2.90.5.orig/modules/other/gail/libgail-util/Makefile.in 2010-07-30 19:14:55.280098147 +0200
++++ gtk+3.0-2.90.5/modules/other/gail/libgail-util/Makefile.in 2010-07-30 19:14:38.567081836 +0200
@@ -42,11 +42,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/other/gail/libgail-util
@@ -27192,7 +27387,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27208,7 +27403,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -332,6 +336,7 @@
+@@ -333,6 +337,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27216,47 +27411,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/gail/Makefile.in
+Index: gtk+3.0-2.90.5/modules/other/gail/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/gail/Makefile.in 2010-07-22 17:59:00.529053303 +0200
-+++ gtk+2.0-2.21.5/modules/other/gail/Makefile.in 2010-07-22 17:58:47.682051386 +0200
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
- subdir = modules/other/gail
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -248,6 +251,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -398,6 +402,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/gail/tests/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/gail/tests/Makefile.in 2010-07-22 17:59:00.445054155 +0200
-+++ gtk+2.0-2.21.5/modules/other/gail/tests/Makefile.in 2010-07-22 17:58:47.938051731 +0200
+--- gtk+3.0-2.90.5.orig/modules/other/gail/tests/Makefile.in 2010-07-30 19:14:55.803095766 +0200
++++ gtk+3.0-2.90.5/modules/other/gail/tests/Makefile.in 2010-07-30 19:14:38.719082502 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/other/gail/tests
@@ -27266,7 +27424,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27274,7 +27432,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -321,6 +324,7 @@
+@@ -313,6 +316,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -27282,7 +27440,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -471,6 +475,7 @@
+@@ -464,6 +468,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27290,20 +27448,20 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/other/Makefile.in
+Index: gtk+3.0-2.90.5/modules/printbackends/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/other/Makefile.in 2010-07-22 17:59:00.609053559 +0200
-+++ gtk+2.0-2.21.5/modules/other/Makefile.in 2010-07-22 17:58:47.378051234 +0200
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = modules/other
+--- gtk+3.0-2.90.5.orig/modules/printbackends/Makefile.in 2010-07-30 19:14:56.499088422 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/Makefile.in 2010-07-30 19:14:38.795081689 +0200
+@@ -42,11 +42,14 @@
+ @HAVE_PAPI_TRUE at am__append_3 = papi
+ subdir = modules/printbackends
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27311,7 +27469,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -157,6 +160,7 @@
+@@ -159,6 +162,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -27319,7 +27477,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -307,6 +311,7 @@
+@@ -310,6 +314,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27327,10 +27485,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/cups/Makefile.in
+Index: gtk+3.0-2.90.5/modules/printbackends/cups/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/cups/Makefile.in 2010-07-22 17:59:00.825065031 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/cups/Makefile.in 2010-07-22 17:58:48.102051344 +0200
+--- gtk+3.0-2.90.5.orig/modules/printbackends/cups/Makefile.in 2010-07-30 19:14:56.211093009 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/cups/Makefile.in 2010-07-30 19:14:38.895081835 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/cups
@@ -27340,7 +27498,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27356,7 +27514,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -331,6 +335,7 @@
+@@ -332,6 +336,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27364,10 +27522,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/file/Makefile.in
+Index: gtk+3.0-2.90.5/modules/printbackends/file/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/file/Makefile.in 2010-07-22 17:59:00.733053473 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/file/Makefile.in 2010-07-22 17:58:48.194051237 +0200
+--- gtk+3.0-2.90.5.orig/modules/printbackends/file/Makefile.in 2010-07-30 19:14:56.147094441 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/file/Makefile.in 2010-07-30 19:14:38.999082416 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/file
@@ -27377,7 +27535,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27393,7 +27551,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -330,6 +334,7 @@
+@@ -331,6 +335,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27401,10 +27559,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/lpr/Makefile.in
+Index: gtk+3.0-2.90.5/modules/printbackends/lpr/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/lpr/Makefile.in 2010-07-22 17:59:00.961064010 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/lpr/Makefile.in 2010-07-22 17:58:48.282051255 +0200
+--- gtk+3.0-2.90.5.orig/modules/printbackends/lpr/Makefile.in 2010-07-30 19:14:56.427095473 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/lpr/Makefile.in 2010-07-30 19:14:39.111082884 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/lpr
@@ -27414,7 +27572,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27430,7 +27588,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -328,6 +332,7 @@
+@@ -329,6 +333,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27438,47 +27596,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/Makefile.in
+Index: gtk+3.0-2.90.5/modules/printbackends/papi/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/Makefile.in 2010-07-22 17:59:01.189054714 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/Makefile.in 2010-07-22 17:58:48.010051031 +0200
-@@ -42,11 +42,14 @@
- @HAVE_PAPI_TRUE at am__append_3 = papi
- subdir = modules/printbackends
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -159,6 +162,7 @@
- GDK_PACKAGES = @GDK_PACKAGES@
- GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
- GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -309,6 +313,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/papi/Makefile.in
-===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/papi/Makefile.in 2010-07-22 17:59:00.889053119 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/papi/Makefile.in 2010-07-22 17:58:48.370051195 +0200
+--- gtk+3.0-2.90.5.orig/modules/printbackends/papi/Makefile.in 2010-07-30 19:14:56.323084759 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/papi/Makefile.in 2010-07-30 19:14:39.203081795 +0200
@@ -39,11 +39,14 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -27488,7 +27609,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27504,7 +27625,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -328,6 +332,7 @@
+@@ -329,6 +333,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27512,10 +27633,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/modules/printbackends/test/Makefile.in
+Index: gtk+3.0-2.90.5/modules/printbackends/test/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/modules/printbackends/test/Makefile.in 2010-07-22 17:59:00.669063840 +0200
-+++ gtk+2.0-2.21.5/modules/printbackends/test/Makefile.in 2010-07-22 17:58:48.462051287 +0200
+--- gtk+3.0-2.90.5.orig/modules/printbackends/test/Makefile.in 2010-07-30 19:14:56.063093899 +0200
++++ gtk+3.0-2.90.5/modules/printbackends/test/Makefile.in 2010-07-30 19:14:39.307081957 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/test
@@ -27525,7 +27646,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27541,7 +27662,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -329,6 +333,7 @@
+@@ -330,6 +334,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27549,10 +27670,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/perf/Makefile.in
+Index: gtk+3.0-2.90.5/perf/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/perf/Makefile.in 2010-07-22 17:59:14.882053698 +0200
-+++ gtk+2.0-2.21.5/perf/Makefile.in 2010-07-22 17:58:48.550051158 +0200
+--- gtk+3.0-2.90.5.orig/perf/Makefile.in 2010-07-30 19:15:12.684111504 +0200
++++ gtk+3.0-2.90.5/perf/Makefile.in 2010-07-30 19:14:39.403081875 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = testperf$(EXEEXT)
subdir = perf
@@ -27562,7 +27683,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27578,7 +27699,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -302,6 +306,7 @@
+@@ -303,6 +307,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -27586,10 +27707,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-Index: gtk+2.0-2.21.5/po/Makefile.in.in
+Index: gtk+3.0-2.90.5/po/Makefile.in.in
===================================================================
---- gtk+2.0-2.21.5.orig/po/Makefile.in.in 2010-07-22 17:59:01.753053846 +0200
-+++ gtk+2.0-2.21.5/po/Makefile.in.in 2010-07-22 17:58:37.318052549 +0200
+--- gtk+3.0-2.90.5.orig/po/Makefile.in.in 2010-07-30 19:14:57.384085324 +0200
++++ gtk+3.0-2.90.5/po/Makefile.in.in 2010-07-30 19:14:20.220103512 +0200
@@ -25,23 +25,23 @@
prefix = @prefix@
@@ -27704,12 +27825,12 @@
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
-Index: gtk+2.0-2.21.5/tests/Makefile.in
+Index: gtk+3.0-2.90.5/tests/Makefile.in
===================================================================
---- gtk+2.0-2.21.5.orig/tests/Makefile.in 2010-07-22 17:59:10.197053365 +0200
-+++ gtk+2.0-2.21.5/tests/Makefile.in 2010-07-22 17:58:48.782052093 +0200
-@@ -73,11 +73,14 @@
- @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE at am__append_2 = -DHAVE_OBJC=1 -x objective-c++
+--- gtk+3.0-2.90.5.orig/tests/Makefile.in 2010-07-30 19:15:06.712115066 +0200
++++ gtk+3.0-2.90.5/tests/Makefile.in 2010-07-30 19:14:39.663082994 +0200
+@@ -74,11 +74,14 @@
+ @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE at am__append_3 = -DHAVE_OBJC=1 -x objective-c++
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
@@ -27717,7 +27838,7 @@
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
@@ -27725,7 +27846,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -402,6 +405,7 @@
+@@ -406,6 +409,7 @@
GDK_PACKAGES = @GDK_PACKAGES@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
@@ -27733,7 +27854,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -552,6 +556,7 @@
+@@ -557,6 +561,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=24930&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Fri Jul 30 17:16:49 2010
@@ -1,10 +1,8 @@
001_static-linking-dont-query-immodules.patch
002_static-linking-dont-build-perf.patch
003_gdk.pc_privates.patch
-004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_support_disabling_x11_extensions.patch
009_gtk-export-filechooser.patch
-011_immodule-cache-dir.patch
015_default-fallback-icon-theme.patch
022_disable-viqr-im-for-vi-locale.patch
041_ia32-libs.patch
More information about the pkg-gnome-commits
mailing list