r25476 - in /desktop/experimental/gtk+3.0/debian/patches: 002_static-linking-dont-build-perf.patch 003_gdk.pc_privates.patch 070_mandatory-relibtoolize.patch
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Wed Nov 3 23:46:04 UTC 2010
Author: sjoerd
Date: Wed Nov 3 23:45:58 2010
New Revision: 25476
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25476
Log:
Update patches
Modified:
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/070_mandatory-relibtoolize.patch
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=25476&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] Wed Nov 3 23:45:58 2010
@@ -9,13 +9,13 @@
## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl
--SRC_SUBDIRS = gdk gtk modules demos tests perf
+-SRC_SUBDIRS = gdk gtk modules demos tests perf examples
+# don't build perf measurement tools in static builds
+if !ENABLE_STATIC
+MAYBE_PERF = perf
+endif
+
-+SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
++SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF) examples
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
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=25476&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] Wed Nov 3 23:45:58 2010
@@ -6,13 +6,13 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
-- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
+- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
-+ GDK_PRIVATE_PACKAGES="gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
++ GDK_PRIVATE_PACKAGES="gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend cairo-gobject"
else
-- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
+- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
+ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
-+ GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend"
++ GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend cairo-gobject"
fi
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
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=25476&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] Wed Nov 3 23:45:58 2010
@@ -1,399 +1,5 @@
-diff --git a/INSTALL b/INSTALL
-index 233c0d0..7d1c323 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -1,35 +1,365 @@
--Prerequisites
--=============
-+Installation Instructions
-+*************************
-
--GTK+ requires the following packages:
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-- - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
-- the same location as GTK+. GTK+ 2.91.0 requires at least
-- GLib , Pango ,
-- GdkPixbuf , ATK
-- and cairo .
-+ Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved. This file is offered as-is,
-+without warranty of any kind.
-
-- - gobject-introspection 0.9.3 or newer.
-+Basic Installation
-+==================
-
--Simple install procedure
--========================
-+ Briefly, the shell commands `./configure; make; make install' should
-+configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-
-- % gzip -cd gtk+-2.91.0.tar.gz | tar xvf - # unpack the sources
-- % cd gtk+-2.91.0 # change to the toplevel directory
-- % ./configure # run the `configure' script
-- % make # build GTK+
-- [ Become root if necessary ]
-- % make install # install GTK+
-+ The `configure' shell script attempts to guess correct values for
-+various system-dependent variables used during compilation. It uses
-+those values to create a `Makefile' in each directory of the package.
-+It may also create one or more `.h' files containing system-dependent
-+definitions. Finally, it creates a shell script `config.status' that
-+you can run in the future to recreate the current configuration, and a
-+file `config.log' containing compiler output (useful mainly for
-+debugging `configure').
-
--The Details
--===========
-+ It can also use an optional file (typically called `config.cache'
-+and enabled with `--cache-file=config.cache' or simply `-C') that saves
-+the results of its tests to speed up reconfiguring. Caching is
-+disabled by default to prevent problems with accidental use of stale
-+cache files.
-
--Complete information about installing GTK+ and related libraries can be found
--in the file:
-+ If you need to do unusual things to compile the package, please try
-+to figure out how `configure' could check whether to do them, and mail
-+diffs or instructions to the address given in the `README' so they can
-+be considered for the next release. If you are using the cache, and at
-+some point `config.cache' contains results you don't want to keep, you
-+may remove or edit it.
-
-- docs/reference/gtk/html/gtk-building.html
-+ The file `configure.ac' (or `configure.in') is used to create
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-
--Or online at:
-+ The simplest way to compile this package is:
-
-- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
-+ 1. `cd' to the directory containing the package's source code and type
-+ `./configure' to configure the package for your system.
-+
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-+
-+ 2. Type `make' to compile the package.
-+
-+ 3. Optionally, type `make check' to run any self-tests that come with
-+ the package, generally using the just-built uninstalled binaries.
-+
-+ 4. Type `make install' to install the programs and any data files and
-+ documentation. When installing into a prefix owned by root, it is
-+ recommended that the package be configured and built as a regular
-+ user, and only the `make install' phase executed with root
-+ privileges.
-+
-+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
-+ this time using the binaries in their final installed location.
-+ This target does not install anything. Running this target as a
-+ regular user, particularly if the prior `make install' required
-+ root privileges, verifies that the installation completed
-+ correctly.
-+
-+ 6. You can remove the program binaries and object files from the
-+ source code directory by typing `make clean'. To also remove the
-+ files that `configure' created (so you can compile the package for
-+ a different kind of computer), type `make distclean'. There is
-+ also a `make maintainer-clean' target, but that is intended mainly
-+ for the package's developers. If you use it, you may have to get
-+ all sorts of other programs in order to regenerate files that came
-+ with the distribution.
-+
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-+
-+Compilers and Options
-+=====================
-+
-+ Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-+
-+ You can give `configure' initial values for configuration parameters
-+by setting variables in the command line or in the environment. Here
-+is an example:
-+
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-+
-+ *Note Defining Variables::, for more details.
-+
-+Compiling For Multiple Architectures
-+====================================
-+
-+ You can compile the package for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory. To do this, you can use GNU `make'. `cd' to the
-+directory where you want the object files and executables to go and run
-+the `configure' script. `configure' automatically checks for the
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-+
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-+
-+ On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
-+this:
-+
-+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CPP="gcc -E" CXXCPP="g++ -E"
-+
-+ This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-+
-+Installation Names
-+==================
-+
-+ By default, `make install' installs the package's commands under
-+`/usr/local/bin', include files under `/usr/local/include', etc. You
-+can specify an installation prefix other than `/usr/local' by giving
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-+
-+ You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files. If you
-+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-+PREFIX as the prefix for installing programs and libraries.
-+Documentation and other data files still use the regular prefix.
-+
-+ In addition, if you use an unusual directory layout you can give
-+options like `--bindir=DIR' to specify different values for particular
-+kinds of files. Run `configure --help' for a list of the directories
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-+
-+Optional Features
-+=================
-+
-+ If the package supports it, you can cause programs to be installed
-+with an extra prefix or suffix on their names by giving `configure' the
-+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-+
-+ Some packages pay attention to `--enable-FEATURE' options to
-+`configure', where FEATURE indicates an optional part of the package.
-+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-+is something like `gnu-as' or `x' (for the X Window System). The
-+`README' should mention any `--enable-' and `--with-' options that the
-+package recognizes.
-+
-+ For packages that use the X Window System, `configure' can usually
-+find the X include and library files automatically, but if it doesn't,
-+you can use the `configure' options `--x-includes=DIR' and
-+`--x-libraries=DIR' to specify their locations.
-+
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-+
-+Particular systems
-+==================
-+
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-+a workaround. If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+ ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+ ./configure CC="cc -nodtk"
-+
-+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+ On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'. It is recommended to use the following options:
-+
-+ ./configure --prefix=/boot/common
-+
-+Specifying the System Type
-+==========================
-+
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
-+`--build=TYPE' option. TYPE can either be a short name for the system
-+type, such as `sun4', or a canonical name which has the form:
-+
-+ CPU-COMPANY-SYSTEM
-+
-+where SYSTEM can have one of these forms:
-+
-+ OS
-+ KERNEL-OS
-+
-+ See the file `config.sub' for the possible values of each field. If
-+`config.sub' isn't included in this package, then this package doesn't
-+need to know the machine type.
-+
-+ If you are _building_ compiler tools for cross-compiling, you should
-+use the option `--target=TYPE' to select the type of system they will
-+produce code for.
-+
-+ If you want to _use_ a cross compiler, that generates code for a
-+platform different from the build platform, you should specify the
-+"host" platform (i.e., that on which the generated programs will
-+eventually be run) with `--host=TYPE'.
-+
-+Sharing Defaults
-+================
-+
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
-+`configure' looks for `PREFIX/share/config.site' if it exists, then
-+`PREFIX/etc/config.site' if it exists. Or, you can set the
-+`CONFIG_SITE' environment variable to the location of the site script.
-+A warning: not all `configure' scripts look for a site script.
-+
-+Defining Variables
-+==================
-+
-+ Variables not defined in a site shell script can be set in the
-+environment passed to `configure'. However, some packages may run
-+configure again during the build, and the customized values of these
-+variables may be lost. In order to avoid this problem, you should set
-+them in the `configure' command line, using `VAR=value'. For example:
-+
-+ ./configure CC=/usr/local2/bin/gcc
-+
-+causes the specified `gcc' to be used as the C compiler (unless it is
-+overridden in the site shell script).
-+
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug. Until the bug is fixed you can use this workaround:
-+
-+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-+
-+`configure' Invocation
-+======================
-+
-+ `configure' recognizes the following options to control how it
-+operates.
-+
-+`--help'
-+`-h'
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-+
-+`--version'
-+`-V'
-+ Print the version of Autoconf used to generate the `configure'
-+ script, and exit.
-+
-+`--cache-file=FILE'
-+ Enable the cache: use and save the results of the tests in FILE,
-+ traditionally `config.cache'. FILE defaults to `/dev/null' to
-+ disable caching.
-+
-+`--config-cache'
-+`-C'
-+ Alias for `--cache-file=config.cache'.
-+
-+`--quiet'
-+`--silent'
-+`-q'
-+ Do not print messages saying which checks are being made. To
-+ suppress all normal output, redirect it to `/dev/null' (any error
-+ messages will still be shown).
-+
-+`--srcdir=DIR'
-+ Look for the package's source code in directory DIR. Usually
-+ `configure' can determine that directory automatically.
-+
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-+
-+`configure' also accepts some other, not widely useful, options. Run
-+`configure --help' for more details.
-
diff --git a/Makefile.in b/Makefile.in
-index 30b2cb0..81f450b 100644
+index 68c8a40..8a7cd0b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,8 +50,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -409,7 +15,25 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -359,6 +361,7 @@ libdir = @libdir@
+@@ -107,7 +109,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = po po-properties gdk gtk modules demos tests perf \
++ examples docs m4macros build
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -206,6 +209,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -362,6 +366,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -417,8 +41,20 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
+@@ -416,7 +421,10 @@ XVFB_START = \
+ || { 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 examples
++
++# 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) examples
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ MAINTAINERCLEANFILES = \
diff --git a/aclocal.m4 b/aclocal.m4
-index 2fc0a2f..e10f5c4 100644
+index e5aaf69..6338e17 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
@@ -432,9 +68,18 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -664,8043 +664,6 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
- fi])
-
+@@ -703,7 +703,7 @@ mostlyclean-am: clean-gsettings-schemas
+ gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+ %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+- $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
++ $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+
+ all-am: $(gsettings_SCHEMAS:.xml=.valid)
+ uninstall-am: uninstall-gsettings-schemas
+@@ -746,8043 +746,6 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+ ]
+ )
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
@@ -8476,7 +8121,7 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
-@@ -8838,7 +801,7 @@ $$1_PKG_ERRORS
+@@ -8920,7 +883,7 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
@@ -8485,7 +8130,7 @@
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
-@@ -8849,7 +812,7 @@ path to pkg-config.
+@@ -8931,7 +894,7 @@ path to pkg-config.
_PKG_TEXT
@@ -8494,7 +8139,7 @@
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -9880,4 +1843,9 @@ AC_SUBST([am__untar])
+@@ -9962,4 +1925,9 @@ AC_SUBST([am__untar])
m4_include([m4/gtk-doc.m4])
m4_include([m4/introspection.m4])
@@ -8505,7 +8150,7 @@
+m4_include([m4/lt~obsolete.m4])
m4_include([acinclude.m4])
diff --git a/build/Makefile.in b/build/Makefile.in
-index a455416..795f77e 100644
+index 2eb7b46..6297d6e 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -8521,7 +8166,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -312,6 +314,7 @@ libdir = @libdir@
+@@ -159,6 +161,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -315,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8530,7 +8183,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
-index 1e17853..7f15294 100644
+index bd4cf24..f320c1e 100644
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -8546,7 +8199,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -312,6 +314,7 @@ libdir = @libdir@
+@@ -159,6 +161,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -315,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8555,7 +8216,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in
-index c685605..d35aa45 100644
+index 65fab44..fab2b7f 100644
--- a/build/win32/vs9/Makefile.in
+++ b/build/win32/vs9/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -8571,7 +8232,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -272,6 +274,7 @@ libdir = @libdir@
+@@ -119,6 +121,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -275,6 +278,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -8669,14 +8338,14 @@
;;
*)
diff --git a/configure b/configure
-index 4846633..d1f9650 100755
+index 3575a85..fddff38 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.66 for gtk+ 2.91.0.
-+# Generated by GNU Autoconf 2.67 for gtk+ 2.91.0.
+-# Generated by GNU Autoconf 2.66 for gtk+ gtk_version.
++# Generated by GNU Autoconf 2.67 for gtk+ gtk_version.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -8851,7 +8520,24 @@
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
-@@ -793,6 +932,7 @@ OTOOL
+@@ -678,6 +817,7 @@ GDK_DEP_CFLAGS
+ GDK_DEP_LIBS
+ GDK_EXTRA_CFLAGS
+ GDK_EXTRA_LIBS
++GDK_PRIVATE_PACKAGES
+ GDK_PACKAGES
+ USE_QUARTZ_FALSE
+ USE_QUARTZ_TRUE
+@@ -790,6 +930,8 @@ am__fastdepCCAS_TRUE
+ CCASDEPMODE
+ CCASFLAGS
+ CCAS
++ENABLE_STATIC_FALSE
++ENABLE_STATIC_TRUE
+ CXXCPP
+ CPP
+ OTOOL64
+@@ -797,6 +939,7 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
@@ -8859,7 +8545,7 @@
RANLIB
AR
LN_S
-@@ -940,7 +1080,6 @@ with_pic
+@@ -944,11 +1087,14 @@ with_pic
enable_fast_install
with_gnu_ld
enable_libtool_lock
@@ -8867,7 +8553,15 @@
enable_largefile
enable_debug
enable_xkb
-@@ -975,9 +1114,6 @@ LIBS
+ enable_xinerama
++enable_xrandr
++enable_xfixes
++enable_xcomposite
++enable_xdamage
+ enable_rebuilds
+ with_xinput
+ with_gdktarget
+@@ -980,9 +1126,6 @@ LIBS
CPPFLAGS
CXX
CXXFLAGS
@@ -8877,7 +8571,7 @@
CCC
CPP
CXXCPP
-@@ -1053,8 +1189,9 @@ do
+@@ -1058,8 +1201,9 @@ do
fi
case $ac_option in
@@ -8889,16 +8583,29 @@
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1764,7 +1901,7 @@ test -n "$ac_init_help" && exit $ac_status
+@@ -1636,6 +1780,12 @@ Optional Features:
+ --enable-xkb support XKB [default=maybe]
+ --enable-xinerama support xinerama extension if available
+ [default=yes]
++ --enable-xrandr support XRandR extension if available [default=yes]
++ --enable-xfixes support XFixes extension if available [default=yes]
++ --enable-xcomposite support X Composite extension if available
++ [default=yes]
++ --enable-xdamage support X Damage extension if available
++ [default=yes]
+ --disable-rebuilds disable all source autogeneration rules
+ --enable-explicit-deps=[yes/no/auto]
+ use explicit dependencies in .pc files
+@@ -1771,7 +1921,7 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.91.0
+ gtk+ configure gtk_version
-generated by GNU Autoconf 2.66
+generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
-@@ -1951,7 +2088,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -1958,7 +2108,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8907,7 +8614,7 @@
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -2097,7 +2234,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -2104,7 +2254,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8916,7 +8623,7 @@
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -2206,7 +2343,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -2213,7 +2363,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
@@ -8925,16 +8632,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
-@@ -2311,7 +2448,7 @@ This file contains any messages produced by compilers while
+@@ -2318,7 +2468,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by gtk+ $as_me 2.91.0, which was
+ It was created by gtk+ $as_me gtk_version, which was
-generated by GNU Autoconf 2.66. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
-@@ -2569,7 +2706,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+@@ -2576,7 +2726,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
@@ -8943,7 +8650,7 @@
fi
done
-@@ -2805,11 +2942,11 @@ am_lf='
+@@ -2856,11 +3006,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -8957,7 +8664,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -3563,7 +3700,7 @@ fi
+@@ -3614,7 +3764,7 @@ fi
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
@@ -8966,7 +8673,7 @@
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3678,7 +3815,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3729,7 +3879,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
@@ -8975,7 +8682,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3721,7 +3858,7 @@ else
+@@ -3772,7 +3922,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
@@ -8984,7 +8691,7 @@
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3780,7 +3917,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -3831,7 +3981,7 @@ $as_echo "$ac_try_echo"; } >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
@@ -8993,7 +8700,7 @@
fi
fi
fi
-@@ -3832,7 +3969,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3883,7 +4033,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
@@ -9002,7 +8709,7 @@
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -4709,7 +4846,7 @@ fi
+@@ -4760,7 +4910,7 @@ fi
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
@@ -9011,7 +8718,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -4742,7 +4879,7 @@ fi
+@@ -4793,7 +4943,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -9020,7 +8727,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5367,8 +5504,8 @@ esac
+@@ -5418,8 +5568,8 @@ esac
@@ -9031,7 +8738,7 @@
-@@ -5384,75 +5521,6 @@ macro_revision='1.3175'
+@@ -5435,75 +5585,6 @@ macro_revision='1.3175'
ltmain="$ac_aux_dir/ltmain.sh"
@@ -9107,7 +8814,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 :
-@@ -5918,11 +5986,8 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -5969,11 +6050,8 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -9121,7 +8828,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
-@@ -5966,7 +6031,7 @@ fi
+@@ -6017,7 +6095,7 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -9130,7 +8837,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
-@@ -6021,15 +6086,6 @@ esac
+@@ -6072,15 +6150,6 @@ esac
fi
fi
@@ -9146,24 +8853,24 @@
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -6049,13 +6105,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
+@@ -6100,13 +6169,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
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:6108: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6172: $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:6111: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6175: $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:6114: output\"" >&5)
++ (eval echo "\"\$as_me:6178: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6112,11 +6168,6 @@ else
+@@ -6163,11 +6232,6 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
@@ -9175,7 +8882,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -6181,8 +6232,8 @@ else
+@@ -6232,8 +6296,8 @@ else
# 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.
@@ -9186,7 +8893,7 @@
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -6450,18 +6501,16 @@ mingw* | pw32*)
+@@ -6501,18 +6565,16 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -9208,7 +8915,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'
-@@ -6491,10 +6540,6 @@ gnu*)
+@@ -6542,10 +6604,6 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9219,7 +8926,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -6503,11 +6548,11 @@ hpux10.20* | hpux11*)
+@@ -6554,11 +6612,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -9233,7 +8940,7 @@
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -6533,7 +6578,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -6584,7 +6642,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9242,7 +8949,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
-@@ -6945,18 +6990,6 @@ if test -n "$RANLIB"; then
+@@ -6996,18 +7054,6 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -9261,7 +8968,7 @@
-@@ -7126,8 +7159,8 @@ _LT_EOF
+@@ -7177,8 +7223,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -9272,16 +8979,16 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7281,7 +7314,7 @@ ia64-*-hpux*)
+@@ -7332,7 +7378,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+ echo '#line 7317 "configure"' > conftest.$ac_ext
++ echo '#line 7381 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7993,38 +8026,6 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -8044,38 +8090,6 @@ rm -f core conftest.err conftest.$ac_objext \
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; }
@@ -9320,7 +9027,7 @@
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -8052,7 +8053,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
+@@ -8103,7 +8117,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -9329,7 +9036,7 @@
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -8102,7 +8103,7 @@ else
+@@ -8153,7 +8167,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -9338,7 +9045,7 @@
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -8118,11 +8119,11 @@ else
+@@ -8169,11 +8183,11 @@ else
ac_preproc_ok=:
break
fi
@@ -9352,7 +9059,7 @@
if $ac_preproc_ok; then :
break
fi
-@@ -8161,7 +8162,7 @@ else
+@@ -8212,7 +8226,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -9361,7 +9068,7 @@
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -8177,18 +8178,18 @@ else
+@@ -8228,18 +8242,18 @@ else
ac_preproc_ok=:
break
fi
@@ -9383,10 +9090,49 @@
fi
ac_ext=c
-@@ -8342,6 +8343,530 @@ done
-
-
-
+@@ -8393,52 +8407,27 @@ done
+
+
+
+-
+-
+-# 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'
@@ -9401,101 +9147,135 @@
+ 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
+@@ -8447,7 +8436,7 @@ do
+ 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
+@@ -8457,28 +8446,32 @@ 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; }
+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
-+
-+
+ 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
+@@ -8487,7 +8480,7 @@ do
+ 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
+@@ -8497,17 +8490,21 @@ 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; }
+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
-+
+ 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:)
+@@ -8515,27 +8512,568 @@ yes:)
+ $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
-+
+ 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; }
+-if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$DLLTOOL"; then
+- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+ fi
+fi
+# Provide some information about the compiler.
@@ -9911,19 +9691,153 @@
+fi
+
+
-
-
- # Set options
-@@ -8377,7 +8902,7 @@ fi
- enable_win32_dll=yes
-
- case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
++
++
++# 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
-@@ -8793,7 +9318,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++ 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; }
++if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$DLLTOOL"; then
++ ac_cv_prog_DLLTOOL="$DLLTOOL" # 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
+@@ -8844,7 +9382,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -9931,10 +9845,16 @@
test -z "$LN_S" && LN_S="ln -s"
-@@ -8843,6 +9367,19 @@ _ACEOF
-
-
-
+@@ -8887,9 +9424,22 @@ objdir=$lt_cv_objdir
+
+
+
+-cat >>confdefs.h <<_ACEOF
+-#define LT_OBJDIR "$lt_cv_objdir/"
+-_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define LT_OBJDIR "$lt_cv_objdir/"
++_ACEOF
+
+
+
@@ -9948,10 +9868,10 @@
+
+
+
- case $host_os in
- aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
-@@ -8855,6 +9392,23 @@ aix3*)
+
+
+
+@@ -8906,6 +9456,23 @@ aix3*)
;;
esac
@@ -9975,7 +9895,7 @@
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -8883,7 +9437,7 @@ for cc_temp in $compiler""; do
+@@ -8934,7 +9501,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -9984,7 +9904,7 @@
# Only perform the check for file, if the check method requires it
-@@ -9083,17 +9637,16 @@ _lt_linker_boilerplate=`cat conftest.err`
+@@ -9134,17 +9701,16 @@ _lt_linker_boilerplate=`cat conftest.err`
$RM -r conftest*
@@ -10007,17 +9927,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; }
-@@ -9113,15 +9666,15 @@ else
+@@ -9164,15 +9730,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9669: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9733: $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:9673: \$? = $ac_status" >&5
++ echo "$as_me:9737: \$? = $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.
@@ -10026,7 +9946,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
-@@ -9199,12 +9752,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -9250,12 +9816,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
@@ -10039,7 +9959,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
-@@ -9247,13 +9794,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -9298,13 +9858,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -10053,7 +9973,7 @@
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -9316,7 +9856,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -9367,7 +9920,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -10062,7 +9982,7 @@
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -9328,26 +9868,26 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -9379,26 +9932,26 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -10097,7 +10017,7 @@
esac
;;
esac
-@@ -9378,7 +9918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -9429,7 +9982,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -10106,17 +10026,17 @@
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -9465,15 +10005,15 @@ else
+@@ -9516,15 +10069,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10008: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10072: $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:10012: \$? = $ac_status" >&5
++ echo "$as_me:10076: \$? = $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.
@@ -10125,7 +10045,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
-@@ -9521,7 +10061,7 @@ else
+@@ -9572,7 +10125,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -10134,17 +10054,17 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -9570,16 +10110,16 @@ else
+@@ -9621,16 +10174,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10113: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10177: $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:10117: \$? = $ac_status" >&5
++ echo "$as_me:10181: \$? = $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
@@ -10154,17 +10074,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
-@@ -9625,16 +10165,16 @@ else
+@@ -9676,16 +10229,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10168: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10232: $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:10172: \$? = $ac_status" >&5
++ echo "$as_me:10236: \$? = $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
@@ -10174,7 +10094,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
-@@ -9744,36 +10284,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9795,36 +10348,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
@@ -10214,7 +10134,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -9807,12 +10324,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -9858,12 +10388,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -10230,7 +10150,7 @@
_LT_EOF
fi
-@@ -9848,7 +10364,6 @@ _LT_EOF
+@@ -9899,7 +10428,6 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -10238,7 +10158,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
-@@ -9870,11 +10385,6 @@ _LT_EOF
+@@ -9921,11 +10449,6 @@ _LT_EOF
fi
;;
@@ -10250,7 +10170,7 @@
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -9904,12 +10414,11 @@ _LT_EOF
+@@ -9955,12 +10478,11 @@ _LT_EOF
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
@@ -10266,7 +10186,7 @@
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -9920,17 +10429,13 @@ _LT_EOF
+@@ -9971,17 +10493,13 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -10286,7 +10206,7 @@
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -9946,17 +10451,17 @@ _LT_EOF
+@@ -9997,17 +10515,17 @@ _LT_EOF
fi
case $cc_basename in
@@ -10307,7 +10227,7 @@
fi
;;
esac
-@@ -9965,7 +10470,7 @@ _LT_EOF
+@@ -10016,7 +10534,7 @@ _LT_EOF
fi
;;
@@ -10316,7 +10236,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10077,10 +10582,8 @@ _LT_EOF
+@@ -10128,10 +10646,8 @@ _LT_EOF
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
@@ -10328,7 +10248,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
-@@ -10142,6 +10645,7 @@ _LT_EOF
+@@ -10193,6 +10709,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10336,7 +10256,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10198,7 +10702,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -10249,7 +10766,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10345,7 +10265,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -10242,13 +10746,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10293,13 +10810,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -10361,7 +10281,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'
-@@ -10287,7 +10786,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10338,7 +10850,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -10370,7 +10290,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.
-@@ -10303,11 +10802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10354,11 +10866,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
@@ -10383,7 +10303,7 @@
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -10315,7 +10810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10366,7 +10874,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -10392,7 +10312,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}"
-@@ -10381,7 +10876,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10432,7 +10940,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
@@ -10401,7 +10321,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'
-@@ -10400,7 +10895,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10451,7 +10959,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux11*)
@@ -10410,7 +10330,7 @@
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -10421,46 +10916,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10472,46 +10980,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -10458,7 +10378,7 @@
;;
esac
fi
-@@ -10488,7 +10944,7 @@ fi
+@@ -10539,7 +11008,7 @@ fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10467,7 +10387,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.
-@@ -10499,15 +10955,15 @@ fi
+@@ -10550,15 +11019,15 @@ fi
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -10486,7 +10406,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10516,7 +10972,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -10567,7 +11036,7 @@ rm -f core conftest.err conftest.$ac_objext \
link_all_deplibs=yes
;;
@@ -10495,7 +10415,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10569,17 +11025,17 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -10620,17 +11089,17 @@ rm -f core conftest.err conftest.$ac_objext \
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -10516,7 +10436,7 @@
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10589,13 +11045,13 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -10640,13 +11109,13 @@ rm -f core conftest.err conftest.$ac_objext \
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -10533,7 +10453,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10798,50 +11254,44 @@ x|xyes)
+@@ -10849,50 +11318,44 @@ x|xyes)
# 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; }
@@ -10613,7 +10533,7 @@
;;
esac
fi
-@@ -11012,23 +11462,16 @@ if test "$GCC" = yes; then
+@@ -11063,23 +11526,16 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -10643,7 +10563,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=
-@@ -11041,7 +11484,7 @@ if test "$GCC" = yes; then
+@@ -11092,7 +11548,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -10652,7 +10572,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -11061,13 +11504,7 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -11112,13 +11568,7 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -10667,7 +10587,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -11155,7 +11592,7 @@ amigaos*)
+@@ -11206,7 +11656,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -10676,7 +10596,7 @@
;;
esac
;;
-@@ -11208,12 +11645,23 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -11259,12 +11709,23 @@ cygwin* | mingw* | pw32* | cegcc*)
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}'
@@ -10702,7 +10622,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -11313,19 +11761,6 @@ gnu*)
+@@ -11364,19 +11825,6 @@ gnu*)
hardcode_into_libs=yes
;;
@@ -10722,7 +10642,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -11368,10 +11803,8 @@ hpux9* | hpux10* | hpux11*)
+@@ -11419,10 +11867,8 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -10734,7 +10654,7 @@
;;
interix[3-9]*)
-@@ -11438,17 +11871,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -11489,17 +11935,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -10757,7 +10677,7 @@
/* end confdefs.h. */
int
-@@ -11461,31 +11889,23 @@ main ()
+@@ -11512,31 +11953,23 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -10794,7 +10714,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11497,6 +11917,18 @@ fi
+@@ -11548,6 +11981,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10813,7 +10733,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11787,11 +12219,6 @@ fi
+@@ -11838,11 +12283,6 @@ fi
@@ -10825,16 +10745,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=
-@@ -12122,7 +12549,7 @@ else
+@@ -12173,7 +12613,7 @@ else
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 12552 "configure"
++#line 12616 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12163,13 +12590,7 @@ else
+@@ -12214,13 +12654,7 @@ else
# endif
#endif
@@ -10849,7 +10769,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12178,11 +12599,7 @@ int main ()
+@@ -12229,11 +12663,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -10862,16 +10782,16 @@
/* dlclose (self); */
}
else
-@@ -12228,7 +12645,7 @@ else
+@@ -12279,7 +12709,7 @@ else
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 12648 "configure"
++#line 12712 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12269,13 +12686,7 @@ else
+@@ -12320,13 +12750,7 @@ else
# endif
#endif
@@ -10886,7 +10806,7 @@
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12284,11 +12695,7 @@ int main ()
+@@ -12335,11 +12759,7 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -10899,10 +10819,44 @@
/* dlclose (self); */
}
else
-@@ -12445,145 +12852,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- CC="$lt_save_CC"
-
+@@ -12462,179 +12882,40 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
+ case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+- ;;
+-
+- aix[4-9]*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+- fi
+- ;;
+- 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; }
+- # 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; }
+-
+-
+-
+-
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-CC="$lt_save_CC"
+-
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
@@ -10968,10 +10922,23 @@
-if $ac_preproc_ok; then :
- break
-fi
--
++ if test -n "$RANLIB"; then
++ archive_cmds="$archive_cmds~\$RANLIB \$lib"
++ postinstall_cmds='$RANLIB $lib'
++ fi
++ ;;
+
- done
- ac_cv_prog_CXXCPP=$CXXCPP
--
++ aix[4-9]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
++ ;;
++ esac
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
++$as_echo "$enable_shared" >&6; }
+
-fi
- CXXCPP=$ac_cv_prog_CXXCPP
-else
@@ -10998,13 +10965,19 @@
- Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
--
++ { $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; }
+
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
--
+
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11020,32 +10993,34 @@
-break
-fi
-rm -f conftest.err conftest.$ac_ext
--
+
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
--
+
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
--fi
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
+ fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
-else
- _lt_caught_CXX_error=yes
-fi
++CC="$lt_save_CC"
++
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -12610,8 +12878,6 @@ module_cmds_CXX=
+@@ -12661,8 +12942,6 @@ module_cmds_CXX=
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
old_archive_cmds_CXX=$old_archive_cmds
@@ -11054,7 +11029,7 @@
no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-@@ -12694,7 +12960,7 @@ $RM -r conftest*
+@@ -12745,7 +13024,7 @@ $RM -r conftest*
*) break;;
esac
done
@@ -11063,7 +11038,7 @@
if test -n "$compiler"; then
-@@ -12856,7 +13122,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -12907,7 +13186,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11072,7 +11047,7 @@
else
GXX=no
-@@ -12998,7 +13264,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13049,7 +13328,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11081,7 +11056,7 @@
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -13042,13 +13308,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13093,13 +13372,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -11097,7 +11072,7 @@
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -13081,7 +13342,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13132,7 +13406,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# _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'
@@ -11105,7 +11080,7 @@
allow_undefined_flag_CXX=unsupported
always_export_symbols_CXX=no
enable_shared_with_static_runtimes_CXX=yes
-@@ -13108,11 +13368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13159,11 +13432,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
@@ -11118,7 +11093,7 @@
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -13120,7 +13376,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13171,7 +13440,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -11127,7 +11102,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}"
-@@ -13173,11 +13429,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13224,11 +13493,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
gnu*)
;;
@@ -11139,7 +11114,7 @@
hpux9*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13202,7 +13453,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13253,7 +13517,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -11148,7 +11123,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -13267,7 +13518,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13318,7 +13582,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -11157,7 +11132,7 @@
;;
*)
if test "$GXX" = yes; then
-@@ -13310,7 +13561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13361,7 +13625,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $cc_basename in
CC*)
# SGI C++
@@ -11166,7 +11141,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13321,9 +13572,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13372,9 +13636,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -11178,7 +11153,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13352,7 +13603,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13403,7 +13667,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -11187,7 +11162,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -13389,26 +13640,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13440,26 +13704,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -11220,7 +11195,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'
;;
-@@ -13416,7 +13667,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13467,7 +13731,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -11229,7 +11204,7 @@
;;
cxx*)
# Compaq C++
-@@ -13435,9 +13686,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13486,9 +13750,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -11241,7 +11216,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'
-@@ -13457,13 +13708,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13508,13 +13772,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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'
@@ -11257,7 +11232,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13532,7 +13783,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13583,7 +13847,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
export_dynamic_flag_spec_CXX='${wl}-E'
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -11266,7 +11241,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -13567,15 +13818,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13618,15 +13882,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host in
osf3*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -11285,7 +11260,7 @@
$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
-@@ -13591,17 +13842,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13642,17 +13906,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# 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.
@@ -11306,7 +11281,7 @@
;;
esac
-@@ -13611,7 +13862,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13662,7 +13926,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11315,7 +11290,7 @@
else
# FIXME: insert proper C++ library support
-@@ -13647,7 +13898,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13698,7 +13962,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
solaris*)
case $cc_basename in
@@ -11324,7 +11299,7 @@
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
-@@ -13668,7 +13919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13719,7 +13983,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
link_all_deplibs_CXX=yes
@@ -11333,7 +11308,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13695,7 +13946,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13746,7 +14010,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11342,7 +11317,7 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -13706,7 +13957,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13757,7 +14021,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -11351,7 +11326,7 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -13760,10 +14011,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13811,10 +14075,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
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'
@@ -11362,7 +11337,7 @@
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -13945,7 +14192,7 @@ linux*)
+@@ -13996,7 +14256,7 @@ linux*)
solaris*)
case $cc_basename in
@@ -11371,7 +11346,7 @@
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -14061,11 +14308,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -14112,11 +14372,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -11383,7 +11358,7 @@
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -14204,8 +14446,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -14255,8 +14510,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
@@ -11394,7 +11369,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -14235,7 +14477,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -14286,7 +14541,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
@@ -11403,7 +11378,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14267,7 +14509,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -14318,7 +14573,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
solaris*)
case $cc_basename in
@@ -11412,17 +11387,17 @@
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
-@@ -14359,15 +14601,15 @@ else
+@@ -14410,15 +14665,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14604: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14668: $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:14608: \$? = $ac_status" >&5
++ echo "$as_me:14672: \$? = $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.
@@ -11431,7 +11406,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
-@@ -14412,7 +14654,7 @@ else
+@@ -14463,7 +14718,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -11440,17 +11415,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
-@@ -14458,16 +14700,16 @@ else
+@@ -14509,16 +14764,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14703: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14767: $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:14707: \$? = $ac_status" >&5
++ echo "$as_me:14771: \$? = $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
@@ -11460,17 +11435,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
-@@ -14510,16 +14752,16 @@ else
+@@ -14561,16 +14816,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14755: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14819: $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:14759: \$? = $ac_status" >&5
++ echo "$as_me:14823: \$? = $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
@@ -11480,7 +11455,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
-@@ -14574,10 +14816,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -14625,10 +14880,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
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
@@ -11492,7 +11467,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
-@@ -14588,6 +14828,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -14639,6 +14892,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
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'
;;
@@ -11502,7 +11477,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14624,50 +14867,44 @@ x|xyes)
+@@ -14675,50 +14931,44 @@ x|xyes)
# 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; }
@@ -11582,7 +11557,7 @@
;;
esac
fi
-@@ -14824,7 +15061,7 @@ amigaos*)
+@@ -14875,7 +15125,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11591,7 +11566,7 @@
;;
esac
;;
-@@ -14877,11 +15114,23 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -14928,11 +15178,23 @@ cygwin* | mingw* | pw32* | cegcc*)
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}'
@@ -11616,7 +11591,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -14980,19 +15229,6 @@ gnu*)
+@@ -15031,19 +15293,6 @@ gnu*)
hardcode_into_libs=yes
;;
@@ -11636,7 +11611,7 @@
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
-@@ -15035,10 +15271,8 @@ hpux9* | hpux10* | hpux11*)
+@@ -15086,10 +15335,8 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -11648,7 +11623,7 @@
;;
interix[3-9]*)
-@@ -15105,17 +15339,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -15156,17 +15403,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11671,7 +11646,7 @@
/* end confdefs.h. */
int
-@@ -15128,31 +15357,23 @@ main ()
+@@ -15179,31 +15421,23 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -11708,7 +11683,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15164,6 +15385,18 @@ fi
+@@ -15215,6 +15449,18 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11727,7 +11702,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -15403,8 +15636,6 @@ fi
+@@ -15454,8 +15700,6 @@ fi
@@ -11736,7 +11711,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=
-@@ -15492,15 +15723,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -15543,15 +15787,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
: ${CONFIG_LT=./config.lt}
{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -11758,7 +11733,7 @@
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
-@@ -15625,6 +15857,7 @@ export LANGUAGE
+@@ -15676,6 +15921,7 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -11766,7 +11741,7 @@
# as_fn_error STATUS ERROR [LINENO LOG_FD]
# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-@@ -15833,7 +16066,7 @@ $as_echo X"$as_dir" |
+@@ -15884,7 +16130,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -11775,7 +11750,7 @@
} # as_fn_mkdir_p
-@@ -15874,15 +16107,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -15925,15 +16171,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -11792,10 +11767,10 @@
exec 5>>config.log
{
echo
-@@ -15907,9 +16133,9 @@ Report bugs to <bug-libtool at gnu.org>."
+@@ -15958,9 +16197,9 @@ Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
- gtk+ config.lt 2.91.0
+ gtk+ config.lt 2.91.3
-configured by $0, generated by GNU Autoconf 2.66.
+configured by $0, generated by GNU Autoconf 2.67.
@@ -11804,7 +11779,7 @@
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -15926,10 +16152,10 @@ do
+@@ -15977,10 +16216,10 @@ do
lt_cl_silent=: ;;
-*) as_fn_error $? "unrecognized option: $1
@@ -11817,7 +11792,7 @@
esac
shift
done
-@@ -15949,203 +16175,186 @@ cat >>"$CONFIG_LT" <<_LTEOF
+@@ -16000,203 +16239,186 @@ cat >>"$CONFIG_LT" <<_LTEOF
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -12195,7 +12170,7 @@
GREP \
EGREP \
FGREP \
-@@ -16168,6 +16377,8 @@ lt_cv_sys_global_symbol_pipe \
+@@ -16219,6 +16441,8 @@ lt_cv_sys_global_symbol_pipe \
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 \
@@ -12204,7 +12179,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -16197,7 +16408,6 @@ variables_saved_for_relink \
+@@ -16248,7 +16472,6 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
@@ -12212,7 +12187,7 @@
finish_eval \
old_striplib \
striplib \
-@@ -16208,7 +16418,6 @@ predeps \
+@@ -16259,7 +16482,6 @@ predeps \
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -12220,7 +12195,7 @@
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
lt_prog_compiler_wl_CXX \
-@@ -16234,9 +16443,9 @@ postdep_objects_CXX \
+@@ -16285,9 +16507,9 @@ postdep_objects_CXX \
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -12232,7 +12207,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -16263,7 +16472,6 @@ postuninstall_cmds \
+@@ -16314,7 +16536,6 @@ postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
@@ -12240,7 +12215,7 @@
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -16273,9 +16481,9 @@ module_cmds_CXX \
+@@ -16324,9 +16545,9 @@ module_cmds_CXX \
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
prelink_cmds_CXX; do
@@ -12252,7 +12227,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -16283,6 +16491,12 @@ prelink_cmds_CXX; do
+@@ -16334,6 +16555,12 @@ prelink_cmds_CXX; do
esac
done
@@ -12265,7 +12240,7 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -16330,8 +16544,7 @@ $as_echo "$as_me: creating $ofile" >&6;}
+@@ -16381,8 +16608,7 @@ $as_echo "$as_me: creating $ofile" >&6;}
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12275,7 +12250,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -16371,13 +16584,13 @@ macro_revision=$macro_revision
+@@ -16422,13 +16648,13 @@ macro_revision=$macro_revision
build_old_libs=$enable_static
# Assembler program.
@@ -12292,7 +12267,7 @@
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
-@@ -16388,12 +16601,6 @@ pic_mode=$pic_mode
+@@ -16439,12 +16665,6 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -12305,7 +12280,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -16443,6 +16650,10 @@ SP2NL=$lt_lt_SP2NL
+@@ -16494,6 +16714,10 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -12316,7 +12291,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -16461,9 +16672,6 @@ RANLIB=$lt_RANLIB
+@@ -16512,9 +16736,6 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -12326,7 +12301,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -16485,6 +16693,12 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
+@@ -16536,6 +16757,12 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -12339,7 +12314,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -16547,9 +16761,6 @@ library_names_spec=$lt_library_names_spec
+@@ -16598,9 +16825,6 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -12349,7 +12324,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -16589,10 +16800,6 @@ striplib=$lt_striplib
+@@ -16640,10 +16864,6 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
@@ -12360,7 +12335,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -16866,7 +17073,7 @@ _LT_EOF
+@@ -16917,7 +17137,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -12369,7 +12344,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -16877,7 +17084,7 @@ func_dirname ()
+@@ -16928,7 +17148,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
@@ -12378,7 +12353,7 @@
}
-@@ -16890,8 +17097,10 @@ func_basename ()
+@@ -16941,8 +17161,10 @@ func_basename ()
func_stripname ()
{
case ${2} in
@@ -12391,7 +12366,7 @@
esac
}
-@@ -16902,20 +17111,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
+@@ -16953,20 +17175,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
# func_opt_split
func_opt_split ()
{
@@ -12416,7 +12391,7 @@
}
# func_arith arithmetic-term...
-@@ -16976,10 +17185,6 @@ _LT_EOF
+@@ -17027,10 +17249,6 @@ _LT_EOF
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -12427,7 +12402,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
-@@ -17134,13 +17339,15 @@ chmod +x "$CONFIG_LT"
+@@ -17185,13 +17403,24 @@ chmod +x "$CONFIG_LT"
# 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.
@@ -12447,10 +12422,46 @@
+ exec 5>>config.log
+ $lt_cl_success || as_fn_exit 1
+fi
++
++
++ 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.
-@@ -17761,7 +17968,7 @@ fi
+@@ -17781,6 +18010,26 @@ else
+ enable_xinerama="yes"
+ fi
+
++# Check whether --enable-xrandr was given.
++if test "${enable_xrandr+set}" = set; then :
++ enableval=$enable_xrandr;
++fi
++
++# Check whether --enable-xfixes was given.
++if test "${enable_xfixes+set}" = set; then :
++ enableval=$enable_xfixes;
++fi
++
++# Check whether --enable-xcomposite was given.
++if test "${enable_xcomposite+set}" = set; then :
++ enableval=$enable_xcomposite;
++fi
++
++# Check whether --enable-xdamage was given.
++if test "${enable_xdamage+set}" = set; then :
++ enableval=$enable_xdamage;
++fi
++
+ # Check whether --enable-rebuilds was given.
+ if test "${enable_rebuilds+set}" = set; then :
+ enableval=$enable_rebuilds;
+@@ -17812,7 +18061,7 @@ fi
case $gdktarget in
x11|win32|quartz) ;;
@@ -12459,7 +12470,7 @@
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -17801,11 +18008,11 @@ am_lf='
+@@ -17852,11 +18101,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -12473,7 +12484,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -18095,7 +18302,6 @@ installed software in a non-standard prefix.
+@@ -18146,7 +18395,6 @@ installed software in a non-standard prefix.
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
@@ -12481,7 +12492,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -18110,8 +18316,7 @@ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+@@ -18161,8 +18409,7 @@ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12491,7 +12502,7 @@
else
BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-@@ -18197,7 +18402,6 @@ installed software in a non-standard prefix.
+@@ -18248,7 +18495,6 @@ installed software in a non-standard prefix.
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
@@ -12499,7 +12510,7 @@
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -18212,8 +18416,7 @@ and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
+@@ -18263,8 +18509,7 @@ and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12509,7 +12520,7 @@
else
CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
-@@ -20416,7 +20619,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -20467,7 +20712,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
gdk_wchar_h=no
fi
@@ -12518,7 +12529,7 @@
if test $gdk_wchar_h = yes; then
$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
-@@ -20437,7 +20640,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -20488,7 +20733,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
gdk_wctype_h=no
fi
@@ -12527,7 +12538,7 @@
if test $gdk_wctype_h = yes; then
$as_echo "#define HAVE_WCTYPE_H 1" >>confdefs.h
-@@ -20555,7 +20758,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -20606,7 +20851,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
gtk_uxtheme_h=no
fi
@@ -12536,7 +12547,7 @@
if test $gtk_uxtheme_h = yes; then
$as_echo "#define HAVE_UXTHEME_H 1" >>confdefs.h
-@@ -21199,7 +21402,7 @@ if test "x$with_x" = xno; then
+@@ -21250,7 +21495,7 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -12545,7 +12556,7 @@
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-@@ -21303,7 +21506,7 @@ else
+@@ -21354,7 +21599,7 @@ else
fi
done
fi
@@ -12554,7 +12565,101 @@
fi # $ac_x_includes = no
if test "$ac_x_libraries" = no; then
-@@ -23796,6 +23999,10 @@ if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then
+@@ -22260,7 +22505,8 @@ fi
+
+
+ # Check for the RANDR extension
+- if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
++ if test x"$enable_xrandr" != xno && \
++ $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
+
+ $as_echo "#define HAVE_RANDR 1" >>confdefs.h
+
+@@ -22280,7 +22526,8 @@ $as_echo "#define HAVE_XCURSOR 1" >>confdefs.h
+
+ # Checks for XFixes extension
+
+- if $PKG_CONFIG --exists xfixes ; then
++ if test x"$enable_xfixes" != xno && \
++ $PKG_CONFIG --exists xfixes ; then
+
+ $as_echo "#define HAVE_XFIXES 1" >>confdefs.h
+
+@@ -22291,7 +22538,8 @@ $as_echo "#define HAVE_XFIXES 1" >>confdefs.h
+
+ # Checks for Xcomposite extension
+
+- if $PKG_CONFIG --exists xcomposite ; then
++ if test x"$enable_xcomposite" != xno && \
++ $PKG_CONFIG --exists xcomposite ; then
+
+ $as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
+
+@@ -22302,7 +22550,7 @@ $as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
+
+ # Checks for Xdamage extension
+
+- if $PKG_CONFIG --exists xdamage ; then
++ if test x"$enable_xdamage" != xno && $PKG_CONFIG --exists xdamage ; then
+
+ $as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
+
+@@ -22472,20 +22720,23 @@ LDFLAGS="$saved_ldflags"
+
+ # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
+ if test "x$gdktarget" = "xx11"; then
+- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
++ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
++ GDK_PRIVATE_PACKAGES="gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend cairo-gobject"
+ else
+- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend cairo-gobject"
++ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
++ GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend cairo-gobject"
+ fi
+
+-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES`"
++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
+ #
+ # If we aren't writing explicit dependencies, then don't put the extra libraries we need
+ # into the pkg-config files
+ #
+ if test $enable_explicit_deps != yes ; then
+- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
+ GDK_EXTRA_LIBS=
++else
++ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
+ fi
+
+
+@@ -22495,6 +22746,7 @@ fi
+
+
+
++
+ ########################################
+ # Check for Accessibility Toolkit flags
+ ########################################
+@@ -23125,7 +23377,7 @@ if test "${enable_schemas_compile+set}" = set; then :
+ enableval=$enable_schemas_compile; case ${enableval} in
+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -23310,7 +23562,7 @@ mostlyclean-am: clean-gsettings-schemas
+ gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+ %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+- $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
++ $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+
+ all-am: $(gsettings_SCHEMAS:.xml=.valid)
+ uninstall-am: uninstall-gsettings-schemas
+@@ -24081,6 +24333,14 @@ if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then
as_fn_error $? "conditional \"HAVE_OBJC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -12562,28 +12667,32 @@
+ 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.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -24409,7 +24616,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+@@ -24694,7 +24954,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.91.0, which was
+ This file was extended by gtk+ $as_me 2.91.3, which was
-generated by GNU Autoconf 2.66. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -24475,7 +24682,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -24760,7 +25020,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- gtk+ config.status 2.91.0
+ gtk+ config.status 2.91.3
-configured by $0, generated by GNU Autoconf 2.66,
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -24496,11 +24703,16 @@ ac_need_defaults=:
+@@ -24781,11 +25041,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
@@ -12601,7 +12710,7 @@
*)
ac_option=$1
ac_optarg=$2
-@@ -24522,6 +24734,7 @@ do
+@@ -24807,6 +25072,7 @@ do
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -12609,7 +12718,7 @@
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
-@@ -24597,203 +24810,186 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+@@ -24882,203 +25148,186 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -12987,7 +13096,7 @@
GREP \
EGREP \
FGREP \
-@@ -24816,6 +25012,8 @@ lt_cv_sys_global_symbol_pipe \
+@@ -25101,6 +25350,8 @@ lt_cv_sys_global_symbol_pipe \
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 \
@@ -12996,7 +13105,7 @@
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
-@@ -24845,7 +25043,6 @@ variables_saved_for_relink \
+@@ -25130,7 +25381,6 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
@@ -13004,7 +13113,7 @@
finish_eval \
old_striplib \
striplib \
-@@ -24856,7 +25053,6 @@ predeps \
+@@ -25141,7 +25391,6 @@ predeps \
postdeps \
compiler_lib_search_path \
LD_CXX \
@@ -13012,7 +13121,7 @@
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
lt_prog_compiler_wl_CXX \
-@@ -24882,9 +25078,9 @@ postdep_objects_CXX \
+@@ -25167,9 +25416,9 @@ postdep_objects_CXX \
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
@@ -13024,7 +13133,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -24911,7 +25107,6 @@ postuninstall_cmds \
+@@ -25196,7 +25445,6 @@ postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
@@ -13032,7 +13141,7 @@
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
-@@ -24921,9 +25116,9 @@ module_cmds_CXX \
+@@ -25206,9 +25454,9 @@ module_cmds_CXX \
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
prelink_cmds_CXX; do
@@ -13044,7 +13153,7 @@
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -24931,6 +25126,12 @@ prelink_cmds_CXX; do
+@@ -25216,6 +25464,12 @@ prelink_cmds_CXX; do
esac
done
@@ -13057,7 +13166,7 @@
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -25059,7 +25260,7 @@ do
+@@ -25343,7 +25597,7 @@ do
"modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;;
"perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
@@ -13066,7 +13175,7 @@
esac
done
-@@ -25375,7 +25576,7 @@ do
+@@ -25659,7 +25913,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -13075,7 +13184,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -25403,7 +25604,7 @@ do
+@@ -25687,7 +25941,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -13084,7 +13193,7 @@
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -25430,7 +25631,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
+@@ -25714,7 +25968,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -13093,7 +13202,7 @@
esac
;;
esac
-@@ -25766,8 +25967,7 @@ $as_echo X"$file" |
+@@ -26050,8 +26304,7 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -13103,7 +13212,7 @@
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -25807,13 +26007,13 @@ macro_revision=$macro_revision
+@@ -26091,13 +26344,13 @@ macro_revision=$macro_revision
build_old_libs=$enable_static
# Assembler program.
@@ -13120,7 +13229,7 @@
# Whether or not to build shared libraries.
build_libtool_libs=$enable_shared
-@@ -25824,12 +26024,6 @@ pic_mode=$pic_mode
+@@ -26108,12 +26361,6 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -13133,7 +13242,7 @@
# The host system.
host_alias=$host_alias
host=$host
-@@ -25879,6 +26073,10 @@ SP2NL=$lt_lt_SP2NL
+@@ -26163,6 +26410,10 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -13144,7 +13253,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -25897,9 +26095,6 @@ RANLIB=$lt_RANLIB
+@@ -26181,9 +26432,6 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -13154,7 +13263,7 @@
# A C compiler.
LTCC=$lt_CC
-@@ -25921,6 +26116,12 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
+@@ -26205,6 +26453,12 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -13167,7 +13276,7 @@
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -25983,9 +26184,6 @@ library_names_spec=$lt_library_names_spec
+@@ -26267,9 +26521,6 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -13177,7 +13286,7 @@
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -26025,10 +26223,6 @@ striplib=$lt_striplib
+@@ -26309,10 +26560,6 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
@@ -13188,7 +13297,7 @@
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -26302,7 +26496,7 @@ _LT_EOF
+@@ -26586,7 +26833,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
@@ -13197,7 +13306,7 @@
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
-@@ -26313,7 +26507,7 @@ func_dirname ()
+@@ -26597,7 +26844,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
@@ -13206,7 +13315,7 @@
}
-@@ -26326,8 +26520,10 @@ func_basename ()
+@@ -26610,8 +26857,10 @@ func_basename ()
func_stripname ()
{
case ${2} in
@@ -13219,7 +13328,7 @@
esac
}
-@@ -26338,20 +26534,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
+@@ -26622,20 +26871,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
# func_opt_split
func_opt_split ()
{
@@ -13244,7 +13353,7 @@
}
# func_arith arithmetic-term...
-@@ -26412,10 +26608,6 @@ _LT_EOF
+@@ -26696,10 +26945,6 @@ _LT_EOF
# The linker used to build libraries.
LD=$lt_LD_CXX
@@ -13256,7 +13365,7 @@
old_archive_cmds=$lt_old_archive_cmds_CXX
diff --git a/demos/Makefile.in b/demos/Makefile.in
-index 4add85a..d89d8ce 100644
+index e2c509f..200d6d8 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -44,8 +44,10 @@ noinst_PROGRAMS = testanimation$(EXEEXT) testpixbuf-color$(EXEEXT) \
@@ -13272,7 +13381,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -360,6 +362,7 @@ libdir = @libdir@
+@@ -207,6 +209,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -363,6 +366,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13281,7 +13398,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in
-index f066922..76f3871 100644
+index b4fcce7..3e4ba68 100644
--- a/demos/gtk-demo/Makefile.in
+++ b/demos/gtk-demo/Makefile.in
@@ -43,8 +43,10 @@ bin_PROGRAMS = gtk3-demo$(EXEEXT)
@@ -13297,7 +13414,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -348,6 +350,7 @@ libdir = @libdir@
+@@ -195,6 +197,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -351,6 +354,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13306,7 +13431,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 342d555..43d905d 100644
+index af22432..00194cd 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -13322,32 +13447,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -312,6 +314,7 @@ libdir = @libdir@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-diff --git a/docs/faq/Makefile.in b/docs/faq/Makefile.in
-index 943cd5c..2045973 100644
---- a/docs/faq/Makefile.in
-+++ b/docs/faq/Makefile.in
-@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- subdir = docs/faq
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-- $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
-- $(top_srcdir)/configure.ac
-+ $(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
-@@ -272,6 +274,7 @@ libdir = @libdir@
+@@ -159,6 +161,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -315,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13356,7 +13464,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
-index 85a4245..faf8a96 100644
+index 5b90906..d513bd3 100644
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -13372,7 +13480,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -312,6 +314,7 @@ libdir = @libdir@
+@@ -159,6 +161,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -315,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13381,7 +13497,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/docs/reference/gdk/Makefile.in b/docs/reference/gdk/Makefile.in
-index b83b78e..e781b61 100644
+index 05f49dc..7e0bdab 100644
--- a/docs/reference/gdk/Makefile.in
+++ b/docs/reference/gdk/Makefile.in
@@ -47,8 +47,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -13397,7 +13513,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -279,6 +281,7 @@ libdir = @libdir@
+@@ -126,6 +128,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -282,6 +285,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13406,7 +13530,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/docs/reference/gtk/Makefile.in b/docs/reference/gtk/Makefile.in
-index 7cdcdc3..fd106e7 100644
+index 8220300..038ef08 100644
--- a/docs/reference/gtk/Makefile.in
+++ b/docs/reference/gtk/Makefile.in
@@ -47,8 +47,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -13422,7 +13546,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -304,6 +306,7 @@ libdir = @libdir@
+@@ -151,6 +153,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -307,6 +310,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13431,7 +13563,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/docs/reference/libgail-util/Makefile.in b/docs/reference/libgail-util/Makefile.in
-index 3bf364f..1b5fd7b 100644
+index 9e250bf..b702b10 100644
--- a/docs/reference/libgail-util/Makefile.in
+++ b/docs/reference/libgail-util/Makefile.in
@@ -46,8 +46,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -13447,7 +13579,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -278,6 +280,7 @@ libdir = @libdir@
+@@ -125,6 +127,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -281,6 +284,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13456,7 +13596,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/docs/tools/Makefile.in b/docs/tools/Makefile.in
-index 5edba8e..bf33478 100644
+index bd43ed1..9b2f360 100644
--- a/docs/tools/Makefile.in
+++ b/docs/tools/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -13472,7 +13612,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -307,6 +309,7 @@ libdir = @libdir@
+@@ -154,6 +156,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -310,6 +313,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13480,12 +13628,12 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
-diff --git a/docs/tutorial/Makefile.in b/docs/tutorial/Makefile.in
-index fc1bbf6..4c494b8 100644
---- a/docs/tutorial/Makefile.in
-+++ b/docs/tutorial/Makefile.in
-@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- subdir = docs/tutorial
+diff --git a/examples/Makefile.in b/examples/Makefile.in
+index bed53b6..71d0121 100644
+--- a/examples/Makefile.in
++++ b/examples/Makefile.in
+@@ -39,8 +39,10 @@ subdir = examples
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
@@ -13497,7 +13645,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -272,6 +274,7 @@ libdir = @libdir@
+@@ -155,6 +157,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -311,6 +314,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13506,7 +13662,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gdk/Makefile.in b/gdk/Makefile.in
-index da35cf1..48b92a6 100644
+index e398e58..627944c 100644
--- a/gdk/Makefile.in
+++ b/gdk/Makefile.in
@@ -47,8 +47,10 @@ DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.am \
@@ -13522,7 +13678,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -433,6 +435,7 @@ libdir = @libdir@
+@@ -282,6 +284,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -438,6 +441,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13531,7 +13695,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gdk/quartz/Makefile.in b/gdk/quartz/Makefile.in
-index 78c47e9..d984644 100644
+index 07670d2..77a1a9c 100644
--- a/gdk/quartz/Makefile.in
+++ b/gdk/quartz/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \
@@ -13547,7 +13711,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -335,6 +337,7 @@ libdir = @libdir@
+@@ -182,6 +184,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -338,6 +341,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13556,10 +13728,10 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gdk/tests/Makefile.in b/gdk/tests/Makefile.in
-index 87c229f..21a6424 100644
+index 61359ef..65df780 100644
--- a/gdk/tests/Makefile.in
+++ b/gdk/tests/Makefile.in
-@@ -42,8 +42,10 @@ TESTS = $(am__EXEEXT_1)
+@@ -42,8 +42,10 @@ noinst_PROGRAMS = $(am__EXEEXT_1)
subdir = gdk/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -13572,7 +13744,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -277,6 +279,7 @@ libdir = @libdir@
+@@ -155,6 +157,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -311,6 +314,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13581,7 +13761,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gdk/win32/Makefile.in b/gdk/win32/Makefile.in
-index c37d461..0034d81 100644
+index 8c9531a..470dc2a 100644
--- a/gdk/win32/Makefile.in
+++ b/gdk/win32/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \
@@ -13597,7 +13777,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -372,6 +374,7 @@ libdir = @libdir@
+@@ -219,6 +221,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -375,6 +378,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13606,7 +13794,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gdk/win32/rc/Makefile.in b/gdk/win32/rc/Makefile.in
-index 368ef31..b66b64f 100644
+index c83c0a2..dddc271 100644
--- a/gdk/win32/rc/Makefile.in
+++ b/gdk/win32/rc/Makefile.in
@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -13622,7 +13810,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -274,6 +276,7 @@ libdir = @libdir@
+@@ -121,6 +123,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -277,6 +280,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13631,7 +13827,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gdk/x11/Makefile.in b/gdk/x11/Makefile.in
-index b219ce8..0b23dd3 100644
+index 4695eaa..0abc6ec 100644
--- a/gdk/x11/Makefile.in
+++ b/gdk/x11/Makefile.in
@@ -57,8 +57,10 @@ TESTS = checksettings$(EXEEXT)
@@ -13647,7 +13843,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -379,6 +381,7 @@ libdir = @libdir@
+@@ -226,6 +228,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -382,6 +385,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13656,7 +13860,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gtk/Makefile.in b/gtk/Makefile.in
-index 0e027f0..e04b5e3 100644
+index fba20b7..3305712 100644
--- a/gtk/Makefile.in
+++ b/gtk/Makefile.in
@@ -78,8 +78,10 @@ bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT) \
@@ -13672,7 +13876,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -774,6 +776,7 @@ libdir = @libdir@
+@@ -619,6 +621,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -775,6 +778,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13681,10 +13893,10 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in
-index 0732bc6..8930bd9 100644
+index e3bef07..6e247d5 100644
--- a/gtk/tests/Makefile.in
+++ b/gtk/tests/Makefile.in
-@@ -43,8 +43,10 @@ noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
+@@ -42,8 +42,10 @@ noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
subdir = gtk/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -13697,7 +13909,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -372,6 +374,7 @@ libdir = @libdir@
+@@ -213,6 +215,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -369,6 +372,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -13706,7 +13926,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/gtk/theme-bits/Makefile.in b/gtk/theme-bits/Makefile.in
-index 0dfb27a..0d908fc 100644
+index b834dda..ee8b78f 100644
--- a/gtk/theme-bits/Makefile.in
+++ b/gtk/theme-bits/Makefile.in
@@ -42,8 +42,10 @@ noinst_PROGRAMS = decompose-bits$(EXEEXT)
@@ -13722,7 +13942,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -304,6 +306,7 @@ libdir = @libdir@
+@@ -151,6 +153,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -307,6 +310,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16836,7 +17064,7 @@
$ECHO > $output "\
# $outputname - a libtool library file
diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in
-index 04ea87e..409b84e 100644
+index 3671250..eaefd37 100644
--- a/m4macros/Makefile.in
+++ b/m4macros/Makefile.in
@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -16852,7 +17080,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -296,6 +298,7 @@ libdir = @libdir@
+@@ -143,6 +145,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -299,6 +302,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16861,7 +17097,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/Makefile.in b/modules/Makefile.in
-index 44c13f2..c75286d 100644
+index f8c5440..78f878c 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -16877,7 +17113,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -313,6 +315,7 @@ libdir = @libdir@
+@@ -160,6 +162,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -316,6 +319,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16886,7 +17130,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/engines/Makefile.in b/modules/engines/Makefile.in
-index d9f26dc..fb626ec 100644
+index 75cb3b2..32ca860 100644
--- a/modules/engines/Makefile.in
+++ b/modules/engines/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -16902,7 +17146,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -312,6 +314,7 @@ libdir = @libdir@
+@@ -159,6 +161,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -315,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16911,7 +17163,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/engines/ms-windows/Makefile.in b/modules/engines/ms-windows/Makefile.in
-index b178438..729641c 100644
+index 8631f67..aa80859 100644
--- a/modules/engines/ms-windows/Makefile.in
+++ b/modules/engines/ms-windows/Makefile.in
@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -16927,7 +17179,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -369,6 +371,7 @@ libdir = @libdir@
+@@ -216,6 +218,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -372,6 +375,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16936,7 +17196,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/engines/ms-windows/Theme/Makefile.in b/modules/engines/ms-windows/Theme/Makefile.in
-index 3678631..e0ed037 100644
+index 6c32bf2..e622009 100644
--- a/modules/engines/ms-windows/Theme/Makefile.in
+++ b/modules/engines/ms-windows/Theme/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -16952,7 +17212,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -312,6 +314,7 @@ libdir = @libdir@
+@@ -159,6 +161,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -315,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16961,7 +17229,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in b/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
-index d15121e..0f359c6 100644
+index 14ea663..0f8822c 100644
--- a/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
+++ b/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -16977,7 +17245,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -296,6 +298,7 @@ libdir = @libdir@
+@@ -143,6 +145,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -299,6 +302,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -16986,7 +17262,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/engines/pixbuf/Makefile.in b/modules/engines/pixbuf/Makefile.in
-index 4dce362..b2c874d 100644
+index 0afbd6e..aeba251 100644
--- a/modules/engines/pixbuf/Makefile.in
+++ b/modules/engines/pixbuf/Makefile.in
@@ -41,8 +41,10 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -17002,7 +17278,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -332,6 +334,7 @@ libdir = @libdir@
+@@ -179,6 +181,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -335,6 +338,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17011,7 +17295,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/input/Makefile.in b/modules/input/Makefile.in
-index b0b4565..ed82907 100644
+index ca929b0..b0fc91d 100644
--- a/modules/input/Makefile.in
+++ b/modules/input/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.am \
@@ -17027,7 +17311,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -533,6 +535,7 @@ libdir = @libdir@
+@@ -380,6 +382,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -536,6 +539,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17035,8 +17327,18 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
+@@ -701,7 +705,8 @@ im_multipress_la_LIBADD = $(LDADDS)
+ @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) \
diff --git a/modules/other/Makefile.in b/modules/other/Makefile.in
-index 66c16ce..03c4b3d 100644
+index db4ac7a..2d8f688 100644
--- a/modules/other/Makefile.in
+++ b/modules/other/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -17052,7 +17354,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -312,6 +314,7 @@ libdir = @libdir@
+@@ -159,6 +161,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -315,6 +318,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17061,7 +17371,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/other/gail/Makefile.in b/modules/other/gail/Makefile.in
-index 317eb60..b5ae8a1 100644
+index f8d031f..db3a118 100644
--- a/modules/other/gail/Makefile.in
+++ b/modules/other/gail/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(libgailinclude_HEADERS) $(srcdir)/Makefile.am \
@@ -17077,7 +17387,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -399,6 +401,7 @@ libdir = @libdir@
+@@ -246,6 +248,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -402,6 +405,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17086,7 +17404,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/other/gail/libgail-util/Makefile.in b/modules/other/gail/libgail-util/Makefile.in
-index f35313d..b9924e5 100644
+index e2b9969..9271600 100644
--- a/modules/other/gail/libgail-util/Makefile.in
+++ b/modules/other/gail/libgail-util/Makefile.in
@@ -43,8 +43,10 @@ DIST_COMMON = $(libgailutilinclude_HEADERS) $(srcdir)/Makefile.am \
@@ -17102,7 +17420,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -337,6 +339,7 @@ libdir = @libdir@
+@@ -184,6 +186,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -340,6 +343,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17111,7 +17437,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/other/gail/tests/Makefile.in b/modules/other/gail/tests/Makefile.in
-index 6a68ff6..eb7eeda 100644
+index 389ca57..6441a3f 100644
--- a/modules/other/gail/tests/Makefile.in
+++ b/modules/other/gail/tests/Makefile.in
@@ -41,8 +41,10 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -17127,7 +17453,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -468,6 +470,7 @@ libdir = @libdir@
+@@ -315,6 +317,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -471,6 +474,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17136,7 +17470,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/printbackends/Makefile.in b/modules/printbackends/Makefile.in
-index 399101f..ec4d4f2 100644
+index 0686479..a128977 100644
--- a/modules/printbackends/Makefile.in
+++ b/modules/printbackends/Makefile.in
@@ -43,8 +43,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -17152,7 +17486,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -314,6 +316,7 @@ libdir = @libdir@
+@@ -161,6 +163,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -317,6 +320,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17161,7 +17503,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/printbackends/cups/Makefile.in b/modules/printbackends/cups/Makefile.in
-index f450d04..7261d3f 100644
+index 0f4c72b..4283a1a 100644
--- a/modules/printbackends/cups/Makefile.in
+++ b/modules/printbackends/cups/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -17177,7 +17519,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -336,6 +338,7 @@ libdir = @libdir@
+@@ -183,6 +185,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -339,6 +342,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17186,7 +17536,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/printbackends/file/Makefile.in b/modules/printbackends/file/Makefile.in
-index 13d1366..8200a87 100644
+index 50c61a0..84a4cb5 100644
--- a/modules/printbackends/file/Makefile.in
+++ b/modules/printbackends/file/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -17202,7 +17552,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -335,6 +337,7 @@ libdir = @libdir@
+@@ -182,6 +184,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -338,6 +341,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17211,7 +17569,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/printbackends/lpr/Makefile.in b/modules/printbackends/lpr/Makefile.in
-index 44e6205..26f2f72 100644
+index a293833..702c3d8 100644
--- a/modules/printbackends/lpr/Makefile.in
+++ b/modules/printbackends/lpr/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -17227,7 +17585,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -333,6 +335,7 @@ libdir = @libdir@
+@@ -180,6 +182,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -336,6 +339,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17236,7 +17602,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/printbackends/papi/Makefile.in b/modules/printbackends/papi/Makefile.in
-index 122f0bb..6a04785 100644
+index 3b07c72..e4d8613 100644
--- a/modules/printbackends/papi/Makefile.in
+++ b/modules/printbackends/papi/Makefile.in
@@ -40,8 +40,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -17252,7 +17618,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -333,6 +335,7 @@ libdir = @libdir@
+@@ -180,6 +182,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -336,6 +339,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17261,7 +17635,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/modules/printbackends/test/Makefile.in b/modules/printbackends/test/Makefile.in
-index 778983d..51ed53e 100644
+index cc84ca2..56ea2d8 100644
--- a/modules/printbackends/test/Makefile.in
+++ b/modules/printbackends/test/Makefile.in
@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -17277,7 +17651,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -334,6 +336,7 @@ libdir = @libdir@
+@@ -181,6 +183,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -337,6 +340,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17286,7 +17668,7 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/perf/Makefile.in b/perf/Makefile.in
-index a10334b..4fbc5ca 100644
+index a612536..d42fb4d 100644
--- a/perf/Makefile.in
+++ b/perf/Makefile.in
@@ -42,8 +42,10 @@ noinst_PROGRAMS = testperf$(EXEEXT)
@@ -17302,7 +17684,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -307,6 +309,7 @@ libdir = @libdir@
+@@ -154,6 +156,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -310,6 +313,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -17311,10 +17701,10 @@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 7f39801..dbc1161 100644
+index e7bfe8f..4f92150 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
-@@ -77,8 +77,10 @@ noinst_PROGRAMS = $(am__EXEEXT_1) simple$(EXEEXT) flicker$(EXEEXT) \
+@@ -78,8 +78,10 @@ noinst_PROGRAMS = $(am__EXEEXT_1) simple$(EXEEXT) flicker$(EXEEXT) \
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -17327,7 +17717,15 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
-@@ -570,6 +572,7 @@ libdir = @libdir@
+@@ -423,6 +425,7 @@ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+ GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -579,6 +582,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
More information about the pkg-gnome-commits
mailing list