r23017 - in /desktop/experimental/gtk+2.0/debian: changelog libgtk-directfb-2.0-0.symbols libgtk2.0-0.symbols patches/070_mandatory-relibtoolize.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Feb 10 08:47:53 UTC 2010
Author: slomo
Date: Wed Feb 10 08:47:52 2010
New Revision: 23017
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23017
Log:
* New upstream development release:
+ debian/patches/070_mandatory-relibtoolize.patch:
- Regenerated for the new version.
+ debian/rules,
debian/libgtk-directfb-2.0-0.symbols,
debian/libgtk2.0-0.symbols:
- Update SHVER to 2.19.5 for the new API and add new symbols.
- Update SHVER to 2.19.4 for the new API and add new symbols.
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=23017&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Wed Feb 10 08:47:52 2010
@@ -1,4 +1,4 @@
-gtk+2.0 (2.19.4-1) experimental; urgency=low
+gtk+2.0 (2.19.5-1) experimental; urgency=low
* New upstream development release:
+ debian/patches/070_mandatory-relibtoolize.patch:
@@ -6,7 +6,19 @@
+ debian/rules,
debian/libgtk-directfb-2.0-0.symbols,
debian/libgtk2.0-0.symbols:
- - Update SHVER to 2.19.3 for the new API and add new symbols.
+ - Update SHVER to 2.19.5 for the new API and add new symbols.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 10 Feb 2010 09:38:52 +0100
+
+gtk+2.0 (2.19.4-1) experimental; urgency=low
+
+ * New upstream development release:
+ + debian/patches/070_mandatory-relibtoolize.patch:
+ - Regenerated for the new version.
+ + debian/rules,
+ debian/libgtk-directfb-2.0-0.symbols,
+ debian/libgtk2.0-0.symbols:
+ - Update SHVER to 2.19.4 for the new API and add new symbols.
-- Sebastian Dröge <slomo at debian.org> Tue, 26 Jan 2010 08:25:41 +0100
Modified: desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk-directfb-2.0-0.symbols?rev=23017&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols [utf-8] Wed Feb 10 08:47:52 2010
@@ -275,7 +275,6 @@
gdk_free_text_list at Base 2.8.0
gdk_function_get_type at Base 2.8.0
gdk_gc_copy at Base 2.8.0
- gdk_gc_directfb_get_type at Base 2.8.0
gdk_gc_get_colormap at Base 2.8.0
gdk_gc_get_screen at Base 2.8.0
gdk_gc_get_type at Base 2.8.0
@@ -2565,6 +2564,7 @@
gtk_paned_compute_position at Base 2.8.0
gtk_paned_get_child1 at Base 2.8.0
gtk_paned_get_child2 at Base 2.8.0
+ gtk_paned_get_handle_window at Base 2.19.5
gtk_paned_get_position at Base 2.8.0
gtk_paned_get_type at Base 2.8.0
gtk_paned_pack1 at Base 2.8.0
@@ -4357,12 +4357,14 @@
gtk_widget_get_has_tooltip at Base 2.12.0
gtk_widget_get_has_window at Base 2.18.0
gtk_widget_get_modifier_style at Base 2.8.0
+ gtk_widget_get_mapped at Base 2.19.5
gtk_widget_get_name at Base 2.8.0
gtk_widget_get_no_show_all at Base 2.8.0
gtk_widget_get_pango_context at Base 2.8.0
gtk_widget_get_parent at Base 2.8.0
gtk_widget_get_parent_window at Base 2.8.0
gtk_widget_get_pointer at Base 2.8.0
+ gtk_widget_get_realized at Base 2.19.5
gtk_widget_get_receives_default at Base 2.18.0
gtk_widget_get_root_window at Base 2.8.0
gtk_widget_get_screen at Base 2.8.0
@@ -4450,10 +4452,12 @@
gtk_widget_set_extension_events at Base 2.8.0
gtk_widget_set_has_tooltip at Base 2.12.0
gtk_widget_set_has_window at Base 2.18.0
+ gtk_widget_set_mapped at Base 2.19.5
gtk_widget_set_name at Base 2.8.0
gtk_widget_set_no_show_all at Base 2.8.0
gtk_widget_set_parent at Base 2.8.0
gtk_widget_set_parent_window at Base 2.8.0
+ gtk_widget_set_realized at Base 2.19.5
gtk_widget_set_receives_default at Base 2.18.0
gtk_widget_set_redraw_on_allocate at Base 2.8.0
gtk_widget_set_scroll_adjustments at Base 2.8.0
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.symbols?rev=23017&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.symbols [utf-8] Wed Feb 10 08:47:52 2010
@@ -2712,6 +2712,7 @@
gtk_paned_compute_position at Base 2.8.0
gtk_paned_get_child1 at Base 2.8.0
gtk_paned_get_child2 at Base 2.8.0
+ gtk_paned_get_handle_window at Base 2.19.5
gtk_paned_get_position at Base 2.8.0
gtk_paned_get_type at Base 2.8.0
gtk_paned_pack1 at Base 2.8.0
@@ -4505,12 +4506,14 @@
gtk_widget_get_has_tooltip at Base 2.12.0
gtk_widget_get_has_window at Base 2.18.0
gtk_widget_get_modifier_style at Base 2.8.0
+ gtk_widget_get_mapped at Base 2.19.5
gtk_widget_get_name at Base 2.8.0
gtk_widget_get_no_show_all at Base 2.8.0
gtk_widget_get_pango_context at Base 2.8.0
gtk_widget_get_parent at Base 2.8.0
gtk_widget_get_parent_window at Base 2.8.0
gtk_widget_get_pointer at Base 2.8.0
+ gtk_widget_get_realized at Base 2.19.5
gtk_widget_get_receives_default at Base 2.18.0
gtk_widget_get_root_window at Base 2.8.0
gtk_widget_get_screen at Base 2.8.0
@@ -4598,10 +4601,12 @@
gtk_widget_set_extension_events at Base 2.8.0
gtk_widget_set_has_tooltip at Base 2.12.0
gtk_widget_set_has_window at Base 2.18.0
+ gtk_widget_set_mapped at Base 2.19.5
gtk_widget_set_name at Base 2.8.0
gtk_widget_set_no_show_all at Base 2.8.0
gtk_widget_set_parent at Base 2.8.0
gtk_widget_set_parent_window at Base 2.8.0
+ gtk_widget_set_realized at Base 2.19.5
gtk_widget_set_receives_default at Base 2.18.0
gtk_widget_set_redraw_on_allocate at Base 2.8.0
gtk_widget_set_scroll_adjustments at Base 2.8.0
Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=23017&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Wed Feb 10 08:47:52 2010
@@ -1,6 +1,6 @@
-diff -Naur gtk+2.0-2.19.4.old/aclocal.m4 gtk+2.0-2.19.4/aclocal.m4
---- gtk+2.0-2.19.4.old/aclocal.m4 2010-01-26 03:43:04.000000000 +0100
-+++ gtk+2.0-2.19.4/aclocal.m4 2010-01-26 08:35:00.837654437 +0100
+diff -Naur gtk+2.0-2.19.5.old/aclocal.m4 gtk+2.0-2.19.5/aclocal.m4
+--- gtk+2.0-2.19.5.old/aclocal.m4 2010-02-09 20:18:26.000000000 +0100
++++ gtk+2.0-2.19.5/aclocal.m4 2010-02-10 09:46:47.593502560 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -8079,9 +8079,9 @@
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
m4_include([acinclude.m4])
-diff -Naur gtk+2.0-2.19.4.old/config.h.in gtk+2.0-2.19.4/config.h.in
---- gtk+2.0-2.19.4.old/config.h.in 2010-01-26 03:43:07.000000000 +0100
-+++ gtk+2.0-2.19.4/config.h.in 2010-01-26 08:35:03.333653020 +0100
+diff -Naur gtk+2.0-2.19.5.old/config.h.in gtk+2.0-2.19.5/config.h.in
+--- gtk+2.0-2.19.5.old/config.h.in 2010-02-09 20:18:31.000000000 +0100
++++ gtk+2.0-2.19.5/config.h.in 2010-02-10 09:46:49.610500389 +0100
@@ -126,6 +126,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
@@ -8102,14 +8102,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur gtk+2.0-2.19.4.old/configure gtk+2.0-2.19.4/configure
---- gtk+2.0-2.19.4.old/configure 2010-01-26 03:43:19.000000000 +0100
-+++ gtk+2.0-2.19.4/configure 2010-01-26 08:35:02.877650998 +0100
+diff -Naur gtk+2.0-2.19.5.old/configure gtk+2.0-2.19.5/configure
+--- gtk+2.0-2.19.5.old/configure 2010-02-09 20:18:49.000000000 +0100
++++ gtk+2.0-2.19.5/configure 2010-02-10 09:46:49.177499406 +0100
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for gtk+ 2.19.4.
-+# Generated by GNU Autoconf 2.65 for gtk+ 2.19.4.
+-# Generated by GNU Autoconf 2.63 for gtk+ 2.19.5.
++# Generated by GNU Autoconf 2.65 for gtk+ 2.19.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
#
@@ -8915,8 +8915,8 @@
# Identity of this package.
PACKAGE_NAME='gtk+'
@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.19.4'
- PACKAGE_STRING='gtk+ 2.19.4'
+ PACKAGE_VERSION='2.19.5'
+ PACKAGE_STRING='gtk+ 2.19.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B'
+PACKAGE_URL=''
@@ -8947,7 +8947,7 @@
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-@@ -1162,6 +1124,7 @@
+@@ -1163,6 +1125,7 @@
program_transform_name
prefix
exec_prefix
@@ -8955,7 +8955,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1343,8 +1306,7 @@
+@@ -1344,8 +1307,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8965,7 +8965,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1370,8 +1332,7 @@
+@@ -1371,8 +1333,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8975,7 +8975,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1575,8 +1536,7 @@
+@@ -1576,8 +1537,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8985,7 +8985,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1592,8 +1552,7 @@
+@@ -1593,8 +1553,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -8995,7 +8995,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1623,17 +1582,17 @@
+@@ -1624,17 +1583,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -9019,7 +9019,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1650,15 +1609,13 @@
+@@ -1651,15 +1610,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -9037,7 +9037,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1681,8 +1638,7 @@
+@@ -1682,8 +1639,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -9047,7 +9047,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1712,11 +1668,9 @@
+@@ -1713,11 +1669,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -9061,7 +9061,7 @@
# Find the source files, if location was not specified.
-@@ -1755,13 +1709,11 @@
+@@ -1756,13 +1710,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -9077,7 +9077,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1906,9 +1858,9 @@
+@@ -1907,9 +1859,9 @@
build test print backend
--enable-introspection=[no/auto/yes]
Enable introspection for this build
@@ -9090,7 +9090,7 @@
--enable-man regenerate man pages from Docbook [default=no]
Optional Packages:
-@@ -1938,7 +1890,7 @@
+@@ -1939,7 +1891,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -9099,10 +9099,10 @@
you have headers in a nonstandard directory <include dir>
CXX C++ compiler command
CXXFLAGS C++ compiler flags
-@@ -2028,459 +1980,968 @@
+@@ -2029,459 +1981,968 @@
if $ac_init_version; then
cat <<\_ACEOF
- gtk+ configure 2.19.4
+ gtk+ configure 2.19.5
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -9118,7 +9118,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.19.4, which was
+-It was created by gtk+ $as_me 2.19.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -9954,7 +9954,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.19.4, which was
++It was created by gtk+ $as_me 2.19.5, which was
+generated by GNU Autoconf 2.65. Invocation command line was
+ $ $0 $@
@@ -10437,7 +10437,7 @@
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
# Don't use installbsd from OSF since it installs stuff as root
-@@ -2516,7 +2977,7 @@
+@@ -2517,7 +2978,7 @@
;;
esac
@@ -10446,7 +10446,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2532,7 +2993,7 @@
+@@ -2533,7 +2994,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -10455,7 +10455,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2543,7 +3004,7 @@
+@@ -2544,7 +3005,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -10464,7 +10464,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2554,15 +3015,11 @@
+@@ -2555,15 +3016,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -10482,7 +10482,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2584,11 +3041,8 @@
+@@ -2585,11 +3042,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -10496,7 +10496,7 @@
fi
test "$2" = conftest.file
-@@ -2597,13 +3051,10 @@
+@@ -2598,13 +3052,10 @@
# Ok.
:
else
@@ -10513,7 +10513,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2631,7 +3082,7 @@
+@@ -2632,7 +3083,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -10522,7 +10522,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2652,9 +3103,9 @@
+@@ -2653,9 +3104,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -10534,7 +10534,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2665,24 +3116,24 @@
+@@ -2666,24 +3117,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10564,7 +10564,7 @@
$as_echo "no" >&6; }
fi
-@@ -2692,9 +3143,9 @@
+@@ -2693,9 +3144,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -10576,7 +10576,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2705,24 +3156,24 @@
+@@ -2706,24 +3157,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10606,7 +10606,7 @@
$as_echo "no" >&6; }
fi
-@@ -2731,7 +3182,7 @@
+@@ -2732,7 +3183,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10615,7 +10615,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2744,10 +3195,10 @@
+@@ -2745,10 +3196,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -10628,7 +10628,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2755,7 +3206,7 @@
+@@ -2756,7 +3207,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10637,7 +10637,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2767,11 +3218,12 @@
+@@ -2768,11 +3219,12 @@
esac
done
done
@@ -10651,7 +10651,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2779,11 +3231,10 @@
+@@ -2780,11 +3232,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -10664,7 +10664,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2796,9 +3247,9 @@
+@@ -2797,9 +3248,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -10676,7 +10676,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2809,24 +3260,24 @@
+@@ -2810,24 +3261,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10706,7 +10706,7 @@
$as_echo "no" >&6; }
fi
-@@ -2834,11 +3285,11 @@
+@@ -2835,11 +3286,11 @@
test -n "$AWK" && break
done
@@ -10720,7 +10720,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2856,11 +3307,11 @@
+@@ -2857,11 +3308,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -10734,7 +10734,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2880,9 +3331,7 @@
+@@ -2881,9 +3332,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -10745,7 +10745,7 @@
fi
fi
-@@ -2936,7 +3385,7 @@
+@@ -2937,7 +3386,7 @@
# by either passing --enable-silent-rules to configure or passing V=0
# to make
# Check whether --enable-silent-rules was given.
@@ -10754,7 +10754,7 @@
enableval=$enable_silent_rules;
fi
-@@ -3025,35 +3474,27 @@
+@@ -3026,35 +3475,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -10797,7 +10797,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -3069,28 +3510,24 @@
+@@ -3070,28 +3511,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -10831,7 +10831,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -3108,7 +3545,7 @@
+@@ -3109,7 +3546,7 @@
MATH_LIB=-lm
@@ -10839,8 +10839,8 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5
$as_echo_n "checking for native Win32... " >&6; }
LIB_EXE_MACHINE_FLAG=X86
- case "$host" in
-@@ -3126,7 +3563,7 @@
+ EXE_MANIFEST_ARCHITECTURE=X86
+@@ -3129,7 +3566,7 @@
os_win32=no
;;
esac
@@ -10849,7 +10849,7 @@
$as_echo "$os_win32" >&6; }
-@@ -3145,9 +3582,9 @@
+@@ -3149,9 +3586,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -10861,7 +10861,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3158,24 +3595,24 @@
+@@ -3162,24 +3599,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10891,7 +10891,7 @@
$as_echo "no" >&6; }
fi
-@@ -3185,9 +3622,9 @@
+@@ -3189,9 +3626,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -10903,7 +10903,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3198,24 +3635,24 @@
+@@ -3202,24 +3639,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10933,7 +10933,7 @@
$as_echo "no" >&6; }
fi
-@@ -3224,7 +3661,7 @@
+@@ -3228,7 +3665,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10942,7 +10942,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3238,9 +3675,9 @@
+@@ -3242,9 +3679,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -10954,7 +10954,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3251,24 +3688,24 @@
+@@ -3255,24 +3692,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10984,7 +10984,7 @@
$as_echo "no" >&6; }
fi
-@@ -3278,9 +3715,9 @@
+@@ -3282,9 +3719,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -10996,7 +10996,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3292,18 +3729,18 @@
+@@ -3296,18 +3733,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11018,7 +11018,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3322,10 +3759,10 @@
+@@ -3326,10 +3763,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -11031,7 +11031,7 @@
$as_echo "no" >&6; }
fi
-@@ -3337,9 +3774,9 @@
+@@ -3341,9 +3778,9 @@
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
@@ -11043,7 +11043,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3350,24 +3787,24 @@
+@@ -3354,24 +3791,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11073,7 +11073,7 @@
$as_echo "no" >&6; }
fi
-@@ -3381,9 +3818,9 @@
+@@ -3385,9 +3822,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -11085,7 +11085,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3394,24 +3831,24 @@
+@@ -3398,24 +3835,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11115,7 +11115,7 @@
$as_echo "no" >&6; }
fi
-@@ -3424,7 +3861,7 @@
+@@ -3428,7 +3865,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11124,7 +11124,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3435,57 +3872,37 @@
+@@ -3439,57 +3876,37 @@
fi
@@ -11202,7 +11202,7 @@
/* end confdefs.h. */
int
-@@ -3501,8 +3918,8 @@
+@@ -3505,8 +3922,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -11213,7 +11213,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3518,17 +3935,17 @@
+@@ -3522,17 +3939,17 @@
done
rm -f $ac_rmfiles
@@ -11236,7 +11236,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3545,7 +3962,7 @@
+@@ -3549,7 +3966,7 @@
# certainly right.
break;;
*.* )
@@ -11245,7 +11245,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3564,84 +3981,42 @@
+@@ -3568,84 +3985,42 @@
else
ac_file=''
fi
@@ -11351,7 +11351,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3656,32 +4031,83 @@
+@@ -3660,32 +4035,83 @@
esac
done
else
@@ -11451,7 +11451,7 @@
/* end confdefs.h. */
int
-@@ -3693,17 +4119,17 @@
+@@ -3697,17 +4123,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -11474,7 +11474,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3716,31 +4142,23 @@
+@@ -3720,31 +4146,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11513,7 +11513,7 @@
/* end confdefs.h. */
int
-@@ -3754,37 +4172,16 @@
+@@ -3758,37 +4176,16 @@
return 0;
}
_ACEOF
@@ -11554,7 +11554,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3793,20 +4190,16 @@
+@@ -3797,20 +4194,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -11578,7 +11578,7 @@
/* end confdefs.h. */
int
-@@ -3817,35 +4210,11 @@
+@@ -3821,35 +4214,11 @@
return 0;
}
_ACEOF
@@ -11617,7 +11617,7 @@
/* end confdefs.h. */
int
-@@ -3856,36 +4225,12 @@
+@@ -3860,36 +4229,12 @@
return 0;
}
_ACEOF
@@ -11658,7 +11658,7 @@
/* end confdefs.h. */
int
-@@ -3896,42 +4241,17 @@
+@@ -3900,42 +4245,17 @@
return 0;
}
_ACEOF
@@ -11703,7 +11703,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3948,18 +4268,14 @@
+@@ -3952,18 +4272,14 @@
CFLAGS=
fi
fi
@@ -11725,7 +11725,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -4016,32 +4332,9 @@
+@@ -4020,32 +4336,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -11759,7 +11759,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -4052,17 +4345,19 @@
+@@ -4056,17 +4349,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -11782,7 +11782,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4081,7 +4376,7 @@
+@@ -4085,7 +4380,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -11791,7 +11791,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -4109,12 +4404,12 @@
+@@ -4113,12 +4408,12 @@
fi
@@ -11806,7 +11806,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -4134,9 +4429,9 @@
+@@ -4138,9 +4433,9 @@
depcc="$CC" am_compiler_list=
@@ -11818,7 +11818,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4244,7 +4539,7 @@
+@@ -4248,7 +4543,7 @@
fi
fi
@@ -11827,7 +11827,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4260,7 +4555,7 @@
+@@ -4264,7 +4559,7 @@
# Check whether --enable-static was given.
@@ -11836,7 +11836,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -4290,15 +4585,23 @@
+@@ -4294,15 +4589,23 @@
@@ -11862,7 +11862,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -4309,24 +4612,24 @@
+@@ -4313,24 +4616,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11892,7 +11892,7 @@
$as_echo "no" >&6; }
fi
-@@ -4340,9 +4643,9 @@
+@@ -4344,9 +4647,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -11904,7 +11904,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -4353,24 +4656,24 @@
+@@ -4357,24 +4660,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11934,7 +11934,7 @@
$as_echo "no" >&6; }
fi
-@@ -4383,7 +4686,7 @@
+@@ -4387,7 +4690,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11943,7 +11943,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4413,9 +4716,9 @@
+@@ -4417,9 +4720,9 @@
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
@@ -11955,7 +11955,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -4426,24 +4729,24 @@
+@@ -4430,24 +4733,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11985,7 +11985,7 @@
$as_echo "no" >&6; }
fi
-@@ -4457,9 +4760,9 @@
+@@ -4461,9 +4764,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -11997,7 +11997,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -4470,24 +4773,24 @@
+@@ -4474,24 +4777,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12027,7 +12027,7 @@
$as_echo "no" >&6; }
fi
-@@ -4500,7 +4803,7 @@
+@@ -4504,7 +4807,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12036,7 +12036,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4511,53 +4814,36 @@
+@@ -4515,53 +4818,36 @@
fi
fi
# Provide some information about the compiler.
@@ -12109,7 +12109,7 @@
/* end confdefs.h. */
int
-@@ -4571,37 +4857,16 @@
+@@ -4575,37 +4861,16 @@
return 0;
}
_ACEOF
@@ -12150,7 +12150,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -4610,20 +4875,16 @@
+@@ -4614,20 +4879,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -12174,7 +12174,7 @@
/* end confdefs.h. */
int
-@@ -4634,35 +4895,11 @@
+@@ -4638,35 +4899,11 @@
return 0;
}
_ACEOF
@@ -12213,7 +12213,7 @@
/* end confdefs.h. */
int
-@@ -4673,36 +4910,12 @@
+@@ -4677,36 +4914,12 @@
return 0;
}
_ACEOF
@@ -12254,7 +12254,7 @@
/* end confdefs.h. */
int
-@@ -4713,42 +4926,17 @@
+@@ -4717,42 +4930,17 @@
return 0;
}
_ACEOF
@@ -12299,7 +12299,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -4773,9 +4961,9 @@
+@@ -4777,9 +4965,9 @@
depcc="$CXX" am_compiler_list=
@@ -12311,7 +12311,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4883,7 +5071,7 @@
+@@ -4887,7 +5075,7 @@
fi
fi
@@ -12320,7 +12320,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4899,11 +5087,7 @@
+@@ -4903,11 +5091,7 @@
@@ -12333,7 +12333,7 @@
/* end confdefs.h. */
int
-@@ -4914,32 +5098,11 @@
+@@ -4918,32 +5102,11 @@
return 0;
}
_ACEOF
@@ -12369,7 +12369,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$CXX" != ""; then
HAVE_CXX_TRUE=
-@@ -4952,11 +5115,7 @@
+@@ -4956,11 +5119,7 @@
gtk_save_cxxflags="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -x objective-c++"
@@ -12382,7 +12382,7 @@
/* end confdefs.h. */
@interface Foo @end
int
-@@ -4967,32 +5126,11 @@
+@@ -4971,32 +5130,11 @@
return 0;
}
_ACEOF
@@ -12417,7 +12417,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$OBJC" = "yes"; then
HAVE_OBJC_TRUE=
-@@ -5012,12 +5150,12 @@
+@@ -5016,12 +5154,12 @@
if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then
@@ -12432,7 +12432,7 @@
$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
fi
enable_shared=yes
-@@ -5030,9 +5168,9 @@
+@@ -5034,9 +5172,9 @@
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
@@ -12444,7 +12444,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AS"; then
-@@ -5043,24 +5181,24 @@
+@@ -5047,24 +5185,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12474,7 +12474,7 @@
$as_echo "no" >&6; }
fi
-@@ -5070,9 +5208,9 @@
+@@ -5074,9 +5212,9 @@
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
@@ -12486,7 +12486,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AS"; then
-@@ -5083,24 +5221,24 @@
+@@ -5087,24 +5225,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12516,7 +12516,7 @@
$as_echo "no" >&6; }
fi
-@@ -5109,7 +5247,7 @@
+@@ -5113,7 +5251,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12525,7 +12525,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5122,9 +5260,9 @@
+@@ -5126,9 +5264,9 @@
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
@@ -12537,7 +12537,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
-@@ -5135,24 +5273,24 @@
+@@ -5139,24 +5277,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12567,7 +12567,7 @@
$as_echo "no" >&6; }
fi
-@@ -5162,9 +5300,9 @@
+@@ -5166,9 +5304,9 @@
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -12579,7 +12579,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
-@@ -5175,24 +5313,24 @@
+@@ -5179,24 +5317,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12609,7 +12609,7 @@
$as_echo "no" >&6; }
fi
-@@ -5201,7 +5339,7 @@
+@@ -5205,7 +5343,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12618,7 +12618,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5214,9 +5352,9 @@
+@@ -5218,9 +5356,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -12630,7 +12630,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5227,24 +5365,24 @@
+@@ -5231,24 +5369,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12660,7 +12660,7 @@
$as_echo "no" >&6; }
fi
-@@ -5254,9 +5392,9 @@
+@@ -5258,9 +5396,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -12672,7 +12672,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5267,24 +5405,24 @@
+@@ -5271,24 +5409,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12702,7 +12702,7 @@
$as_echo "no" >&6; }
fi
-@@ -5293,7 +5431,7 @@
+@@ -5297,7 +5435,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12711,7 +12711,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5328,7 +5466,7 @@
+@@ -5332,7 +5470,7 @@
case `pwd` in
*\ * | *\ *)
@@ -12720,7 +12720,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -5351,9 +5489,9 @@
+@@ -5355,9 +5493,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -12732,7 +12732,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -5361,7 +5499,7 @@
+@@ -5365,7 +5503,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -12741,7 +12741,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -5370,7 +5508,7 @@
+@@ -5374,7 +5512,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12750,7 +12750,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -5390,7 +5528,7 @@
+@@ -5394,7 +5532,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12759,7 +12759,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -5405,19 +5543,17 @@
+@@ -5409,19 +5547,17 @@
$ac_path_SED_found && break 3
done
done
@@ -12782,7 +12782,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -5435,9 +5571,9 @@
+@@ -5439,9 +5575,9 @@
@@ -12794,7 +12794,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5448,7 +5584,7 @@
+@@ -5452,7 +5588,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12803,7 +12803,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -5468,7 +5604,7 @@
+@@ -5472,7 +5608,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12812,7 +12812,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -5483,26 +5619,24 @@
+@@ -5487,26 +5623,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -12844,7 +12844,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5516,7 +5650,7 @@
+@@ -5520,7 +5654,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12853,7 +12853,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -5536,7 +5670,7 @@
+@@ -5540,7 +5674,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12862,7 +12862,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -5551,12 +5685,10 @@
+@@ -5555,12 +5689,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -12877,7 +12877,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5564,14 +5696,14 @@
+@@ -5568,14 +5700,14 @@
fi
fi
@@ -12895,7 +12895,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -5585,7 +5717,7 @@
+@@ -5589,7 +5721,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12904,7 +12904,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -5605,7 +5737,7 @@
+@@ -5609,7 +5741,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12913,7 +12913,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -5620,12 +5752,10 @@
+@@ -5624,12 +5756,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -12928,7 +12928,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -5633,7 +5763,7 @@
+@@ -5637,7 +5767,7 @@
fi
fi
@@ -12937,7 +12937,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -5659,7 +5789,7 @@
+@@ -5663,7 +5793,7 @@
# Check whether --with-gnu-ld was given.
@@ -12946,7 +12946,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -5668,7 +5798,7 @@
+@@ -5672,7 +5802,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -12955,7 +12955,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -5698,13 +5828,13 @@
+@@ -5702,13 +5832,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -12972,7 +12972,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -5735,18 +5865,16 @@
+@@ -5739,18 +5869,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -12996,7 +12996,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5759,7 +5887,7 @@
+@@ -5763,7 +5891,7 @@
;;
esac
fi
@@ -13005,7 +13005,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -5771,9 +5899,9 @@
+@@ -5775,9 +5903,9 @@
@@ -13017,7 +13017,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -5820,7 +5948,7 @@
+@@ -5824,7 +5952,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -13026,7 +13026,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -5831,9 +5959,9 @@
+@@ -5835,9 +5963,9 @@
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
@@ -13038,7 +13038,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -5844,24 +5972,24 @@
+@@ -5848,24 +5976,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13068,7 +13068,7 @@
$as_echo "no" >&6; }
fi
-@@ -5875,9 +6003,9 @@
+@@ -5879,9 +6007,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -13080,7 +13080,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -5888,24 +6016,24 @@
+@@ -5892,24 +6020,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13110,7 +13110,7 @@
$as_echo "no" >&6; }
fi
-@@ -5918,7 +6046,7 @@
+@@ -5922,7 +6050,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13119,7 +13119,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5938,44 +6066,44 @@
+@@ -5942,44 +6070,44 @@
@@ -13132,16 +13132,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5948: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6076: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:5952: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6080: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5951: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6079: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:5955: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6083: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5954: output\"" >&5)
-+ (eval echo "\"\$as_me:6082: output\"" >&5)
+- (eval echo "\"\$as_me:5958: output\"" >&5)
++ (eval echo "\"\$as_me:6086: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -13175,7 +13175,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6093,10 +6221,10 @@
+@@ -6097,10 +6225,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13188,7 +13188,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6110,7 +6238,7 @@
+@@ -6114,7 +6242,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -13197,7 +13197,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6120,17 +6248,17 @@
+@@ -6124,17 +6252,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -13218,7 +13218,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -6165,14 +6293,14 @@
+@@ -6169,14 +6297,14 @@
@@ -13236,7 +13236,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6201,9 +6329,9 @@
+@@ -6205,9 +6333,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -13248,7 +13248,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6214,24 +6342,24 @@
+@@ -6218,24 +6346,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13278,7 +13278,7 @@
$as_echo "no" >&6; }
fi
-@@ -6241,9 +6369,9 @@
+@@ -6245,9 +6373,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -13290,7 +13290,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6254,24 +6382,24 @@
+@@ -6258,24 +6386,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13320,7 +13320,7 @@
$as_echo "no" >&6; }
fi
-@@ -6280,7 +6408,7 @@
+@@ -6284,7 +6412,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13329,7 +13329,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6297,9 +6425,9 @@
+@@ -6301,9 +6429,9 @@
@@ -13341,7 +13341,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6414,11 +6542,11 @@
+@@ -6418,11 +6546,11 @@
;;
# This must be Linux ELF.
@@ -13355,7 +13355,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
-@@ -6493,7 +6621,7 @@
+@@ -6497,7 +6625,7 @@
esac
fi
@@ -13364,7 +13364,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -6513,9 +6641,9 @@
+@@ -6517,9 +6645,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -13376,7 +13376,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -6526,24 +6654,24 @@
+@@ -6530,24 +6658,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13406,7 +13406,7 @@
$as_echo "no" >&6; }
fi
-@@ -6553,9 +6681,9 @@
+@@ -6557,9 +6685,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -13418,7 +13418,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -6566,24 +6694,24 @@
+@@ -6570,24 +6698,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13448,7 +13448,7 @@
$as_echo "no" >&6; }
fi
-@@ -6592,7 +6720,7 @@
+@@ -6596,7 +6724,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13457,7 +13457,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6618,9 +6746,9 @@
+@@ -6622,9 +6750,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -13469,7 +13469,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -6631,24 +6759,24 @@
+@@ -6635,24 +6763,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13499,7 +13499,7 @@
$as_echo "no" >&6; }
fi
-@@ -6658,9 +6786,9 @@
+@@ -6662,9 +6790,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -13511,7 +13511,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -6671,24 +6799,24 @@
+@@ -6675,24 +6803,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13541,7 +13541,7 @@
$as_echo "no" >&6; }
fi
-@@ -6697,7 +6825,7 @@
+@@ -6701,7 +6829,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13550,7 +13550,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6717,9 +6845,9 @@
+@@ -6721,9 +6849,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -13562,7 +13562,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -6730,24 +6858,24 @@
+@@ -6734,24 +6862,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13592,7 +13592,7 @@
$as_echo "no" >&6; }
fi
-@@ -6757,9 +6885,9 @@
+@@ -6761,9 +6889,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -13604,7 +13604,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -6770,24 +6898,24 @@
+@@ -6774,24 +6902,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13634,7 +13634,7 @@
$as_echo "no" >&6; }
fi
-@@ -6796,7 +6924,7 @@
+@@ -6800,7 +6928,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13643,7 +13643,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6874,9 +7002,9 @@
+@@ -6878,9 +7006,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -13655,7 +13655,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -6992,18 +7120,18 @@
+@@ -6996,18 +7124,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -13680,7 +13680,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7056,11 +7184,11 @@
+@@ -7060,11 +7188,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -13695,7 +13695,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7094,10 +7222,10 @@
+@@ -7098,10 +7226,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -13708,7 +13708,7 @@
$as_echo "ok" >&6; }
fi
-@@ -7124,7 +7252,7 @@
+@@ -7128,7 +7256,7 @@
# Check whether --enable-libtool-lock was given.
@@ -13717,7 +13717,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -7136,11 +7264,11 @@
+@@ -7140,11 +7268,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -13732,13 +13732,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7154,12 +7282,12 @@
+@@ -7158,12 +7286,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7157 "configure"' > conftest.$ac_ext
+- echo '#line 7161 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7285 "configure"' > conftest.$ac_ext
++ echo '#line 7289 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13749,7 +13749,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7193,11 +7321,11 @@
+@@ -7197,11 +7325,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -13764,7 +13764,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7246,9 +7374,9 @@
+@@ -7250,9 +7378,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -13776,7 +13776,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7257,11 +7385,7 @@
+@@ -7261,11 +7389,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -13789,7 +13789,7 @@
/* end confdefs.h. */
int
-@@ -7272,38 +7396,13 @@
+@@ -7276,38 +7400,13 @@
return 0;
}
_ACEOF
@@ -13832,7 +13832,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7311,7 +7410,7 @@
+@@ -7315,7 +7414,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -13841,7 +13841,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -7321,11 +7420,11 @@
+@@ -7325,11 +7424,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -13856,7 +13856,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7351,9 +7450,9 @@
+@@ -7355,9 +7454,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -13868,7 +13868,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7364,24 +7463,24 @@
+@@ -7368,24 +7467,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13898,7 +13898,7 @@
$as_echo "no" >&6; }
fi
-@@ -7391,9 +7490,9 @@
+@@ -7395,9 +7494,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -13910,7 +13910,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7404,24 +7503,24 @@
+@@ -7408,24 +7507,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13940,7 +13940,7 @@
$as_echo "no" >&6; }
fi
-@@ -7430,7 +7529,7 @@
+@@ -7434,7 +7533,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13949,7 +13949,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7443,9 +7542,9 @@
+@@ -7447,9 +7546,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -13961,7 +13961,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -7456,24 +7555,24 @@
+@@ -7460,24 +7559,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13991,7 +13991,7 @@
$as_echo "no" >&6; }
fi
-@@ -7483,9 +7582,9 @@
+@@ -7487,9 +7586,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -14003,7 +14003,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -7496,24 +7595,24 @@
+@@ -7500,24 +7599,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14033,7 +14033,7 @@
$as_echo "no" >&6; }
fi
-@@ -7522,7 +7621,7 @@
+@@ -7526,7 +7625,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14042,7 +14042,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7535,9 +7634,9 @@
+@@ -7539,9 +7638,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -14054,7 +14054,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -7548,24 +7647,24 @@
+@@ -7552,24 +7651,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14084,7 +14084,7 @@
$as_echo "no" >&6; }
fi
-@@ -7575,9 +7674,9 @@
+@@ -7579,9 +7678,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -14096,7 +14096,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -7588,24 +7687,24 @@
+@@ -7592,24 +7691,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14126,7 +14126,7 @@
$as_echo "no" >&6; }
fi
-@@ -7614,7 +7713,7 @@
+@@ -7618,7 +7717,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14135,7 +14135,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7627,9 +7726,9 @@
+@@ -7631,9 +7730,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -14147,7 +14147,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -7640,24 +7739,24 @@
+@@ -7644,24 +7743,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14177,7 +14177,7 @@
$as_echo "no" >&6; }
fi
-@@ -7667,9 +7766,9 @@
+@@ -7671,9 +7770,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -14189,7 +14189,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -7680,24 +7779,24 @@
+@@ -7684,24 +7783,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14219,7 +14219,7 @@
$as_echo "no" >&6; }
fi
-@@ -7706,7 +7805,7 @@
+@@ -7710,7 +7809,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14228,7 +14228,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7719,9 +7818,9 @@
+@@ -7723,9 +7822,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -14240,7 +14240,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -7732,24 +7831,24 @@
+@@ -7736,24 +7835,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14270,7 +14270,7 @@
$as_echo "no" >&6; }
fi
-@@ -7759,9 +7858,9 @@
+@@ -7763,9 +7862,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -14282,7 +14282,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -7772,24 +7871,24 @@
+@@ -7776,24 +7875,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14312,7 +14312,7 @@
$as_echo "no" >&6; }
fi
-@@ -7798,7 +7897,7 @@
+@@ -7802,7 +7901,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14321,7 +14321,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7834,9 +7933,9 @@
+@@ -7838,9 +7937,9 @@
@@ -14333,7 +14333,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -7861,22 +7960,18 @@
+@@ -7865,22 +7964,18 @@
rm -f conftest.*
fi
fi
@@ -14360,7 +14360,7 @@
/* end confdefs.h. */
int
-@@ -7887,42 +7982,17 @@
+@@ -7891,42 +7986,17 @@
return 0;
}
_ACEOF
@@ -14408,7 +14408,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -7964,14 +8034,14 @@
+@@ -7968,14 +8038,14 @@
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
@@ -14425,7 +14425,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -7986,11 +8056,7 @@
+@@ -7990,11 +8060,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -14438,7 +14438,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -7999,78 +8065,34 @@
+@@ -8003,78 +8069,34 @@
#endif
Syntax error
_ACEOF
@@ -14522,7 +14522,7 @@
break
fi
-@@ -8082,7 +8104,7 @@
+@@ -8086,7 +8108,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -14531,7 +14531,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -8093,11 +8115,7 @@
+@@ -8097,11 +8119,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -14544,7 +14544,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -8106,87 +8124,40 @@
+@@ -8110,87 +8128,40 @@
#endif
Syntax error
_ACEOF
@@ -14641,7 +14641,7 @@
fi
ac_ext=c
-@@ -8196,16 +8167,12 @@
+@@ -8200,16 +8171,12 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -14661,7 +14661,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -8220,48 +8187,23 @@
+@@ -8224,48 +8191,23 @@
return 0;
}
_ACEOF
@@ -14715,7 +14715,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -8271,18 +8213,14 @@
+@@ -8275,18 +8217,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -14737,7 +14737,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -8292,14 +8230,10 @@
+@@ -8296,14 +8234,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -14754,7 +14754,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -8326,118 +8260,34 @@
+@@ -8330,118 +8264,34 @@
return 0;
}
_ACEOF
@@ -14886,7 +14886,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8447,62 +8297,13 @@
+@@ -8451,62 +8301,13 @@
done
@@ -14954,7 +14954,7 @@
_ACEOF
fi
-@@ -8525,9 +8326,9 @@
+@@ -8529,9 +8330,9 @@
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
@@ -14966,7 +14966,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -8538,24 +8339,24 @@
+@@ -8542,24 +8343,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14996,7 +14996,7 @@
$as_echo "no" >&6; }
fi
-@@ -8569,9 +8370,9 @@
+@@ -8573,9 +8374,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -15008,7 +15008,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -8582,24 +8383,24 @@
+@@ -8586,24 +8387,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15038,7 +15038,7 @@
$as_echo "no" >&6; }
fi
-@@ -8612,7 +8413,7 @@
+@@ -8616,7 +8417,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15047,7 +15047,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8623,53 +8424,36 @@
+@@ -8627,53 +8428,36 @@
fi
fi
# Provide some information about the compiler.
@@ -15120,7 +15120,7 @@
/* end confdefs.h. */
int
-@@ -8683,37 +8467,16 @@
+@@ -8687,37 +8471,16 @@
return 0;
}
_ACEOF
@@ -15161,7 +15161,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -8722,20 +8485,16 @@
+@@ -8726,20 +8489,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -15185,7 +15185,7 @@
/* end confdefs.h. */
int
-@@ -8746,35 +8505,11 @@
+@@ -8750,35 +8509,11 @@
return 0;
}
_ACEOF
@@ -15224,7 +15224,7 @@
/* end confdefs.h. */
int
-@@ -8785,36 +8520,12 @@
+@@ -8789,36 +8524,12 @@
return 0;
}
_ACEOF
@@ -15265,7 +15265,7 @@
/* end confdefs.h. */
int
-@@ -8825,42 +8536,17 @@
+@@ -8829,42 +8540,17 @@
return 0;
}
_ACEOF
@@ -15310,7 +15310,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -8885,9 +8571,9 @@
+@@ -8889,9 +8575,9 @@
depcc="$CXX" am_compiler_list=
@@ -15322,7 +15322,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -8995,7 +8681,7 @@
+@@ -8999,7 +8685,7 @@
fi
fi
@@ -15331,7 +15331,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -9018,10 +8704,10 @@
+@@ -9022,10 +8708,10 @@
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -15344,7 +15344,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -9036,11 +8722,7 @@
+@@ -9040,11 +8726,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -15357,7 +15357,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -9049,78 +8731,34 @@
+@@ -9053,78 +8735,34 @@
#endif
Syntax error
_ACEOF
@@ -15441,7 +15441,7 @@
break
fi
-@@ -9132,7 +8770,7 @@
+@@ -9136,7 +8774,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -15450,7 +15450,7 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -9143,11 +8781,7 @@
+@@ -9147,11 +8785,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -15463,7 +15463,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -9156,81 +8790,37 @@
+@@ -9160,81 +8794,37 @@
#endif
Syntax error
_ACEOF
@@ -15552,7 +15552,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
_lt_caught_CXX_error=yes; }
fi
-@@ -9257,7 +8847,7 @@
+@@ -9261,7 +8851,7 @@
# Check whether --enable-shared was given.
@@ -15561,7 +15561,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9290,7 +8880,7 @@
+@@ -9294,7 +8884,7 @@
# Check whether --with-pic was given.
@@ -15570,7 +15570,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9306,7 +8896,7 @@
+@@ -9310,7 +8900,7 @@
# Check whether --enable-fast-install was given.
@@ -15579,7 +15579,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9387,9 +8977,9 @@
+@@ -9391,9 +8981,9 @@
setopt NO_GLOB_SUBST
fi
@@ -15591,7 +15591,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9402,7 +8992,7 @@
+@@ -9406,7 +8996,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -15600,7 +15600,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9495,9 +9085,9 @@
+@@ -9499,9 +9089,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -15612,7 +15612,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9548,10 +9138,10 @@
+@@ -9552,10 +9142,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -15625,7 +15625,7 @@
$as_echo "no" >&6; }
fi
-@@ -9561,9 +9151,9 @@
+@@ -9565,9 +9155,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -15637,7 +15637,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9614,10 +9204,10 @@
+@@ -9618,10 +9208,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -15650,7 +15650,7 @@
$as_echo "no" >&6; }
fi
-@@ -9687,6 +9277,10 @@
+@@ -9691,6 +9281,10 @@
$RM -r conftest*
@@ -15661,7 +15661,7 @@
if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-@@ -9694,9 +9288,9 @@
+@@ -9698,9 +9292,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -15673,21 +15673,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9712,11 +9306,11 @@
+@@ -9716,11 +9310,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9715: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9309: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9719: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9313: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9719: \$? = $ac_status" >&5
-+ echo "$as_me:9313: \$? = $ac_status" >&5
+- echo "$as_me:9723: \$? = $ac_status" >&5
++ echo "$as_me:9317: \$? = $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.
-@@ -9729,7 +9323,7 @@
+@@ -9733,7 +9327,7 @@
$RM conftest*
fi
@@ -15696,7 +15696,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9749,7 +9343,7 @@
+@@ -9753,7 +9347,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -15705,7 +15705,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9881,7 +9475,7 @@
+@@ -9885,7 +9479,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -15714,7 +15714,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -10021,7 +9615,7 @@
+@@ -10025,7 +9619,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -15723,7 +15723,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -10033,9 +9627,9 @@
+@@ -10037,9 +9631,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -15735,21 +15735,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -10051,11 +9645,11 @@
+@@ -10055,11 +9649,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10054: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9648: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10058: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9652: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:10058: \$? = $ac_status" >&5
-+ echo "$as_me:9652: \$? = $ac_status" >&5
+- echo "$as_me:10062: \$? = $ac_status" >&5
++ echo "$as_me:9656: \$? = $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.
-@@ -10068,7 +9662,7 @@
+@@ -10072,7 +9666,7 @@
$RM conftest*
fi
@@ -15758,7 +15758,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10092,9 +9686,9 @@
+@@ -10096,9 +9690,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -15770,7 +15770,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10120,7 +9714,7 @@
+@@ -10124,7 +9718,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -15779,7 +15779,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10135,9 +9729,9 @@
+@@ -10139,9 +9733,9 @@
@@ -15791,21 +15791,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10156,11 +9750,11 @@
+@@ -10160,11 +9754,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10159: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9753: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10163: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10163: \$? = $ac_status" >&5
-+ echo "$as_me:9757: \$? = $ac_status" >&5
+- echo "$as_me:10167: \$? = $ac_status" >&5
++ echo "$as_me:9761: \$? = $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
-@@ -10182,7 +9776,7 @@
+@@ -10186,7 +9780,7 @@
$RM conftest*
fi
@@ -15814,7 +15814,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10190,9 +9784,9 @@
+@@ -10194,9 +9788,9 @@
@@ -15826,21 +15826,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10211,11 +9805,11 @@
+@@ -10215,11 +9809,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:10214: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9808: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:10218: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9812: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10218: \$? = $ac_status" >&5
-+ echo "$as_me:9812: \$? = $ac_status" >&5
+- echo "$as_me:10222: \$? = $ac_status" >&5
++ echo "$as_me:9816: \$? = $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
-@@ -10237,7 +9831,7 @@
+@@ -10241,7 +9835,7 @@
$RM conftest*
fi
@@ -15849,7 +15849,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10246,7 +9840,7 @@
+@@ -10250,7 +9844,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -15858,7 +15858,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10254,10 +9848,10 @@
+@@ -10258,10 +9852,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -15871,7 +15871,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10270,7 +9864,7 @@
+@@ -10274,7 +9868,7 @@
@@ -15880,7 +15880,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10330,6 +9924,9 @@
+@@ -10334,6 +9928,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -15890,7 +15890,7 @@
esac
ld_shlibs=yes
-@@ -10351,6 +9948,7 @@
+@@ -10355,6 +9952,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -15898,7 +15898,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10442,7 +10040,7 @@
+@@ -10446,7 +10044,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -15907,7 +15907,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10512,7 +10110,7 @@
+@@ -10516,7 +10114,7 @@
fi
;;
@@ -15916,7 +15916,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10687,6 +10285,7 @@
+@@ -10691,6 +10289,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -15924,7 +15924,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10712,11 +10311,7 @@
+@@ -10716,11 +10315,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -15937,7 +15937,7 @@
/* end confdefs.h. */
int
-@@ -10727,27 +10322,7 @@
+@@ -10731,27 +10326,7 @@
return 0;
}
_ACEOF
@@ -15966,7 +15966,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10761,16 +10336,9 @@
+@@ -10765,16 +10340,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -15985,7 +15985,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10783,11 +10351,7 @@
+@@ -10787,11 +10355,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -15998,7 +15998,7 @@
/* end confdefs.h. */
int
-@@ -10798,27 +10362,7 @@
+@@ -10802,27 +10366,7 @@
return 0;
}
_ACEOF
@@ -16027,7 +16027,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10832,16 +10376,9 @@
+@@ -10836,16 +10380,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -16046,7 +16046,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -11053,42 +10590,16 @@
+@@ -11057,42 +10594,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -16094,7 +16094,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11101,7 +10612,7 @@
+@@ -11105,7 +10616,7 @@
link_all_deplibs=yes
;;
@@ -16103,7 +16103,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11344,7 +10855,7 @@
+@@ -11348,7 +10859,7 @@
fi
fi
@@ -16112,7 +16112,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11381,16 +10892,16 @@
+@@ -11385,16 +10896,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -16133,7 +16133,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11404,11 +10915,11 @@
+@@ -11408,11 +10919,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -16148,7 +16148,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11419,7 +10930,7 @@
+@@ -11423,7 +10934,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -16157,7 +16157,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11583,7 +11094,7 @@
+@@ -11587,7 +11098,7 @@
@@ -16166,7 +16166,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11991,7 +11502,7 @@
+@@ -11995,7 +11506,7 @@
;;
# This must be Linux ELF.
@@ -16175,7 +16175,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12005,11 +11516,7 @@
+@@ -12009,11 +11520,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -16188,7 +16188,7 @@
/* end confdefs.h. */
int
-@@ -12020,41 +11527,13 @@
+@@ -12024,41 +11531,13 @@
return 0;
}
_ACEOF
@@ -16234,7 +16234,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -12063,13 +11542,10 @@
+@@ -12067,13 +11546,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -16249,7 +16249,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12081,6 +11557,18 @@
+@@ -12085,6 +11561,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16268,7 +16268,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12269,7 +11757,7 @@
+@@ -12273,7 +11761,7 @@
dynamic_linker=no
;;
esac
@@ -16277,7 +16277,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12371,7 +11859,7 @@
+@@ -12375,7 +11863,7 @@
@@ -16286,7 +16286,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12396,7 +11884,7 @@
+@@ -12400,7 +11888,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -16295,7 +16295,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12441,18 +11929,14 @@
+@@ -12445,18 +11933,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16317,7 +16317,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12470,43 +11954,18 @@
+@@ -12474,43 +11958,18 @@
return 0;
}
_ACEOF
@@ -16367,7 +16367,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12519,33 +11978,19 @@
+@@ -12523,33 +11982,19 @@
;;
*)
@@ -16411,7 +16411,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12554,13 +11999,6 @@
+@@ -12558,13 +12003,6 @@
extern "C"
#endif
char shl_load ();
@@ -16425,7 +16425,7 @@
int
main ()
{
-@@ -12569,56 +12007,32 @@
+@@ -12573,56 +12011,32 @@
return 0;
}
_ACEOF
@@ -16501,7 +16501,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12627,222 +12041,37 @@
+@@ -12631,222 +12045,37 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -16741,7 +16741,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12860,57 +12089,28 @@
+@@ -12864,57 +12093,28 @@
return 0;
}
_ACEOF
@@ -16808,7 +16808,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12928,43 +12128,18 @@
+@@ -12932,43 +12132,18 @@
return 0;
}
_ACEOF
@@ -16858,7 +16858,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -13003,9 +12178,9 @@
+@@ -13007,9 +12182,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -16870,16 +16870,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13014,7 +12189,7 @@
+@@ -13018,7 +12193,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 13017 "configure"
-+#line 12192 "configure"
+-#line 13021 "configure"
++#line 12196 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13073,11 +12248,11 @@
+@@ -13077,11 +12252,11 @@
return status;
}
_LT_EOF
@@ -16894,7 +16894,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13094,14 +12269,14 @@
+@@ -13098,14 +12273,14 @@
fi
@@ -16912,16 +16912,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13110,7 +12285,7 @@
+@@ -13114,7 +12289,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 13113 "configure"
-+#line 12288 "configure"
+-#line 13117 "configure"
++#line 12292 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13169,11 +12344,11 @@
+@@ -13173,11 +12348,11 @@
return status;
}
_LT_EOF
@@ -16936,7 +16936,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13190,7 +12365,7 @@
+@@ -13194,7 +12369,7 @@
fi
@@ -16945,7 +16945,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13229,12 +12404,12 @@
+@@ -13233,12 +12408,12 @@
striplib=
old_striplib=
@@ -16960,7 +16960,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13243,15 +12418,15 @@
+@@ -13247,15 +12422,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -16979,7 +16979,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13269,12 +12444,12 @@
+@@ -13273,12 +12448,12 @@
# Report which library types will actually be built
@@ -16995,7 +16995,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13295,14 +12470,14 @@
+@@ -13299,14 +12474,14 @@
fi
;;
esac
@@ -17013,7 +17013,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13443,7 +12618,7 @@
+@@ -13447,7 +12622,7 @@
# Check whether --with-gnu-ld was given.
@@ -17022,7 +17022,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -13452,7 +12627,7 @@
+@@ -13456,7 +12631,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -17031,7 +17031,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -13482,13 +12657,13 @@
+@@ -13486,13 +12661,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17048,7 +17048,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -13519,18 +12694,16 @@
+@@ -13523,18 +12698,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17072,7 +17072,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -13543,7 +12716,7 @@
+@@ -13547,7 +12720,7 @@
;;
esac
fi
@@ -17081,7 +17081,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -13598,7 +12771,7 @@
+@@ -13602,7 +12775,7 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17090,7 +17090,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
-@@ -13699,11 +12872,7 @@
+@@ -13703,11 +12876,7 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -17103,7 +17103,7 @@
/* end confdefs.h. */
int
-@@ -13714,27 +12883,7 @@
+@@ -13718,27 +12887,7 @@
return 0;
}
_ACEOF
@@ -17132,7 +17132,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13748,16 +12897,9 @@
+@@ -13752,16 +12901,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -17151,7 +17151,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13771,11 +12913,7 @@
+@@ -13775,11 +12917,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -17164,7 +17164,7 @@
/* end confdefs.h. */
int
-@@ -13786,27 +12924,7 @@
+@@ -13790,27 +12928,7 @@
return 0;
}
_ACEOF
@@ -17193,7 +17193,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13820,16 +12938,9 @@
+@@ -13824,16 +12942,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -17212,7 +17212,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -14114,7 +13225,7 @@
+@@ -14118,7 +13229,7 @@
inherit_rpath_CXX=yes
;;
@@ -17221,7 +17221,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -14573,7 +13684,7 @@
+@@ -14577,7 +13688,7 @@
;;
esac
@@ -17230,7 +17230,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -14601,11 +13712,11 @@
+@@ -14605,11 +13716,11 @@
};
_LT_EOF
@@ -17245,7 +17245,7 @@
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -14786,7 +13897,7 @@
+@@ -14790,7 +13901,7 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -17254,7 +17254,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
-@@ -14942,7 +14053,7 @@
+@@ -14946,7 +14057,7 @@
;;
esac
;;
@@ -17263,7 +17263,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -15006,7 +14117,7 @@
+@@ -15010,7 +14121,7 @@
;;
esac
;;
@@ -17272,7 +17272,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -15103,7 +14214,7 @@
+@@ -15107,7 +14218,7 @@
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -17281,7 +17281,7 @@
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-@@ -15112,9 +14223,9 @@
+@@ -15116,9 +14227,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -17293,21 +17293,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -15130,11 +14241,11 @@
+@@ -15134,11 +14245,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15133: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14244: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15137: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14248: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15137: \$? = $ac_status" >&5
-+ echo "$as_me:14248: \$? = $ac_status" >&5
+- echo "$as_me:15141: \$? = $ac_status" >&5
++ echo "$as_me:14252: \$? = $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.
-@@ -15147,7 +14258,7 @@
+@@ -15151,7 +14262,7 @@
$RM conftest*
fi
@@ -17316,7 +17316,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -15168,9 +14279,9 @@
+@@ -15172,9 +14283,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -17328,7 +17328,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -15196,7 +14307,7 @@
+@@ -15200,7 +14311,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -17337,7 +17337,7 @@
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -15208,9 +14319,9 @@
+@@ -15212,9 +14323,9 @@
@@ -17349,21 +17349,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -15229,11 +14340,11 @@
+@@ -15233,11 +14344,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15232: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14343: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15236: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14347: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15236: \$? = $ac_status" >&5
-+ echo "$as_me:14347: \$? = $ac_status" >&5
+- echo "$as_me:15240: \$? = $ac_status" >&5
++ echo "$as_me:14351: \$? = $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
-@@ -15255,14 +14366,14 @@
+@@ -15259,14 +14370,14 @@
$RM conftest*
fi
@@ -17381,21 +17381,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -15281,11 +14392,11 @@
+@@ -15285,11 +14396,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15284: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14395: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15288: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14399: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15288: \$? = $ac_status" >&5
-+ echo "$as_me:14399: \$? = $ac_status" >&5
+- echo "$as_me:15292: \$? = $ac_status" >&5
++ echo "$as_me:14403: \$? = $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
-@@ -15307,7 +14418,7 @@
+@@ -15311,7 +14422,7 @@
$RM conftest*
fi
@@ -17404,7 +17404,7 @@
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-@@ -15316,7 +14427,7 @@
+@@ -15320,7 +14431,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -17413,7 +17413,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -15324,10 +14435,10 @@
+@@ -15328,10 +14439,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -17426,7 +17426,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -15337,7 +14448,7 @@
+@@ -15341,7 +14452,7 @@
@@ -17435,7 +17435,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -15357,13 +14468,16 @@
+@@ -15361,13 +14472,16 @@
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'
;;
@@ -17453,7 +17453,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -15391,16 +14505,16 @@
+@@ -15395,16 +14509,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -17474,7 +17474,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -15414,11 +14528,11 @@
+@@ -15418,11 +14532,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
@@ -17489,7 +17489,7 @@
then
archive_cmds_need_lc_CXX=no
else
-@@ -15429,7 +14543,7 @@
+@@ -15433,7 +14547,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -17498,7 +17498,7 @@
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
-@@ -15500,7 +14614,7 @@
+@@ -15504,7 +14618,7 @@
@@ -17507,7 +17507,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
-@@ -15856,7 +14970,7 @@
+@@ -15860,7 +14974,7 @@
;;
# This must be Linux ELF.
@@ -17516,7 +17516,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15870,11 +14984,7 @@
+@@ -15874,11 +14988,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
@@ -17529,7 +17529,7 @@
/* end confdefs.h. */
int
-@@ -15885,41 +14995,13 @@
+@@ -15889,41 +14999,13 @@
return 0;
}
_ACEOF
@@ -17575,7 +17575,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -15928,13 +15010,10 @@
+@@ -15932,13 +15014,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -17590,7 +17590,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15946,6 +15025,18 @@
+@@ -15950,6 +15029,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17609,7 +17609,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16134,7 +15225,7 @@
+@@ -16138,7 +15229,7 @@
dynamic_linker=no
;;
esac
@@ -17618,7 +17618,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -16185,7 +15276,7 @@
+@@ -16189,7 +15280,7 @@
@@ -17627,7 +17627,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -16210,7 +15301,7 @@
+@@ -16214,7 +15305,7 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -17636,7 +17636,7 @@
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
-@@ -16269,7 +15360,7 @@
+@@ -16273,7 +15364,7 @@
: ${CONFIG_LT=./config.lt}
@@ -17645,7 +17645,7 @@
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
cat >"$CONFIG_LT" <<_LTEOF
#! $SHELL
-@@ -16281,13 +15372,13 @@
+@@ -16285,13 +15376,13 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -17663,7 +17663,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -16295,23 +15386,15 @@
+@@ -16299,23 +15390,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -17692,7 +17692,7 @@
as_nl='
'
export as_nl
-@@ -16319,7 +15402,13 @@
+@@ -16323,7 +15406,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -17707,7 +17707,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -16330,7 +15419,7 @@
+@@ -16334,7 +15423,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -17716,7 +17716,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -16353,13 +15442,6 @@
+@@ -16357,13 +15446,6 @@
}
fi
@@ -17730,7 +17730,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -16369,15 +15451,15 @@
+@@ -16373,15 +15455,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -17749,7 +17749,7 @@
IFS=$as_save_IFS
;;
-@@ -16389,12 +15471,16 @@
+@@ -16393,12 +15475,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -17770,7 +17770,7 @@
done
PS1='$ '
PS2='> '
-@@ -16406,7 +15492,90 @@
+@@ -16410,7 +15496,90 @@
LANGUAGE=C
export LANGUAGE
@@ -17862,7 +17862,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -16420,8 +15589,12 @@
+@@ -16424,8 +15593,12 @@
as_basename=false
fi
@@ -17876,7 +17876,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -16441,77 +15614,25 @@
+@@ -16445,77 +15618,25 @@
}
s/.*/./; q'`
@@ -17972,7 +17972,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -16540,8 +15661,56 @@
+@@ -16544,8 +15665,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -18030,7 +18030,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -16560,10 +15729,10 @@
+@@ -16564,10 +15733,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -18043,16 +18043,16 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -16603,7 +15772,7 @@
+@@ -16607,7 +15776,7 @@
lt_cl_version="\
- gtk+ config.lt 2.19.4
+ gtk+ config.lt 2.19.5
-configured by $0, generated by GNU Autoconf 2.63.
+configured by $0, generated by GNU Autoconf 2.65.
Copyright (C) 2008 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
-@@ -16621,17 +15790,11 @@
+@@ -16625,17 +15794,11 @@
--quiet | --q* | --silent | --s* | -q )
lt_cl_silent=: ;;
@@ -18075,7 +18075,7 @@
esac
shift
done
-@@ -16997,7 +16160,7 @@
+@@ -17001,7 +16164,7 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -18084,7 +18084,7 @@
$as_echo "$as_me: creating $ofile" >&6;}
-@@ -17807,7 +16970,7 @@
+@@ -17811,7 +16974,7 @@
_LT_EOF
@@ -18093,7 +18093,7 @@
_LTEOF
chmod +x "$CONFIG_LT"
-@@ -17822,22 +16985,22 @@
+@@ -17826,22 +16989,22 @@
exec 5>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
exec 5>>config.log
@@ -18120,7 +18120,7 @@
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -17846,11 +17009,7 @@
+@@ -17850,11 +17013,7 @@
while :; do
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
@@ -18133,7 +18133,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -17869,60 +17028,14 @@
+@@ -17873,60 +17032,14 @@
return 0;
}
_ACEOF
@@ -18196,7 +18196,7 @@
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -17930,23 +17043,19 @@
+@@ -17934,23 +17047,19 @@
rm -f conftest.$ac_ext
fi
fi
@@ -18224,7 +18224,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -17965,38 +17074,11 @@
+@@ -17969,38 +17078,11 @@
return 0;
}
_ACEOF
@@ -18265,7 +18265,7 @@
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -18016,38 +17098,15 @@
+@@ -18020,38 +17102,15 @@
return 0;
}
_ACEOF
@@ -18306,7 +18306,7 @@
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -18059,17 +17118,13 @@
+@@ -18063,17 +17122,13 @@
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -18327,7 +18327,7 @@
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -18088,38 +17143,11 @@
+@@ -18092,38 +17147,11 @@
return 0;
}
_ACEOF
@@ -18368,7 +18368,7 @@
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -18139,38 +17167,15 @@
+@@ -18143,38 +17171,15 @@
return 0;
}
_ACEOF
@@ -18409,7 +18409,7 @@
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -18194,9 +17199,9 @@
+@@ -18198,9 +17203,9 @@
depcc="$CCAS" am_compiler_list=
@@ -18421,7 +18421,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -18302,7 +17307,7 @@
+@@ -18306,7 +17311,7 @@
fi
fi
@@ -18430,7 +18430,7 @@
$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
-@@ -18319,9 +17324,9 @@
+@@ -18323,9 +17328,9 @@
# Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2
@@ -18442,7 +18442,7 @@
$as_echo_n "(cached) " >&6
else
case $NM in
-@@ -18334,14 +17339,14 @@
+@@ -18338,14 +17343,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18460,7 +18460,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm"
-@@ -18350,26 +17355,26 @@
+@@ -18354,26 +17359,26 @@
fi
NM=$ac_cv_path_NM
if test -n "$NM"; then
@@ -18492,7 +18492,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -18383,7 +17388,7 @@
+@@ -18387,7 +17392,7 @@
@@ -18501,7 +18501,7 @@
$as_echo_n "checking for some Win32 platform... " >&6; }
case "$host" in
*-*-mingw*|*-*-cygwin*)
-@@ -18393,7 +17398,7 @@
+@@ -18397,7 +17402,7 @@
platform_win32=no
;;
esac
@@ -18510,7 +18510,7 @@
$as_echo "$platform_win32" >&6; }
if test "$platform_win32" = "yes"; then
PLATFORM_WIN32_TRUE=
-@@ -18433,9 +17438,9 @@
+@@ -18437,9 +17442,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
set dummy ${ac_tool_prefix}windres; ac_word=$2
@@ -18522,7 +18522,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$WINDRES"; then
-@@ -18446,24 +17451,24 @@
+@@ -18450,24 +17455,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18552,7 +18552,7 @@
$as_echo "no" >&6; }
fi
-@@ -18473,9 +17478,9 @@
+@@ -18477,9 +17482,9 @@
ac_ct_WINDRES=$WINDRES
# Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2
@@ -18564,7 +18564,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_WINDRES"; then
-@@ -18486,24 +17491,24 @@
+@@ -18490,24 +17495,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18594,7 +18594,7 @@
$as_echo "no" >&6; }
fi
-@@ -18512,7 +17517,7 @@
+@@ -18516,7 +17521,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -18603,7 +18603,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -18523,15 +17528,13 @@
+@@ -18527,15 +17532,13 @@
fi
if test "$WINDRES" = no; then
@@ -18622,7 +18622,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ms_librarian"; then
-@@ -18542,14 +17545,14 @@
+@@ -18546,14 +17549,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18640,7 +18640,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no"
-@@ -18557,10 +17560,10 @@
+@@ -18561,10 +17564,10 @@
fi
ms_librarian=$ac_cv_prog_ms_librarian
if test -n "$ms_librarian"; then
@@ -18653,7 +18653,7 @@
$as_echo "no" >&6; }
fi
-@@ -18578,42 +17581,42 @@
+@@ -18582,42 +17585,42 @@
# Check whether --enable-debug was given.
@@ -18702,7 +18702,7 @@
enableval=$enable_visibility;
else
enable_visibility=yes
-@@ -18622,7 +17625,7 @@
+@@ -18626,7 +17629,7 @@
# Check whether --with-xinput was given.
@@ -18711,7 +18711,7 @@
withval=$with_xinput;
fi
-@@ -18635,7 +17638,7 @@
+@@ -18639,7 +17642,7 @@
# Check whether --with-gdktarget was given.
@@ -18720,7 +18720,7 @@
withval=$with_gdktarget; gdktarget=$with_gdktarget
fi
-@@ -18643,9 +17646,7 @@
+@@ -18647,9 +17650,7 @@
case $gdktarget in
x11|win32|quartz|directfb) ;;
@@ -18731,7 +18731,7 @@
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -18679,7 +17680,7 @@
+@@ -18683,7 +17684,7 @@
# Build time sanity check...
@@ -18740,7 +18740,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -18690,15 +17691,11 @@
+@@ -18694,15 +17695,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -18758,7 +18758,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -18720,11 +17717,8 @@
+@@ -18724,11 +17721,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -18772,7 +18772,7 @@
fi
test "$2" = conftest.file
-@@ -18733,27 +17727,20 @@
+@@ -18737,27 +17731,20 @@
# Ok.
:
else
@@ -18806,7 +18806,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18778,54 +17765,27 @@
+@@ -18782,54 +17769,27 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -18869,7 +18869,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -18838,9 +17798,9 @@
+@@ -18842,9 +17802,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -18881,7 +18881,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -18851,24 +17811,24 @@
+@@ -18855,24 +17815,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18911,7 +18911,7 @@
$as_echo "no" >&6; }
fi
-@@ -18878,9 +17838,9 @@
+@@ -18882,9 +17842,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -18923,7 +18923,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -18891,24 +17851,24 @@
+@@ -18895,24 +17855,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18953,7 +18953,7 @@
$as_echo "no" >&6; }
fi
-@@ -18917,7 +17877,7 @@
+@@ -18921,7 +17881,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -18962,7 +18962,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -18931,9 +17891,9 @@
+@@ -18935,9 +17895,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -18974,7 +18974,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -18944,24 +17904,24 @@
+@@ -18948,24 +17908,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19004,7 +19004,7 @@
$as_echo "no" >&6; }
fi
-@@ -18971,9 +17931,9 @@
+@@ -18975,9 +17935,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -19016,7 +19016,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -18985,18 +17945,18 @@
+@@ -18989,18 +17949,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19038,7 +19038,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -19015,10 +17975,10 @@
+@@ -19019,10 +17979,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -19051,7 +19051,7 @@
$as_echo "no" >&6; }
fi
-@@ -19030,9 +17990,9 @@
+@@ -19034,9 +17994,9 @@
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
@@ -19063,7 +19063,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -19043,24 +18003,24 @@
+@@ -19047,24 +18007,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19093,7 +19093,7 @@
$as_echo "no" >&6; }
fi
-@@ -19074,9 +18034,9 @@
+@@ -19078,9 +18038,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -19105,7 +19105,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -19087,24 +18047,24 @@
+@@ -19091,24 +18051,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19135,7 +19135,7 @@
$as_echo "no" >&6; }
fi
-@@ -19117,7 +18077,7 @@
+@@ -19121,7 +18081,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -19144,7 +19144,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -19128,62 +18088,42 @@
+@@ -19132,62 +18092,42 @@
fi
@@ -19229,7 +19229,7 @@
/* end confdefs.h. */
int
-@@ -19197,37 +18137,16 @@
+@@ -19201,37 +18141,16 @@
return 0;
}
_ACEOF
@@ -19270,7 +19270,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -19236,20 +18155,16 @@
+@@ -19240,20 +18159,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -19294,7 +19294,7 @@
/* end confdefs.h. */
int
-@@ -19260,35 +18175,11 @@
+@@ -19264,35 +18179,11 @@
return 0;
}
_ACEOF
@@ -19333,7 +19333,7 @@
/* end confdefs.h. */
int
-@@ -19299,36 +18190,12 @@
+@@ -19303,36 +18194,12 @@
return 0;
}
_ACEOF
@@ -19374,7 +19374,7 @@
/* end confdefs.h. */
int
-@@ -19339,42 +18206,17 @@
+@@ -19343,42 +18210,17 @@
return 0;
}
_ACEOF
@@ -19419,7 +19419,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -19391,18 +18233,14 @@
+@@ -19395,18 +18237,14 @@
CFLAGS=
fi
fi
@@ -19441,7 +19441,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -19459,32 +18297,9 @@
+@@ -19463,32 +18301,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -19475,7 +19475,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -19495,17 +18310,19 @@
+@@ -19499,17 +18314,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -19498,7 +19498,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -19515,9 +18332,9 @@
+@@ -19519,9 +18336,9 @@
depcc="$CC" am_compiler_list=
@@ -19510,7 +19510,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -19625,7 +18442,7 @@
+@@ -19629,7 +18446,7 @@
fi
fi
@@ -19519,7 +19519,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -19644,22 +18461,18 @@
+@@ -19648,22 +18465,18 @@
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
if test "x$CC" != xcc; then
@@ -19546,7 +19546,7 @@
/* end confdefs.h. */
int
-@@ -19675,63 +18488,63 @@
+@@ -19679,63 +18492,63 @@
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -19635,7 +19635,7 @@
then
# cc works too.
:
-@@ -19748,15 +18561,13 @@
+@@ -19752,15 +18565,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -19654,7 +19654,7 @@
fi
-@@ -19775,104 +18586,12 @@
+@@ -19779,104 +18590,12 @@
fi
@@ -19761,7 +19761,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -19890,11 +18609,11 @@
+@@ -19894,11 +18613,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -19775,7 +19775,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -19928,7 +18647,7 @@
+@@ -19932,7 +18651,7 @@
if test x"$os_win32" = xyes; then
if test x"$GCC" = xyes; then
msnative_struct=''
@@ -19784,7 +19784,7 @@
$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; }
if test -z "$ac_cv_prog_CC"; then
our_gcc="$CC"
-@@ -19948,13 +18667,13 @@
+@@ -19952,13 +18671,13 @@
;;
esac
if test x"$msnative_struct" = x ; then
@@ -19801,7 +19801,7 @@
$as_echo "${msnative_struct}" >&6; }
fi
fi
-@@ -19975,9 +18694,9 @@
+@@ -19979,9 +18698,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -19813,7 +19813,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -19990,14 +18709,14 @@
+@@ -19994,14 +18713,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19831,7 +19831,7 @@
IFS=$as_save_IFS
;;
-@@ -20005,10 +18724,10 @@
+@@ -20009,10 +18728,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -19844,7 +19844,7 @@
$as_echo "no" >&6; }
fi
-@@ -20018,9 +18737,9 @@
+@@ -20022,9 +18741,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -19856,7 +19856,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -20033,14 +18752,14 @@
+@@ -20037,14 +18756,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19874,7 +19874,7 @@
IFS=$as_save_IFS
;;
-@@ -20048,10 +18767,10 @@
+@@ -20052,10 +18771,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -19887,7 +19887,7 @@
$as_echo "no" >&6; }
fi
-@@ -20060,7 +18779,7 @@
+@@ -20064,7 +18783,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -19896,7 +19896,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -20073,13 +18792,13 @@
+@@ -20077,13 +18796,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -19913,7 +19913,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -20087,40 +18806,44 @@
+@@ -20091,40 +18810,44 @@
fi
pkg_failed=no
@@ -19977,7 +19977,7 @@
fi
-@@ -20133,25 +18856,14 @@
+@@ -20137,25 +18860,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -20006,7 +20006,7 @@
$BASE_DEPENDENCIES_PKG_ERRORS
-@@ -20161,22 +18873,11 @@
+@@ -20165,22 +18877,11 @@
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.
@@ -20032,7 +20032,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20185,12 +18886,11 @@
+@@ -20189,12 +18890,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -20047,7 +20047,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20207,40 +18907,44 @@
+@@ -20211,40 +18911,44 @@
fi
pkg_failed=no
@@ -20111,7 +20111,7 @@
fi
-@@ -20253,14 +18957,14 @@
+@@ -20257,14 +18961,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -20129,7 +20129,7 @@
$CAIRO_BACKEND_PKG_ERRORS
-@@ -20270,33 +18974,11 @@
+@@ -20274,33 +18978,11 @@
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.
@@ -20166,7 +20166,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20305,12 +18987,11 @@
+@@ -20309,12 +18991,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -20181,7 +20181,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20327,14 +19008,14 @@
+@@ -20331,14 +19012,14 @@
# Check whether --enable-explicit-deps was given.
@@ -20198,7 +20198,7 @@
$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; }
case $enable_explicit_deps in
auto)
-@@ -20348,12 +19029,10 @@
+@@ -20352,12 +19033,10 @@
;;
yes|no)
;;
@@ -20213,7 +20213,7 @@
$as_echo "$enable_explicit_deps" >&6; }
if test $enable_explicit_deps = no; then
-@@ -20372,9 +19051,9 @@
+@@ -20376,9 +19055,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -20225,7 +20225,7 @@
$as_echo_n "(cached) " >&6
else
case $PERL in
-@@ -20387,14 +19066,14 @@
+@@ -20391,14 +19070,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20243,7 +20243,7 @@
IFS=$as_save_IFS
;;
-@@ -20402,10 +19081,10 @@
+@@ -20406,10 +19085,10 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -20256,7 +20256,7 @@
$as_echo "no" >&6; }
fi
-@@ -20417,9 +19096,9 @@
+@@ -20421,9 +19100,9 @@
# We would like indent, but don't require it.
# Extract the first word of "indent", so it can be a program name with args.
set dummy indent; ac_word=$2
@@ -20268,7 +20268,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$INDENT"; then
-@@ -20430,24 +19109,24 @@
+@@ -20434,24 +19113,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20298,7 +20298,7 @@
$as_echo "no" >&6; }
fi
-@@ -20461,222 +19140,37 @@
+@@ -20465,222 +19144,37 @@
fi
@@ -20545,7 +20545,7 @@
int
main ()
{
-@@ -20688,56 +19182,25 @@
+@@ -20692,56 +19186,25 @@
return 0;
}
_ACEOF
@@ -20610,7 +20610,7 @@
/* end confdefs.h. */
#include <langinfo.h>
int
-@@ -20751,56 +19214,25 @@
+@@ -20755,56 +19218,25 @@
return 0;
}
_ACEOF
@@ -20675,7 +20675,7 @@
/* end confdefs.h. */
#include <langinfo.h>
int
-@@ -20814,56 +19246,25 @@
+@@ -20818,56 +19250,25 @@
return 0;
}
_ACEOF
@@ -20740,7 +20740,7 @@
/* end confdefs.h. */
#include <langinfo.h>
int
-@@ -20877,56 +19278,25 @@
+@@ -20881,56 +19282,25 @@
return 0;
}
_ACEOF
@@ -20805,7 +20805,7 @@
/* end confdefs.h. */
#include <setjmp.h>
int
-@@ -20940,424 +19310,92 @@
+@@ -20944,424 +19314,92 @@
return 0;
}
_ACEOF
@@ -21279,7 +21279,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -21370,54 +19408,25 @@
+@@ -21374,54 +19412,25 @@
return 0;
}
_ACEOF
@@ -21342,7 +21342,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -21430,141 +19439,26 @@
+@@ -21434,141 +19443,26 @@
return 0;
}
_ACEOF
@@ -21494,7 +21494,7 @@
_ACEOF
fi
-@@ -21579,18 +19473,14 @@
+@@ -21583,18 +19477,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -21516,7 +21516,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21608,55 +19498,26 @@
+@@ -21612,55 +19502,26 @@
return 0;
}
_ACEOF
@@ -21581,7 +21581,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21674,55 +19535,26 @@
+@@ -21678,55 +19539,26 @@
return 0;
}
_ACEOF
@@ -21646,7 +21646,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21740,43 +19572,18 @@
+@@ -21744,43 +19576,18 @@
return 0;
}
_ACEOF
@@ -21696,7 +21696,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -21786,22 +19593,18 @@
+@@ -21790,22 +19597,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -21724,7 +21724,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21819,55 +19622,26 @@
+@@ -21823,55 +19626,26 @@
return 0;
}
_ACEOF
@@ -21789,7 +21789,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21885,43 +19659,18 @@
+@@ -21889,43 +19663,18 @@
return 0;
}
_ACEOF
@@ -21839,7 +21839,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -21943,102 +19692,12 @@
+@@ -21947,102 +19696,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -21947,7 +21947,7 @@
_ACEOF
fi
-@@ -22068,15 +19727,13 @@
+@@ -22072,15 +19731,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -21966,7 +21966,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -22101,118 +19758,28 @@
+@@ -22105,118 +19762,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -22093,7 +22093,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -22227,14 +19794,14 @@
+@@ -22231,14 +19798,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -22113,7 +22113,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -22242,9 +19809,9 @@
+@@ -22246,9 +19813,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -22125,7 +22125,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -22257,14 +19824,14 @@
+@@ -22261,14 +19828,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -22143,7 +22143,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -22273,19 +19840,19 @@
+@@ -22277,19 +19844,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -22167,7 +22167,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -22310,18 +19877,14 @@
+@@ -22314,18 +19881,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -22189,7 +22189,7 @@
/* end confdefs.h. */
int
-@@ -22333,121 +19896,14 @@
+@@ -22337,121 +19900,14 @@
return 0;
}
_ACEOF
@@ -22315,7 +22315,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -22462,10 +19918,8 @@
+@@ -22466,10 +19922,8 @@
;;
esac
fi
@@ -22328,7 +22328,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -22479,9 +19933,7 @@
+@@ -22483,9 +19937,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -22339,7 +22339,7 @@
fi
-@@ -22489,7 +19941,7 @@
+@@ -22493,7 +19945,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -22348,7 +22348,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -22522,7 +19974,7 @@
+@@ -22526,7 +19978,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -22357,7 +22357,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -22547,7 +19999,7 @@
+@@ -22551,7 +20003,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -22366,7 +22366,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -22618,129 +20070,67 @@
+@@ -22622,129 +20074,67 @@
@@ -22516,7 +22516,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -22749,27 +20139,23 @@
+@@ -22753,27 +20143,23 @@
#
# see bug 162979
#
@@ -22549,7 +22549,7 @@
/* end confdefs.h. */
#include <dirent.h>
int
-@@ -22780,37 +20166,13 @@
+@@ -22784,37 +20170,13 @@
return 0;
}
_ACEOF
@@ -22591,7 +22591,7 @@
/* end confdefs.h. */
#include <dirent.h>
int
-@@ -22821,40 +20183,18 @@
+@@ -22825,40 +20187,18 @@
return 0;
}
_ACEOF
@@ -22636,7 +22636,7 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
#
-@@ -22864,7 +20204,7 @@
+@@ -22868,7 +20208,7 @@
GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0"
# Check whether --enable-glibtest was given.
@@ -22645,7 +22645,7 @@
enableval=$enable_glibtest;
else
enable_glibtest=yes
-@@ -22899,9 +20239,9 @@
+@@ -22903,9 +20243,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -22657,7 +22657,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -22914,14 +20254,14 @@
+@@ -22918,14 +20258,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -22675,7 +22675,7 @@
IFS=$as_save_IFS
;;
-@@ -22929,10 +20269,10 @@
+@@ -22933,10 +20273,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -22688,7 +22688,7 @@
$as_echo "no" >&6; }
fi
-@@ -22942,9 +20282,9 @@
+@@ -22946,9 +20286,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -22700,7 +22700,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -22957,14 +20297,14 @@
+@@ -22961,14 +20301,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -22718,7 +22718,7 @@
IFS=$as_save_IFS
;;
-@@ -22972,10 +20312,10 @@
+@@ -22976,10 +20316,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -22731,7 +22731,7 @@
$as_echo "no" >&6; }
fi
-@@ -22984,7 +20324,7 @@
+@@ -22988,7 +20328,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -22740,7 +22740,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -22997,13 +20337,13 @@
+@@ -23001,13 +20341,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.16
@@ -22757,7 +22757,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -23018,7 +20358,7 @@
+@@ -23022,7 +20362,7 @@
fi
min_glib_version=2.21.3
@@ -22766,7 +22766,7 @@
$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
if test x$PKG_CONFIG != xno ; then
-@@ -23054,14 +20394,10 @@
+@@ -23058,14 +20398,10 @@
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$GLIB_LIBS $LIBS"
rm -f conf.glibtest
@@ -22783,7 +22783,7 @@
/* end confdefs.h. */
#include <glib.h>
-@@ -23136,52 +20472,25 @@
+@@ -23140,52 +20476,25 @@
}
_ACEOF
@@ -22843,7 +22843,7 @@
$as_echo "no" >&6; }
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
-@@ -23195,11 +20504,7 @@
+@@ -23199,11 +20508,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
@@ -22856,7 +22856,7 @@
/* end confdefs.h. */
#include <glib.h>
-@@ -23213,27 +20518,7 @@
+@@ -23217,27 +20522,7 @@
return 0;
}
_ACEOF
@@ -22885,7 +22885,7 @@
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -23244,16 +20529,11 @@
+@@ -23248,16 +20533,11 @@
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
@@ -22905,7 +22905,7 @@
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
-@@ -23263,13 +20543,9 @@
+@@ -23267,13 +20547,9 @@
GLIB_GENMARSHAL=""
GOBJECT_QUERY=""
GLIB_MKENUMS=""
@@ -22921,7 +22921,7 @@
fi
-@@ -23291,413 +20567,354 @@
+@@ -23295,413 +20571,354 @@
gtk_save_LIBS=$LIBS
LIBS="$LIBS $GLIB_LIBS"
@@ -23617,7 +23617,7 @@
_ACEOF
fi
-@@ -23705,910 +20922,599 @@
+@@ -23709,910 +20926,599 @@
done
@@ -24979,7 +24979,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -24616,290 +21522,93 @@
+@@ -24620,290 +21526,93 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -25325,7 +25325,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -24907,100 +21616,66 @@
+@@ -24911,100 +21620,66 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -25467,7 +25467,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -25008,314 +21683,136 @@
+@@ -25012,314 +21687,136 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -25874,7 +25874,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -25323,72 +21820,92 @@
+@@ -25327,72 +21824,92 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -26018,7 +26018,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -25397,1212 +21914,671 @@
+@@ -25401,1212 +21918,671 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -27719,7 +27719,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -26611,116 +22587,50 @@
+@@ -26615,116 +22591,50 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -27862,7 +27862,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -26729,3384 +22639,554 @@
+@@ -26733,3384 +22643,554 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -31677,7 +31677,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30114,92 +23194,27 @@
+@@ -30118,92 +23198,27 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -31779,7 +31779,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30207,200 +23222,141 @@
+@@ -30211,200 +23226,141 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32078,7 +32078,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30408,103 +23364,55 @@
+@@ -30412,103 +23368,55 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32214,7 +32214,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30512,116 +23420,48 @@
+@@ -30516,116 +23424,48 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32356,7 +32356,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30629,99 +23469,48 @@
+@@ -30633,99 +23473,48 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32481,7 +32481,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30729,97 +23518,51 @@
+@@ -30733,97 +23522,51 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -32608,7 +32608,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -30827,224 +23570,238 @@
+@@ -30831,224 +23574,238 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -33016,7 +33016,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31062,43 +23819,18 @@
+@@ -31066,43 +23823,18 @@
return 0;
}
_ACEOF
@@ -33066,7 +33066,7 @@
case "$x_extra_libs " in
*-lXextSam[\ \ ]*) ;;
*) x_extra_libs="-lXextSam $x_extra_libs" ;;
-@@ -31112,286 +23844,20 @@
+@@ -31116,286 +23848,20 @@
if test "x$enable_shm" = "xyes"; then
# Check for shared memory
@@ -33359,7 +33359,7 @@
else
no_sys_shm=yes
-@@ -31401,18 +23867,14 @@
+@@ -31405,18 +23871,14 @@
# Check for the X shared memory extension header file
have_xshm=no
@@ -33380,7 +33380,7 @@
/* end confdefs.h. */
#include <stdlib.h>
-@@ -31431,42 +23893,17 @@
+@@ -31435,42 +23897,17 @@
return 0;
}
_ACEOF
@@ -33426,7 +33426,7 @@
fi
fi
-@@ -31477,7 +23914,7 @@
+@@ -31481,7 +23918,7 @@
CPPFLAGS="$CPPFLAGS $x_cflags"
# Check for XFree
@@ -33435,7 +33435,7 @@
$as_echo_n "checking for Xinerama support on XFree86... " >&6; }
have_xfree_xinerama=false
-@@ -31485,18 +23922,14 @@
+@@ -31489,18 +23926,14 @@
have_xfree_xinerama=true
X_PACKAGES="$X_PACKAGES xinerama"
else
@@ -33457,7 +33457,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31514,89 +23947,21 @@
+@@ -31518,89 +23951,21 @@
return 0;
}
_ACEOF
@@ -33556,7 +33556,7 @@
case "$x_extra_libs " in
*-lXinerama[\ \ ]*) ;;
*) x_extra_libs="-lXinerama $x_extra_libs" ;;
-@@ -31614,160 +23979,29 @@
+@@ -31618,160 +23983,29 @@
if $have_xfree_xinerama ; then
@@ -33727,7 +33727,7 @@
have_solaris_xinerama=true
else
:
-@@ -31779,19 +24013,15 @@
+@@ -31783,19 +24017,15 @@
if $have_solaris_xinerama ; then
@@ -33751,7 +33751,7 @@
$as_echo "no" >&6; }
fi
;;
-@@ -31805,9 +24035,7 @@
+@@ -31809,9 +24039,7 @@
if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
@@ -33762,7 +33762,7 @@
if $PKG_CONFIG --exists xi ; then
-@@ -31821,9 +24049,7 @@
+@@ -31825,9 +24053,7 @@
fi
else
@@ -33773,7 +33773,7 @@
fi
-@@ -31839,9 +24065,7 @@
+@@ -31843,9 +24069,7 @@
# Check for the RANDR extension
if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
@@ -33784,7 +33784,7 @@
X_PACKAGES="$X_PACKAGES xrandr"
-@@ -31851,9 +24075,7 @@
+@@ -31855,9 +24079,7 @@
if $PKG_CONFIG --exists xcursor ; then
@@ -33795,7 +33795,7 @@
X_PACKAGES="$X_PACKAGES xcursor"
-@@ -31863,9 +24085,7 @@
+@@ -31867,9 +24089,7 @@
if $PKG_CONFIG --exists xfixes ; then
@@ -33806,7 +33806,7 @@
X_PACKAGES="$X_PACKAGES xfixes"
-@@ -31876,9 +24096,7 @@
+@@ -31880,9 +24100,7 @@
if $PKG_CONFIG --exists xcomposite ; then
@@ -33817,7 +33817,7 @@
X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -31889,9 +24107,7 @@
+@@ -31893,9 +24111,7 @@
if $PKG_CONFIG --exists xdamage ; then
@@ -33828,7 +33828,7 @@
X_PACKAGES="$X_PACKAGES xdamage"
-@@ -31997,45 +24213,49 @@
+@@ -32001,45 +24217,49 @@
if test "x$gdktarget" = "xdirectfb"; then
DIRECTFB_REQUIRED_VERSION=1.0.0
@@ -33898,7 +33898,7 @@
fi
-@@ -32048,25 +24268,14 @@
+@@ -32052,25 +24272,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -33927,7 +33927,7 @@
$DIRECTFB_PKG_ERRORS
-@@ -32076,22 +24285,11 @@
+@@ -32080,22 +24289,11 @@
Alternatively, you may set the environment variables DIRECTFB_CFLAGS
and DIRECTFB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -33953,7 +33953,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -32100,12 +24298,11 @@
+@@ -32104,12 +24302,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -33968,7 +33968,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -32137,24 +24334,19 @@
+@@ -32141,24 +24338,19 @@
PANGO_PACKAGES="pango pangocairo"
fi
@@ -33997,7 +33997,7 @@
fi
CFLAGS="$CFLAGS $PANGO_CFLAGS"
-@@ -32164,11 +24356,7 @@
+@@ -32168,11 +24360,7 @@
else
gtk_save_LIBS="$LIBS"
LIBS="$PANGO_LIBS $LIBS"
@@ -34010,7 +34010,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32186,60 +24374,33 @@
+@@ -32190,60 +24378,33 @@
return 0;
}
_ACEOF
@@ -34082,7 +34082,7 @@
fi
-@@ -32249,29 +24410,25 @@
+@@ -32253,29 +24414,25 @@
@@ -34117,7 +34117,7 @@
fi
if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
-@@ -32279,11 +24436,7 @@
+@@ -32283,11 +24440,7 @@
else
gtk_save_LIBS="$LIBS"
LIBS="$ATK_LIBS $LIBS"
@@ -34130,7 +34130,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32301,44 +24454,15 @@
+@@ -32305,44 +24458,15 @@
return 0;
}
_ACEOF
@@ -34180,7 +34180,7 @@
LIBS="$gtk_save_LIBS"
fi
-@@ -32361,7 +24485,7 @@
+@@ -32365,7 +24489,7 @@
CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
if test $enable_explicit_deps != yes ; then
@@ -34189,7 +34189,7 @@
fi
-@@ -32389,17 +24513,13 @@
+@@ -32393,17 +24517,13 @@
########################
old_LIBS="$LIBS"
@@ -34210,7 +34210,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32424,69 +24544,38 @@
+@@ -32428,69 +24548,38 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -34291,7 +34291,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32505,75 +24594,44 @@
+@@ -32509,75 +24598,44 @@
}
_ACEOF
for ac_lib in '' socket; do
@@ -34384,7 +34384,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -32598,161 +24656,37 @@
+@@ -32602,161 +24660,37 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -34557,7 +34557,7 @@
struct_sockaddr_un_sun_len=true
else
struct_sockaddr_un_suin_len=false
-@@ -32780,7 +24714,7 @@
+@@ -32784,7 +24718,7 @@
################################################################
# Check whether --enable-cups was given.
@@ -34566,7 +34566,7 @@
enableval=$enable_cups;
else
enable_cups=auto
-@@ -32799,9 +24733,9 @@
+@@ -32803,9 +24737,9 @@
else
# Extract the first word of "cups-config", so it can be a program name with args.
set dummy cups-config; ac_word=$2
@@ -34578,7 +34578,7 @@
$as_echo_n "(cached) " >&6
else
case $CUPS_CONFIG in
-@@ -32814,14 +24748,14 @@
+@@ -32818,14 +24752,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -34596,7 +34596,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no"
-@@ -32830,10 +24764,10 @@
+@@ -32834,10 +24768,10 @@
fi
CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
if test -n "$CUPS_CONFIG"; then
@@ -34609,7 +34609,7 @@
$as_echo "no" >&6; }
fi
-@@ -32849,13 +24783,9 @@
+@@ -32853,13 +24787,9 @@
fi
else
@@ -34625,7 +34625,7 @@
fi
else
CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'`
-@@ -32868,9 +24798,7 @@
+@@ -32872,9 +24802,7 @@
if test $CUPS_API_MAJOR -gt 1 -o \
$CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
@@ -34636,7 +34636,7 @@
fi
-@@ -32879,144 +24807,11 @@
+@@ -32883,144 +24811,11 @@
@@ -34784,7 +34784,7 @@
fi
-@@ -33030,156 +24825,37 @@
+@@ -33034,156 +24829,37 @@
fi
@@ -34969,7 +34969,7 @@
_ACEOF
fi
-@@ -33193,7 +24869,7 @@
+@@ -33197,7 +24873,7 @@
#
# Check whether --enable-papi was given.
@@ -34978,7 +34978,7 @@
enableval=$enable_papi;
else
enable_papi=auto
-@@ -33210,20 +24886,16 @@
+@@ -33214,20 +24890,16 @@
fi
else
@@ -35003,7 +35003,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -33241,43 +24913,18 @@
+@@ -33245,43 +24917,18 @@
return 0;
}
_ACEOF
@@ -35053,7 +35053,7 @@
have_papi=yes
else
have_papi=no
-@@ -33285,9 +24932,7 @@
+@@ -33289,9 +24936,7 @@
if test $have_papi = yes; then
@@ -35064,7 +35064,7 @@
fi
if test $have_papi = yes; then
-@@ -33299,13 +24944,9 @@
+@@ -33303,13 +24948,9 @@
fi
if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
@@ -35080,7 +35080,7 @@
fi
fi
-@@ -33314,448 +24955,43 @@
+@@ -33318,448 +24959,43 @@
HAVE_PAPI_CUPS_FALSE='#'
else
HAVE_PAPI_CUPS_TRUE='#'
@@ -35560,7 +35560,7 @@
fi
-@@ -33765,7 +25001,7 @@
+@@ -33769,7 +25005,7 @@
# Check whether --enable-test-print-backend was given.
@@ -35569,7 +35569,7 @@
enableval=$enable_test_print_backend;
else
enable_test_print_backend=no
-@@ -33811,62 +25047,59 @@
+@@ -33815,62 +25051,59 @@
# Check whether --enable-introspection was given.
@@ -35658,7 +35658,7 @@
$as_echo "$found_introspection" >&6; }
INTROSPECTION_SCANNER=
-@@ -33914,9 +25147,9 @@
+@@ -33918,9 +25151,9 @@
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
@@ -35670,7 +35670,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -33929,14 +25162,14 @@
+@@ -33933,14 +25166,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35688,7 +35688,7 @@
IFS=$as_save_IFS
;;
-@@ -33944,10 +25177,10 @@
+@@ -33948,10 +25181,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -35701,7 +35701,7 @@
$as_echo "no" >&6; }
fi
-@@ -33956,9 +25189,9 @@
+@@ -33960,9 +25193,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -35713,7 +35713,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -33971,14 +25204,14 @@
+@@ -33975,14 +25208,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35731,7 +35731,7 @@
IFS=$as_save_IFS
;;
-@@ -33986,10 +25219,10 @@
+@@ -33990,10 +25223,10 @@
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
if test -n "$GTKDOC_REBASE"; then
@@ -35744,7 +35744,7 @@
$as_echo "no" >&6; }
fi
-@@ -34000,9 +25233,9 @@
+@@ -34004,9 +25237,9 @@
# Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
set dummy gtkdoc-mkpdf; ac_word=$2
@@ -35756,7 +35756,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -34015,14 +25248,14 @@
+@@ -34019,14 +25252,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35774,7 +35774,7 @@
IFS=$as_save_IFS
;;
-@@ -34030,10 +25263,10 @@
+@@ -34034,10 +25267,10 @@
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
if test -n "$GTKDOC_MKPDF"; then
@@ -35787,7 +35787,7 @@
$as_echo "no" >&6; }
fi
-@@ -34041,7 +25274,7 @@
+@@ -34045,7 +25278,7 @@
# Check whether --with-html-dir was given.
@@ -35796,7 +35796,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -34051,7 +25284,7 @@
+@@ -34055,7 +25288,7 @@
# Check whether --enable-gtk-doc was given.
@@ -35805,7 +35805,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -34060,33 +25293,31 @@
+@@ -34064,33 +25297,31 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -35847,7 +35847,7 @@
enableval=$enable_gtk_doc_pdf;
else
enable_gtk_doc_pdf=no
-@@ -34142,9 +25373,9 @@
+@@ -34146,9 +25377,9 @@
# Extract the first word of "db2html", so it can be a program name with args.
set dummy db2html; ac_word=$2
@@ -35859,7 +35859,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DB2HTML"; then
-@@ -34155,14 +25386,14 @@
+@@ -34159,14 +25390,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35877,7 +35877,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false"
-@@ -34170,10 +25401,10 @@
+@@ -34174,10 +25405,10 @@
fi
DB2HTML=$ac_cv_prog_DB2HTML
if test -n "$DB2HTML"; then
@@ -35890,7 +35890,7 @@
$as_echo "no" >&6; }
fi
-@@ -34188,7 +25419,7 @@
+@@ -34192,7 +25423,7 @@
# Check whether --enable-man was given.
@@ -35899,7 +35899,7 @@
enableval=$enable_man; enable_man=yes
else
enable_man=no
-@@ -34198,9 +25429,9 @@
+@@ -34202,9 +25433,9 @@
if test "${enable_man}" != no; then
# Extract the first word of "xsltproc", so it can be a program name with args.
set dummy xsltproc; ac_word=$2
@@ -35911,7 +35911,7 @@
$as_echo_n "(cached) " >&6
else
case $XSLTPROC in
-@@ -34213,14 +25444,14 @@
+@@ -34217,14 +25448,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35929,7 +35929,7 @@
IFS=$as_save_IFS
;;
-@@ -34228,10 +25459,10 @@
+@@ -34232,10 +25463,10 @@
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -35942,7 +35942,7 @@
$as_echo "no" >&6; }
fi
-@@ -34244,7 +25475,7 @@
+@@ -34248,7 +25479,7 @@
# check for the presence of the XML catalog
# Check whether --with-xml-catalog was given.
@@ -35951,7 +35951,7 @@
withval=$with_xml_catalog;
else
with_xml_catalog=/etc/xml/catalog
-@@ -34253,23 +25484,23 @@
+@@ -34257,23 +25488,23 @@
jh_found_xmlcatalog=true
XML_CATALOG_FILE="$with_xml_catalog"
@@ -35980,7 +35980,7 @@
$as_echo_n "(cached) " >&6
else
case $XMLCATALOG in
-@@ -34282,14 +25513,14 @@
+@@ -34286,14 +25517,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -35998,7 +35998,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no"
-@@ -34298,10 +25529,10 @@
+@@ -34302,10 +25533,10 @@
fi
XMLCATALOG=$ac_cv_path_XMLCATALOG
if test -n "$XMLCATALOG"; then
@@ -36011,7 +36011,7 @@
$as_echo "no" >&6; }
fi
-@@ -34317,35 +25548,35 @@
+@@ -34321,35 +25552,35 @@
fi
@@ -36059,7 +36059,7 @@
$as_echo "not found" >&6; }
enable_man=no
fi
-@@ -34399,13 +25630,13 @@
+@@ -34403,13 +25634,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -36075,7 +36075,7 @@
esac ;;
esac
done
-@@ -34413,8 +25644,8 @@
+@@ -34417,8 +25648,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -36086,7 +36086,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -34437,11 +25668,11 @@
+@@ -34441,11 +25672,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -36100,7 +36100,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -34461,8 +25692,8 @@
+@@ -34465,8 +25696,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -36111,7 +36111,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -34478,594 +25709,350 @@
+@@ -34482,594 +25713,350 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -36879,7 +36879,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -35075,17 +26062,18 @@
+@@ -35079,17 +26066,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -36905,7 +36905,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -35093,23 +26081,15 @@
+@@ -35097,23 +26085,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -36934,7 +36934,7 @@
as_nl='
'
export as_nl
-@@ -35117,7 +26097,13 @@
+@@ -35121,7 +26101,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -36949,7 +36949,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -35128,7 +26114,7 @@
+@@ -35132,7 +26118,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -36958,7 +36958,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -35151,13 +26137,6 @@
+@@ -35155,13 +26141,6 @@
}
fi
@@ -36972,7 +36972,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -35167,15 +26146,15 @@
+@@ -35171,15 +26150,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -36991,7 +36991,7 @@
IFS=$as_save_IFS
;;
-@@ -35187,12 +26166,16 @@
+@@ -35191,12 +26170,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -37012,7 +37012,7 @@
done
PS1='$ '
PS2='> '
-@@ -35204,7 +26187,89 @@
+@@ -35208,7 +26191,89 @@
LANGUAGE=C
export LANGUAGE
@@ -37103,7 +37103,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -35218,8 +26283,12 @@
+@@ -35222,8 +26287,12 @@
as_basename=false
fi
@@ -37117,7 +37117,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -35239,76 +26308,25 @@
+@@ -35243,76 +26312,25 @@
}
s/.*/./; q'`
@@ -37205,7 +37205,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -35337,8 +26355,56 @@
+@@ -35341,8 +26359,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -37263,7 +37263,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -35357,10 +26423,10 @@
+@@ -35361,10 +26427,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -37276,7 +37276,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -35375,13 +26441,19 @@
+@@ -35379,13 +26445,19 @@
exec 6>&1
@@ -37292,13 +37292,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by gtk+ $as_me 2.19.4, which was
+ This file was extended by gtk+ $as_me 2.19.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -35413,13 +26485,15 @@
+@@ -35417,13 +26489,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -37317,7 +37317,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -35438,16 +26512,17 @@
+@@ -35442,16 +26516,17 @@
Configuration commands:
$config_commands
@@ -37328,7 +37328,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.19.4
+ gtk+ config.status 2.19.5
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -37339,7 +37339,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -35483,6 +26558,8 @@
+@@ -35487,6 +26562,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -37348,7 +37348,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -35490,20 +26567,19 @@
+@@ -35494,20 +26571,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -37373,7 +37373,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -35511,11 +26587,10 @@
+@@ -35515,11 +26591,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -37388,7 +37388,7 @@
ac_need_defaults=false ;;
esac
-@@ -36030,9 +27105,7 @@
+@@ -36034,9 +27109,7 @@
"contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;;
"contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;;
@@ -37399,7 +37399,7 @@
esac
done
-@@ -36059,7 +27132,7 @@
+@@ -36063,7 +27136,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -37408,7 +37408,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -36070,11 +27143,7 @@
+@@ -36074,11 +27147,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -37421,7 +37421,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -36082,10 +27151,16 @@
+@@ -36086,10 +27155,16 @@
if test -n "$CONFIG_FILES"; then
@@ -37440,7 +37440,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -36099,24 +27174,18 @@
+@@ -36103,24 +27178,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -37468,7 +37468,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -36138,7 +27207,7 @@
+@@ -36142,7 +27211,7 @@
t delim
:nl
h
@@ -37477,7 +37477,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -36152,7 +27221,7 @@
+@@ -36156,7 +27225,7 @@
t nl
:delim
h
@@ -37486,7 +37486,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -36205,9 +27274,7 @@
+@@ -36209,9 +27278,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -37497,7 +37497,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -36248,9 +27315,7 @@
+@@ -36252,9 +27319,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -37508,7 +37508,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -36335,9 +27400,7 @@
+@@ -36339,9 +27404,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -37519,7 +37519,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -36350,9 +27413,7 @@
+@@ -36354,9 +27417,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -37530,7 +37530,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -36380,12 +27441,10 @@
+@@ -36384,12 +27445,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -37545,7 +37545,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -36396,7 +27455,7 @@
+@@ -36400,7 +27459,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -37554,7 +37554,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -36409,9 +27468,7 @@
+@@ -36413,9 +27472,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -37565,7 +37565,7 @@
esac
;;
esac
-@@ -36439,47 +27496,7 @@
+@@ -36443,47 +27500,7 @@
q
}
s/.*/./; q'`
@@ -37614,7 +37614,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -36536,7 +27553,6 @@
+@@ -36540,7 +27557,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -37622,7 +37622,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -36546,12 +27562,11 @@
+@@ -36550,12 +27566,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -37637,7 +37637,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -36561,7 +27576,7 @@
+@@ -36565,7 +27580,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -37646,7 +37646,7 @@
esac
_ACEOF
-@@ -36590,14 +27605,12 @@
+@@ -36594,14 +27609,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -37663,7 +37663,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -36607,9 +27620,7 @@
+@@ -36611,9 +27624,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -37674,7 +37674,7 @@
;;
:H)
#
-@@ -36620,25 +27631,19 @@
+@@ -36624,25 +27635,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -37704,7 +37704,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -36676,7 +27681,7 @@
+@@ -36680,7 +27685,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -37713,7 +37713,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -36771,47 +27776,7 @@
+@@ -36775,47 +27780,7 @@
q
}
s/.*/./; q'`
@@ -37762,7 +37762,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -37674,7 +28639,7 @@
+@@ -37678,7 +28643,7 @@
if cmp -s $outfile gdk/gdkconfig.h; then
@@ -37771,7 +37771,7 @@
$as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;}
rm -f $outfile
else
-@@ -37686,15 +28651,12 @@
+@@ -37690,15 +28655,12 @@
done # for ac_tag
@@ -37789,7 +37789,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -37715,10 +28677,10 @@
+@@ -37719,10 +28681,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -37802,9 +37802,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-diff -Naur gtk+2.0-2.19.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.4/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.19.4.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-01-26 03:43:10.000000000 +0100
-+++ gtk+2.0-2.19.4/contrib/gdk-pixbuf-xlib/Makefile.in 2010-01-26 08:35:05.008652344 +0100
+diff -Naur gtk+2.0-2.19.5.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.19.5/contrib/gdk-pixbuf-xlib/Makefile.in
+--- gtk+2.0-2.19.5.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-02-09 20:18:36.000000000 +0100
++++ gtk+2.0-2.19.5/contrib/gdk-pixbuf-xlib/Makefile.in 2010-02-10 09:46:50.713499514 +0100
@@ -44,11 +44,14 @@
$(top_srcdir)/Makefile.decl ChangeLog
subdir = contrib/gdk-pixbuf-xlib
@@ -37822,7 +37822,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc
CONFIG_CLEAN_VPATH_FILES =
-@@ -197,6 +200,7 @@
+@@ -198,6 +201,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -37830,7 +37830,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -283,6 +287,7 @@
+@@ -284,6 +288,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -37838,12 +37838,156 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/contrib/Makefile.in gtk+2.0-2.19.4/contrib/Makefile.in
---- gtk+2.0-2.19.4.old/contrib/Makefile.in 2010-01-26 03:43:10.000000000 +0100
-+++ gtk+2.0-2.19.4/contrib/Makefile.in 2010-01-26 08:35:04.896652363 +0100
+diff -Naur gtk+2.0-2.19.5.old/contrib/Makefile.in gtk+2.0-2.19.5/contrib/Makefile.in
+--- gtk+2.0-2.19.5.old/contrib/Makefile.in 2010-02-09 20:18:36.000000000 +0100
++++ gtk+2.0-2.19.5/contrib/Makefile.in 2010-02-10 09:46:50.589498840 +0100
@@ -40,11 +40,14 @@
@USE_X11_TRUE at am__append_1 = gdk-pixbuf-xlib
subdir = contrib
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -171,6 +174,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -257,6 +261,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.5/demos/gtk-demo/Makefile.in
+--- gtk+2.0-2.19.5.old/demos/gtk-demo/Makefile.in 2010-02-09 20:18:37.000000000 +0100
++++ gtk+2.0-2.19.5/demos/gtk-demo/Makefile.in 2010-02-10 09:46:50.929499323 +0100
+@@ -42,11 +42,14 @@
+ bin_PROGRAMS = gtk-demo$(EXEEXT)
+ subdir = demos/gtk-demo
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = geninclude.pl
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -207,6 +210,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -293,6 +297,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/demos/Makefile.in gtk+2.0-2.19.5/demos/Makefile.in
+--- gtk+2.0-2.19.5.old/demos/Makefile.in 2010-02-09 20:18:36.000000000 +0100
++++ gtk+2.0-2.19.5/demos/Makefile.in 2010-02-10 09:46:50.825499226 +0100
+@@ -46,11 +46,14 @@
+ @HAVE_PNG_TRUE at am__append_1 = testpixbuf
+ subdir = demos
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -230,6 +233,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -316,6 +320,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/docs/faq/Makefile.in gtk+2.0-2.19.5/docs/faq/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/faq/Makefile.in 2010-02-09 20:18:37.000000000 +0100
++++ gtk+2.0-2.19.5/docs/faq/Makefile.in 2010-02-10 09:46:51.081499570 +0100
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = docs/faq
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -130,6 +133,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -216,6 +220,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/docs/Makefile.in gtk+2.0-2.19.5/docs/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/Makefile.in 2010-02-09 20:18:37.000000000 +0100
++++ gtk+2.0-2.19.5/docs/Makefile.in 2010-02-10 09:46:51.005500183 +0100
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = docs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -37874,153 +38018,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.19.4/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.19.4.old/demos/gtk-demo/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/demos/gtk-demo/Makefile.in 2010-01-26 08:35:05.260652052 +0100
-@@ -42,11 +42,14 @@
- bin_PROGRAMS = gtk-demo$(EXEEXT)
- subdir = demos/gtk-demo
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = geninclude.pl
- CONFIG_CLEAN_VPATH_FILES =
-@@ -206,6 +209,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -292,6 +296,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/demos/Makefile.in gtk+2.0-2.19.4/demos/Makefile.in
---- gtk+2.0-2.19.4.old/demos/Makefile.in 2010-01-26 03:43:10.000000000 +0100
-+++ gtk+2.0-2.19.4/demos/Makefile.in 2010-01-26 08:35:05.136652207 +0100
-@@ -46,11 +46,14 @@
- @HAVE_PNG_TRUE at am__append_1 = testpixbuf
- subdir = demos
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -229,6 +232,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -315,6 +319,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/faq/Makefile.in gtk+2.0-2.19.4/docs/faq/Makefile.in
---- gtk+2.0-2.19.4.old/docs/faq/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/faq/Makefile.in 2010-01-26 08:35:05.460655463 +0100
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = docs/faq
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -129,6 +132,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -215,6 +219,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/Makefile.in gtk+2.0-2.19.4/docs/Makefile.in
---- gtk+2.0-2.19.4.old/docs/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/Makefile.in 2010-01-26 08:35:05.356660413 +0100
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = docs
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -169,6 +172,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -255,6 +259,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.4/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.19.4.old/docs/reference/gdk/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/reference/gdk/Makefile.in 2010-01-26 08:35:05.768652440 +0100
+diff -Naur gtk+2.0-2.19.5.old/docs/reference/gdk/Makefile.in gtk+2.0-2.19.5/docs/reference/gdk/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/reference/gdk/Makefile.in 2010-02-09 20:18:38.000000000 +0100
++++ gtk+2.0-2.19.5/docs/reference/gdk/Makefile.in 2010-02-10 09:46:51.337499565 +0100
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gdk
@@ -38038,7 +38038,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = version.xml
CONFIG_CLEAN_VPATH_FILES =
-@@ -136,6 +139,7 @@
+@@ -137,6 +140,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38046,7 +38046,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -222,6 +226,7 @@
+@@ -223,6 +227,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38054,9 +38054,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.19.4/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.19.4.old/docs/reference/gdk-pixbuf/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/reference/gdk-pixbuf/Makefile.in 2010-01-26 08:35:05.660653719 +0100
+diff -Naur gtk+2.0-2.19.5.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.19.5/docs/reference/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/reference/gdk-pixbuf/Makefile.in 2010-02-09 20:18:38.000000000 +0100
++++ gtk+2.0-2.19.5/docs/reference/gdk-pixbuf/Makefile.in 2010-02-10 09:46:51.249499063 +0100
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gdk-pixbuf
@@ -38074,7 +38074,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = version.xml
CONFIG_CLEAN_VPATH_FILES =
-@@ -161,6 +164,7 @@
+@@ -162,6 +165,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38082,7 +38082,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -247,6 +251,7 @@
+@@ -248,6 +252,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38090,9 +38090,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.19.4/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.19.4.old/docs/reference/gtk/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/reference/gtk/Makefile.in 2010-01-26 08:35:05.884653144 +0100
+diff -Naur gtk+2.0-2.19.5.old/docs/reference/gtk/Makefile.in gtk+2.0-2.19.5/docs/reference/gtk/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/reference/gtk/Makefile.in 2010-02-09 20:18:38.000000000 +0100
++++ gtk+2.0-2.19.5/docs/reference/gtk/Makefile.in 2010-02-10 09:46:51.433498994 +0100
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gtk
@@ -38110,7 +38110,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = version.xml
CONFIG_CLEAN_VPATH_FILES =
-@@ -161,6 +164,7 @@
+@@ -162,6 +165,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38118,7 +38118,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -247,6 +251,7 @@
+@@ -248,6 +252,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38126,12 +38126,264 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.19.4/docs/reference/libgail-util/Makefile.in
---- gtk+2.0-2.19.4.old/docs/reference/libgail-util/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/reference/libgail-util/Makefile.in 2010-01-26 08:35:05.992654502 +0100
+diff -Naur gtk+2.0-2.19.5.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.19.5/docs/reference/libgail-util/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/reference/libgail-util/Makefile.in 2010-02-09 20:18:38.000000000 +0100
++++ gtk+2.0-2.19.5/docs/reference/libgail-util/Makefile.in 2010-02-10 09:46:51.521499213 +0100
@@ -45,11 +45,14 @@
$(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make
subdir = docs/reference/libgail-util
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -136,6 +139,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -222,6 +226,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/docs/reference/Makefile.in gtk+2.0-2.19.5/docs/reference/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/reference/Makefile.in 2010-02-09 20:18:37.000000000 +0100
++++ gtk+2.0-2.19.5/docs/reference/Makefile.in 2010-02-10 09:46:51.157498889 +0100
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
+ subdir = docs/reference
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -170,6 +173,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -256,6 +260,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/docs/tools/Makefile.in gtk+2.0-2.19.5/docs/tools/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/tools/Makefile.in 2010-02-09 20:18:38.000000000 +0100
++++ gtk+2.0-2.19.5/docs/tools/Makefile.in 2010-02-10 09:46:51.613499234 +0100
+@@ -41,11 +41,14 @@
+ @USE_X11_TRUE at noinst_PROGRAMS = doc-shooter$(EXEEXT)
+ subdir = docs/tools
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -166,6 +169,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -252,6 +256,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/docs/tutorial/Makefile.in gtk+2.0-2.19.5/docs/tutorial/Makefile.in
+--- gtk+2.0-2.19.5.old/docs/tutorial/Makefile.in 2010-02-09 20:18:38.000000000 +0100
++++ gtk+2.0-2.19.5/docs/tutorial/Makefile.in 2010-02-10 09:46:51.689499116 +0100
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = docs/tutorial
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -130,6 +133,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -216,6 +220,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/gdk/directfb/Makefile.in gtk+2.0-2.19.5/gdk/directfb/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk/directfb/Makefile.in 2010-02-09 20:18:40.000000000 +0100
++++ gtk+2.0-2.19.5/gdk/directfb/Makefile.in 2010-02-10 09:46:52.354499353 +0100
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
+ subdir = gdk/directfb
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -194,6 +197,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -280,6 +284,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/gdk/Makefile.in gtk+2.0-2.19.5/gdk/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk/Makefile.in 2010-02-09 20:18:39.000000000 +0100
++++ gtk+2.0-2.19.5/gdk/Makefile.in 2010-02-10 09:46:52.254499559 +0100
+@@ -45,11 +45,14 @@
+ @HAVE_INTROSPECTION_TRUE at am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
+ subdir = gdk
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -321,6 +324,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -407,6 +411,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/gdk/quartz/Makefile.in gtk+2.0-2.19.5/gdk/quartz/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk/quartz/Makefile.in 2010-02-09 20:18:40.000000000 +0100
++++ gtk+2.0-2.19.5/gdk/quartz/Makefile.in 2010-02-10 09:46:52.458498540 +0100
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
+ subdir = gdk/quartz
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -193,6 +196,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -279,6 +283,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/gdk/tests/Makefile.in gtk+2.0-2.19.5/gdk/tests/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk/tests/Makefile.in 2010-02-09 20:18:40.000000000 +0100
++++ gtk+2.0-2.19.5/gdk/tests/Makefile.in 2010-02-10 09:46:52.538499138 +0100
+@@ -41,11 +41,14 @@
+ TESTS = $(am__EXEEXT_1)
+ subdir = gdk/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -38162,261 +38414,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/reference/Makefile.in gtk+2.0-2.19.4/docs/reference/Makefile.in
---- gtk+2.0-2.19.4.old/docs/reference/Makefile.in 2010-01-26 03:43:11.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/reference/Makefile.in 2010-01-26 08:35:05.552652979 +0100
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
- subdir = docs/reference
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -169,6 +172,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -255,6 +259,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/tools/Makefile.in gtk+2.0-2.19.4/docs/tools/Makefile.in
---- gtk+2.0-2.19.4.old/docs/tools/Makefile.in 2010-01-26 03:43:12.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/tools/Makefile.in 2010-01-26 08:35:06.096653477 +0100
-@@ -41,11 +41,14 @@
- @USE_X11_TRUE at noinst_PROGRAMS = doc-shooter$(EXEEXT)
- subdir = docs/tools
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -165,6 +168,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -251,6 +255,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/docs/tutorial/Makefile.in gtk+2.0-2.19.4/docs/tutorial/Makefile.in
---- gtk+2.0-2.19.4.old/docs/tutorial/Makefile.in 2010-01-26 03:43:12.000000000 +0100
-+++ gtk+2.0-2.19.4/docs/tutorial/Makefile.in 2010-01-26 08:35:06.196653690 +0100
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = docs/tutorial
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -129,6 +132,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -215,6 +219,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk/directfb/Makefile.in gtk+2.0-2.19.4/gdk/directfb/Makefile.in
---- gtk+2.0-2.19.4.old/gdk/directfb/Makefile.in 2010-01-26 03:43:13.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk/directfb/Makefile.in 2010-01-26 08:35:07.224653760 +0100
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
- subdir = gdk/directfb
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -193,6 +196,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -279,6 +283,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk/Makefile.in gtk+2.0-2.19.4/gdk/Makefile.in
---- gtk+2.0-2.19.4.old/gdk/Makefile.in 2010-01-26 03:43:12.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk/Makefile.in 2010-01-26 08:35:07.108653815 +0100
-@@ -45,11 +45,14 @@
- @HAVE_INTROSPECTION_TRUE at am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
- subdir = gdk
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -320,6 +323,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -406,6 +410,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk/quartz/Makefile.in gtk+2.0-2.19.4/gdk/quartz/Makefile.in
---- gtk+2.0-2.19.4.old/gdk/quartz/Makefile.in 2010-01-26 03:43:13.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk/quartz/Makefile.in 2010-01-26 08:35:07.340655796 +0100
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = gdk/quartz
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -192,6 +195,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -278,6 +282,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk/tests/Makefile.in gtk+2.0-2.19.4/gdk/tests/Makefile.in
---- gtk+2.0-2.19.4.old/gdk/tests/Makefile.in 2010-01-26 03:43:13.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk/tests/Makefile.in 2010-01-26 08:35:07.440655717 +0100
-@@ -41,11 +41,14 @@
- TESTS = $(am__EXEEXT_1)
- subdir = gdk/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -134,6 +137,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -220,6 +224,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk/win32/Makefile.in gtk+2.0-2.19.4/gdk/win32/Makefile.in
---- gtk+2.0-2.19.4.old/gdk/win32/Makefile.in 2010-01-26 03:43:13.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk/win32/Makefile.in 2010-01-26 08:35:07.564653388 +0100
+diff -Naur gtk+2.0-2.19.5.old/gdk/win32/Makefile.in gtk+2.0-2.19.5/gdk/win32/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk/win32/Makefile.in 2010-02-09 20:18:40.000000000 +0100
++++ gtk+2.0-2.19.5/gdk/win32/Makefile.in 2010-02-10 09:46:52.642499706 +0100
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32
@@ -38434,7 +38434,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -230,6 +233,7 @@
+@@ -231,6 +234,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38442,7 +38442,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -316,6 +320,7 @@
+@@ -317,6 +321,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38450,9 +38450,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk/win32/rc/Makefile.in gtk+2.0-2.19.4/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.19.4.old/gdk/win32/rc/Makefile.in 2010-01-26 03:43:13.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk/win32/rc/Makefile.in 2010-01-26 08:35:07.656653421 +0100
+diff -Naur gtk+2.0-2.19.5.old/gdk/win32/rc/Makefile.in gtk+2.0-2.19.5/gdk/win32/rc/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk/win32/rc/Makefile.in 2010-02-09 20:18:40.000000000 +0100
++++ gtk+2.0-2.19.5/gdk/win32/rc/Makefile.in 2010-02-10 09:46:52.722499332 +0100
@@ -40,11 +40,14 @@
$(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32/rc
@@ -38470,7 +38470,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gdk.rc
CONFIG_CLEAN_VPATH_FILES =
-@@ -131,6 +134,7 @@
+@@ -132,6 +135,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38478,7 +38478,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -217,6 +221,7 @@
+@@ -218,6 +222,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38486,9 +38486,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk/x11/Makefile.in gtk+2.0-2.19.4/gdk/x11/Makefile.in
---- gtk+2.0-2.19.4.old/gdk/x11/Makefile.in 2010-01-26 03:43:13.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk/x11/Makefile.in 2010-01-26 08:35:07.780652429 +0100
+diff -Naur gtk+2.0-2.19.5.old/gdk/x11/Makefile.in gtk+2.0-2.19.5/gdk/x11/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk/x11/Makefile.in 2010-02-09 20:18:40.000000000 +0100
++++ gtk+2.0-2.19.5/gdk/x11/Makefile.in 2010-02-10 09:46:52.830499513 +0100
@@ -46,11 +46,14 @@
TESTS = checksettings$(EXEEXT)
subdir = gdk/x11
@@ -38506,7 +38506,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -222,6 +225,7 @@
+@@ -223,6 +226,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38514,7 +38514,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -308,6 +312,7 @@
+@@ -309,6 +313,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38522,9 +38522,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.4/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.19.4.old/gdk-pixbuf/Makefile.in 2010-01-26 03:43:12.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk-pixbuf/Makefile.in 2010-01-26 08:35:06.776655063 +0100
+diff -Naur gtk+2.0-2.19.5.old/gdk-pixbuf/Makefile.in gtk+2.0-2.19.5/gdk-pixbuf/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk-pixbuf/Makefile.in 2010-02-09 20:18:39.000000000 +0100
++++ gtk+2.0-2.19.5/gdk-pixbuf/Makefile.in 2010-02-10 09:46:51.969499729 +0100
@@ -51,11 +51,14 @@
@HAVE_INTROSPECTION_TRUE at am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
subdir = gdk-pixbuf
@@ -38542,7 +38542,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h
CONFIG_CLEAN_VPATH_FILES =
-@@ -778,6 +781,7 @@
+@@ -779,6 +782,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38550,7 +38550,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -864,6 +868,7 @@
+@@ -865,6 +869,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38558,7 +38558,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -997,6 +1002,7 @@
+@@ -998,6 +1003,7 @@
libgdk_pixbuf-2.0.la
loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
@@ -38566,7 +38566,7 @@
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
#
-@@ -1368,7 +1374,7 @@
+@@ -1369,7 +1375,7 @@
$(GDK_PIXBUF_DEP_CFLAGS) \
-DGDK_PIXBUF_ENABLE_BACKEND
@@ -38575,9 +38575,9 @@
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
test_gdk_pixbuf_LDADD = $(LDADDS)
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-diff -Naur gtk+2.0-2.19.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.4/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.19.4.old/gdk-pixbuf/pixops/Makefile.in 2010-01-26 03:43:12.000000000 +0100
-+++ gtk+2.0-2.19.4/gdk-pixbuf/pixops/Makefile.in 2010-01-26 08:35:06.916652808 +0100
+diff -Naur gtk+2.0-2.19.5.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.19.5/gdk-pixbuf/pixops/Makefile.in
+--- gtk+2.0-2.19.5.old/gdk-pixbuf/pixops/Makefile.in 2010-02-09 20:18:39.000000000 +0100
++++ gtk+2.0-2.19.5/gdk-pixbuf/pixops/Makefile.in 2010-02-10 09:46:52.081500199 +0100
@@ -42,11 +42,14 @@
noinst_PROGRAMS = timescale$(EXEEXT)
subdir = gdk-pixbuf/pixops
@@ -38595,7 +38595,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -182,6 +185,7 @@
+@@ -183,6 +186,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38603,7 +38603,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -268,6 +272,7 @@
+@@ -269,6 +273,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38611,9 +38611,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gtk/Makefile.in gtk+2.0-2.19.4/gtk/Makefile.in
---- gtk+2.0-2.19.4.old/gtk/Makefile.in 2010-01-26 03:43:14.000000000 +0100
-+++ gtk+2.0-2.19.4/gtk/Makefile.in 2010-01-26 08:35:08.176653520 +0100
+diff -Naur gtk+2.0-2.19.5.old/gtk/Makefile.in gtk+2.0-2.19.5/gtk/Makefile.in
+--- gtk+2.0-2.19.5.old/gtk/Makefile.in 2010-02-09 20:18:41.000000000 +0100
++++ gtk+2.0-2.19.5/gtk/Makefile.in 2010-02-10 09:46:53.189499745 +0100
@@ -77,11 +77,14 @@
subdir = gtk
@@ -38631,7 +38631,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
CONFIG_CLEAN_VPATH_FILES =
-@@ -738,6 +741,7 @@
+@@ -739,6 +742,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38639,7 +38639,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -824,6 +828,7 @@
+@@ -825,6 +829,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38647,7 +38647,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -986,6 +991,8 @@
+@@ -987,6 +992,8 @@
-I$(top_srcdir)/gdk \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
@@ -38656,7 +38656,7 @@
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -1099,17 +1106,21 @@
+@@ -1100,17 +1107,21 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -38686,9 +38686,9 @@
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
gtkrbtree.h gtkrecentchooserdefault.h \
-diff -Naur gtk+2.0-2.19.4.old/gtk/tests/Makefile.in gtk+2.0-2.19.4/gtk/tests/Makefile.in
---- gtk+2.0-2.19.4.old/gtk/tests/Makefile.in 2010-01-26 03:43:14.000000000 +0100
-+++ gtk+2.0-2.19.4/gtk/tests/Makefile.in 2010-01-26 08:35:08.348653530 +0100
+diff -Naur gtk+2.0-2.19.5.old/gtk/tests/Makefile.in gtk+2.0-2.19.5/gtk/tests/Makefile.in
+--- gtk+2.0-2.19.5.old/gtk/tests/Makefile.in 2010-02-09 20:18:41.000000000 +0100
++++ gtk+2.0-2.19.5/gtk/tests/Makefile.in 2010-02-10 09:46:53.313499237 +0100
@@ -42,11 +42,14 @@
@OS_UNIX_TRUE at am__append_1 = defaultvalue
subdir = gtk/tests
@@ -38706,7 +38706,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -220,6 +223,7 @@
+@@ -221,6 +224,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38714,7 +38714,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -306,6 +310,7 @@
+@@ -307,6 +311,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38722,9 +38722,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.4/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.19.4.old/gtk/theme-bits/Makefile.in 2010-01-26 03:43:14.000000000 +0100
-+++ gtk+2.0-2.19.4/gtk/theme-bits/Makefile.in 2010-01-26 08:35:08.464653737 +0100
+diff -Naur gtk+2.0-2.19.5.old/gtk/theme-bits/Makefile.in gtk+2.0-2.19.5/gtk/theme-bits/Makefile.in
+--- gtk+2.0-2.19.5.old/gtk/theme-bits/Makefile.in 2010-02-09 20:18:42.000000000 +0100
++++ gtk+2.0-2.19.5/gtk/theme-bits/Makefile.in 2010-02-10 09:46:53.409500692 +0100
@@ -41,11 +41,14 @@
noinst_PROGRAMS = decompose-bits$(EXEEXT)
subdir = gtk/theme-bits
@@ -38742,7 +38742,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -162,6 +165,7 @@
+@@ -163,6 +166,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -38750,7 +38750,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -248,6 +252,7 @@
+@@ -249,6 +253,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38758,9 +38758,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/ltmain.sh gtk+2.0-2.19.4/ltmain.sh
---- gtk+2.0-2.19.4.old/ltmain.sh 2009-12-02 12:35:38.000000000 +0100
-+++ gtk+2.0-2.19.4/ltmain.sh 2010-01-26 08:34:55.220652272 +0100
+diff -Naur gtk+2.0-2.19.5.old/ltmain.sh gtk+2.0-2.19.5/ltmain.sh
+--- gtk+2.0-2.19.5.old/ltmain.sh 2010-01-22 17:05:36.000000000 +0100
++++ gtk+2.0-2.19.5/ltmain.sh 2010-02-10 09:46:42.005501998 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -38839,9 +38839,9 @@
esac
;;
no)
-diff -Naur gtk+2.0-2.19.4.old/m4/gtk-doc.m4 gtk+2.0-2.19.4/m4/gtk-doc.m4
---- gtk+2.0-2.19.4.old/m4/gtk-doc.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.19.4/m4/gtk-doc.m4 2010-01-26 08:34:56.092674059 +0100
+diff -Naur gtk+2.0-2.19.5.old/m4/gtk-doc.m4 gtk+2.0-2.19.5/m4/gtk-doc.m4
+--- gtk+2.0-2.19.5.old/m4/gtk-doc.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.19.5/m4/gtk-doc.m4 2010-02-10 09:46:43.013609104 +0100
@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
@@ -38904,9 +38904,9 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])
-diff -Naur gtk+2.0-2.19.4.old/m4/libtool.m4 gtk+2.0-2.19.4/m4/libtool.m4
---- gtk+2.0-2.19.4.old/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.19.4/m4/libtool.m4 2010-01-26 08:34:55.504651277 +0100
+diff -Naur gtk+2.0-2.19.5.old/m4/libtool.m4 gtk+2.0-2.19.5/m4/libtool.m4
+--- gtk+2.0-2.19.5.old/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.19.5/m4/libtool.m4 2010-02-10 09:46:42.085502313 +0100
@@ -0,0 +1,7377 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -46285,9 +46285,9 @@
+ ;;
+ esac
+])
-diff -Naur gtk+2.0-2.19.4.old/m4/lt~obsolete.m4 gtk+2.0-2.19.4/m4/lt~obsolete.m4
---- gtk+2.0-2.19.4.old/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.19.4/m4/lt~obsolete.m4 2010-01-26 08:34:55.900681018 +0100
+diff -Naur gtk+2.0-2.19.5.old/m4/lt~obsolete.m4 gtk+2.0-2.19.5/m4/lt~obsolete.m4
+--- gtk+2.0-2.19.5.old/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.19.5/m4/lt~obsolete.m4 2010-02-10 09:46:42.809502640 +0100
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@@ -46381,9 +46381,9 @@
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-diff -Naur gtk+2.0-2.19.4.old/m4/ltoptions.m4 gtk+2.0-2.19.4/m4/ltoptions.m4
---- gtk+2.0-2.19.4.old/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.19.4/m4/ltoptions.m4 2010-01-26 08:34:55.620653106 +0100
+diff -Naur gtk+2.0-2.19.5.old/m4/ltoptions.m4 gtk+2.0-2.19.5/m4/ltoptions.m4
+--- gtk+2.0-2.19.5.old/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.19.5/m4/ltoptions.m4 2010-02-10 09:46:42.249505558 +0100
@@ -0,0 +1,368 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
@@ -46753,9 +46753,9 @@
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
-diff -Naur gtk+2.0-2.19.4.old/m4/ltsugar.m4 gtk+2.0-2.19.4/m4/ltsugar.m4
---- gtk+2.0-2.19.4.old/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.19.4/m4/ltsugar.m4 2010-01-26 08:34:55.708652353 +0100
+diff -Naur gtk+2.0-2.19.5.old/m4/ltsugar.m4 gtk+2.0-2.19.5/m4/ltsugar.m4
+--- gtk+2.0-2.19.5.old/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.19.5/m4/ltsugar.m4 2010-02-10 09:46:42.553529259 +0100
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@@ -46880,9 +46880,9 @@
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
-diff -Naur gtk+2.0-2.19.4.old/m4/ltversion.m4 gtk+2.0-2.19.4/m4/ltversion.m4
---- gtk+2.0-2.19.4.old/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.19.4/m4/ltversion.m4 2010-01-26 08:34:55.800652738 +0100
+diff -Naur gtk+2.0-2.19.5.old/m4/ltversion.m4 gtk+2.0-2.19.5/m4/ltversion.m4
+--- gtk+2.0-2.19.5.old/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.19.5/m4/ltversion.m4 2010-02-10 09:46:42.689502329 +0100
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
@@ -46907,9 +46907,9 @@
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
-diff -Naur gtk+2.0-2.19.4.old/m4macros/Makefile.in gtk+2.0-2.19.4/m4macros/Makefile.in
---- gtk+2.0-2.19.4.old/m4macros/Makefile.in 2010-01-26 03:43:14.000000000 +0100
-+++ gtk+2.0-2.19.4/m4macros/Makefile.in 2010-01-26 08:35:08.556653209 +0100
+diff -Naur gtk+2.0-2.19.5.old/m4macros/Makefile.in gtk+2.0-2.19.5/m4macros/Makefile.in
+--- gtk+2.0-2.19.5.old/m4macros/Makefile.in 2010-02-09 20:18:42.000000000 +0100
++++ gtk+2.0-2.19.5/m4macros/Makefile.in 2010-02-10 09:46:53.489499826 +0100
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = m4macros
@@ -46927,7 +46927,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -153,6 +156,7 @@
+@@ -154,6 +157,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -46935,7 +46935,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -239,6 +243,7 @@
+@@ -240,6 +244,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -46943,9 +46943,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/Makefile.in gtk+2.0-2.19.4/Makefile.in
---- gtk+2.0-2.19.4.old/Makefile.in 2010-01-26 03:43:17.000000000 +0100
-+++ gtk+2.0-2.19.4/Makefile.in 2010-01-26 08:35:11.516651334 +0100
+diff -Naur gtk+2.0-2.19.5.old/Makefile.in gtk+2.0-2.19.5/Makefile.in
+--- gtk+2.0-2.19.5.old/Makefile.in 2010-02-09 20:18:47.000000000 +0100
++++ gtk+2.0-2.19.5/Makefile.in 2010-02-10 09:46:56.085499450 +0100
@@ -47,17 +47,20 @@
$(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \
$(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
@@ -46980,7 +46980,7 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-@@ -219,6 +223,7 @@
+@@ -220,6 +224,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -46988,7 +46988,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -305,6 +310,7 @@
+@@ -306,6 +311,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -46996,7 +46996,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -475,7 +481,10 @@
+@@ -476,7 +482,10 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -47008,9 +47008,9 @@
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
-diff -Naur gtk+2.0-2.19.4.old/mkinstalldirs gtk+2.0-2.19.4/mkinstalldirs
---- gtk+2.0-2.19.4.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.19.4/mkinstalldirs 2010-01-26 08:35:11.448654009 +0100
+diff -Naur gtk+2.0-2.19.5.old/mkinstalldirs gtk+2.0-2.19.5/mkinstalldirs
+--- gtk+2.0-2.19.5.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
++++ gtk+2.0-2.19.5/mkinstalldirs 2010-02-10 09:46:56.025499651 +0100
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -47174,258 +47174,12 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-diff -Naur gtk+2.0-2.19.4.old/modules/engines/Makefile.in gtk+2.0-2.19.4/modules/engines/Makefile.in
---- gtk+2.0-2.19.4.old/modules/engines/Makefile.in 2010-01-26 03:43:14.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/engines/Makefile.in 2010-01-26 08:35:08.740652162 +0100
+diff -Naur gtk+2.0-2.19.5.old/modules/engines/Makefile.in gtk+2.0-2.19.5/modules/engines/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/engines/Makefile.in 2010-02-09 20:18:42.000000000 +0100
++++ gtk+2.0-2.19.5/modules/engines/Makefile.in 2010-02-10 09:46:53.649500246 +0100
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -169,6 +172,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -255,6 +259,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.19.4/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.19.4.old/modules/engines/ms-windows/Makefile.in 2010-01-26 03:43:15.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/engines/ms-windows/Makefile.in 2010-01-26 08:35:08.852653549 +0100
-@@ -40,11 +40,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -227,6 +230,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -313,6 +317,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.19.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.19.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-01-26 03:43:15.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-01-26 08:35:09.040653760 +0100
-@@ -40,11 +40,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows/Theme/gtk-2.0
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -153,6 +156,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -239,6 +243,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.19.4/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.19.4.old/modules/engines/ms-windows/Theme/Makefile.in 2010-01-26 03:43:15.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/engines/ms-windows/Theme/Makefile.in 2010-01-26 08:35:08.944652313 +0100
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = modules/engines/ms-windows/Theme
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -169,6 +172,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -255,6 +259,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.19.4/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.19.4.old/modules/engines/pixbuf/Makefile.in 2010-01-26 03:43:15.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/engines/pixbuf/Makefile.in 2010-01-26 08:35:09.156654120 +0100
-@@ -40,11 +40,14 @@
- $(top_srcdir)/Makefile.decl ChangeLog
- subdir = modules/engines/pixbuf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -190,6 +193,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -276,6 +280,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/input/Makefile.in gtk+2.0-2.19.4/modules/input/Makefile.in
---- gtk+2.0-2.19.4.old/modules/input/Makefile.in 2010-01-26 03:43:15.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/input/Makefile.in 2010-01-26 08:35:09.380654802 +0100
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/input
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -391,6 +394,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -477,6 +481,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -713,7 +718,8 @@
- @INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
- imconffiledir = $(sysconfdir)/gtk-2.0
- dist_imconffile_DATA = im-multipress.conf
-- at CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
-+ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
-+ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE at RUN_QUERY_IMMODULES_TEST = false
- @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
- @BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
- @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
-@@ -1265,7 +1271,18 @@
- included-modules: $(noinst_LTLIBRARIES)
-
- gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
-+ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
-+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
-+ else \
-+ echo "***" ; \
-+ echo "*** Warning: gtk.immodules not built" ; \
-+ echo "***" ; \
-+ echo "*** Generate this file manually on host" ; \
-+ echo "*** system using gtk-query-immodules-2.0" ; \
-+ echo "***" ; \
-+ touch gtk.immodules; \
-+ fi
-
- @CROSS_COMPILING_FALSE at all-local: gtk.immodules
-
-diff -Naur gtk+2.0-2.19.4.old/modules/Makefile.in gtk+2.0-2.19.4/modules/Makefile.in
---- gtk+2.0-2.19.4.old/modules/Makefile.in 2010-01-26 03:43:14.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/Makefile.in 2010-01-26 08:35:08.648654150 +0100
-@@ -40,11 +40,14 @@
- @OS_UNIX_TRUE at am__append_1 = printbackends
- subdir = modules
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -47456,12 +47210,402 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.19.4/modules/other/gail/libgail-util/Makefile.in
---- gtk+2.0-2.19.4.old/modules/other/gail/libgail-util/Makefile.in 2010-01-26 03:43:16.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/other/gail/libgail-util/Makefile.in 2010-01-26 08:35:10.008653671 +0100
+diff -Naur gtk+2.0-2.19.5.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.19.5/modules/engines/ms-windows/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/engines/ms-windows/Makefile.in 2010-02-09 20:18:43.000000000 +0100
++++ gtk+2.0-2.19.5/modules/engines/ms-windows/Makefile.in 2010-02-10 09:46:53.749499342 +0100
+@@ -40,11 +40,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = modules/engines/ms-windows
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -228,6 +231,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -314,6 +318,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.19.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-02-09 20:18:43.000000000 +0100
++++ gtk+2.0-2.19.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-02-10 09:46:53.937499083 +0100
+@@ -40,11 +40,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = modules/engines/ms-windows/Theme/gtk-2.0
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -154,6 +157,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -240,6 +244,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.19.5/modules/engines/ms-windows/Theme/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/engines/ms-windows/Theme/Makefile.in 2010-02-09 20:18:43.000000000 +0100
++++ gtk+2.0-2.19.5/modules/engines/ms-windows/Theme/Makefile.in 2010-02-10 09:46:53.837500054 +0100
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = modules/engines/ms-windows/Theme
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -170,6 +173,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -256,6 +260,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.19.5/modules/engines/pixbuf/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/engines/pixbuf/Makefile.in 2010-02-09 20:18:43.000000000 +0100
++++ gtk+2.0-2.19.5/modules/engines/pixbuf/Makefile.in 2010-02-10 09:46:54.037499779 +0100
+@@ -40,11 +40,14 @@
+ $(top_srcdir)/Makefile.decl ChangeLog
+ subdir = modules/engines/pixbuf
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -191,6 +194,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -277,6 +281,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/input/Makefile.in gtk+2.0-2.19.5/modules/input/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/input/Makefile.in 2010-02-09 20:18:44.000000000 +0100
++++ gtk+2.0-2.19.5/modules/input/Makefile.in 2010-02-10 09:46:54.225499224 +0100
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
+ subdir = modules/input
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -392,6 +395,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -478,6 +482,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+@@ -714,7 +719,8 @@
+ @INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
+ imconffiledir = $(sysconfdir)/gtk-2.0
+ dist_imconffile_DATA = im-multipress.conf
+- at CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE at RUN_QUERY_IMMODULES_TEST = false
+ @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
+ @BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
+ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
+@@ -1266,7 +1272,18 @@
+ included-modules: $(noinst_LTLIBRARIES)
+
+ gtk.immodules: Makefile.am $(module_LTLIBRARIES)
+- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
++ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
++ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
++ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
++ else \
++ echo "***" ; \
++ echo "*** Warning: gtk.immodules not built" ; \
++ echo "***" ; \
++ echo "*** Generate this file manually on host" ; \
++ echo "*** system using gtk-query-immodules-2.0" ; \
++ echo "***" ; \
++ touch gtk.immodules; \
++ fi
+
+ @CROSS_COMPILING_FALSE at all-local: gtk.immodules
+
+diff -Naur gtk+2.0-2.19.5.old/modules/Makefile.in gtk+2.0-2.19.5/modules/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/Makefile.in 2010-02-09 20:18:42.000000000 +0100
++++ gtk+2.0-2.19.5/modules/Makefile.in 2010-02-10 09:46:53.569499094 +0100
+@@ -40,11 +40,14 @@
+ @OS_UNIX_TRUE at am__append_1 = printbackends
+ subdir = modules
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -171,6 +174,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -257,6 +261,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.19.5/modules/other/gail/libgail-util/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/other/gail/libgail-util/Makefile.in 2010-02-09 20:18:45.000000000 +0100
++++ gtk+2.0-2.19.5/modules/other/gail/libgail-util/Makefile.in 2010-02-10 09:46:54.797500207 +0100
@@ -42,11 +42,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/other/gail/libgail-util
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -195,6 +198,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -281,6 +285,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/other/gail/Makefile.in gtk+2.0-2.19.5/modules/other/gail/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/other/gail/Makefile.in 2010-02-09 20:18:44.000000000 +0100
++++ gtk+2.0-2.19.5/modules/other/gail/Makefile.in 2010-02-10 09:46:54.653501523 +0100
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
+ subdir = modules/other/gail
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -262,6 +265,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -348,6 +352,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19.5/modules/other/gail/tests/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/other/gail/tests/Makefile.in 2010-02-09 20:18:45.000000000 +0100
++++ gtk+2.0-2.19.5/modules/other/gail/tests/Makefile.in 2010-02-10 09:46:54.949500120 +0100
+@@ -40,11 +40,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = modules/other/gail/tests
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -334,6 +337,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -420,6 +424,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/other/Makefile.in gtk+2.0-2.19.5/modules/other/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/other/Makefile.in 2010-02-09 20:18:44.000000000 +0100
++++ gtk+2.0-2.19.5/modules/other/Makefile.in 2010-02-10 09:46:54.309500195 +0100
+@@ -39,11 +39,14 @@
+ $(top_srcdir)/Makefile.decl
+ subdir = modules/other
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -170,6 +173,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -256,6 +260,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.19.5/modules/printbackends/cups/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/printbackends/cups/Makefile.in 2010-02-09 20:18:45.000000000 +0100
++++ gtk+2.0-2.19.5/modules/printbackends/cups/Makefile.in 2010-02-10 09:46:55.157499867 +0100
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
+ subdir = modules/printbackends/cups
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -47492,120 +47636,12 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/other/gail/Makefile.in gtk+2.0-2.19.4/modules/other/gail/Makefile.in
---- gtk+2.0-2.19.4.old/modules/other/gail/Makefile.in 2010-01-26 03:43:16.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/other/gail/Makefile.in 2010-01-26 08:35:09.876652756 +0100
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
- subdir = modules/other/gail
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -261,6 +264,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -347,6 +351,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.19.4/modules/other/gail/tests/Makefile.in
---- gtk+2.0-2.19.4.old/modules/other/gail/tests/Makefile.in 2010-01-26 03:43:16.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/other/gail/tests/Makefile.in 2010-01-26 08:35:10.188651834 +0100
-@@ -40,11 +40,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = modules/other/gail/tests
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -333,6 +336,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -419,6 +423,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/other/Makefile.in gtk+2.0-2.19.4/modules/other/Makefile.in
---- gtk+2.0-2.19.4.old/modules/other/Makefile.in 2010-01-26 03:43:15.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/other/Makefile.in 2010-01-26 08:35:09.472653496 +0100
-@@ -39,11 +39,14 @@
- $(top_srcdir)/Makefile.decl
- subdir = modules/other
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -169,6 +172,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -255,6 +259,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.19.4/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.19.4.old/modules/printbackends/cups/Makefile.in 2010-01-26 03:43:16.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/printbackends/cups/Makefile.in 2010-01-26 08:35:10.404651914 +0100
+diff -Naur gtk+2.0-2.19.5.old/modules/printbackends/file/Makefile.in gtk+2.0-2.19.5/modules/printbackends/file/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/printbackends/file/Makefile.in 2010-02-09 20:18:45.000000000 +0100
++++ gtk+2.0-2.19.5/modules/printbackends/file/Makefile.in 2010-02-10 09:46:55.261500449 +0100
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/cups
+ subdir = modules/printbackends/file
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -47636,12 +47672,120 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/printbackends/file/Makefile.in gtk+2.0-2.19.4/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.19.4.old/modules/printbackends/file/Makefile.in 2010-01-26 03:43:16.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/printbackends/file/Makefile.in 2010-01-26 08:35:10.528653629 +0100
+diff -Naur gtk+2.0-2.19.5.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19.5/modules/printbackends/lpr/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/printbackends/lpr/Makefile.in 2010-02-09 20:18:46.000000000 +0100
++++ gtk+2.0-2.19.5/modules/printbackends/lpr/Makefile.in 2010-02-10 09:46:55.365498867 +0100
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/file
+ subdir = modules/printbackends/lpr
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -191,6 +194,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -277,6 +281,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/printbackends/Makefile.in gtk+2.0-2.19.5/modules/printbackends/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/printbackends/Makefile.in 2010-02-09 20:18:45.000000000 +0100
++++ gtk+2.0-2.19.5/modules/printbackends/Makefile.in 2010-02-10 09:46:55.033499131 +0100
+@@ -42,11 +42,14 @@
+ @HAVE_PAPI_TRUE at am__append_3 = papi
+ subdir = modules/printbackends
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -172,6 +175,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -258,6 +262,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.19.5/modules/printbackends/papi/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/printbackends/papi/Makefile.in 2010-02-09 20:18:46.000000000 +0100
++++ gtk+2.0-2.19.5/modules/printbackends/papi/Makefile.in 2010-02-10 09:46:55.461500319 +0100
+@@ -39,11 +39,14 @@
+ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
++ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+@@ -191,6 +194,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
+ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
+ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
+ GDK_WLIBS = @GDK_WLIBS@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -277,6 +281,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGO_PREFIX = @PANGO_PREFIX@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+diff -Naur gtk+2.0-2.19.5.old/modules/printbackends/test/Makefile.in gtk+2.0-2.19.5/modules/printbackends/test/Makefile.in
+--- gtk+2.0-2.19.5.old/modules/printbackends/test/Makefile.in 2010-02-09 20:18:46.000000000 +0100
++++ gtk+2.0-2.19.5/modules/printbackends/test/Makefile.in 2010-02-10 09:46:55.565499494 +0100
+@@ -41,11 +41,14 @@
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
+ subdir = modules/printbackends/test
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -47672,153 +47816,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.19.4/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.19.4.old/modules/printbackends/lpr/Makefile.in 2010-01-26 03:43:16.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/printbackends/lpr/Makefile.in 2010-01-26 08:35:10.652652493 +0100
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/lpr
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -190,6 +193,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -276,6 +280,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/printbackends/Makefile.in gtk+2.0-2.19.4/modules/printbackends/Makefile.in
---- gtk+2.0-2.19.4.old/modules/printbackends/Makefile.in 2010-01-26 03:43:16.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/printbackends/Makefile.in 2010-01-26 08:35:10.284652310 +0100
-@@ -42,11 +42,14 @@
- @HAVE_PAPI_TRUE at am__append_3 = papi
- subdir = modules/printbackends
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -171,6 +174,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -257,6 +261,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.19.4/modules/printbackends/papi/Makefile.in
---- gtk+2.0-2.19.4.old/modules/printbackends/papi/Makefile.in 2010-01-26 03:43:17.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/printbackends/papi/Makefile.in 2010-01-26 08:35:10.768651811 +0100
-@@ -39,11 +39,14 @@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -190,6 +193,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -276,6 +280,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/modules/printbackends/test/Makefile.in gtk+2.0-2.19.4/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.19.4.old/modules/printbackends/test/Makefile.in 2010-01-26 03:43:17.000000000 +0100
-+++ gtk+2.0-2.19.4/modules/printbackends/test/Makefile.in 2010-01-26 08:35:10.896652852 +0100
-@@ -41,11 +41,14 @@
- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
- subdir = modules/printbackends/test
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -191,6 +194,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -277,6 +281,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGO_PREFIX = @PANGO_PREFIX@
- PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/perf/Makefile.in gtk+2.0-2.19.4/perf/Makefile.in
---- gtk+2.0-2.19.4.old/perf/Makefile.in 2010-01-26 03:43:17.000000000 +0100
-+++ gtk+2.0-2.19.4/perf/Makefile.in 2010-01-26 08:35:11.012654390 +0100
+diff -Naur gtk+2.0-2.19.5.old/perf/Makefile.in gtk+2.0-2.19.5/perf/Makefile.in
+--- gtk+2.0-2.19.5.old/perf/Makefile.in 2010-02-09 20:18:46.000000000 +0100
++++ gtk+2.0-2.19.5/perf/Makefile.in 2010-02-10 09:46:55.669499367 +0100
@@ -41,11 +41,14 @@
noinst_PROGRAMS = testperf$(EXEEXT)
subdir = perf
@@ -47836,7 +47836,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -165,6 +168,7 @@
+@@ -166,6 +169,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -47844,7 +47844,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -251,6 +255,7 @@
+@@ -252,6 +256,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -47852,9 +47852,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_PREFIX = @PANGO_PREFIX@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Naur gtk+2.0-2.19.4.old/po/Makefile.in.in gtk+2.0-2.19.4/po/Makefile.in.in
---- gtk+2.0-2.19.4.old/po/Makefile.in.in 2009-12-19 03:54:51.000000000 +0100
-+++ gtk+2.0-2.19.4/po/Makefile.in.in 2010-01-26 08:34:56.064651362 +0100
+diff -Naur gtk+2.0-2.19.5.old/po/Makefile.in.in gtk+2.0-2.19.5/po/Makefile.in.in
+--- gtk+2.0-2.19.5.old/po/Makefile.in.in 2009-12-19 03:54:51.000000000 +0100
++++ gtk+2.0-2.19.5/po/Makefile.in.in 2010-02-10 09:46:42.961603684 +0100
@@ -25,22 +25,23 @@
prefix = @prefix@
@@ -47966,9 +47966,9 @@
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
-diff -Naur gtk+2.0-2.19.4.old/tests/Makefile.in gtk+2.0-2.19.4/tests/Makefile.in
---- gtk+2.0-2.19.4.old/tests/Makefile.in 2010-01-26 03:43:17.000000000 +0100
-+++ gtk+2.0-2.19.4/tests/Makefile.in 2010-01-26 08:35:11.356652381 +0100
+diff -Naur gtk+2.0-2.19.5.old/tests/Makefile.in gtk+2.0-2.19.5/tests/Makefile.in
+--- gtk+2.0-2.19.5.old/tests/Makefile.in 2010-02-09 20:18:47.000000000 +0100
++++ gtk+2.0-2.19.5/tests/Makefile.in 2010-02-10 09:46:55.933499692 +0100
@@ -75,11 +75,14 @@
@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE at am__append_2 = -DHAVE_OBJC=1 -x objective-c++
subdir = tests
@@ -47986,7 +47986,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -431,6 +434,7 @@
+@@ -432,6 +435,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
@@ -47994,7 +47994,7 @@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -517,6 +521,7 @@
+@@ -518,6 +522,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=23017&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Wed Feb 10 08:47:52 2010
@@ -54,7 +54,7 @@
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0
SONAME := 0
-SHVER := 2.19.4
+SHVER := 2.19.5
# earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0
More information about the pkg-gnome-commits
mailing list